From 763f41e58126afdc361006831a7daca773a9627a Mon Sep 17 00:00:00 2001 From: Douglas Santos Date: Mon, 22 Feb 2010 11:32:02 -0500 Subject: [PATCH] add options to set subbuf size and cnt --- libust/tracectl.c | 144 +++++++++++++++++++++++++++++++++++++++++++-- libust/tracer.c | 5 ++ libustcmd/ustcmd.c | 67 +++++++++++++++++++++ libustcmd/ustcmd.h | 3 + ustctl/ustctl.c | 35 +++++++++++ 5 files changed, 249 insertions(+), 5 deletions(-) diff --git a/libust/tracectl.c b/libust/tracectl.c index e84d289..d4cb3ef 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -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; @@ -798,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"); @@ -813,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) { @@ -874,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]=""; diff --git a/libust/tracer.c b/libust/tracer.c index d5ec43e..52928b8 100644 --- a/libust/tracer.c +++ b/libust/tracer.c @@ -630,6 +630,11 @@ int ltt_trace_alloc(const char *trace_name) ltt_lock_traces(); + if (_ltt_trace_find(trace_name)) { /* Trace already allocated */ + err = 1; + goto traces_error; + } + trace = _ltt_trace_find_setup(trace_name); if (!trace) { ERR("Trace not found %s", trace_name); diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c index d22fb52..930c078 100644 --- a/libustcmd/ustcmd.c +++ b/libustcmd/ustcmd.c @@ -101,6 +101,55 @@ int ustcmd_set_marker_state(const char *mn, int state, pid_t pid) return 0; } +/** + * Set subbuffer size. + * + * @param channel_size Channel name and size + * @param pid Traced process ID + * @return 0 if successful, or error + */ +int ustcmd_set_subbuf_size(const char *channel_size, pid_t pid) +{ + char *cmd; + int result; + + asprintf(&cmd, "%s %s", "set_subbuf_size", channel_size); + + result = ustcmd_send_cmd(cmd, pid, NULL); + if (result) { + free(cmd); + return 1; + } + + free(cmd); + return 0; +} + +/** + * Set subbuffer num. + * + * @param channel_num Channel name and num + * @param pid Traced process ID + * @return 0 if successful, or error + */ +int ustcmd_set_subbuf_num(const char *channel_size, pid_t pid) +{ + char *cmd; + int result; + + asprintf(&cmd, "%s %s", "set_subbuf_num", channel_size); + + result = ustcmd_send_cmd(cmd, pid, NULL); + if (result) { + free(cmd); + return 1; + } + + free(cmd); + return 0; +} + + /** * Destroys an UST trace according to a PID. * @@ -173,6 +222,24 @@ int ustcmd_start_trace(pid_t pid) return 0; } +/** + * Alloc an UST trace according to a PID. + * + * @param pid Traced process ID + * @return 0 if successful, or error USTCMD_ERR_GEN + */ +int ustcmd_alloc_trace(pid_t pid) +{ + int result; + + result = ustcmd_send_cmd("trace_alloc", pid, NULL); + if (result) { + return USTCMD_ERR_GEN; + } + + return 0; +} + /** * Stops an UST trace according to a PID. * diff --git a/libustcmd/ustcmd.h b/libustcmd/ustcmd.h index a494bcf..ea918d5 100644 --- a/libustcmd/ustcmd.h +++ b/libustcmd/ustcmd.h @@ -31,11 +31,14 @@ struct marker_status { extern pid_t *ustcmd_get_online_pids(void); extern int ustcmd_set_marker_state(const char *, int, pid_t); +extern int ustcmd_set_subbuf_size(const char *, pid_t); +extern int ustcmd_set_subbuf_num(const char *, pid_t); extern int ustcmd_destroy_trace(pid_t); extern int ustcmd_setup_and_start(pid_t); extern int ustcmd_stop_trace(pid_t); extern int ustcmd_create_trace(pid_t); extern int ustcmd_start_trace(pid_t); +extern int ustcmd_alloc_trace(pid_t); extern int ustcmd_free_cmsf(struct marker_status *); extern unsigned int ustcmd_count_nl(const char *); extern int ustcmd_send_cmd(const char *, pid_t, char **); diff --git a/ustctl/ustctl.c b/ustctl/ustctl.c index 3ff2fb7..39ca402 100644 --- a/ustctl/ustctl.c +++ b/ustctl/ustctl.c @@ -36,6 +36,9 @@ enum command { ENABLE_MARKER, DISABLE_MARKER, GET_ONLINE_PIDS, + SET_SUBBUF_SIZE, + SET_SUBBUF_NUM, + ALLOC_TRACE, UNKNOWN }; @@ -57,6 +60,8 @@ Commands:\n\ --start-trace\t\t\tStart tracing\n\ --stop-trace\t\t\tStop tracing\n\ --destroy-trace\t\t\tDestroy the trace\n\ + --set-subbuf-size \"CHANNEL/bytes\"\tSet the size of subbuffers per channel\n\ + --set-subbuf-num \"CHANNEL/n\"\tSet the number of subbuffers per channel\n\ --enable-marker \"CHANNEL/MARKER\"\tEnable a marker\n\ --disable-marker \"CHANNEL/MARKER\"\tDisable a marker\n\ --list-markers\t\t\tList the markers of the process, their\n\t\t\t\t\t state and format string\n\ @@ -75,6 +80,7 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts) int option_index = 0; static struct option long_options[] = { {"create-trace", 0, 0, 1012}, + {"alloc-trace", 0, 0, 1015}, {"start-trace", 0, 0, 1000}, {"stop-trace", 0, 0, 1001}, {"destroy-trace", 0, 0, 1002}, @@ -87,6 +93,8 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts) {"help", 0, 0, 'h'}, {"version", 0, 0, 1010}, {"online-pids", 0, 0, 1011}, + {"set-subbuf-size", 1, 0, 1013}, + {"set-subbuf-num", 1, 0, 1014}, {0, 0, 0, 0} }; @@ -137,6 +145,17 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts) case 1012: opts->cmd = CREATE_TRACE; break; + case 1013: + opts->cmd = SET_SUBBUF_SIZE; + opts->regex = strdup(optarg); + break; + case 1014: + opts->cmd = SET_SUBBUF_NUM; + opts->regex = strdup(optarg); + break; + case 1015: + opts->cmd = ALLOC_TRACE; + break; default: /* unknown option or other error; error is printed by getopt, just return */ @@ -293,6 +312,22 @@ int main(int argc, char *argv[]) ustcmd_set_marker_state(opts.regex, 0, *pidit); break; + case SET_SUBBUF_SIZE: + ustcmd_set_subbuf_size(opts.regex, *pidit); + break; + + case SET_SUBBUF_NUM: + ustcmd_set_subbuf_num(opts.regex, *pidit); + break; + + case ALLOC_TRACE: + result = ustcmd_alloc_trace(*pidit); + if (result) { + ERR("error while trying to alloc trace with PID %u\n", (unsigned int) *pidit); + break; + } + break; + default: ERR("unknown command\n"); break; -- 2.34.1