X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=5ccd1f5eba14b0846223f297ea78408c9af37fa0;hb=69ba01560f9193dbf4ad2fc8361efb725704807c;hp=2101d5c4c3725e8de547fbf815237cbff988a3b3;hpb=b4512257eb71d0432554047acf6278dc42a15a75;p=ust.git diff --git a/libust/tracectl.c b/libust/tracectl.c index 2101d5c..5ccd1f5 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -1,3 +1,21 @@ +/* Copyright (C) 2009 Pierre-Marc Fournier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#define _GNU_SOURCE #include #include #include @@ -13,6 +31,7 @@ #include "localerr.h" #include "ustcomm.h" #include "relay.h" /* FIXME: remove */ +#include "marker-control.h" //#define USE_CLONE @@ -68,7 +87,7 @@ struct blocked_consumer { struct list_head list; }; -static void print_markers(void) +static void print_markers(FILE *fp) { struct marker_iter iter; @@ -77,7 +96,7 @@ static void print_markers(void) marker_iter_start(&iter); while(iter.marker) { - fprintf(stderr, "marker: %s_%s \"%s\"\n", iter.marker->channel, iter.marker->name, iter.marker->format); + fprintf(fp, "marker: %s_%s %d \"%s\"\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format); marker_iter_next(&iter); } unlock_markers(); @@ -113,7 +132,7 @@ void notif_cb(void) } } -static int inform_consumer_daemon(void) +static void inform_consumer_daemon(void) { ustcomm_request_consumer(getpid(), "metadata"); ustcomm_request_consumer(getpid(), "ust"); @@ -145,10 +164,11 @@ void process_blocked_consumers(void) idx++; } - result = poll(fds, n_fds, 0); + while((result = poll(fds, n_fds, 0)) == -1 && errno == EINTR) + /* nothing */; if(result == -1) { PERROR("poll"); - return -1; + return; } list_for_each_entry(bc, &blocked_consumers, list) { @@ -166,7 +186,7 @@ void process_blocked_consumers(void) close(bc->fd_producer); - __list_del(bc->list.prev, bc->list.next); + list_del(&bc->list); result = ustcomm_send_reply(&bc->server, "END", &bc->src); if(result < 0) { @@ -194,22 +214,19 @@ void process_blocked_consumers(void) } free(reply); - __list_del(bc->list.prev, bc->list.next); + list_del(&bc->list); } } } -int listener_main(void *p) +void *listener_main(void *p) { int result; DBG("LISTENER"); for(;;) { - uint32_t size; - struct sockaddr_un addr; - socklen_t addrlen = sizeof(addr); char trace_name[] = "auto"; char trace_type[] = "ustrelay"; char *recvbuf; @@ -232,7 +249,48 @@ int listener_main(void *p) len = strlen(recvbuf); if(!strcmp(recvbuf, "print_markers")) { - print_markers(); + print_markers(stderr); + } + else if(!strcmp(recvbuf, "list_markers")) { + char *ptr; + size_t size; + FILE *fp; + + fp = open_memstream(&ptr, &size); + print_markers(fp); + fclose(fp); + + result = ustcomm_send_reply(&ustcomm_app.server, ptr, &src); + + free(ptr); + } + 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) { + ERR("ltt_trace_setup failed"); + return (void *)1; + } + + result = ltt_trace_set_type(trace_name, trace_type); + if(result < 0) { + ERR("ltt_trace_set_type failed"); + return (void *)1; + } + + result = ltt_trace_alloc(trace_name); + if(result < 0) { + ERR("ltt_trace_alloc failed"); + return (void *)1; + } + + inform_consumer_daemon(); + + result = ltt_trace_start(trace_name); + if(result < 0) { + ERR("ltt_trace_start failed"); + continue; + } } else if(!strcmp(recvbuf, "trace_setup")) { DBG("trace setup"); @@ -240,13 +298,13 @@ int listener_main(void *p) result = ltt_trace_setup(trace_name); if(result < 0) { ERR("ltt_trace_setup failed"); - return; + return (void *)1; } result = ltt_trace_set_type(trace_name, trace_type); if(result < 0) { ERR("ltt_trace_set_type failed"); - return; + return (void *)1; } } else if(!strcmp(recvbuf, "trace_alloc")) { @@ -255,7 +313,7 @@ int listener_main(void *p) result = ltt_trace_alloc(trace_name); if(result < 0) { ERR("ltt_trace_alloc failed"); - return; + return (void *)1; } } else if(!strcmp(recvbuf, "trace_start")) { @@ -273,7 +331,7 @@ int listener_main(void *p) result = ltt_trace_stop(trace_name); if(result < 0) { ERR("ltt_trace_stop failed"); - return; + return (void *)1; } } else if(!strcmp(recvbuf, "trace_destroy")) { @@ -283,7 +341,7 @@ int listener_main(void *p) result = ltt_trace_destroy(trace_name); if(result < 0) { ERR("ltt_trace_destroy failed"); - return; + return (void *)1; } } else if(nth_token_is(recvbuf, "get_shmid", 0) == 1) { @@ -305,15 +363,14 @@ int listener_main(void *p) ltt_unlock_traces(); if(trace == NULL) { - CPRINTF("cannot find trace!"); - return 1; + ERR("cannot find trace!"); + return (void *)1; } for(i=0; inr_channels; i++) { struct rchan *rchan = trace->channels[i].trans_channel_data; struct rchan_buf *rbuf = rchan->buf; struct ltt_channel_struct *ltt_channel = (struct ltt_channel_struct *)rchan->private_data; - struct ltt_channel_buf_struct *ltt_buf = ltt_channel->buf; if(!strcmp(trace->channels[i].channel_name, channel_name)) { char *reply; @@ -353,8 +410,8 @@ int listener_main(void *p) ltt_unlock_traces(); if(trace == NULL) { - CPRINTF("cannot find trace!"); - return 1; + ERR("cannot find trace!"); + return (void *)1; } for(i=0; inr_channels; i++) { @@ -363,8 +420,8 @@ int listener_main(void *p) 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); + DBG("the n_subbufs for the requested channel is %zd", rchan->n_subbufs); + asprintf(&reply, "%zd", rchan->n_subbufs); result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); if(result) { @@ -397,8 +454,8 @@ int listener_main(void *p) ltt_unlock_traces(); if(trace == NULL) { - CPRINTF("cannot find trace!"); - return 1; + ERR("cannot find trace!"); + return (void *)1; } for(i=0; inr_channels; i++) { @@ -407,8 +464,8 @@ int listener_main(void *p) 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); + DBG("the subbuf_size for the requested channel is %zd", rchan->subbuf_size); + asprintf(&reply, "%zd", rchan->subbuf_size); result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); if(result) { @@ -448,8 +505,8 @@ int listener_main(void *p) ltt_unlock_traces(); if(trace == NULL) { - CPRINTF("cannot find trace!"); - return 1; + ERR("cannot find trace!"); + return (void *)1; } for(i=0; inr_channels; i++) { @@ -458,9 +515,6 @@ int listener_main(void *p) 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; - int fd; struct blocked_consumer *bc; bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer)); @@ -514,8 +568,8 @@ int listener_main(void *p) ltt_unlock_traces(); if(trace == NULL) { - CPRINTF("cannot find trace!"); - return 1; + ERR("cannot find trace!"); + return (void *)1; } for(i=0; inr_channels; i++) { @@ -529,12 +583,13 @@ int listener_main(void *p) result = ltt_do_put_subbuf(rbuf, lttbuf, consumed_old); if(result < 0) { - WARN("ltt_do_put_subbuf: error"); + WARN("ltt_do_put_subbuf: error (subbuf=%s)", channel_name); + asprintf(&reply, "%s", "ERROR"); } else { - DBG("ltt_do_put_subbuf: success"); + DBG("ltt_do_put_subbuf: success (subbuf=%s)", channel_name); + asprintf(&reply, "%s", "OK"); } - asprintf(&reply, "%s", "OK", consumed_old); result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); if(result) { @@ -551,6 +606,40 @@ int listener_main(void *p) free(channel_name); free(consumed_old_str); } + 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) { + WARN("invalid marker name"); + goto next_cmd; + } + printf("%s %s\n", channel_name, marker_name); + + result = ltt_marker_connect(channel_name, marker_name, "default"); + 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) { + 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(marker_name == NULL) { + } + printf("%s %s\n", channel_name, marker_name); + + result = ltt_marker_disconnect(channel_name, marker_name, "default"); + if(result < 0) { + WARN("could not disable marker; channel=%s, name=%s", channel_name, marker_name); + } + } // else if(nth_token_is(recvbuf, "get_notifications", 0) == 1) { // struct ltt_trace_struct *trace; // char trace_name[] = "auto"; @@ -570,8 +659,8 @@ int listener_main(void *p) // ltt_unlock_traces(); // // if(trace == NULL) { -// CPRINTF("cannot find trace!"); -// return 1; +// ERR("cannot find trace!"); +// return (void *)1; // } // // for(i=0; inr_channels; i++) { @@ -609,13 +698,11 @@ int listener_main(void *p) } } -static char listener_stack[16384]; - void create_listener(void) { - int result; +#ifdef USE_CLONE static char listener_stack[16384]; - //char *listener_stack = malloc(16384); +#endif #ifdef USE_CLONE result = clone(listener_main, listener_stack+sizeof(listener_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM | CLONE_SIGHAND | CLONE_THREAD, NULL); @@ -655,18 +742,22 @@ static int init_socket(void) return ustcomm_init_app(getpid(), &ustcomm_app); } +/* FIXME: reenable this to delete socket file. */ + +#if 0 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"); + } } +#endif static int init_signal_handler(void) { @@ -704,8 +795,8 @@ static void auto_probe_connect(struct marker *m) int result; result = ltt_marker_connect(m->channel, m->name, "default"); - if(result) - ERR("ltt_marker_connect"); + if(result && result != -EEXIST) + ERR("ltt_marker_connect (marker = %s/%s, errno = %d)", m->channel, m->name, -result); DBG("just auto connected marker %s %s to probe default", m->channel, m->name); } @@ -718,8 +809,6 @@ static void __attribute__((constructor(101))) init0() } } -static void fini(void); - static void __attribute__((constructor(1000))) init() { int result; @@ -780,7 +869,6 @@ static void __attribute__((constructor(1000))) init() ERR("ltt_trace_start failed"); return; } - //start_consumer(); inform_consumer_daemon(); } @@ -794,6 +882,8 @@ static void __attribute__((constructor(1000))) init() /* This is only called if we terminate normally, not with an unhandled signal, * so we cannot rely on it. */ +/* This destructor probably isn't needed, because ustd can do crash recovery. */ +#if 0 static void __attribute__((destructor)) fini() { int result; @@ -812,9 +902,6 @@ static void __attribute__((destructor)) fini() ERR("ltt_trace_destroy error"); } - /* FIXME: wait for the consumer to be done */ - //DBG("waiting 5 sec for consume"); - //sleep(5); - destroy_socket(); } +#endif