projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix destruction to free all memory
[ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index 848b272f77c5167de00828e88b67652472ada7f7..3f2ee38cdb7357f0bc5b94dc093536ca87acb819 100644
(file)
--- a/
libust/tracectl.c
+++ b/
libust/tracectl.c
@@
-17,6
+17,7
@@
#define _GNU_SOURCE
#include <stdio.h>
#define _GNU_SOURCE
#include <stdio.h>
+#include <stdlib.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
@@
-26,8
+27,7
@@
#include <fcntl.h>
#include <poll.h>
#include <regex.h>
#include <fcntl.h>
#include <poll.h>
#include <regex.h>
-
-#include <urcu-bp.h>
+#include <urcu/uatomic_arch.h>
#include <ust/marker.h>
#include <ust/tracectl.h>
#include <ust/marker.h>
#include <ust/tracectl.h>
@@
-125,15
+125,6
@@
static void print_markers(FILE *fp)
static int init_socket(void);
static int init_socket(void);
-/* This needs to be called whenever a new thread is created. It notifies
- * liburcu of the new thread.
- */
-
-void ust_register_thread(void)
-{
- rcu_register_thread();
-}
-
int fd_notif = -1;
void notif_cb(void)
{
int fd_notif = -1;
void notif_cb(void)
{
@@
-695,7
+686,7
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
/* Being here is the proof the daemon has mapped the buffer in its
* memory. We may now decrement buffers_to_export.
*/
/* Being here is the proof the daemon has mapped the buffer in its
* memory. We may now decrement buffers_to_export.
*/
- if(
atomic_long
_read(&buf->consumed) == 0) {
+ if(
uatomic
_read(&buf->consumed) == 0) {
DBG("decrementing buffers_to_export");
buffers_to_export--;
}
DBG("decrementing buffers_to_export");
buffers_to_export--;
}
@@
-828,8
+819,6
@@
void *listener_main(void *p)
{
int result;
{
int result;
- ust_register_thread();
-
DBG("LISTENER");
for(;;) {
DBG("LISTENER");
for(;;) {
@@
-1191,16
+1180,8
@@
static void __attribute__((constructor)) init()
*/
pidunique = make_pidunique();
*/
pidunique = make_pidunique();
- /* Initialize RCU in case the constructor order is not good. */
- rcu_init();
-
- /* It is important to do this before events start to be generated. */
- ust_register_thread();
-
DBG("Tracectl constructor");
DBG("Tracectl constructor");
- /* Must create socket before signal handler to prevent races.
- */
result = init_socket();
if(result == -1) {
ERR("init_socket error");
result = init_socket();
if(result == -1) {
ERR("init_socket error");
@@
-1430,7
+1411,7
@@
static void __attribute__((destructor)) keepalive()
destroy_traces();
destroy_traces();
- ustcomm_fini_app(&ustcomm_app);
+ ustcomm_fini_app(&ustcomm_app
, 0
);
}
void ust_potential_exec(void)
}
void ust_potential_exec(void)
@@
-1478,7
+1459,8
@@
static void ust_fork(void)
list_del(&bc->list);
}
list_del(&bc->list);
}
- ustcomm_free_app(&ustcomm_app);
+ /* free app, keeping socket file */
+ ustcomm_fini_app(&ustcomm_app, 1);
buffers_to_export = 0;
have_listener = 0;
buffers_to_export = 0;
have_listener = 0;
This page took
0.023941 seconds
and
4
git commands to generate.