From: Douglas Santos Date: Mon, 13 Sep 2010 22:47:43 +0000 (-0400) Subject: tracectl cleanup v3 X-Git-Tag: v0.8~15 X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=e9b58dc0868620ba4c0e63b605602f2044a02251 tracectl cleanup v3 kernel style-> if, else, for, while also remove a trailing space Signed-off-by: Douglas Santos Acked-by: Mathieu Desnoyers --- diff --git a/libust/tracectl.c b/libust/tracectl.c index dd61ebe..5ec35b6 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -121,7 +121,7 @@ static void print_markers(FILE *fp) marker_iter_reset(&iter); marker_iter_start(&iter); - while(iter.marker) { + while (iter.marker) { fprintf(fp, "marker: %s/%s %d \"%s\" %p\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format, iter.marker->location); marker_iter_next(&iter); } @@ -136,7 +136,7 @@ static void print_trace_events(FILE *fp) trace_event_iter_reset(&iter); trace_event_iter_start(&iter); - while(iter.trace_event) { + while (iter.trace_event) { fprintf(fp, "trace_event: %s\n", iter.trace_event->name); trace_event_iter_next(&iter); } @@ -162,15 +162,15 @@ static void inform_consumer_daemon(const char *trace_name) ltt_lock_traces(); trace = _ltt_trace_find(trace_name); - if(trace == NULL) { + if (trace == NULL) { WARN("inform_consumer_daemon: could not find trace \"%s\"; it is probably already destroyed", trace_name); goto finish; } - for(i=0; i < trace->nr_channels; i++) { - if(trace->channels[i].request_collection) { + for (i=0; i < trace->nr_channels; i++) { + if (trace->channels[i].request_collection) { /* iterate on all cpus */ - for(j=0; jchannels[i].n_cpus; j++) { + for (j=0; jchannels[i].n_cpus; j++) { char *buf; if (asprintf(&buf, "%s_%d", trace->channels[i].channel_name, j) < 0) { ERR("inform_consumer_daemon : asprintf failed (%s_%d)", @@ -178,7 +178,7 @@ static void inform_consumer_daemon(const char *trace_name) goto finish; } result = ustcomm_request_consumer(pid, buf); - if(result == -1) { + if (result == -1) { WARN("Failed to request collection for channel %s. Is the daemon available?", trace->channels[i].channel_name); /* continue even if fail */ } @@ -201,23 +201,23 @@ int process_blkd_consumer_act(void *priv, int fd, short events) char inbuf; result = read(bc->fd_producer, &inbuf, 1); - if(result == -1) { + if (result == -1) { PERROR("read"); return -1; } - if(result == 0) { + if (result == 0) { int res; DBG("listener: got messsage that a buffer ended"); res = close(bc->fd_producer); - if(res == -1) { + if (res == -1) { PERROR("close"); } list_del(&bc->list); result = ustcomm_send_reply(&bc->server, "END", &bc->src); - if(result < 0) { + if (result < 0) { ERR("ustcomm_send_reply failed"); return -1; } @@ -226,11 +226,10 @@ int process_blkd_consumer_act(void *priv, int fd, short events) } result = ust_buffers_get_subbuf(bc->buf, &consumed_old); - if(result == -EAGAIN) { + if (result == -EAGAIN) { WARN("missed buffer?"); return 0; - } - else if(result < 0) { + } else if (result < 0) { ERR("ust_buffers_get_subbuf: error: %s", strerror(-result)); } if (asprintf(&reply, "%s %ld", "OK", consumed_old) < 0) { @@ -239,7 +238,7 @@ int process_blkd_consumer_act(void *priv, int fd, short events) return -1; } result = ustcomm_send_reply(&bc->server, reply, &bc->src); - if(result < 0) { + if (result < 0) { ERR("ustcomm_send_reply failed"); free(reply); return -1; @@ -266,11 +265,10 @@ void seperate_channel_cpu(const char *channel_and_cpu, char **channel, int *cpu) const char *sep; sep = rindex(channel_and_cpu, '_'); - if(sep == NULL) { + if (sep == NULL) { *cpu = -1; sep = channel_and_cpu + strlen(channel_and_cpu); - } - else { + } else { *cpu = atoi(sep+1); } @@ -296,14 +294,14 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) DBG("get_shmid"); channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { + if (channel_and_cpu == NULL) { ERR("cannot parse channel"); retval = -1; goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { + if (ch_cpu == -1) { ERR("problem parsing channel name"); retval = -1; goto free_short_chan_name; @@ -313,17 +311,17 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) trace = _ltt_trace_find(trace_name); ltt_unlock_traces(); - if(trace == NULL) { + if (trace == NULL) { ERR("cannot find trace!"); retval = -1; goto free_short_chan_name; } - for(i=0; inr_channels; i++) { + for (i=0; inr_channels; i++) { struct ust_channel *channel = &trace->channels[i]; struct ust_buffer *buf = channel->buf[ch_cpu]; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { + if (!strcmp(trace->channels[i].channel_name, ch_name)) { char *reply; // DBG("the shmid for the requested channel is %d", buf->shmid); @@ -336,7 +334,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) { + if (result) { ERR("ustcomm_send_reply failed"); free(reply); retval = -1; @@ -350,7 +348,7 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) } } - if(!found) { + if (!found) { ERR("channel not found (%s)", channel_and_cpu); } @@ -376,14 +374,14 @@ static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) DBG("get_n_subbufs"); channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { + if (channel_and_cpu == NULL) { ERR("cannot parse channel"); retval = -1; goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { + if (ch_cpu == -1) { ERR("problem parsing channel name"); retval = -1; goto free_short_chan_name; @@ -393,16 +391,16 @@ static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) trace = _ltt_trace_find(trace_name); ltt_unlock_traces(); - if(trace == NULL) { + if (trace == NULL) { ERR("cannot find trace!"); retval = -1; goto free_short_chan_name; } - for(i=0; inr_channels; i++) { + for (i=0; inr_channels; i++) { struct ust_channel *channel = &trace->channels[i]; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { + if (!strcmp(trace->channels[i].channel_name, ch_name)) { char *reply; DBG("the n_subbufs for the requested channel is %d", channel->subbuf_cnt); @@ -414,7 +412,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) { + if (result) { ERR("ustcomm_send_reply failed"); free(reply); retval = -1; @@ -426,7 +424,7 @@ static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) break; } } - if(found == 0) { + if (found == 0) { ERR("unable to find channel"); } @@ -452,14 +450,14 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr DBG("get_subbuf_size"); channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { + if (channel_and_cpu == NULL) { ERR("cannot parse channel"); retval = -1; goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { + if (ch_cpu == -1) { ERR("problem parsing channel name"); retval = -1; goto free_short_chan_name; @@ -469,16 +467,16 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr trace = _ltt_trace_find(trace_name); ltt_unlock_traces(); - if(trace == NULL) { + if (trace == NULL) { ERR("cannot find trace!"); retval = -1; goto free_short_chan_name; } - for(i=0; inr_channels; i++) { + for (i=0; inr_channels; i++) { struct ust_channel *channel = &trace->channels[i]; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { + if (!strcmp(trace->channels[i].channel_name, ch_name)) { char *reply; DBG("the subbuf_size for the requested channel is %zd", channel->subbuf_size); @@ -490,7 +488,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) { + if (result) { ERR("ustcomm_send_reply failed"); free(reply); retval = -1; @@ -502,7 +500,7 @@ static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr break; } } - if(found == 0) { + if (found == 0) { ERR("unable to find channel"); } @@ -520,7 +518,7 @@ static unsigned int pow2_higher_or_eq(unsigned int v) int hb = fls(v); int retval = 1<<(hb-1); - if(v-retval == 0) + if (v-retval == 0) return retval; else return retval<<1; @@ -542,7 +540,7 @@ static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr channel_slash_size = nth_token(recvbuf, 1); sscanf(channel_slash_size, "%255[^/]/%u", ch_name, &size); - if(ch_name == NULL) { + if (ch_name == NULL) { ERR("cannot parse channel"); retval = -1; goto end; @@ -555,16 +553,16 @@ static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr ltt_lock_traces(); trace = _ltt_trace_find_setup(trace_name); - if(trace == NULL) { + if (trace == NULL) { ERR("cannot find trace!"); retval = -1; goto end; } - for(i = 0; i < trace->nr_channels; i++) { + for (i = 0; i < trace->nr_channels; i++) { struct ust_channel *channel = &trace->channels[i]; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { + 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); @@ -573,7 +571,7 @@ static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr break; } } - if(found == 0) { + if (found == 0) { ERR("unable to find channel"); } @@ -598,7 +596,7 @@ static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src channel_slash_num = nth_token(recvbuf, 1); sscanf(channel_slash_num, "%255[^/]/%u", ch_name, &num); - if(ch_name == NULL) { + if (ch_name == NULL) { ERR("cannot parse channel"); retval = -1; goto end; @@ -611,16 +609,16 @@ static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src ltt_lock_traces(); trace = _ltt_trace_find_setup(trace_name); - if(trace == NULL) { + if (trace == NULL) { ERR("cannot find trace!"); retval = -1; goto end; } - for(i = 0; i < trace->nr_channels; i++) { + for (i = 0; i < trace->nr_channels; i++) { struct ust_channel *channel = &trace->channels[i]; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { + 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); @@ -629,7 +627,7 @@ static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src break; } } - if(found == 0) { + if (found == 0) { ERR("unable to find channel"); } @@ -652,14 +650,14 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) DBG("get_subbuf"); channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { + if (channel_and_cpu == NULL) { ERR("cannot parse channel"); retval = -1; goto end; } seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { + if (ch_cpu == -1) { ERR("problem parsing channel name"); retval = -1; goto free_short_chan_name; @@ -668,12 +666,12 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) ltt_lock_traces(); trace = _ltt_trace_find(trace_name); - if(trace == NULL) { + if (trace == NULL) { int result; DBG("Cannot find trace. It was likely destroyed by the user."); result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); - if(result) { + if (result) { ERR("ustcomm_send_reply failed"); retval = -1; goto unlock_traces; @@ -682,17 +680,17 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) goto unlock_traces; } - for(i=0; inr_channels; i++) { + for (i=0; inr_channels; i++) { struct ust_channel *channel = &trace->channels[i]; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { + if (!strcmp(trace->channels[i].channel_name, ch_name)) { struct ust_buffer *buf = channel->buf[ch_cpu]; struct blocked_consumer *bc; found = 1; bc = (struct blocked_consumer *) zmalloc(sizeof(struct blocked_consumer)); - if(bc == NULL) { + if (bc == NULL) { ERR("zmalloc returned NULL"); goto unlock_traces; } @@ -707,7 +705,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. */ - if(uatomic_read(&buf->consumed) == 0) { + if (uatomic_read(&buf->consumed) == 0) { DBG("decrementing buffers_to_export"); STORE_SHARED(buffers_to_export, LOAD_SHARED(buffers_to_export)-1); } @@ -715,7 +713,7 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) break; } } - if(found == 0) { + if (found == 0) { ERR("unable to find channel"); } @@ -748,27 +746,27 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) DBG("put_subbuf"); channel_and_cpu = strdup(nth_token(recvbuf, 1)); - if(channel_and_cpu == NULL) { + if (channel_and_cpu == NULL) { ERR("cannot parse channel"); retval = -1; goto end; } consumed_old_str = strdup(nth_token(recvbuf, 2)); - if(consumed_old_str == NULL) { + if (consumed_old_str == NULL) { ERR("cannot parse consumed_old"); retval = -1; goto free_channel_and_cpu; } consumed_old = strtol(consumed_old_str, &endptr, 10); - if(*endptr != '\0') { + if (*endptr != '\0') { 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) { + if (ch_cpu == -1) { ERR("problem parsing channel name"); retval = -1; goto free_short_chan_name; @@ -777,10 +775,10 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) ltt_lock_traces(); trace = _ltt_trace_find(trace_name); - if(trace == NULL) { + if (trace == NULL) { DBG("Cannot find trace. It was likely destroyed by the user."); result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); - if(result) { + if (result) { ERR("ustcomm_send_reply failed"); retval = -1; goto unlock_traces; @@ -789,24 +787,23 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) goto unlock_traces; } - for(i=0; inr_channels; i++) { + for (i=0; inr_channels; i++) { struct ust_channel *channel = &trace->channels[i]; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { + if (!strcmp(trace->channels[i].channel_name, ch_name)) { struct ust_buffer *buf = channel->buf[ch_cpu]; found = 1; result = ust_buffers_put_subbuf(buf, consumed_old); - if(result < 0) { + if (result < 0) { WARN("ust_buffers_put_subbuf: error (subbuf=%s)", channel_and_cpu); if (asprintf(&reply, "%s", "ERROR") < 0) { ERR("do_cmd_put_subbuffer : asprintf failed (ERROR)"); retval = -1; goto unlock_traces; } - } - else { + } else { DBG("ust_buffers_put_subbuf: success (subbuf=%s)", channel_and_cpu); if (asprintf(&reply, "%s", "OK") < 0) { ERR("do_cmd_put_subbuffer : asprintf failed (OK)"); @@ -816,7 +813,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) { + if (result) { ERR("ustcomm_send_reply failed"); free(reply); retval = -1; @@ -827,7 +824,7 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) break; } } - if(found == 0) { + if (found == 0) { ERR("unable to find channel"); } @@ -868,10 +865,9 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src) DBG("received a message! it's: %s", recvbuf); len = strlen(recvbuf); - if(!strcmp(recvbuf, "print_markers")) { + if (!strcmp(recvbuf, "print_markers")) { print_markers(stderr); - } - else if(!strcmp(recvbuf, "list_markers")) { + } else if (!strcmp(recvbuf, "list_markers")) { char *ptr; size_t size; FILE *fp; @@ -886,7 +882,7 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src) } else if (!strcmp(recvbuf, "print_trace_events")) { print_trace_events(stderr); - } else if(!strcmp(recvbuf, "list_trace_events")) { + } else if (!strcmp(recvbuf, "list_trace_events")) { char *ptr; size_t size; FILE *fp; @@ -905,22 +901,22 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src) return -1; } free(ptr); - } else if(!strcmp(recvbuf, "start")) { + } 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) { + if (result < 0) { ERR("ltt_trace_setup failed"); return -1; } result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_set_type failed"); return -1; } result = ltt_trace_alloc(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_alloc failed"); return -1; } @@ -928,98 +924,88 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src) inform_consumer_daemon(trace_name); result = ltt_trace_start(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_start failed"); return -1; } - } - else if(!strcmp(recvbuf, "trace_setup")) { + } else if (!strcmp(recvbuf, "trace_setup")) { DBG("trace setup"); result = ltt_trace_setup(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_setup failed"); return -1; } result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_set_type failed"); return -1; } - } - else if(!strcmp(recvbuf, "trace_alloc")) { + } else if (!strcmp(recvbuf, "trace_alloc")) { DBG("trace alloc"); result = ltt_trace_alloc(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_alloc failed"); return -1; } inform_consumer_daemon(trace_name); - } - else if(!strcmp(recvbuf, "trace_create")) { + } else if (!strcmp(recvbuf, "trace_create")) { DBG("trace create"); result = ltt_trace_setup(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_setup failed"); return -1; } result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_set_type failed"); return -1; } - } - else if(!strcmp(recvbuf, "trace_start")) { + } else if (!strcmp(recvbuf, "trace_start")) { DBG("trace start"); result = ltt_trace_alloc(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_alloc failed"); return -1; } - if(!result) { + if (!result) { inform_consumer_daemon(trace_name); } result = ltt_trace_start(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_start failed"); return -1; } - } - else if(!strcmp(recvbuf, "trace_stop")) { + } else if (!strcmp(recvbuf, "trace_stop")) { DBG("trace stop"); result = ltt_trace_stop(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_stop failed"); return -1; } - } - else if(!strcmp(recvbuf, "trace_destroy")) { + } else if (!strcmp(recvbuf, "trace_destroy")) { DBG("trace destroy"); result = ltt_trace_destroy(trace_name, 0); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_destroy failed"); return -1; } - } - else if(nth_token_is(recvbuf, "get_shmid", 0) == 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) { + } 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) { + } 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) { + } else if (nth_token_is(recvbuf, "load_probe_lib", 0) == 1) { char *libfile; libfile = nth_token(recvbuf, 1); @@ -1027,54 +1013,47 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src) DBG("load_probe_lib loading %s", libfile); free(libfile); - } - else if(nth_token_is(recvbuf, "get_subbuffer", 0) == 1) { + } 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) { + } 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) { + } 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) { + } 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) { + } 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); - if(channel_name == NULL || marker_name == NULL) { + if (channel_name == NULL || marker_name == NULL) { WARN("invalid marker name"); goto next_cmd; } result = ltt_marker_connect(channel_name, marker_name, "default"); - if(result < 0) { + 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) { + } 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(channel_name == NULL || marker_name == NULL) { + if (channel_name == NULL || marker_name == NULL) { WARN("invalid marker name"); goto next_cmd; } result = ltt_marker_disconnect(channel_name, marker_name, "default"); - if(result < 0) { + 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) { + } else if (nth_token_is(recvbuf, "get_pidunique", 0) == 1) { char *reply; if (asprintf(&reply, "%lld", pidunique) < 0) { @@ -1084,16 +1063,15 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src) } result = ustcomm_send_reply(&ustcomm_app.server, reply, src); - if(result) { + if (result) { ERR("listener: get_pidunique: ustcomm_send_reply failed"); goto next_cmd; } free(reply); - } - else if(nth_token_is(recvbuf, "get_sock_path", 0) == 1) { + } else if (nth_token_is(recvbuf, "get_sock_path", 0) == 1) { char *reply = getenv("UST_DAEMON_SOCKET"); - if(!reply) { + if (!reply) { if (asprintf(&reply, "%s/%s", SOCK_DIR, "ustd") < 0) { ERR("process_client_cmd : asprintf failed (%s/ustd)", SOCK_DIR); @@ -1101,23 +1079,19 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src) } result = ustcomm_send_reply(&ustcomm_app.server, reply, src); free(reply); - } - else { + } else { result = ustcomm_send_reply(&ustcomm_app.server, reply, src); } - if(result) + if (result) ERR("ustcomm_send_reply failed"); - } - else if(nth_token_is(recvbuf, "set_sock_path", 0) == 1) { + } else if (nth_token_is(recvbuf, "set_sock_path", 0) == 1) { char *sock_path = nth_token(recvbuf, 1); result = setenv("UST_DAEMON_SOCKET", sock_path, 1); - if(result) + if (result) ERR("cannot set UST_DAEMON_SOCKET environment variable"); - } - else if(nth_token_is(recvbuf, "force_switch", 0) == 1) { + } else if (nth_token_is(recvbuf, "force_switch", 0) == 1) { do_cmd_force_switch(); - } - else { + } else { ERR("unable to parse message: %s", recvbuf); } @@ -1134,7 +1108,7 @@ void *listener_main(void *p) pthread_cleanup_push(listener_cleanup, NULL); - for(;;) { + for (;;) { struct mpentries mpent; multipoll_init(&mpent); @@ -1143,7 +1117,7 @@ void *listener_main(void *p) ustcomm_mp_add_app_clients(&mpent, &ustcomm_app, process_client_cmd); result = multipoll_poll(&mpent, -1); - if(result == -1) { + if (result == -1) { ERR("error in multipoll_poll"); } @@ -1165,7 +1139,7 @@ void create_listener(void) sigset_t sig_all_blocked; sigset_t orig_parent_mask; - if(have_listener) { + if (have_listener) { WARN("not creating listener because we already had one"); return; } @@ -1179,21 +1153,20 @@ void create_listener(void) sigfillset(&sig_all_blocked); result = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_parent_mask); - if(result) { + if (result) { PERROR("pthread_sigmask: %s", strerror(result)); } result = pthread_create(&listener_thread, NULL, listener_main, NULL); - if(result == -1) { + if (result == -1) { PERROR("pthread_create"); } /* Restore original signal mask in parent */ result = pthread_sigmask(SIG_SETMASK, &orig_parent_mask, NULL); - if(result) { + if (result) { PERROR("pthread_sigmask: %s", strerror(result)); - } - else { + } else { have_listener = 1; } } @@ -1216,12 +1189,11 @@ static void auto_probe_connect(struct marker *m) char* concat_name = NULL; const char *probe_name = "default"; - if(autoprobe_method == AUTOPROBE_DISABLED) { + if (autoprobe_method == AUTOPROBE_DISABLED) { return; - } - else if(autoprobe_method == AUTOPROBE_ENABLE_REGEX) { + } else if (autoprobe_method == AUTOPROBE_ENABLE_REGEX) { result = asprintf(&concat_name, "%s/%s", m->channel, m->name); - if(result == -1) { + if (result == -1) { ERR("auto_probe_connect: asprintf failed (marker %s/%s)", m->channel, m->name); return; @@ -1234,7 +1206,7 @@ static void auto_probe_connect(struct marker *m) } result = ltt_marker_connect(m->channel, m->name, probe_name); - if(result && result != -EEXIST) + if (result && result != -EEXIST) ERR("ltt_marker_connect (marker = %s/%s, errno = %d)", m->channel, m->name, -result); DBG("auto connected marker %s (addr: %p) %s to probe default", m->channel, m, m->name); @@ -1259,7 +1231,7 @@ static void __attribute__((constructor)) init() DBG("Tracectl constructor"); result = init_socket(); - if(result == -1) { + if (result == -1) { ERR("init_socket error"); return; } @@ -1267,7 +1239,7 @@ static void __attribute__((constructor)) init() create_listener(); autoprobe_val = getenv("UST_AUTOPROBE"); - if(autoprobe_val) { + if (autoprobe_val) { struct marker_iter iter; DBG("Autoprobe enabled."); @@ -1281,7 +1253,7 @@ static void __attribute__((constructor)) init() /* first, set the callback that will connect the * probe on new markers */ - if(autoprobe_val[0] == '/') { + if (autoprobe_val[0] == '/') { result = regcomp(&autoprobe_regex, autoprobe_val+1, 0); if (result) { char regexerr[150]; @@ -1289,12 +1261,10 @@ static void __attribute__((constructor)) init() regerror(result, &autoprobe_regex, regexerr, sizeof(regexerr)); ERR("cannot parse regex %s (%s), will ignore UST_AUTOPROBE", autoprobe_val, regexerr); /* don't crash the application just for this */ - } - else { + } else { autoprobe_method = AUTOPROBE_ENABLE_REGEX; } - } - else { + } else { /* just enable all instrumentation */ autoprobe_method = AUTOPROBE_ENABLE_ALL; } @@ -1306,51 +1276,49 @@ static void __attribute__((constructor)) init() marker_iter_start(&iter); DBG("now iterating on markers already registered"); - while(iter.marker) { + while (iter.marker) { DBG("now iterating on marker %s", iter.marker->name); auto_probe_connect(iter.marker); marker_iter_next(&iter); } } - if(getenv("UST_OVERWRITE")) { + if (getenv("UST_OVERWRITE")) { int val = atoi(getenv("UST_OVERWRITE")); - if(val == 0 || val == 1) { + if (val == 0 || val == 1) { STORE_SHARED(ust_channels_overwrite_by_default, val); - } - else { + } else { WARN("invalid value for UST_OVERWRITE"); } } - if(getenv("UST_AUTOCOLLECT")) { + if (getenv("UST_AUTOCOLLECT")) { int val = atoi(getenv("UST_AUTOCOLLECT")); - if(val == 0 || val == 1) { + if (val == 0 || val == 1) { STORE_SHARED(ust_channels_request_collection_by_default, val); - } - else { + } else { WARN("invalid value for UST_AUTOCOLLECT"); } } subbuffer_size_val = getenv("UST_SUBBUF_SIZE"); - if(subbuffer_size_val) { + if (subbuffer_size_val) { sscanf(subbuffer_size_val, "%u", &subbuffer_size); power = pow2_higher_or_eq(subbuffer_size); - if(power != subbuffer_size) + if (power != subbuffer_size) WARN("using the next power of two for buffer size = %u\n", power); chan_infos[LTT_CHANNEL_UST].def_subbufsize = power; } subbuffer_count_val = getenv("UST_SUBBUF_NUM"); - if(subbuffer_count_val) { + if (subbuffer_count_val) { sscanf(subbuffer_count_val, "%u", &subbuffer_count); - if(subbuffer_count < 2) + if (subbuffer_count < 2) subbuffer_count = 2; chan_infos[LTT_CHANNEL_UST].def_subbufcount = subbuffer_count; } - if(getenv("UST_TRACE")) { + if (getenv("UST_TRACE")) { char trace_name[] = "auto"; char trace_type[] = "ustrelay"; @@ -1388,25 +1356,25 @@ static void __attribute__((constructor)) init() ltt_channels_register("ust"); result = ltt_trace_setup(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_setup failed"); return; } result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_set_type failed"); return; } result = ltt_trace_alloc(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_alloc failed"); return; } result = ltt_trace_start(trace_name); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_start failed"); return; } @@ -1442,12 +1410,12 @@ static void destroy_traces(void) DBG("destructor stopping traces"); result = ltt_trace_stop("auto"); - if(result == -1) { + if (result == -1) { ERR("ltt_trace_stop error"); } result = ltt_trace_destroy("auto", 0); - if(result == -1) { + if (result == -1) { ERR("ltt_trace_destroy error"); } } @@ -1460,7 +1428,7 @@ static int trace_recording(void) ltt_lock_traces(); list_for_each_entry(trace, <t_traces.head, list) { - if(trace->active) { + if (trace->active) { retval = 1; break; } @@ -1487,8 +1455,8 @@ int restarting_usleep(useconds_t usecs) tv.tv_nsec = usecs * 1000; do { - result = nanosleep(&tv, &tv); - } while(result == -1 && errno == EINTR); + result = nanosleep(&tv, &tv); + } while (result == -1 && errno == EINTR); return result; } @@ -1497,15 +1465,15 @@ static void stop_listener(void) { int result; - if(!have_listener) + if (!have_listener) return; result = pthread_cancel(listener_thread); - if(result != 0) { + if (result != 0) { ERR("pthread_cancel: %s", strerror(result)); } result = pthread_join(listener_thread, NULL); - if(result != 0) { + if (result != 0) { ERR("pthread_join: %s", strerror(result)); } } @@ -1522,15 +1490,15 @@ static void stop_listener(void) static void __attribute__((destructor)) keepalive() { - if(trace_recording() && LOAD_SHARED(buffers_to_export)) { + if (trace_recording() && LOAD_SHARED(buffers_to_export)) { int total = 0; DBG("Keeping process alive for consumer daemon..."); - while(LOAD_SHARED(buffers_to_export)) { + while (LOAD_SHARED(buffers_to_export)) { const int interv = 200000; restarting_usleep(interv); total += interv; - if(total >= 3000000) { + if (total >= 3000000) { WARN("non-consumed buffers remaining after wait limit; not waiting anymore"); break; } @@ -1583,7 +1551,7 @@ static void ust_fork(void) /* Delete all blocked consumers */ list_for_each_entry(bc, &blocked_consumers, list) { result = close(bc->fd_producer); - if(result == -1) { + if (result == -1) { PERROR("close"); } free(deletable_bc); @@ -1600,7 +1568,7 @@ static void ust_fork(void) create_listener(); ltt_trace_setup("auto"); result = ltt_trace_set_type("auto", "ustrelay"); - if(result < 0) { + if (result < 0) { ERR("ltt_trace_set_type failed"); return; } @@ -1627,7 +1595,7 @@ void ust_before_fork(ust_fork_info_t *fork_info) /* Disable signals */ sigfillset(&all_sigs); result = sigprocmask(SIG_BLOCK, &all_sigs, &fork_info->orig_sigs); - if(result == -1) { + if (result == -1) { PERROR("sigprocmask"); return; } @@ -1640,7 +1608,7 @@ static void ust_after_fork_common(ust_fork_info_t *fork_info) /* Restore signals */ result = sigprocmask(SIG_SETMASK, &fork_info->orig_sigs, NULL); - if(result == -1) { + if (result == -1) { PERROR("sigprocmask"); return; }