X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracectl.c;h=d4cb3efbcb7a97b5963106143b37640090b38822;hb=763f41e58126afdc361006831a7daca773a9627a;hp=c0bf6d2d7536702e02bcf07c9a39f35f7f872689;hpb=e17571a59eef2b054c7432f6cba10c2cb467a182;p=lttng-ust.git diff --git a/libust/tracectl.c b/libust/tracectl.c index c0bf6d2d..d4cb3efb 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -311,13 +311,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 +344,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; @@ -361,7 +361,7 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) buffers_to_export--; } else { - ERR("get_shmid: channel not found (%s)", channel_and_cpu); + ERR("channel not found (%s)", channel_and_cpu); } free_short_chan_name: @@ -387,13 +387,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 +418,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 +430,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 +456,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 +487,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 +499,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 +509,132 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr return retval; } +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!"); + ltt_unlock_traces(); + 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"); + } + + ltt_unlock_traces(); + + end: + 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!"); + ltt_unlock_traces(); + 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"); + } + + ltt_unlock_traces(); + + end: + return retval; +} + static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) { int retval = 0; @@ -524,13 +650,13 @@ 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; } @@ -539,8 +665,20 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) ltt_unlock_traces(); if(trace == NULL) { - ERR("cannot find trace!"); - retval = -1; + 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); + if(result) { + ERR("ustcomm_send_reply failed"); + free(reply); + retval = -1; + goto free_short_chan_name; + } + + free(reply); goto free_short_chan_name; } @@ -570,7 +708,7 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) } } if(found == 0) { - ERR("get_subbuf: unable to find channel"); + ERR("unable to find channel"); } free_short_chan_name: @@ -594,32 +732,33 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) long consumed_old; char *consumed_old_str; char *endptr; + char *reply = NULL; DBG("put_subbuf"); 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; } @@ -629,8 +768,17 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) ltt_unlock_traces(); if(trace == NULL) { - ERR("cannot find trace!"); - retval = -1; + WARN("Cannot find trace. It was likely destroyed by the user."); + asprintf(&reply, "%s", "NOTFOUND"); + result = ustcomm_send_reply(&ustcomm_app.server, reply, src); + if(result) { + ERR("ustcomm_send_reply failed"); + free(reply); + retval = -1; + goto free_short_chan_name; + } + + free(reply); goto free_short_chan_name; } @@ -639,8 +787,6 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) if(!strcmp(trace->channels[i].channel_name, ch_name)) { struct ust_buffer *buf = channel->buf[ch_cpu]; - char *reply; - long consumed_old=0; found = 1; @@ -656,7 +802,7 @@ 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; @@ -667,15 +813,15 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) } } if(found == 0) { - ERR("get_subbuf_size: unable to find channel"); + ERR("unable to find channel"); } - free_channel_and_cpu: - free(channel_and_cpu); - free_consumed_old_str: - free(consumed_old_str); free_short_chan_name: free(ch_name); + free_consumed_old_str: + free(consumed_old_str); + free_channel_and_cpu: + free(channel_and_cpu); end: return retval; @@ -778,6 +924,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"); @@ -793,17 +940,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) { @@ -854,6 +1002,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]="";