X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=57218a6bd62765b217a27338104b1cbb88a21061;hb=02c8b050c0fbb61aa8625ecaf8776e642449c838;hp=4447b92d676c04aebbe54eb9e39504bb5aa04ecb;hpb=2ddb81a86943f0ca84b92ae4a1cf144098a9d8bd;p=ust.git diff --git a/libust/tracectl.c b/libust/tracectl.c index 4447b92..57218a6 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -27,8 +27,6 @@ #include #include -#include - #include #include #include "tracer.h" @@ -125,15 +123,6 @@ static void print_markers(FILE *fp) 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) { @@ -311,13 +300,13 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) channel_and_cpu = nth_token(recvbuf, 1); if(channel_and_cpu == NULL) { - ERR("get_shmid: cannot parse channel"); + ERR("cannot parse channel"); goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); if(ch_cpu == -1) { - ERR("Problem parsing channel name"); + ERR("problem parsing channel name"); goto free_short_chan_name; } @@ -344,7 +333,7 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) result = ustcomm_send_reply(&ustcomm_app.server, reply, src); if(result) { - ERR("listener: get_shmid: ustcomm_send_reply failed"); + ERR("ustcomm_send_reply failed"); free(reply); retval = -1; goto free_short_chan_name; @@ -357,11 +346,8 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) } } - if(found) { - buffers_to_export--; - } - else { - ERR("get_shmid: channel not found (%s)", channel_and_cpu); + if(!found) { + ERR("channel not found (%s)", channel_and_cpu); } free_short_chan_name: @@ -387,13 +373,13 @@ static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) channel_and_cpu = nth_token(recvbuf, 1); if(channel_and_cpu == NULL) { - ERR("get_n_subbufs: cannot parse channel"); + ERR("cannot parse channel"); goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); if(ch_cpu == -1) { - ERR("Problem parsing channel name"); + ERR("problem parsing channel name"); goto free_short_chan_name; } @@ -418,7 +404,7 @@ static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) result = ustcomm_send_reply(&ustcomm_app.server, reply, src); if(result) { - ERR("listener: get_n_subbufs: ustcomm_send_reply failed"); + ERR("ustcomm_send_reply failed"); free(reply); retval = -1; goto free_short_chan_name; @@ -430,7 +416,7 @@ static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) } } if(found == 0) { - ERR("get_n_subbufs: unable to find channel"); + ERR("unable to find channel"); } free_short_chan_name: @@ -456,13 +442,13 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr channel_and_cpu = nth_token(recvbuf, 1); if(channel_and_cpu == NULL) { - ERR("get_subbuf_size: cannot parse channel"); + ERR("cannot parse channel"); goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); if(ch_cpu == -1) { - ERR("Problem parsing channel name"); + ERR("problem parsing channel name"); goto free_short_chan_name; } @@ -487,7 +473,7 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr result = ustcomm_send_reply(&ustcomm_app.server, reply, src); if(result) { - ERR("listener: get_subbuf_size: ustcomm_send_reply failed"); + ERR("ustcomm_send_reply failed"); free(reply); retval = -1; goto free_short_chan_name; @@ -499,7 +485,7 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr } } if(found == 0) { - ERR("get_subbuf_size: unable to find channel"); + ERR("unable to find channel"); } free_short_chan_name: @@ -509,6 +495,128 @@ 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; + + while (power2 < x && power2 < hardcoded) + power2 *= 2; + + return power2; +} + +static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *src) +{ + char *channel_slash_size; + char ch_name[256]=""; + unsigned int size, power; + int retval = 0; + struct ust_trace *trace; + char trace_name[] = "auto"; + int i; + int found = 0; + + DBG("set_subbuf_size"); + + channel_slash_size = nth_token(recvbuf, 1); + sscanf(channel_slash_size, "%255[^/]/%u", ch_name, &size); + + if(ch_name == NULL) { + ERR("cannot parse channel"); + goto end; + } + + power = poweroftwo(size); + if (power != size) + WARN("using the next 2^n = %u\n", power); + + ltt_lock_traces(); + trace = _ltt_trace_find_setup(trace_name); + if(trace == NULL) { + ERR("cannot find trace!"); + retval = -1; + goto end; + } + + for(i = 0; i < trace->nr_channels; i++) { + struct ust_channel *channel = &trace->channels[i]; + + if(!strcmp(trace->channels[i].channel_name, ch_name)) { + + channel->subbuf_size = power; + DBG("the set_subbuf_size for the requested channel is %zd", channel->subbuf_size); + + found = 1; + break; + } + } + if(found == 0) { + ERR("unable to find channel"); + } + + end: + ltt_unlock_traces(); + return retval; +} + +static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src) +{ + char *channel_slash_num; + char ch_name[256]=""; + unsigned int num; + int retval = 0; + struct ust_trace *trace; + char trace_name[] = "auto"; + int i; + int found = 0; + + DBG("set_subbuf_num"); + + channel_slash_num = nth_token(recvbuf, 1); + sscanf(channel_slash_num, "%255[^/]/%u", ch_name, &num); + + if(ch_name == NULL) { + ERR("cannot parse channel"); + goto end; + } + if (num < 2) { + ERR("subbuffer count should be greater than 2"); + goto end; + } + + ltt_lock_traces(); + trace = _ltt_trace_find_setup(trace_name); + if(trace == NULL) { + ERR("cannot find trace!"); + retval = -1; + goto end; + } + + for(i = 0; i < trace->nr_channels; i++) { + struct ust_channel *channel = &trace->channels[i]; + + if(!strcmp(trace->channels[i].channel_name, ch_name)) { + + channel->subbuf_cnt = num; + DBG("the set_subbuf_cnt for the requested channel is %zd", channel->subbuf_cnt); + + found = 1; + break; + } + } + if(found == 0) { + ERR("unable to find channel"); + } + + end: + ltt_unlock_traces(); + return retval; +} + static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) { int retval = 0; @@ -524,36 +632,31 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) channel_and_cpu = nth_token(recvbuf, 1); if(channel_and_cpu == NULL) { - ERR("get_subbuf: cannot parse channel"); + ERR("cannot parse channel"); goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); if(ch_cpu == -1) { - ERR("Problem parsing channel name"); + ERR("problem parsing channel name"); goto free_short_chan_name; } ltt_lock_traces(); trace = _ltt_trace_find(trace_name); - ltt_unlock_traces(); if(trace == NULL) { - char *reply; int result; WARN("Cannot find trace. It was likely destroyed by the user."); - asprintf(&reply, "%s", "NOTFOUND"); - result = ustcomm_send_reply(&ustcomm_app.server, reply, src); + result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); if(result) { ERR("ustcomm_send_reply failed"); - free(reply); retval = -1; - goto free_short_chan_name; + goto unlock_traces; } - free(reply); - goto free_short_chan_name; + goto unlock_traces; } for(i=0; inr_channels; i++) { @@ -568,7 +671,7 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer)); if(bc == NULL) { ERR("malloc returned NULL"); - goto free_short_chan_name; + goto unlock_traces; } bc->fd_consumer = src->fd; bc->fd_producer = buf->data_ready_fd_read; @@ -578,13 +681,24 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) list_add(&bc->list, &blocked_consumers); + /* 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) { + DBG("decrementing buffers_to_export"); + buffers_to_export--; + } + break; } } if(found == 0) { - ERR("get_subbuf: unable to find channel"); + ERR("unable to find channel"); } + unlock_traces: + ltt_unlock_traces(); + free_short_chan_name: free(ch_name); @@ -612,48 +726,44 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) channel_and_cpu = strdup_malloc(nth_token(recvbuf, 1)); if(channel_and_cpu == NULL) { - ERR("put_subbuf_size: cannot parse channel"); + ERR("cannot parse channel"); retval = -1; goto end; } consumed_old_str = strdup_malloc(nth_token(recvbuf, 2)); if(consumed_old_str == NULL) { - ERR("put_subbuf: cannot parse consumed_old"); + ERR("cannot parse consumed_old"); retval = -1; goto free_channel_and_cpu; } consumed_old = strtol(consumed_old_str, &endptr, 10); if(*endptr != '\0') { - ERR("put_subbuf: invalid value for consumed_old"); + ERR("invalid value for consumed_old"); retval = -1; goto free_consumed_old_str; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); if(ch_cpu == -1) { - ERR("Problem parsing channel name"); + ERR("problem parsing channel name"); retval = -1; goto free_short_chan_name; } ltt_lock_traces(); trace = _ltt_trace_find(trace_name); - ltt_unlock_traces(); if(trace == NULL) { WARN("Cannot find trace. It was likely destroyed by the user."); - asprintf(&reply, "%s", "NOTFOUND"); - result = ustcomm_send_reply(&ustcomm_app.server, reply, src); + result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); if(result) { ERR("ustcomm_send_reply failed"); - free(reply); retval = -1; - goto free_short_chan_name; + goto unlock_traces; } - free(reply); - goto free_short_chan_name; + goto unlock_traces; } for(i=0; inr_channels; i++) { @@ -676,10 +786,10 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) result = ustcomm_send_reply(&ustcomm_app.server, reply, src); if(result) { - ERR("listener: put_subbuf: ustcomm_send_reply failed"); + ERR("ustcomm_send_reply failed"); free(reply); retval = -1; - goto free_channel_and_cpu; + goto unlock_traces; } free(reply); @@ -690,6 +800,8 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) ERR("unable to find channel"); } + unlock_traces: + ltt_unlock_traces(); free_short_chan_name: free(ch_name); free_consumed_old_str: @@ -705,8 +817,6 @@ void *listener_main(void *p) { int result; - ust_register_thread(); - DBG("LISTENER"); for(;;) { @@ -798,6 +908,7 @@ void *listener_main(void *p) ERR("ltt_trace_alloc failed"); return (void *)1; } + inform_consumer_daemon(trace_name); } else if(!strcmp(recvbuf, "trace_create")) { DBG("trace create"); @@ -813,17 +924,18 @@ void *listener_main(void *p) ERR("ltt_trace_set_type failed"); return (void *)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; } - - inform_consumer_daemon(trace_name); - } - else if(!strcmp(recvbuf, "trace_start")) { - DBG("trace start"); + if(!result) { + inform_consumer_daemon(trace_name); + } result = ltt_trace_start(trace_name); if(result < 0) { @@ -844,7 +956,7 @@ void *listener_main(void *p) DBG("trace destroy"); - result = ltt_trace_destroy(trace_name); + result = ltt_trace_destroy(trace_name, 0); if(result < 0) { ERR("ltt_trace_destroy failed"); return (void *)1; @@ -874,6 +986,12 @@ void *listener_main(void *p) 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]=""; @@ -1060,16 +1178,8 @@ static void __attribute__((constructor)) init() */ 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"); - /* Must create socket before signal handler to prevent races. - */ result = init_socket(); if(result == -1) { ERR("init_socket error"); @@ -1222,7 +1332,7 @@ static void destroy_traces(void) ERR("ltt_trace_stop error"); } - result = ltt_trace_destroy("auto"); + result = ltt_trace_destroy("auto", 0); if(result == -1) { ERR("ltt_trace_destroy error"); } @@ -1327,9 +1437,14 @@ static void ust_fork(void) struct blocked_consumer *deletable_bc = NULL; int result; + /* FIXME: technically, the locks could have been taken before the fork */ DBG("ust: forking"); + + /* break lock if necessary */ + ltt_unlock_traces(); + ltt_trace_stop("auto"); - ltt_trace_destroy("auto"); + ltt_trace_destroy("auto", 1); /* Delete all active connections */ ustcomm_close_all_connections(&ustcomm_app.server); @@ -1342,9 +1457,12 @@ static void ust_fork(void) list_del(&bc->list); } + ustcomm_free_app(&ustcomm_app); + + buffers_to_export = 0; have_listener = 0; - create_listener(); init_socket(); + create_listener(); ltt_trace_setup("auto"); result = ltt_trace_set_type("auto", "ustrelay"); if(result < 0) {