X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libtracectl%2Ftracectl.c;h=3732bc03714ae585297dd3b933e86a912b3c7a29;hb=46ef48cdf8b64608a4f679500bc34293b9f0b649;hp=e926c9efdfd7eb369a8ea88bc2e349fe6b7d68dd;hpb=b02e31e53039229b50d2f54ee31d68709aba1412;p=ust.git diff --git a/libtracectl/tracectl.c b/libtracectl/tracectl.c index e926c9e..3732bc0 100644 --- a/libtracectl/tracectl.c +++ b/libtracectl/tracectl.c @@ -11,13 +11,10 @@ #include "tracer.h" #include "localerr.h" #include "ustcomm.h" +#include "relay.h" /* FIXME: remove */ //#define USE_CLONE -#define UNIX_PATH_MAX 108 - -#define SOCKETDIR "/tmp/socks" -#define SOCKETDIRLEN sizeof(SOCKETDIR) #define USTSIGNAL SIGIO #define MAX_MSG_SIZE (100) @@ -47,9 +44,6 @@ struct trctl_msg { char payload[94]; }; -char mysocketfile[UNIX_PATH_MAX] = ""; -//int pfd = -1; - struct consumer_channel { int fd; struct ltt_channel_struct *chan; @@ -88,7 +82,7 @@ int consumer(void *arg) consumer_channels[i].chan = chan; snprintf(tmp, sizeof(tmp), "trace/%s_0", chan->channel_name); - result = consumer_channels[i].fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00644); + result = consumer_channels[i].fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00600); if(result == -1) { perror("open"); return -1; @@ -121,44 +115,6 @@ int consumer(void *arg) sleep(1); } - -// CPRINTF("consumer: got a trace: %s with %d channels\n", trace_name, trace->nr_channels); -// -// struct ltt_channel_struct *chan = &trace->channels[0]; -// -// CPRINTF("channel 1 (%s) active=%u", chan->channel_name, chan->active & 1); - -// struct rchan *rchan = chan->trans_channel_data; -// struct rchan_buf *rbuf = rchan->buf; -// struct ltt_channel_buf_struct *lttbuf = chan->buf; -// long consumed_old; -// -// result = fd = open("trace.out", O_WRONLY | O_CREAT | O_TRUNC, 00644); -// if(result == -1) { -// perror("open"); -// return -1; -// } - -// for(;;) { -// write(STDOUT_FILENO, str, sizeof(str)); -// -// result = ltt_do_get_subbuf(rbuf, lttbuf, &consumed_old); -// if(result < 0) { -// CPRINTF("ltt_do_get_subbuf: error: %s", strerror(-result)); -// } -// else { -// CPRINTF("success!"); -// -// result = write(fd, rbuf->buf_data + (consumed_old & (2 * 4096-1)), 4096); -// ltt_do_put_subbuf(rbuf, lttbuf, consumed_old); -// } -// -// //CPRINTF("There seems to be %ld bytes available", SUBBUF_TRUNC(local_read(<tbuf->offset), rbuf->chan) - consumed_old); -// CPRINTF("Commit count %ld", local_read(<tbuf->commit_count[0])); -// -// -// sleep(1); -// } } void start_consumer(void) @@ -222,8 +178,6 @@ void notif_cb(void) } } -#define CONSUMER_DAEMON_SOCK SOCKETDIR "/ustd" - static int inform_consumer_daemon(void) { ustcomm_request_consumer(getpid(), "metadata"); @@ -246,18 +200,14 @@ int listener_main(void *p) int len; struct ustcomm_source src; - result = ustcomm_app_recv_message(&ustcomm_app, &recvbuf, &src); - DBG("HERE"); - if(result) { + result = ustcomm_app_recv_message(&ustcomm_app, &recvbuf, &src, -1); + if(result <= 0) { WARN("error in ustcomm_app_recv_message"); continue; } DBG("received a message! it's: %s\n", recvbuf); len = strlen(recvbuf); - //if(len && recvbuf[len-1] == '\n') { - // recvbuf[len-1] = '\0'; - //} if(!strcmp(recvbuf, "print_markers")) { print_markers(); @@ -318,9 +268,16 @@ int listener_main(void *p) struct ltt_trace_struct *trace; char trace_name[] = "auto"; int i; + char *channel_name; DBG("get_shmid"); + channel_name = nth_token(recvbuf, 1); + if(channel_name == NULL) { + ERR("get_shmid: cannot parse channel"); + goto next_cmd; + } + ltt_lock_traces(); trace = _ltt_trace_find(trace_name); ltt_unlock_traces(); @@ -334,8 +291,110 @@ int listener_main(void *p) struct rchan *rchan = trace->channels[i].trans_channel_data; struct rchan_buf *rbuf = rchan->buf; - DBG("the shmid is %d", rbuf->shmid); + if(!strcmp(trace->channels[i].channel_name, channel_name)) { + char *reply; + + DBG("the shmid for the requested channel is %d", rbuf->shmid); + asprintf(&reply, "%d", rbuf->shmid); + + result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); + if(result) { + ERR("listener: get_shmid: ustcomm_send_reply failed"); + goto next_cmd; + } + + free(reply); + + break; + } + } + } + else if(nth_token_is(recvbuf, "get_n_subbufs", 0) == 1) { + struct ltt_trace_struct *trace; + char trace_name[] = "auto"; + int i; + char *channel_name; + + DBG("get_n_subbufs"); + + channel_name = nth_token(recvbuf, 1); + if(channel_name == NULL) { + ERR("get_n_subbufs: cannot parse channel"); + goto next_cmd; + } + + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); + ltt_unlock_traces(); + + if(trace == NULL) { + CPRINTF("cannot find trace!"); + return 1; + } + + for(i=0; inr_channels; i++) { + struct rchan *rchan = trace->channels[i].trans_channel_data; + + if(!strcmp(trace->channels[i].channel_name, channel_name)) { + char *reply; + + DBG("the n_subbufs for the requested channel is %d", rchan->n_subbufs); + asprintf(&reply, "%d", rchan->n_subbufs); + + result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); + if(result) { + ERR("listener: get_n_subbufs: ustcomm_send_reply failed"); + goto next_cmd; + } + + free(reply); + break; + } + } + } + else if(nth_token_is(recvbuf, "get_subbuf_size", 0) == 1) { + struct ltt_trace_struct *trace; + char trace_name[] = "auto"; + int i; + char *channel_name; + + DBG("get_subbuf_size"); + + channel_name = nth_token(recvbuf, 1); + if(channel_name == NULL) { + ERR("get_subbuf_size: cannot parse channel"); + goto next_cmd; + } + + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); + ltt_unlock_traces(); + + if(trace == NULL) { + CPRINTF("cannot find trace!"); + return 1; + } + + for(i=0; inr_channels; i++) { + struct rchan *rchan = trace->channels[i].trans_channel_data; + + if(!strcmp(trace->channels[i].channel_name, channel_name)) { + char *reply; + + DBG("the subbuf_size for the requested channel is %d", rchan->subbuf_size); + asprintf(&reply, "%d", rchan->subbuf_size); + + result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); + if(result) { + ERR("listener: get_subbuf_size: ustcomm_send_reply failed"); + goto next_cmd; + } + + free(reply); + + break; + } } } else if(nth_token_is(recvbuf, "load_probe_lib", 0) == 1) { @@ -345,7 +404,184 @@ int listener_main(void *p) DBG("load_probe_lib loading %s", libfile); } + else if(nth_token_is(recvbuf, "get_subbuffer", 0) == 1) { + struct ltt_trace_struct *trace; + char trace_name[] = "auto"; + int i; + char *channel_name; + + DBG("get_subbuf"); + + channel_name = nth_token(recvbuf, 1); + if(channel_name == NULL) { + ERR("get_subbuf: cannot parse channel"); + goto next_cmd; + } + + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); + ltt_unlock_traces(); + + if(trace == NULL) { + CPRINTF("cannot find trace!"); + return 1; + } + + for(i=0; inr_channels; i++) { + struct rchan *rchan = trace->channels[i].trans_channel_data; + + 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; + char *reply; + long consumed_old=0; + + result = ltt_do_get_subbuf(rbuf, lttbuf, &consumed_old); + if(result < 0) { + DBG("ltt_do_get_subbuf: error: %s", strerror(-result)); + asprintf(&reply, "%s %ld", "UNAVAIL", 0); + } + else { + DBG("ltt_do_get_subbuf: success"); + asprintf(&reply, "%s %ld", "OK", consumed_old); + } + + result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); + if(result) { + ERR("listener: get_subbuf: ustcomm_send_reply failed"); + goto next_cmd; + } + + free(reply); + + break; + } + } + } + else if(nth_token_is(recvbuf, "put_subbuffer", 0) == 1) { + struct ltt_trace_struct *trace; + char trace_name[] = "auto"; + int i; + char *channel_name; + long consumed_old; + char *consumed_old_str; + char *endptr; + + DBG("put_subbuf"); + + channel_name = strdup_malloc(nth_token(recvbuf, 1)); + if(channel_name == NULL) { + ERR("put_subbuf_size: cannot parse channel"); + goto next_cmd; + } + + consumed_old_str = strdup_malloc(nth_token(recvbuf, 2)); + if(consumed_old_str == NULL) { + ERR("put_subbuf: cannot parse consumed_old"); + goto next_cmd; + } + consumed_old = strtol(consumed_old_str, &endptr, 10); + if(*endptr != '\0') { + ERR("put_subbuf: invalid value for consumed_old"); + goto next_cmd; + } + + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); + ltt_unlock_traces(); + + if(trace == NULL) { + CPRINTF("cannot find trace!"); + return 1; + } + + for(i=0; inr_channels; i++) { + struct rchan *rchan = trace->channels[i].trans_channel_data; + + 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; + char *reply; + long consumed_old=0; + + result = ltt_do_put_subbuf(rbuf, lttbuf, consumed_old); + if(result < 0) { + WARN("ltt_do_put_subbuf: error"); + } + else { + DBG("ltt_do_put_subbuf: success"); + } + asprintf(&reply, "%s", "OK", consumed_old); + + result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); + if(result) { + ERR("listener: put_subbuf: ustcomm_send_reply failed"); + goto next_cmd; + } + + free(reply); + + break; + } + } + + free(channel_name); + free(consumed_old_str); + } + else if(nth_token_is(recvbuf, "get_notifications", 0) == 1) { + struct ltt_trace_struct *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) { + CPRINTF("cannot find trace!"); + return 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); + } + next_cmd: free(recvbuf); } } @@ -398,15 +634,15 @@ static int init_socket(void) static void destroy_socket(void) { - int result; - - if(mysocketfile[0] == '\0') - return; - - result = unlink(mysocketfile); - if(result == -1) { - PERROR("unlink"); - } +// int result; +// +// if(mysocketfile[0] == '\0') +// return; +// +// result = unlink(mysocketfile); +// if(result == -1) { +// PERROR("unlink"); +// } } static int init_signal_handler(void) @@ -451,12 +687,39 @@ static void auto_probe_connect(struct marker *m) DBG("just auto connected marker %s %s to probe default", m->channel, m->name); } +/* Wake the consumer of a buffer + * + * wake_consumer_cb is called in tracing context so it must haste. + * + * FIXME: don't do a system call here; maybe schedule work to be done + * in listener context? Once this is done in listener context, we can + * check for the return value of send_message_fd and remove the fd if necessary + * + * @arg: the buffer + * @finished: 0: subbuffer full; 1: buffer being destroyed + */ + +static void wake_consumer_cb(void *arg, int finished) +{ + struct ltt_channel_buf_struct *ltt_buf = (struct ltt_channel_buf_struct *) arg; + int fd = (int)ACCESS_ONCE(arg); + + if(!finished) { + send_message_fd(fd, "consume", NULL); + } + else { + send_message_fd(fd, "destroyed", NULL); + } +} + static void __attribute__((constructor(101))) init0() { DBG("UST_AUTOPROBE constructor"); if(getenv("UST_AUTOPROBE")) { marker_set_new_marker_cb(auto_probe_connect); } + + relay_set_wake_consumer(wake_consumer_cb); } static void fini(void); @@ -554,7 +817,8 @@ static void __attribute__((destructor)) fini() } /* FIXME: wait for the consumer to be done */ - sleep(1); + DBG("waiting 5 sec for consume"); + sleep(5); destroy_socket(); }