X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=libust%2Ftracectl.c;h=7a5cf9562282ce7fe90cc3d5e4c405d3bf44b8c6;hp=57218a6bd62765b217a27338104b1cbb88a21061;hb=f51d84eac11907346fa02e33da358aad171ac80a;hpb=02c8b050c0fbb61aa8625ecaf8776e642449c838 diff --git a/libust/tracectl.c b/libust/tracectl.c index 57218a6..7a5cf95 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -17,15 +17,17 @@ #define _GNU_SOURCE #include +#include #include +#include #include #include #include #include -#include #include #include #include +#include #include #include @@ -34,8 +36,7 @@ #include "ustcomm.h" #include "buffers.h" #include "marker-control.h" - -//#define USE_CLONE +#include "multipoll.h" #define USTSIGNAL SIGIO @@ -43,8 +44,6 @@ #define MSG_NOTIF 1 #define MSG_REGISTER_NOTIF 2 -char consumer_stack[10000]; - /* This should only be accessed by the constructor, before the creation * of the listener, and then only by the listener. */ @@ -60,7 +59,7 @@ struct tracecmd { /* no padding */ }; /* volatile because shared between the listener and the main thread */ -volatile sig_atomic_t buffers_to_export = 0; +int buffers_to_export = 0; struct trctl_msg { /* size: the size of all the fields except size itself */ @@ -123,28 +122,6 @@ static void print_markers(FILE *fp) static int init_socket(void); -int fd_notif = -1; -void notif_cb(void) -{ - int result; - struct trctl_msg msg; - - /* FIXME: fd_notif should probably be protected by a spinlock */ - - if(fd_notif == -1) - return; - - msg.type = MSG_NOTIF; - msg.size = sizeof(msg.type); - - /* FIXME: don't block here */ - result = write(fd_notif, &msg, msg.size+sizeof(msg.size)); - if(result == -1) { - PERROR("write"); - return; - } -} - /* Ask the daemon to collect a trace called trace_name and being * produced by this pid. * @@ -168,17 +145,19 @@ static void inform_consumer_daemon(const char *trace_name) } for(i=0; i < trace->nr_channels; i++) { - /* iterate on all cpus */ - for(j=0; jchannels[i].n_cpus; j++) { - char *buf; - asprintf(&buf, "%s_%d", trace->channels[i].channel_name, j); - result = ustcomm_request_consumer(pid, buf); - if(result == -1) { - WARN("Failed to request collection for channel %s. Is the daemon available?", trace->channels[i].channel_name); - /* continue even if fail */ + if(trace->channels[i].request_collection) { + /* iterate on all cpus */ + for(j=0; jchannels[i].n_cpus; j++) { + char *buf; + asprintf(&buf, "%s_%d", trace->channels[i].channel_name, j); + result = ustcomm_request_consumer(pid, buf); + if(result == -1) { + WARN("Failed to request collection for channel %s. Is the daemon available?", trace->channels[i].channel_name); + /* continue even if fail */ + } + free(buf); + STORE_SHARED(buffers_to_export, LOAD_SHARED(buffers_to_export)+1); } - free(buf); - buffers_to_export++; } } @@ -186,84 +165,67 @@ static void inform_consumer_daemon(const char *trace_name) ltt_unlock_traces(); } -void process_blocked_consumers(void) +int process_blkd_consumer_act(void *priv, int fd, short events) { - int n_fds = 0; - struct pollfd *fds; - struct blocked_consumer *bc; - int idx = 0; - char inbuf; int result; + long consumed_old = 0; + char *reply; + struct blocked_consumer *bc = (struct blocked_consumer *) priv; + char inbuf; - list_for_each_entry(bc, &blocked_consumers, list) { - n_fds++; - } - - fds = (struct pollfd *) malloc(n_fds * sizeof(struct pollfd)); - if(fds == NULL) { - ERR("malloc returned NULL"); - return; - } - - list_for_each_entry(bc, &blocked_consumers, list) { - fds[idx].fd = bc->fd_producer; - fds[idx].events = POLLIN; - bc->tmp_poll_idx = idx; - idx++; - } - - while((result = poll(fds, n_fds, 0)) == -1 && errno == EINTR) - /* nothing */; + result = read(bc->fd_producer, &inbuf, 1); if(result == -1) { - PERROR("poll"); - return; + PERROR("read"); + return -1; } + if(result == 0) { + int res; + DBG("listener: got messsage that a buffer ended"); - list_for_each_entry(bc, &blocked_consumers, list) { - if(fds[bc->tmp_poll_idx].revents) { - long consumed_old = 0; - char *reply; + res = close(bc->fd_producer); + if(res == -1) { + PERROR("close"); + } - result = read(bc->fd_producer, &inbuf, 1); - if(result == -1) { - PERROR("read"); - continue; - } - if(result == 0) { - DBG("PRODUCER END"); + list_del(&bc->list); - close(bc->fd_producer); + result = ustcomm_send_reply(&bc->server, "END", &bc->src); + if(result < 0) { + ERR("ustcomm_send_reply failed"); + return -1; + } - list_del(&bc->list); + return 0; + } - result = ustcomm_send_reply(&bc->server, "END", &bc->src); - if(result < 0) { - ERR("ustcomm_send_reply failed"); - continue; - } + result = ust_buffers_get_subbuf(bc->buf, &consumed_old); + if(result == -EAGAIN) { + WARN("missed buffer?"); + return 0; + } + else if(result < 0) { + ERR("ust_buffers_get_subbuf: error: %s", strerror(-result)); + } + asprintf(&reply, "%s %ld", "OK", consumed_old); + result = ustcomm_send_reply(&bc->server, reply, &bc->src); + if(result < 0) { + ERR("ustcomm_send_reply failed"); + free(reply); + return -1; + } + free(reply); - continue; - } + list_del(&bc->list); - result = ust_buffers_get_subbuf(bc->buf, &consumed_old); - if(result == -EAGAIN) { - WARN("missed buffer?"); - continue; - } - else if(result < 0) { - DBG("ust_buffers_get_subbuf: error: %s", strerror(-result)); - } - asprintf(&reply, "%s %ld", "OK", consumed_old); - result = ustcomm_send_reply(&bc->server, reply, &bc->src); - if(result < 0) { - ERR("ustcomm_send_reply failed"); - free(reply); - continue; - } - free(reply); + return 0; +} - list_del(&bc->list); - } +void blocked_consumers_add_to_mp(struct mpentries *ent) +{ + struct blocked_consumer *bc; + + list_for_each_entry(bc, &blocked_consumers, list) { + multipoll_add(ent, bc->fd_producer, POLLIN, process_blkd_consumer_act, bc, NULL); } } @@ -495,18 +457,18 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr return retval; } -static unsigned int poweroftwo(unsigned int x) -{ - unsigned int power2 = 1; - unsigned int hardcoded = 2147483648; /* FIX max 2^31 */ - - if (x < 2) - return 2; +/* Return the power of two which is equal or higher to v */ - while (power2 < x && power2 < hardcoded) - power2 *= 2; - - return power2; +static unsigned int pow2_higher_or_eq(unsigned int v) +{ + int hb = fls(v); + int hbm1 = hb-1; + int retval = 1<<(hb-1); + + if(v-retval == 0) + return retval; + else + return retval<<1; } static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *src) @@ -530,9 +492,10 @@ static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr goto end; } - power = poweroftwo(size); + power = pow2_higher_or_eq(size); + power = max_t(unsigned int, 2u, power); if (power != size) - WARN("using the next 2^n = %u\n", power); + WARN("using the next power of two for buffer size = %u\n", power); ltt_lock_traces(); trace = _ltt_trace_find_setup(trace_name); @@ -648,7 +611,7 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) if(trace == NULL) { int result; - WARN("Cannot find trace. It was likely destroyed by the user."); + DBG("Cannot find trace. It was likely destroyed by the user."); result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); if(result) { ERR("ustcomm_send_reply failed"); @@ -684,9 +647,9 @@ 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. */ - if(atomic_long_read(&buf->consumed) == 0) { + if(uatomic_read(&buf->consumed) == 0) { DBG("decrementing buffers_to_export"); - buffers_to_export--; + STORE_SHARED(buffers_to_export, LOAD_SHARED(buffers_to_export)-1); } break; @@ -724,14 +687,14 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) DBG("put_subbuf"); - channel_and_cpu = strdup_malloc(nth_token(recvbuf, 1)); + channel_and_cpu = strdup(nth_token(recvbuf, 1)); if(channel_and_cpu == NULL) { ERR("cannot parse channel"); retval = -1; goto end; } - consumed_old_str = strdup_malloc(nth_token(recvbuf, 2)); + consumed_old_str = strdup(nth_token(recvbuf, 2)); if(consumed_old_str == NULL) { ERR("cannot parse consumed_old"); retval = -1; @@ -755,7 +718,7 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) trace = _ltt_trace_find(trace_name); if(trace == NULL) { - WARN("Cannot find trace. It was likely destroyed by the user."); + DBG("Cannot find trace. It was likely destroyed by the user."); result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); if(result) { ERR("ustcomm_send_reply failed"); @@ -813,314 +776,293 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) return retval; } -void *listener_main(void *p) +static void listener_cleanup(void *ptr) +{ + ustcomm_fini_app(&ustcomm_app, 0); +} + +int process_client_cmd(char *recvbuf, struct ustcomm_source *src) { int result; + char trace_name[] = "auto"; + char trace_type[] = "ustrelay"; + int len; - DBG("LISTENER"); + DBG("received a message! it's: %s", recvbuf); + len = strlen(recvbuf); - for(;;) { - char trace_name[] = "auto"; - char trace_type[] = "ustrelay"; - char *recvbuf; - int len; - struct ustcomm_source src; + if(!strcmp(recvbuf, "print_markers")) { + print_markers(stderr); + } + else if(!strcmp(recvbuf, "list_markers")) { + char *ptr; + size_t size; + FILE *fp; - process_blocked_consumers(); + fp = open_memstream(&ptr, &size); + print_markers(fp); + fclose(fp); - result = ustcomm_app_recv_message(&ustcomm_app, &recvbuf, &src, 5); + result = ustcomm_send_reply(&ustcomm_app.server, ptr, src); + + free(ptr); + } + else if(!strcmp(recvbuf, "start")) { + /* start is an operation that setups the trace, allocates it and starts it */ + result = ltt_trace_setup(trace_name); if(result < 0) { - WARN("error in ustcomm_app_recv_message"); - continue; - } - else if(result == 0) { - /* no message */ - continue; + ERR("ltt_trace_setup failed"); + return -1; } - DBG("received a message! it's: %s", recvbuf); - len = strlen(recvbuf); - - if(!strcmp(recvbuf, "print_markers")) { - print_markers(stderr); + result = ltt_trace_set_type(trace_name, trace_type); + if(result < 0) { + ERR("ltt_trace_set_type failed"); + return -1; } - else if(!strcmp(recvbuf, "list_markers")) { - char *ptr; - size_t size; - FILE *fp; - fp = open_memstream(&ptr, &size); - print_markers(fp); - fclose(fp); + result = ltt_trace_alloc(trace_name); + if(result < 0) { + ERR("ltt_trace_alloc failed"); + return -1; + } - result = ustcomm_send_reply(&ustcomm_app.server, ptr, &src); + inform_consumer_daemon(trace_name); - free(ptr); + result = ltt_trace_start(trace_name); + if(result < 0) { + ERR("ltt_trace_start failed"); + return -1; } - else if(!strcmp(recvbuf, "start")) { - /* start is an operation that setups the trace, allocates it and starts it */ - result = ltt_trace_setup(trace_name); - if(result < 0) { - ERR("ltt_trace_setup failed"); - return (void *)1; - } - - result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { - ERR("ltt_trace_set_type failed"); - return (void *)1; - } + } + else if(!strcmp(recvbuf, "trace_setup")) { + DBG("trace setup"); - result = ltt_trace_alloc(trace_name); - if(result < 0) { - ERR("ltt_trace_alloc failed"); - return (void *)1; - } + result = ltt_trace_setup(trace_name); + if(result < 0) { + ERR("ltt_trace_setup failed"); + return -1; + } - inform_consumer_daemon(trace_name); + result = ltt_trace_set_type(trace_name, trace_type); + if(result < 0) { + ERR("ltt_trace_set_type failed"); + return -1; + } + } + else if(!strcmp(recvbuf, "trace_alloc")) { + DBG("trace alloc"); - result = ltt_trace_start(trace_name); - if(result < 0) { - ERR("ltt_trace_start failed"); - continue; - } + result = ltt_trace_alloc(trace_name); + if(result < 0) { + ERR("ltt_trace_alloc failed"); + return -1; } - else if(!strcmp(recvbuf, "trace_setup")) { - DBG("trace setup"); + inform_consumer_daemon(trace_name); + } + else if(!strcmp(recvbuf, "trace_create")) { + DBG("trace create"); - result = ltt_trace_setup(trace_name); - if(result < 0) { - ERR("ltt_trace_setup failed"); - return (void *)1; - } + result = ltt_trace_setup(trace_name); + if(result < 0) { + ERR("ltt_trace_setup failed"); + return -1; + } - result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { - ERR("ltt_trace_set_type failed"); - return (void *)1; - } + result = ltt_trace_set_type(trace_name, trace_type); + if(result < 0) { + ERR("ltt_trace_set_type failed"); + return -1; } - else if(!strcmp(recvbuf, "trace_alloc")) { - DBG("trace alloc"); + } + else if(!strcmp(recvbuf, "trace_start")) { + DBG("trace start"); - result = ltt_trace_alloc(trace_name); - if(result < 0) { - ERR("ltt_trace_alloc failed"); - return (void *)1; - } + result = ltt_trace_alloc(trace_name); + if(result < 0) { + ERR("ltt_trace_alloc failed"); + return -1; + } + if(!result) { inform_consumer_daemon(trace_name); } - else if(!strcmp(recvbuf, "trace_create")) { - DBG("trace create"); - result = ltt_trace_setup(trace_name); - if(result < 0) { - ERR("ltt_trace_setup failed"); - return (void *)1; - } - - result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { - ERR("ltt_trace_set_type failed"); - return (void *)1; - } + result = ltt_trace_start(trace_name); + if(result < 0) { + ERR("ltt_trace_start failed"); + return -1; } - else if(!strcmp(recvbuf, "trace_start")) { - DBG("trace start"); - - result = ltt_trace_alloc(trace_name); - if(result < 0) { - ERR("ltt_trace_alloc failed"); - return (void *)1; - } - if(!result) { - inform_consumer_daemon(trace_name); - } + } + else if(!strcmp(recvbuf, "trace_stop")) { + DBG("trace stop"); - result = ltt_trace_start(trace_name); - if(result < 0) { - ERR("ltt_trace_start failed"); - continue; - } + result = ltt_trace_stop(trace_name); + if(result < 0) { + ERR("ltt_trace_stop failed"); + return -1; } - else if(!strcmp(recvbuf, "trace_stop")) { - DBG("trace stop"); + } + else if(!strcmp(recvbuf, "trace_destroy")) { - result = ltt_trace_stop(trace_name); - if(result < 0) { - ERR("ltt_trace_stop failed"); - return (void *)1; - } + DBG("trace destroy"); + + result = ltt_trace_destroy(trace_name, 0); + if(result < 0) { + ERR("ltt_trace_destroy failed"); + return -1; } - else if(!strcmp(recvbuf, "trace_destroy")) { + } + else if(nth_token_is(recvbuf, "get_shmid", 0) == 1) { + do_cmd_get_shmid(recvbuf, src); + } + else if(nth_token_is(recvbuf, "get_n_subbufs", 0) == 1) { + do_cmd_get_n_subbufs(recvbuf, src); + } + else if(nth_token_is(recvbuf, "get_subbuf_size", 0) == 1) { + do_cmd_get_subbuf_size(recvbuf, src); + } + else if(nth_token_is(recvbuf, "load_probe_lib", 0) == 1) { + char *libfile; - DBG("trace destroy"); + libfile = nth_token(recvbuf, 1); - result = ltt_trace_destroy(trace_name, 0); - if(result < 0) { - ERR("ltt_trace_destroy failed"); - return (void *)1; - } - } - else if(nth_token_is(recvbuf, "get_shmid", 0) == 1) { - do_cmd_get_shmid(recvbuf, &src); - } - else if(nth_token_is(recvbuf, "get_n_subbufs", 0) == 1) { - do_cmd_get_n_subbufs(recvbuf, &src); - } - else if(nth_token_is(recvbuf, "get_subbuf_size", 0) == 1) { - do_cmd_get_subbuf_size(recvbuf, &src); - } - else if(nth_token_is(recvbuf, "load_probe_lib", 0) == 1) { - char *libfile; + DBG("load_probe_lib loading %s", libfile); - libfile = nth_token(recvbuf, 1); + free(libfile); + } + else if(nth_token_is(recvbuf, "get_subbuffer", 0) == 1) { + do_cmd_get_subbuffer(recvbuf, src); + } + else if(nth_token_is(recvbuf, "put_subbuffer", 0) == 1) { + do_cmd_put_subbuffer(recvbuf, src); + } + else if(nth_token_is(recvbuf, "set_subbuf_size", 0) == 1) { + do_cmd_set_subbuf_size(recvbuf, src); + } + else if(nth_token_is(recvbuf, "set_subbuf_num", 0) == 1) { + do_cmd_set_subbuf_num(recvbuf, src); + } + else if(nth_token_is(recvbuf, "enable_marker", 0) == 1) { + char *channel_slash_name = nth_token(recvbuf, 1); + char channel_name[256]=""; + char marker_name[256]=""; - DBG("load_probe_lib loading %s", libfile); + result = sscanf(channel_slash_name, "%255[^/]/%255s", channel_name, marker_name); - free(libfile); + if(channel_name == NULL || marker_name == NULL) { + WARN("invalid marker name"); + goto next_cmd; } - else if(nth_token_is(recvbuf, "get_subbuffer", 0) == 1) { - do_cmd_get_subbuffer(recvbuf, &src); + + result = ltt_marker_connect(channel_name, marker_name, "default"); + if(result < 0) { + WARN("could not enable marker; channel=%s, name=%s", channel_name, marker_name); } - else if(nth_token_is(recvbuf, "put_subbuffer", 0) == 1) { - do_cmd_put_subbuffer(recvbuf, &src); + } + else if(nth_token_is(recvbuf, "disable_marker", 0) == 1) { + char *channel_slash_name = nth_token(recvbuf, 1); + char *marker_name; + char *channel_name; + + result = sscanf(channel_slash_name, "%a[^/]/%as", &channel_name, &marker_name); + + if(marker_name == NULL) { } - else if(nth_token_is(recvbuf, "set_subbuf_size", 0) == 1) { - do_cmd_set_subbuf_size(recvbuf, &src); + + result = ltt_marker_disconnect(channel_name, marker_name, "default"); + if(result < 0) { + WARN("could not disable marker; channel=%s, name=%s", channel_name, marker_name); } - else if(nth_token_is(recvbuf, "set_subbuf_num", 0) == 1) { - do_cmd_set_subbuf_num(recvbuf, &src); + } + else if(nth_token_is(recvbuf, "get_pidunique", 0) == 1) { + char *reply; + + asprintf(&reply, "%lld", pidunique); + + result = ustcomm_send_reply(&ustcomm_app.server, reply, src); + if(result) { + ERR("listener: get_pidunique: ustcomm_send_reply failed"); + goto next_cmd; } - else if(nth_token_is(recvbuf, "enable_marker", 0) == 1) { - char *channel_slash_name = nth_token(recvbuf, 1); - char channel_name[256]=""; - char marker_name[256]=""; - result = sscanf(channel_slash_name, "%255[^/]/%255s", channel_name, marker_name); + free(reply); + } + else { + ERR("unable to parse message: %s", recvbuf); + } - if(channel_name == NULL || marker_name == NULL) { - WARN("invalid marker name"); - goto next_cmd; - } +next_cmd: - result = ltt_marker_connect(channel_name, marker_name, "default"); - if(result < 0) { - WARN("could not enable marker; channel=%s, name=%s", channel_name, marker_name); - } - } - else if(nth_token_is(recvbuf, "disable_marker", 0) == 1) { - char *channel_slash_name = nth_token(recvbuf, 1); - char *marker_name; - char *channel_name; + return 0; +} - result = sscanf(channel_slash_name, "%a[^/]/%as", &channel_name, &marker_name); +void *listener_main(void *p) +{ + int result; - if(marker_name == NULL) { - } + DBG("LISTENER"); - result = ltt_marker_disconnect(channel_name, marker_name, "default"); - if(result < 0) { - WARN("could not disable marker; channel=%s, name=%s", channel_name, marker_name); - } - } - else if(nth_token_is(recvbuf, "get_pidunique", 0) == 1) { - char *reply; + pthread_cleanup_push(listener_cleanup, NULL); - asprintf(&reply, "%lld", pidunique); + for(;;) { + struct mpentries mpent; - result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); - if(result) { - ERR("listener: get_pidunique: ustcomm_send_reply failed"); - goto next_cmd; - } + multipoll_init(&mpent); - free(reply); - } -// else if(nth_token_is(recvbuf, "get_notifications", 0) == 1) { -// struct ust_trace *trace; -// char trace_name[] = "auto"; -// int i; -// char *channel_name; -// -// DBG("get_notifications"); -// -// channel_name = strdup_malloc(nth_token(recvbuf, 1)); -// if(channel_name == NULL) { -// ERR("put_subbuf_size: cannot parse channel"); -// goto next_cmd; -// } -// -// ltt_lock_traces(); -// trace = _ltt_trace_find(trace_name); -// ltt_unlock_traces(); -// -// if(trace == NULL) { -// ERR("cannot find trace!"); -// return (void *)1; -// } -// -// for(i=0; inr_channels; i++) { -// struct rchan *rchan = trace->channels[i].trans_channel_data; -// int fd; -// -// if(!strcmp(trace->channels[i].channel_name, channel_name)) { -// struct rchan_buf *rbuf = rchan->buf; -// struct ltt_channel_buf_struct *lttbuf = trace->channels[i].buf; -// -// result = fd = ustcomm_app_detach_client(&ustcomm_app, &src); -// if(result == -1) { -// ERR("ustcomm_app_detach_client failed"); -// goto next_cmd; -// } -// -// lttbuf->wake_consumer_arg = (void *) fd; -// -// smp_wmb(); -// -// lttbuf->call_wake_consumer = 1; -// -// break; -// } -// } -// -// free(channel_name); -// } - else { - ERR("unable to parse message: %s", recvbuf); + blocked_consumers_add_to_mp(&mpent); + ustcomm_mp_add_app_clients(&mpent, &ustcomm_app, process_client_cmd); + + result = multipoll_poll(&mpent, -1); + if(result == -1) { + ERR("error in multipoll_poll"); } - next_cmd: - free(recvbuf); + multipoll_destroy(&mpent); } + + pthread_cleanup_pop(1); } -volatile sig_atomic_t have_listener = 0; +/* These should only be accessed in the parent thread, + * not the listener. + */ +static volatile sig_atomic_t have_listener = 0; +static pthread_t listener_thread; void create_listener(void) { -#ifdef USE_CLONE - static char listener_stack[16384]; int result; -#else - pthread_t thread; -#endif + sigset_t sig_all_blocked; + sigset_t orig_parent_mask; if(have_listener) { WARN("not creating listener because we already had one"); return; } -#ifdef USE_CLONE - result = clone((int (*)(void *)) listener_main, listener_stack+sizeof(listener_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM | CLONE_SIGHAND | CLONE_THREAD, NULL); + /* A new thread created by pthread_create inherits the signal mask + * from the parent. To avoid any signal being received by the + * listener thread, we block all signals temporarily in the parent, + * while we create the listener thread. + */ + + sigfillset(&sig_all_blocked); + + result = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_parent_mask); + if(result) { + PERROR("pthread_sigmask: %s", strerror(result)); + } + + result = pthread_create(&listener_thread, NULL, listener_main, NULL); if(result == -1) { - perror("clone"); - return; + PERROR("pthread_create"); } -#else - pthread_create(&thread, NULL, listener_main, NULL); -#endif + /* Restore original signal mask in parent */ + result = pthread_sigmask(SIG_SETMASK, &orig_parent_mask, NULL); + if(result) { + PERROR("pthread_sigmask: %s", strerror(result)); + } have_listener = 1; } @@ -1235,6 +1177,26 @@ static void __attribute__((constructor)) init() } } + if(getenv("UST_OVERWRITE")) { + int val = atoi(getenv("UST_OVERWRITE")); + if(val == 0 || val == 1) { + STORE_SHARED(ust_channels_overwrite_by_default, val); + } + else { + WARN("invalid value for UST_OVERWRITE"); + } + } + + if(getenv("UST_AUTOCOLLECT")) { + int val = atoi(getenv("UST_AUTOCOLLECT")); + if(val == 0 || val == 1) { + STORE_SHARED(ust_channels_request_collection_by_default, val); + } + else { + WARN("invalid value for UST_AUTOCOLLECT"); + } + } + if(getenv("UST_TRACE")) { char trace_name[] = "auto"; char trace_type[] = "ustrelay"; @@ -1379,6 +1341,20 @@ int restarting_usleep(useconds_t usecs) return result; } +static void stop_listener() +{ + int result; + + result = pthread_cancel(listener_thread); + if(result != 0) { + ERR("pthread_cancel: %s", strerror(result)); + } + result = pthread_join(listener_thread, NULL); + if(result != 0) { + ERR("pthread_join: %s", strerror(result)); + } +} + /* This destructor keeps the process alive for a few seconds in order * to leave time to ustd to connect to its buffers. This is necessary * for programs whose execution is very short. It is also useful in all @@ -1391,10 +1367,10 @@ int restarting_usleep(useconds_t usecs) static void __attribute__((destructor)) keepalive() { - if(trace_recording() && buffers_to_export) { + if(trace_recording() && LOAD_SHARED(buffers_to_export)) { int total = 0; DBG("Keeping process alive for consumer daemon..."); - while(buffers_to_export) { + while(LOAD_SHARED(buffers_to_export)) { const int interv = 200000; restarting_usleep(interv); total += interv; @@ -1409,7 +1385,8 @@ static void __attribute__((destructor)) keepalive() destroy_traces(); - ustcomm_fini_app(&ustcomm_app); + /* Ask the listener to stop and clean up. */ + stop_listener(); } void ust_potential_exec(void) @@ -1450,16 +1427,19 @@ static void ust_fork(void) /* Delete all blocked consumers */ list_for_each_entry(bc, &blocked_consumers, list) { - close(bc->fd_producer); - close(bc->fd_consumer); + result = close(bc->fd_producer); + if(result == -1) { + PERROR("close"); + } free(deletable_bc); deletable_bc = bc; list_del(&bc->list); } - ustcomm_free_app(&ustcomm_app); + /* free app, keeping socket file */ + ustcomm_fini_app(&ustcomm_app, 1); - buffers_to_export = 0; + STORE_SHARED(buffers_to_export, 0); have_listener = 0; init_socket(); create_listener();