X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=5f942cd8306a3cdb661c73bb45484782bb6a245d;hb=bc237fab2306223e429c43ff003ac06c3777be99;hp=848b272f77c5167de00828e88b67652472ada7f7;hpb=393bc3911a4d704f85d6331aca2fb4a5b57b5e8a;p=ust.git diff --git a/libust/tracectl.c b/libust/tracectl.c index 848b272..5f942cd 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -15,21 +15,29 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/* This file contains the implementation of the UST listener thread, which + * receives trace control commands. It also coordinates the initialization of + * libust. + */ + #define _GNU_SOURCE #include +#include #include +#include #include +#include +#include #include #include -#include -#include #include #include #include - -#include +#include +#include #include +#include #include #include "tracer.h" #include "usterr.h" @@ -37,68 +45,39 @@ #include "buffers.h" #include "marker-control.h" -//#define USE_CLONE - -#define USTSIGNAL SIGIO - -#define MAX_MSG_SIZE (100) -#define MSG_NOTIF 1 -#define MSG_REGISTER_NOTIF 2 - -char consumer_stack[10000]; - /* This should only be accessed by the constructor, before the creation * of the listener, and then only by the listener. */ s64 pidunique = -1LL; -struct list_head blocked_consumers = LIST_HEAD_INIT(blocked_consumers); - -static struct ustcomm_app ustcomm_app; +/* The process pid is used to detect a non-traceable fork + * and allow the non-traceable fork to be ignored + * by destructor sequences in libust + */ +static pid_t processpid = 0; -struct tracecmd { /* no padding */ - uint32_t size; - uint16_t command; -}; +static struct ustcomm_header _receive_header; +static struct ustcomm_header *receive_header = &_receive_header; +static char receive_buffer[USTCOMM_BUFFER_SIZE]; +static char send_buffer[USTCOMM_BUFFER_SIZE]; -/* volatile because shared between the listener and the main thread */ -volatile sig_atomic_t buffers_to_export = 0; - -struct trctl_msg { - /* size: the size of all the fields except size itself */ - uint32_t size; - uint16_t type; - /* Only the necessary part of the payload is transferred. It - * may even be none of it. - */ - char payload[94]; -}; +static int epoll_fd; +static struct ustcomm_sock *listen_sock; -struct consumer_channel { - int fd; - struct ltt_channel_struct *chan; -}; +extern struct chan_info_struct chan_infos[]; -struct blocked_consumer { - int fd_consumer; - int fd_producer; - int tmp_poll_idx; +static struct list_head open_buffers_list = LIST_HEAD_INIT(open_buffers_list); - /* args to ustcomm_send_reply */ - struct ustcomm_server server; - struct ustcomm_source src; +static struct list_head ust_socks = LIST_HEAD_INIT(ust_socks); - /* args to ust_buffers_get_subbuf */ - struct ust_buffer *buf; - - struct list_head list; -}; +/* volatile because shared between the listener and the main thread */ +int buffers_to_export = 0; static long long make_pidunique(void) { s64 retval; struct timeval tv; - + gettimeofday(&tv, NULL); retval = tv.tv_sec; @@ -116,44 +95,88 @@ static void print_markers(FILE *fp) marker_iter_reset(&iter); marker_iter_start(&iter); - 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); + 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); } unlock_markers(); } -static int init_socket(void); +static void print_trace_events(FILE *fp) +{ + struct trace_event_iter iter; -/* This needs to be called whenever a new thread is created. It notifies - * liburcu of the new thread. - */ + lock_trace_events(); + trace_event_iter_reset(&iter); + trace_event_iter_start(&iter); -void ust_register_thread(void) -{ - rcu_register_thread(); + while (iter.trace_event) { + fprintf(fp, "trace_event: %s\n", iter.trace_event->name); + trace_event_iter_next(&iter); + } + unlock_trace_events(); } -int fd_notif = -1; -void notif_cb(void) +static int connect_ustd(void) { - int result; - struct trctl_msg msg; + int result, fd; + char default_daemon_path[] = SOCK_DIR "/ustd"; + char *explicit_daemon_path, *daemon_path; + + explicit_daemon_path = getenv("UST_DAEMON_SOCKET"); + if (explicit_daemon_path) { + daemon_path = explicit_daemon_path; + } else { + daemon_path = default_daemon_path; + } - /* FIXME: fd_notif should probably be protected by a spinlock */ + DBG("Connecting to daemon_path %s", daemon_path); - if(fd_notif == -1) - return; + result = ustcomm_connect_path(daemon_path, &fd); + if (result < 0) { + WARN("connect_ustd failed, daemon_path: %s", + daemon_path); + return result; + } + + return fd; +} - msg.type = MSG_NOTIF; - msg.size = sizeof(msg.type); - /* FIXME: don't block here */ - result = write(fd_notif, &msg, msg.size+sizeof(msg.size)); - if(result == -1) { - PERROR("write"); +static void request_buffer_consumer(int sock, + const char *channel, + int cpu) +{ + struct ustcomm_header send_header, recv_header; + struct ustcomm_buffer_info buf_inf; + int result = 0; + + result = ustcomm_pack_buffer_info(&send_header, + &buf_inf, + channel, + cpu); + + if (result < 0) { + ERR("failed to pack buffer info message %s_%d", + channel, cpu); return; } + + buf_inf.pid = getpid(); + send_header.command = CONSUME_BUFFER; + + result = ustcomm_req(sock, &send_header, (char *) &buf_inf, + &recv_header, NULL); + if (result <= 0) { + PERROR("request for buffer consumer failed, is the daemon online?"); + } + + return; } /* Ask the daemon to collect a trace called trace_name and being @@ -165,982 +188,937 @@ void notif_cb(void) static void inform_consumer_daemon(const char *trace_name) { - int i,j; + int sock, i,j; struct ust_trace *trace; - pid_t pid = getpid(); - int result; + const char *ch_name; + + sock = connect_ustd(); + if (sock < 0) { + return; + } + + DBG("Connected to ustd"); 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++) { - /* iterate on all cpus */ - for(j=0; jchannels[i].n_cpus; j++) { - char *buf; - asprintf(&buf, "%s_%d", trace->channels[i].channel_name, j); - result = ustcomm_request_consumer(pid, buf); - if(result == -1) { - WARN("Failed to request collection for channel %s. Is the daemon available?", trace->channels[i].channel_name); - /* continue even if fail */ + goto unlock_traces; + } + + 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++) { + ch_name = trace->channels[i].channel_name; + request_buffer_consumer(sock, ch_name, j); + STORE_SHARED(buffers_to_export, + LOAD_SHARED(buffers_to_export)+1); } - free(buf); - buffers_to_export++; } } - finish: +unlock_traces: ltt_unlock_traces(); + + close(sock); } -void process_blocked_consumers(void) +static struct ust_channel *find_channel(const char *ch_name, + struct ust_trace *trace) { - int n_fds = 0; - struct pollfd *fds; - struct blocked_consumer *bc; - int idx = 0; - char inbuf; - int result; + int i; - list_for_each_entry(bc, &blocked_consumers, list) { - n_fds++; + for (i=0; inr_channels; i++) { + if (!strcmp(trace->channels[i].channel_name, ch_name)) { + return &trace->channels[i]; + } } - fds = (struct pollfd *) malloc(n_fds * sizeof(struct pollfd)); - if(fds == NULL) { - ERR("malloc returned NULL"); - return; - } + return NULL; +} + +static int get_buffer_shmid_pipe_fd(const char *trace_name, const char *ch_name, + int ch_cpu, + int *buf_shmid, + int *buf_struct_shmid, + int *buf_pipe_fd) +{ + struct ust_trace *trace; + struct ust_channel *channel; + struct ust_buffer *buf; + + DBG("get_buffer_shmid_pipe_fd"); + + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); + ltt_unlock_traces(); - list_for_each_entry(bc, &blocked_consumers, list) { - fds[idx].fd = bc->fd_producer; - fds[idx].events = POLLIN; - bc->tmp_poll_idx = idx; - idx++; + if (trace == NULL) { + ERR("cannot find trace!"); + return -ENODATA; } - while((result = poll(fds, n_fds, 0)) == -1 && errno == EINTR) - /* nothing */; - if(result == -1) { - PERROR("poll"); - return; + channel = find_channel(ch_name, trace); + if (!channel) { + ERR("cannot find channel %s!", ch_name); + return -ENODATA; } - list_for_each_entry(bc, &blocked_consumers, list) { - if(fds[bc->tmp_poll_idx].revents) { - long consumed_old = 0; - char *reply; + buf = channel->buf[ch_cpu]; - result = read(bc->fd_producer, &inbuf, 1); - if(result == -1) { - PERROR("read"); - continue; - } - if(result == 0) { - DBG("PRODUCER END"); + *buf_shmid = buf->shmid; + *buf_struct_shmid = channel->buf_struct_shmids[ch_cpu]; + *buf_pipe_fd = buf->data_ready_fd_read; - close(bc->fd_producer); + return 0; +} - list_del(&bc->list); +static int get_subbuf_num_size(const char *trace_name, const char *ch_name, + int *num, int *size) +{ + struct ust_trace *trace; + struct ust_channel *channel; - result = ustcomm_send_reply(&bc->server, "END", &bc->src); - if(result < 0) { - ERR("ustcomm_send_reply failed"); - continue; - } + DBG("get_subbuf_size"); - continue; - } + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); + ltt_unlock_traces(); - result = ust_buffers_get_subbuf(bc->buf, &consumed_old); - if(result == -EAGAIN) { - WARN("missed buffer?"); - continue; - } - else if(result < 0) { - DBG("ust_buffers_get_subbuf: error: %s", strerror(-result)); - } - asprintf(&reply, "%s %ld", "OK", consumed_old); - result = ustcomm_send_reply(&bc->server, reply, &bc->src); - if(result < 0) { - ERR("ustcomm_send_reply failed"); - free(reply); - continue; - } - free(reply); + if (!trace) { + ERR("cannot find trace!"); + return -ENODATA; + } - list_del(&bc->list); - } + channel = find_channel(ch_name, trace); + if (!channel) { + ERR("unable to find channel"); + return -ENODATA; } + *num = channel->subbuf_cnt; + *size = channel->subbuf_size; + + return 0; } -void seperate_channel_cpu(const char *channel_and_cpu, char **channel, int *cpu) -{ - const char *sep; +/* Return the power of two which is equal or higher to v */ - sep = rindex(channel_and_cpu, '_'); - if(sep == NULL) { - *cpu = -1; - sep = channel_and_cpu + strlen(channel_and_cpu); - } - else { - *cpu = atoi(sep+1); - } +static unsigned int pow2_higher_or_eq(unsigned int v) +{ + int hb = fls(v); + int retval = 1<<(hb-1); - asprintf(channel, "%.*s", (int)(sep-channel_and_cpu), channel_and_cpu); + if (v-retval == 0) + return retval; + else + return retval<<1; } -static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src) +static int set_subbuf_size(const char *trace_name, const char *ch_name, + unsigned int size) { + unsigned int power; int retval = 0; struct ust_trace *trace; - char trace_name[] = "auto"; - int i; - char *channel_and_cpu; - int found = 0; - int result; - char *ch_name; - int ch_cpu; + struct ust_channel *channel; - DBG("get_shmid"); - - channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { - ERR("cannot parse channel"); - goto end; - } + DBG("set_subbuf_size"); - seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { - ERR("problem parsing channel name"); - goto free_short_chan_name; + power = pow2_higher_or_eq(size); + power = max_t(unsigned int, 2u, power); + if (power != size) { + WARN("using the next power of two for buffer size = %u\n", power); } ltt_lock_traces(); - trace = _ltt_trace_find(trace_name); - ltt_unlock_traces(); - - if(trace == NULL) { + trace = _ltt_trace_find_setup(trace_name); + if (trace == NULL) { ERR("cannot find trace!"); - retval = -1; - goto free_short_chan_name; + retval = -ENODATA; + goto unlock_traces; } - 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)) { - char *reply; - -// DBG("the shmid for the requested channel is %d", buf->shmid); -// DBG("the shmid for its buffer structure is %d", channel->buf_struct_shmids); - asprintf(&reply, "%d %d", buf->shmid, channel->buf_struct_shmids[ch_cpu]); - - 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); - - found = 1; - break; - } + channel = find_channel(ch_name, trace); + if (!channel) { + ERR("unable to find channel"); + retval = -ENODATA; + goto unlock_traces; } - if(!found) { - ERR("channel not found (%s)", channel_and_cpu); - } + channel->subbuf_size = power; + DBG("the set_subbuf_size for the requested channel is %u", channel->subbuf_size); - free_short_chan_name: - free(ch_name); +unlock_traces: + ltt_unlock_traces(); - end: return retval; } -static int do_cmd_get_n_subbufs(const char *recvbuf, struct ustcomm_source *src) +static int set_subbuf_num(const char *trace_name, const char *ch_name, + unsigned int num) { - int retval = 0; struct ust_trace *trace; - char trace_name[] = "auto"; - int i; - char *channel_and_cpu; - int found = 0; - int result; - char *ch_name; - int ch_cpu; - - DBG("get_n_subbufs"); + struct ust_channel *channel; + int retval = 0; - channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { - ERR("cannot parse channel"); - goto end; - } + DBG("set_subbuf_num"); - seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { - ERR("problem parsing channel name"); - goto free_short_chan_name; + if (num < 2) { + ERR("subbuffer count should be greater than 2"); + return -EINVAL; } ltt_lock_traces(); - trace = _ltt_trace_find(trace_name); - ltt_unlock_traces(); - - if(trace == NULL) { + trace = _ltt_trace_find_setup(trace_name); + if (trace == NULL) { ERR("cannot find trace!"); - retval = -1; - goto free_short_chan_name; + retval = -ENODATA; + goto unlock_traces; } - for(i=0; inr_channels; i++) { - struct ust_channel *channel = &trace->channels[i]; - - if(!strcmp(trace->channels[i].channel_name, ch_name)) { - char *reply; - - DBG("the n_subbufs for the requested channel is %d", channel->subbuf_cnt); - asprintf(&reply, "%d", channel->subbuf_cnt); - - 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); - found = 1; - break; - } - } - if(found == 0) { + channel = find_channel(ch_name, trace); + if (!channel) { ERR("unable to find channel"); + retval = -ENODATA; + goto unlock_traces; } - free_short_chan_name: - free(ch_name); + channel->subbuf_cnt = num; + DBG("the set_subbuf_cnt for the requested channel is %zd", channel->subbuf_cnt); - end: +unlock_traces: + ltt_unlock_traces(); return retval; } -static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *src) +static int get_subbuffer(const char *trace_name, const char *ch_name, + int ch_cpu, long *consumed_old) { int retval = 0; struct ust_trace *trace; - char trace_name[] = "auto"; - int i; - char *channel_and_cpu; - int found = 0; - int result; - char *ch_name; - int ch_cpu; - - DBG("get_subbuf_size"); + struct ust_channel *channel; + struct ust_buffer *buf; - channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { - ERR("cannot parse channel"); - goto end; - } + DBG("get_subbuf"); - seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { - ERR("problem parsing channel name"); - goto free_short_chan_name; - } + *consumed_old = 0; ltt_lock_traces(); trace = _ltt_trace_find(trace_name); - ltt_unlock_traces(); - if(trace == NULL) { - ERR("cannot find trace!"); - retval = -1; - goto free_short_chan_name; + if (!trace) { + DBG("Cannot find trace. It was likely destroyed by the user."); + retval = -ENODATA; + goto unlock_traces; } - for(i=0; inr_channels; i++) { - struct ust_channel *channel = &trace->channels[i]; - - if(!strcmp(trace->channels[i].channel_name, ch_name)) { - char *reply; - - DBG("the subbuf_size for the requested channel is %zd", channel->subbuf_size); - asprintf(&reply, "%zd", channel->subbuf_size); + channel = find_channel(ch_name, trace); + if (!channel) { + ERR("unable to find channel"); + retval = -ENODATA; + goto unlock_traces; + } - 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; - } + buf = channel->buf[ch_cpu]; - free(reply); - found = 1; - break; - } - } - if(found == 0) { - ERR("unable to find channel"); + retval = ust_buffers_get_subbuf(buf, consumed_old); + if (retval < 0) { + WARN("missed buffer?"); } - free_short_chan_name: - free(ch_name); +unlock_traces: + ltt_unlock_traces(); - end: return retval; } -static 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) +static int notify_buffer_mapped(const char *trace_name, + const char *ch_name, + int ch_cpu) { - 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; + struct ust_channel *channel; + struct ust_buffer *buf; - DBG("set_subbuf_size"); + DBG("get_buffer_fd"); - channel_slash_size = nth_token(recvbuf, 1); - sscanf(channel_slash_size, "%255[^/]/%u", ch_name, &size); + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); - if(ch_name == NULL) { - ERR("cannot parse channel"); - goto end; + if (!trace) { + retval = -ENODATA; + DBG("Cannot find trace. It was likely destroyed by the user."); + goto unlock_traces; } - 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!"); - retval = -1; - goto end; + channel = find_channel(ch_name, trace); + if (!channel) { + retval = -ENODATA; + ERR("unable to find channel"); + goto unlock_traces; } - for(i = 0; i < trace->nr_channels; i++) { - struct ust_channel *channel = &trace->channels[i]; + buf = channel->buf[ch_cpu]; - 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"); + /* 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) { + DBG("decrementing buffers_to_export"); + STORE_SHARED(buffers_to_export, LOAD_SHARED(buffers_to_export)-1); } - end: + /* The buffer has been exported, ergo, we can add it to the + * list of open buffers + */ + list_add(&buf->open_buffers_list, &open_buffers_list); + +unlock_traces: ltt_unlock_traces(); + return retval; } -static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src) +static int put_subbuffer(const char *trace_name, const char *ch_name, + int ch_cpu, long consumed_old) { - 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; + struct ust_channel *channel; + struct ust_buffer *buf; - DBG("set_subbuf_num"); + DBG("put_subbuf"); - channel_slash_num = nth_token(recvbuf, 1); - sscanf(channel_slash_num, "%255[^/]/%u", ch_name, &num); + ltt_lock_traces(); + trace = _ltt_trace_find(trace_name); - if(ch_name == NULL) { - ERR("cannot parse channel"); - goto end; - } - if (num < 2) { - ERR("subbuffer count should be greater than 2"); - goto end; + if (!trace) { + retval = -ENODATA; + DBG("Cannot find trace. It was likely destroyed by the user."); + goto unlock_traces; } - ltt_lock_traces(); - trace = _ltt_trace_find_setup(trace_name); - if(trace == NULL) { - ERR("cannot find trace!"); - retval = -1; - goto end; + channel = find_channel(ch_name, trace); + if (!channel) { + retval = -ENODATA; + ERR("unable to find channel"); + goto unlock_traces; } - for(i = 0; i < trace->nr_channels; i++) { - struct ust_channel *channel = &trace->channels[i]; + buf = channel->buf[ch_cpu]; - 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"); + retval = ust_buffers_put_subbuf(buf, consumed_old); + if (retval < 0) { + WARN("ust_buffers_put_subbuf: error (subbuf=%s_%d)", + ch_name, ch_cpu); + } else { + DBG("ust_buffers_put_subbuf: success (subbuf=%s_%d)", + ch_name, ch_cpu); } - end: +unlock_traces: ltt_unlock_traces(); + return retval; } -static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src) +static void listener_cleanup(void *ptr) { - int retval = 0; - struct ust_trace *trace; - char trace_name[] = "auto"; - int i; - char *channel_and_cpu; - int found = 0; - char *ch_name; - int ch_cpu; + ustcomm_del_named_sock(listen_sock, 0); +} - DBG("get_subbuf"); +static void force_subbuf_switch() +{ + struct ust_buffer *buf; - channel_and_cpu = nth_token(recvbuf, 1); - if(channel_and_cpu == NULL) { - ERR("cannot parse channel"); - goto end; + list_for_each_entry(buf, &open_buffers_list, + open_buffers_list) { + ltt_force_switch(buf, FORCE_FLUSH); } +} - seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { - ERR("problem parsing channel name"); - goto free_short_chan_name; +/* Simple commands are those which need only respond with a return value. */ +static int process_simple_client_cmd(int command, char *recv_buf) +{ + int result; + char trace_type[] = "ustrelay"; + char trace_name[] = "auto"; + + switch(command) { + case SET_SOCK_PATH: + { + struct ustcomm_sock_path *sock_msg; + sock_msg = (struct ustcomm_sock_path *)recv_buf; + sock_msg->sock_path = + ustcomm_restore_ptr(sock_msg->sock_path, + sock_msg->data, + sizeof(sock_msg->data)); + if (!sock_msg->sock_path) { + + return -EINVAL; + } + return setenv("UST_DAEMON_SOCKET", sock_msg->sock_path, 1); } + case 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 result; + } - ltt_lock_traces(); - trace = _ltt_trace_find(trace_name); + result = ltt_trace_set_type(trace_name, trace_type); + if (result < 0) { + ERR("ltt_trace_set_type failed"); + return result; + } + + result = ltt_trace_alloc(trace_name); + if (result < 0) { + ERR("ltt_trace_alloc failed"); + return result; + } - if(trace == NULL) { - int result; + inform_consumer_daemon(trace_name); - WARN("Cannot find trace. It was likely destroyed by the user."); - result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); - if(result) { - ERR("ustcomm_send_reply failed"); - retval = -1; - goto unlock_traces; + result = ltt_trace_start(trace_name); + if (result < 0) { + ERR("ltt_trace_start failed"); + return result; } - goto unlock_traces; - } + return 0; + case SETUP_TRACE: + DBG("trace setup"); - for(i=0; inr_channels; i++) { - struct ust_channel *channel = &trace->channels[i]; + result = ltt_trace_setup(trace_name); + if (result < 0) { + ERR("ltt_trace_setup failed"); + return result; + } - if(!strcmp(trace->channels[i].channel_name, ch_name)) { - struct ust_buffer *buf = channel->buf[ch_cpu]; - struct blocked_consumer *bc; + result = ltt_trace_set_type(trace_name, trace_type); + if (result < 0) { + ERR("ltt_trace_set_type failed"); + return result; + } - found = 1; + return 0; + case ALLOC_TRACE: + DBG("trace alloc"); - bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer)); - if(bc == NULL) { - ERR("malloc returned NULL"); - goto unlock_traces; - } - bc->fd_consumer = src->fd; - bc->fd_producer = buf->data_ready_fd_read; - bc->buf = buf; - bc->src = *src; - bc->server = ustcomm_app.server; - - list_add(&bc->list, &blocked_consumers); - - /* Being here is the proof the daemon has mapped the buffer in its - * memory. We may now decrement buffers_to_export. - */ - if(atomic_long_read(&buf->consumed) == 0) { - DBG("decrementing buffers_to_export"); - buffers_to_export--; - } + result = ltt_trace_alloc(trace_name); + if (result < 0) { + ERR("ltt_trace_alloc failed"); + return result; + } + inform_consumer_daemon(trace_name); - break; + return 0; + + case CREATE_TRACE: + DBG("trace create"); + + result = ltt_trace_setup(trace_name); + if (result < 0) { + ERR("ltt_trace_setup failed"); + return result; } - } - if(found == 0) { - ERR("unable to find channel"); - } - unlock_traces: - ltt_unlock_traces(); + result = ltt_trace_set_type(trace_name, trace_type); + if (result < 0) { + ERR("ltt_trace_set_type failed"); + return result; + } - free_short_chan_name: - free(ch_name); + return 0; + case START_TRACE: + DBG("trace start"); - end: - return retval; + result = ltt_trace_alloc(trace_name); + if (result < 0) { + ERR("ltt_trace_alloc failed"); + return result; + } + if (!result) { + inform_consumer_daemon(trace_name); + } + + result = ltt_trace_start(trace_name); + if (result < 0) { + ERR("ltt_trace_start failed"); + return result; + } + + return 0; + case STOP_TRACE: + DBG("trace stop"); + + result = ltt_trace_stop(trace_name); + if (result < 0) { + ERR("ltt_trace_stop failed"); + return result; + } + + return 0; + case DESTROY_TRACE: + DBG("trace destroy"); + + result = ltt_trace_destroy(trace_name, 0); + if (result < 0) { + ERR("ltt_trace_destroy failed"); + return result; + } + return 0; + case FORCE_SUBBUF_SWITCH: + /* FIXME: return codes? */ + force_subbuf_switch(); + + break; + + default: + return -EINVAL; + } + + return 0; } -static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src) +static void process_channel_cmd(int sock, int command, + struct ustcomm_channel_info *ch_inf) { - int retval = 0; - struct ust_trace *trace; + struct ustcomm_header _reply_header; + struct ustcomm_header *reply_header = &_reply_header; + struct ustcomm_channel_info *reply_msg = + (struct ustcomm_channel_info *)send_buffer; char trace_name[] = "auto"; - int i; - char *channel_and_cpu; - int found = 0; - int result; - char *ch_name; - int ch_cpu; - long consumed_old; - char *consumed_old_str; - char *endptr; - char *reply = NULL; + int result, offset = 0, num, size; - DBG("put_subbuf"); + memset(reply_header, 0, sizeof(*reply_header)); - channel_and_cpu = strdup_malloc(nth_token(recvbuf, 1)); - if(channel_and_cpu == NULL) { - ERR("cannot parse channel"); - retval = -1; - goto end; - } + switch (command) { + case GET_SUBBUF_NUM_SIZE: + result = get_subbuf_num_size(trace_name, + ch_inf->channel, + &num, &size); + if (result < 0) { + reply_header->result = result; + break; + } - consumed_old_str = strdup_malloc(nth_token(recvbuf, 2)); - 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') { - ERR("invalid value for consumed_old"); - retval = -1; - goto free_consumed_old_str; - } + reply_msg->channel = USTCOMM_POISON_PTR; + reply_msg->subbuf_num = num; + reply_msg->subbuf_size = size; - seperate_channel_cpu(channel_and_cpu, &ch_name, &ch_cpu); - if(ch_cpu == -1) { - ERR("problem parsing channel name"); - retval = -1; - goto free_short_chan_name; - } - ltt_lock_traces(); - trace = _ltt_trace_find(trace_name); + reply_header->size = COMPUTE_MSG_SIZE(reply_msg, offset); - if(trace == NULL) { - WARN("Cannot find trace. It was likely destroyed by the user."); - result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src); - if(result) { - ERR("ustcomm_send_reply failed"); - retval = -1; - goto unlock_traces; - } + break; + case SET_SUBBUF_NUM: + reply_header->result = set_subbuf_num(trace_name, + ch_inf->channel, + ch_inf->subbuf_num); - goto unlock_traces; + break; + case SET_SUBBUF_SIZE: + reply_header->result = set_subbuf_size(trace_name, + ch_inf->channel, + ch_inf->subbuf_size); + + + break; } + if (ustcomm_send(sock, reply_header, (char *)reply_msg) < 0) { + ERR("ustcomm_send failed"); + } +} - for(i=0; inr_channels; i++) { - struct ust_channel *channel = &trace->channels[i]; +static void process_buffer_cmd(int sock, int command, + struct ustcomm_buffer_info *buf_inf) +{ + struct ustcomm_header _reply_header; + struct ustcomm_header *reply_header = &_reply_header; + struct ustcomm_buffer_info *reply_msg = + (struct ustcomm_buffer_info *)send_buffer; + char trace_name[] = "auto"; + int result, offset = 0, buf_shmid, buf_struct_shmid, buf_pipe_fd; + long consumed_old; - if(!strcmp(trace->channels[i].channel_name, ch_name)) { - struct ust_buffer *buf = channel->buf[ch_cpu]; + memset(reply_header, 0, sizeof(*reply_header)); + + switch (command) { + case GET_BUF_SHMID_PIPE_FD: + result = get_buffer_shmid_pipe_fd(trace_name, buf_inf->channel, + buf_inf->ch_cpu, + &buf_shmid, + &buf_struct_shmid, + &buf_pipe_fd); + if (result < 0) { + reply_header->result = result; + break; + } - found = 1; + reply_msg->channel = USTCOMM_POISON_PTR; + reply_msg->buf_shmid = buf_shmid; + reply_msg->buf_struct_shmid = buf_struct_shmid; - result = ust_buffers_put_subbuf(buf, consumed_old); - if(result < 0) { - WARN("ust_buffers_put_subbuf: error (subbuf=%s)", channel_and_cpu); - asprintf(&reply, "%s", "ERROR"); - } - else { - DBG("ust_buffers_put_subbuf: success (subbuf=%s)", channel_and_cpu); - asprintf(&reply, "%s", "OK"); - } + reply_header->size = COMPUTE_MSG_SIZE(reply_msg, offset); + reply_header->fd_included = 1; - result = ustcomm_send_reply(&ustcomm_app.server, reply, src); - if(result) { - ERR("ustcomm_send_reply failed"); - free(reply); - retval = -1; - goto unlock_traces; - } + if (ustcomm_send_fd(sock, reply_header, (char *)reply_msg, + &buf_pipe_fd) < 0) { + ERR("ustcomm_send failed"); + } + return; - free(reply); + case NOTIFY_BUF_MAPPED: + reply_header->result = + notify_buffer_mapped(trace_name, + buf_inf->channel, + buf_inf->ch_cpu); + break; + case GET_SUBBUFFER: + result = get_subbuffer(trace_name, buf_inf->channel, + buf_inf->ch_cpu, &consumed_old); + if (result < 0) { + reply_header->result = result; break; } + + reply_msg->channel = USTCOMM_POISON_PTR; + reply_msg->consumed_old = consumed_old; + + reply_header->size = COMPUTE_MSG_SIZE(reply_msg, offset); + + break; + case PUT_SUBBUFFER: + result = put_subbuffer(trace_name, buf_inf->channel, + buf_inf->ch_cpu, + buf_inf->consumed_old); + reply_header->result = result; + + break; } - if(found == 0) { - ERR("unable to find channel"); + + if (ustcomm_send(sock, reply_header, (char *)reply_msg) < 0) { + ERR("ustcomm_send failed"); } - unlock_traces: - ltt_unlock_traces(); - 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; } -void *listener_main(void *p) +static void process_marker_cmd(int sock, int command, + struct ustcomm_marker_info *marker_inf) { + struct ustcomm_header _reply_header; + struct ustcomm_header *reply_header = &_reply_header; int result; - ust_register_thread(); + memset(reply_header, 0, sizeof(*reply_header)); - DBG("LISTENER"); + switch(command) { + case ENABLE_MARKER: - for(;;) { - char trace_name[] = "auto"; - char trace_type[] = "ustrelay"; - char *recvbuf; - int len; - struct ustcomm_source src; - - process_blocked_consumers(); + result = ltt_marker_connect(marker_inf->channel, + marker_inf->marker, + "default"); + if (result < 0) { + WARN("could not enable marker; channel=%s," + " name=%s", + marker_inf->channel, + marker_inf->marker); - result = ustcomm_app_recv_message(&ustcomm_app, &recvbuf, &src, 5); - if(result < 0) { - WARN("error in ustcomm_app_recv_message"); - continue; } - else if(result == 0) { - /* no message */ - continue; + break; + case DISABLE_MARKER: + result = ltt_marker_disconnect(marker_inf->channel, + marker_inf->marker, + "default"); + if (result < 0) { + WARN("could not disable marker; channel=%s," + " name=%s", + marker_inf->channel, + marker_inf->marker); } + break; + } - DBG("received a message! it's: %s", recvbuf); - len = strlen(recvbuf); + reply_header->result = result; + + if (ustcomm_send(sock, reply_header, NULL) < 0) { + ERR("ustcomm_send failed"); + } - if(!strcmp(recvbuf, "print_markers")) { - print_markers(stderr); +} +static void process_client_cmd(struct ustcomm_header *recv_header, + char *recv_buf, int sock) +{ + int result; + struct ustcomm_header _reply_header; + struct ustcomm_header *reply_header = &_reply_header; + char *send_buf = send_buffer; + + memset(reply_header, 0, sizeof(*reply_header)); + memset(send_buf, 0, sizeof(send_buffer)); + + switch(recv_header->command) { + case GET_SUBBUF_NUM_SIZE: + case SET_SUBBUF_NUM: + case SET_SUBBUF_SIZE: + { + struct ustcomm_channel_info *ch_inf; + ch_inf = (struct ustcomm_channel_info *)recv_buf; + result = ustcomm_unpack_channel_info(ch_inf); + if (result < 0) { + ERR("couldn't unpack channel info"); + reply_header->result = -EINVAL; + goto send_response; } - else if(!strcmp(recvbuf, "list_markers")) { - char *ptr; - size_t size; - FILE *fp; + process_channel_cmd(sock, recv_header->command, ch_inf); + return; + } + case GET_BUF_SHMID_PIPE_FD: + case NOTIFY_BUF_MAPPED: + case GET_SUBBUFFER: + case PUT_SUBBUFFER: + { + struct ustcomm_buffer_info *buf_inf; + buf_inf = (struct ustcomm_buffer_info *)recv_buf; + result = ustcomm_unpack_buffer_info(buf_inf); + if (result < 0) { + ERR("couldn't unpack buffer info"); + reply_header->result = -EINVAL; + goto send_response; + } + process_buffer_cmd(sock, recv_header->command, buf_inf); + return; + } + case ENABLE_MARKER: + case DISABLE_MARKER: + { + struct ustcomm_marker_info *marker_inf; + marker_inf = (struct ustcomm_marker_info *)recv_buf; + result = ustcomm_unpack_marker_info(marker_inf); + if (result < 0) { + ERR("couldn't unpack marker info"); + reply_header->result = -EINVAL; + goto send_response; + } + process_marker_cmd(sock, recv_header->command, marker_inf); + return; + } + case LIST_MARKERS: + { + char *ptr; + size_t size; + FILE *fp; + + fp = open_memstream(&ptr, &size); + if (fp == NULL) { + ERR("opening memstream failed"); + return; + } + print_markers(fp); + fclose(fp); - fp = open_memstream(&ptr, &size); - print_markers(fp); - fclose(fp); + reply_header->size = size; - result = ustcomm_send_reply(&ustcomm_app.server, ptr, &src); + result = ustcomm_send(sock, reply_header, ptr); - 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; - } + free(ptr); - result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { - ERR("ltt_trace_set_type failed"); - return (void *)1; - } + if (result < 0) { + PERROR("failed to send markers list"); + } - result = ltt_trace_alloc(trace_name); - if(result < 0) { - ERR("ltt_trace_alloc failed"); - return (void *)1; - } + break; + } + case LIST_TRACE_EVENTS: + { + char *ptr; + size_t size; + FILE *fp; + + fp = open_memstream(&ptr, &size); + if (fp == NULL) { + ERR("opening memstream failed"); + return; + } + print_trace_events(fp); + fclose(fp); - inform_consumer_daemon(trace_name); + reply_header->size = size; - result = ltt_trace_start(trace_name); - if(result < 0) { - ERR("ltt_trace_start failed"); - continue; - } - } - else if(!strcmp(recvbuf, "trace_setup")) { - DBG("trace setup"); + result = ustcomm_send(sock, reply_header, ptr); - result = ltt_trace_setup(trace_name); - if(result < 0) { - ERR("ltt_trace_setup failed"); - return (void *)1; - } + free(ptr); - result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { - ERR("ltt_trace_set_type failed"); - return (void *)1; - } + if (result < 0) { + ERR("list_trace_events failed"); + return; } - else if(!strcmp(recvbuf, "trace_alloc")) { - DBG("trace alloc"); - 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_create")) { - DBG("trace create"); + break; + } + case LOAD_PROBE_LIB: + { + char *libfile; - result = ltt_trace_setup(trace_name); - if(result < 0) { - ERR("ltt_trace_setup failed"); - return (void *)1; - } + /* FIXME: No functionality at all... */ + libfile = recv_buf; - result = ltt_trace_set_type(trace_name, trace_type); - if(result < 0) { - ERR("ltt_trace_set_type failed"); - return (void *)1; - } - } - else if(!strcmp(recvbuf, "trace_start")) { - DBG("trace start"); + DBG("load_probe_lib loading %s", libfile); - result = ltt_trace_alloc(trace_name); - if(result < 0) { - ERR("ltt_trace_alloc failed"); - return (void *)1; - } - if(!result) { - inform_consumer_daemon(trace_name); - } + break; + } + case GET_PIDUNIQUE: + { + struct ustcomm_pidunique *pid_msg; + pid_msg = (struct ustcomm_pidunique *)send_buf; - result = ltt_trace_start(trace_name); - if(result < 0) { - ERR("ltt_trace_start failed"); - continue; - } - } - else if(!strcmp(recvbuf, "trace_stop")) { - DBG("trace stop"); + pid_msg->pidunique = pidunique; + reply_header->size = sizeof(pid_msg); - result = ltt_trace_stop(trace_name); - if(result < 0) { - ERR("ltt_trace_stop failed"); - return (void *)1; - } - } - else if(!strcmp(recvbuf, "trace_destroy")) { + goto send_response; - DBG("trace destroy"); + } + case GET_SOCK_PATH: + { + struct ustcomm_sock_path *sock_msg; + char *sock_path_env; - result = ltt_trace_destroy(trace_name, 0); - if(result < 0) { - ERR("ltt_trace_destroy failed"); - return (void *)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) { - do_cmd_get_n_subbufs(recvbuf, &src); - } - 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) { - char *libfile; + sock_msg = (struct ustcomm_sock_path *)send_buf; - libfile = nth_token(recvbuf, 1); + sock_path_env = getenv("UST_DAEMON_SOCKET"); - DBG("load_probe_lib loading %s", libfile); + if (!sock_path_env) { + result = ustcomm_pack_sock_path(reply_header, + sock_msg, + SOCK_DIR "/ustd"); - free(libfile); + } else { + result = ustcomm_pack_sock_path(reply_header, + sock_msg, + sock_path_env); } - 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) { - 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]=""; - char marker_name[256]=""; + reply_header->result = result; - result = sscanf(channel_slash_name, "%255[^/]/%255s", channel_name, marker_name); + goto send_response; + } + default: + reply_header->result = + process_simple_client_cmd(recv_header->command, + recv_buf); + goto send_response; - 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) { - 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; + return; - result = sscanf(channel_slash_name, "%a[^/]/%as", &channel_name, &marker_name); +send_response: + ustcomm_send(sock, reply_header, send_buf); +} - if(marker_name == NULL) { - } +#define MAX_EVENTS 10 - 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_pidunique", 0) == 1) { - char *reply; +void *listener_main(void *p) +{ + struct ustcomm_sock *epoll_sock; + struct epoll_event events[MAX_EVENTS]; + struct sockaddr addr; + int accept_fd, nfds, result, i, addr_size; - asprintf(&reply, "%lld", pidunique); + DBG("LISTENER"); - result = ustcomm_send_reply(&ustcomm_app.server, reply, &src); - if(result) { - ERR("listener: get_pidunique: ustcomm_send_reply failed"); - goto next_cmd; - } + pthread_cleanup_push(listener_cleanup, NULL); - free(reply); - } -// else if(nth_token_is(recvbuf, "get_notifications", 0) == 1) { -// struct ust_trace *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) { -// ERR("cannot find trace!"); -// return (void *)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); + for(;;) { + nfds = epoll_wait(epoll_fd, events, MAX_EVENTS, -1); + if (nfds == -1) { + PERROR("listener_main: epoll_wait failed"); + continue; } - next_cmd: - free(recvbuf); + for (i = 0; i < nfds; i++) { + epoll_sock = (struct ustcomm_sock *)events[i].data.ptr; + if (epoll_sock == listen_sock) { + addr_size = sizeof(struct sockaddr); + accept_fd = accept(epoll_sock->fd, + &addr, + (socklen_t *)&addr_size); + if (accept_fd == -1) { + PERROR("listener_main: accept failed"); + continue; + } + ustcomm_init_sock(accept_fd, epoll_fd, + &ust_socks); + } else { + memset(receive_header, 0, + sizeof(*receive_header)); + memset(receive_buffer, 0, + sizeof(receive_buffer)); + result = ustcomm_recv(epoll_sock->fd, + receive_header, + receive_buffer); + if (result == 0) { + ustcomm_del_sock(epoll_sock, 0); + } else { + process_client_cmd(receive_header, + receive_buffer, + epoll_sock->fd); + } + } + } } + + pthread_cleanup_pop(1); } -volatile sig_atomic_t have_listener = 0; +/* These should only be accessed in the parent thread, + * not the listener. + */ +static volatile sig_atomic_t have_listener = 0; +static pthread_t listener_thread; void create_listener(void) { -#ifdef USE_CLONE - static char listener_stack[16384]; int result; -#else - pthread_t thread; -#endif + 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; } -#ifdef USE_CLONE - result = clone((int (*)(void *)) listener_main, listener_stack+sizeof(listener_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM | CLONE_SIGHAND | CLONE_THREAD, NULL); - if(result == -1) { - perror("clone"); - return; - } -#else + /* A new thread created by pthread_create inherits the signal mask + * from the parent. To avoid any signal being received by the + * listener thread, we block all signals temporarily in the parent, + * while we create the listener thread. + */ - pthread_create(&thread, NULL, listener_main, NULL); -#endif + sigfillset(&sig_all_blocked); - have_listener = 1; -} + result = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_parent_mask); + if (result) { + PERROR("pthread_sigmask: %s", strerror(result)); + } -static int init_socket(void) -{ - return ustcomm_init_app(getpid(), &ustcomm_app); + result = pthread_create(&listener_thread, NULL, listener_main, NULL); + if (result == -1) { + PERROR("pthread_create"); + } + + /* Restore original signal mask in parent */ + result = pthread_sigmask(SIG_SETMASK, &orig_parent_mask, NULL); + if (result) { + PERROR("pthread_sigmask: %s", strerror(result)); + } else { + have_listener = 1; + } } #define AUTOPROBE_DISABLED 0 @@ -1156,12 +1134,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; @@ -1174,43 +1151,85 @@ 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); } +static struct ustcomm_sock * init_app_socket(int epoll_fd) +{ + char *name; + int result; + struct ustcomm_sock *sock; + + result = asprintf(&name, "%s/%d", SOCK_DIR, (int)getpid()); + if (result < 0) { + ERR("string overflow allocating socket name, " + "UST thread bailing"); + return NULL; + } + + result = ensure_dir_exists(SOCK_DIR); + if (result == -1) { + ERR("Unable to create socket directory %s, UST thread bailing", + SOCK_DIR); + goto free_name; + } + + sock = ustcomm_init_named_socket(name, epoll_fd); + if (!sock) { + ERR("Error initializing named socket (%s). Check that directory" + "exists and that it is writable. UST thread bailing", name); + goto free_name; + } + + free(name); + return sock; + +free_name: + free(name); + return NULL; +} + static void __attribute__((constructor)) init() { int result; char* autoprobe_val = NULL; + char* subbuffer_size_val = NULL; + char* subbuffer_count_val = NULL; + unsigned int subbuffer_size; + unsigned int subbuffer_count; + unsigned int power; /* Assign the pidunique, to be able to differentiate the processes with same * pid, (before and after an exec). */ pidunique = make_pidunique(); - - /* Initialize RCU in case the constructor order is not good. */ - rcu_init(); - - /* It is important to do this before events start to be generated. */ - ust_register_thread(); + processpid = getpid(); DBG("Tracectl constructor"); - /* Must create socket before signal handler to prevent races. - */ - result = init_socket(); - if(result == -1) { - ERR("init_socket error"); + /* Set up epoll */ + epoll_fd = epoll_create(MAX_EVENTS); + if (epoll_fd == -1) { + ERR("epoll_create failed, tracing shutting down"); + return; + } + + /* Create the socket */ + listen_sock = init_app_socket(epoll_fd); + if (!listen_sock) { + ERR("failed to create application socket," + " tracing shutting down"); return; } create_listener(); autoprobe_val = getenv("UST_AUTOPROBE"); - if(autoprobe_val) { + if (autoprobe_val) { struct marker_iter iter; DBG("Autoprobe enabled."); @@ -1224,7 +1243,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]; @@ -1232,12 +1251,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; } @@ -1249,14 +1266,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_TRACE")) { + if (getenv("UST_OVERWRITE")) { + int val = atoi(getenv("UST_OVERWRITE")); + if (val == 0 || val == 1) { + STORE_SHARED(ust_channels_overwrite_by_default, val); + } else { + WARN("invalid value for UST_OVERWRITE"); + } + } + + if (getenv("UST_AUTOCOLLECT")) { + int val = atoi(getenv("UST_AUTOCOLLECT")); + if (val == 0 || val == 1) { + STORE_SHARED(ust_channels_request_collection_by_default, val); + } else { + WARN("invalid value for UST_AUTOCOLLECT"); + } + } + + subbuffer_size_val = getenv("UST_SUBBUF_SIZE"); + if (subbuffer_size_val) { + sscanf(subbuffer_size_val, "%u", &subbuffer_size); + power = pow2_higher_or_eq(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) { + sscanf(subbuffer_count_val, "%u", &subbuffer_count); + if (subbuffer_count < 2) + subbuffer_count = 2; + chan_infos[LTT_CHANNEL_UST].def_subbufcount = subbuffer_count; + } + + if (getenv("UST_TRACE")) { char trace_name[] = "auto"; char trace_type[] = "ustrelay"; @@ -1294,25 +1346,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; } @@ -1322,7 +1374,6 @@ static void __attribute__((constructor)) init() inform_consumer_daemon(trace_name); } - return; /* should decrementally destroy stuff if error */ @@ -1349,12 +1400,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"); } } @@ -1367,7 +1418,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; } @@ -1378,26 +1429,36 @@ static int trace_recording(void) return retval; } -#if 0 -static int have_consumer(void) +int restarting_usleep(useconds_t usecs) { - return !list_empty(&blocked_consumers); + struct timespec tv; + int result; + + tv.tv_sec = 0; + tv.tv_nsec = usecs * 1000; + + do { + result = nanosleep(&tv, &tv); + } while (result == -1 && errno == EINTR); + + return result; } -#endif -int restarting_usleep(useconds_t usecs) +static void stop_listener(void) { - struct timespec tv; - int result; - - tv.tv_sec = 0; - tv.tv_nsec = usecs * 1000; - - do { - result = nanosleep(&tv, &tv); - } while(result == -1 && errno == EINTR); + int result; - return result; + if (!have_listener) + return; + + result = pthread_cancel(listener_thread); + if (result != 0) { + ERR("pthread_cancel: %s", strerror(result)); + } + result = pthread_join(listener_thread, NULL); + if (result != 0) { + ERR("pthread_join: %s", strerror(result)); + } } /* This destructor keeps the process alive for a few seconds in order @@ -1412,15 +1473,19 @@ int restarting_usleep(useconds_t usecs) static void __attribute__((destructor)) keepalive() { - if(trace_recording() && buffers_to_export) { + if (processpid != getpid()) { + return; + } + + if (trace_recording() && LOAD_SHARED(buffers_to_export)) { int total = 0; DBG("Keeping process alive for consumer daemon..."); - while(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; } @@ -1430,7 +1495,8 @@ static void __attribute__((destructor)) keepalive() destroy_traces(); - ustcomm_fini_app(&ustcomm_app); + /* Ask the listener to stop and clean up. */ + stop_listener(); } void ust_potential_exec(void) @@ -1454,39 +1520,66 @@ void ust_potential_exec(void) static void ust_fork(void) { - struct blocked_consumer *bc; - struct blocked_consumer *deletable_bc = NULL; + struct ust_buffer *buf, *buf_tmp; + struct ustcomm_sock *sock, *sock_tmp; int result; /* FIXME: technically, the locks could have been taken before the fork */ DBG("ust: forking"); + /* Get the pid of the new process */ + processpid = getpid(); + /* break lock if necessary */ ltt_unlock_traces(); ltt_trace_stop("auto"); ltt_trace_destroy("auto", 1); - /* Delete all active connections */ - ustcomm_close_all_connections(&ustcomm_app.server); + /* Delete all active connections, but leave them in the epoll set */ + list_for_each_entry_safe(sock, sock_tmp, &ust_socks, list) { + ustcomm_del_sock(sock, 1); + } /* Delete all blocked consumers */ - list_for_each_entry(bc, &blocked_consumers, list) { - close(bc->fd_producer); - close(bc->fd_consumer); - free(deletable_bc); - deletable_bc = bc; - list_del(&bc->list); + list_for_each_entry_safe(buf, buf_tmp, &open_buffers_list, + open_buffers_list) { + result = close(buf->data_ready_fd_read); + if (result == -1) { + PERROR("close"); + } + result = close(buf->data_ready_fd_write); + if (result == -1) { + PERROR("close"); + } + list_del(&buf->open_buffers_list); } - ustcomm_free_app(&ustcomm_app); + /* Clean up the listener socket and epoll, keeping the scoket file */ + ustcomm_del_named_sock(listen_sock, 1); + close(epoll_fd); - buffers_to_export = 0; + /* Re-start the launch sequence */ + STORE_SHARED(buffers_to_export, 0); have_listener = 0; - init_socket(); + + /* Set up epoll */ + epoll_fd = epoll_create(MAX_EVENTS); + if (epoll_fd == -1) { + ERR("epoll_create failed, tracing shutting down"); + return; + } + + /* Create the socket */ + listen_sock = init_app_socket(epoll_fd); + if (!listen_sock) { + ERR("failed to create application socket," + " tracing shutting down"); + return; + } 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; } @@ -1513,7 +1606,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; } @@ -1526,7 +1619,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; }