X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libtracectl%2Ftracectl.c;h=917937f21994574eb8f4933a6ff45cbcb02898e7;hb=3a7b90de71f2a82f73f06fb14a7b77805aea1064;hp=a2521585b336f204d56cf1ef7b8489d18d242578;hpb=1c184644865c13e167b174cd593e80a2c62b2482;p=ust.git

diff --git a/libtracectl/tracectl.c b/libtracectl/tracectl.c
index a252158..917937f 100644
--- a/libtracectl/tracectl.c
+++ b/libtracectl/tracectl.c
@@ -6,16 +6,16 @@
 #include <sys/un.h>
 #include <sched.h>
 #include <fcntl.h>
+#include <poll.h>
 
 #include "marker.h"
 #include "tracer.h"
-#include "usterr.h"
+#include "localerr.h"
+#include "ustcomm.h"
+#include "relay.h" /* FIXME: remove */
 
-#define UNIX_PATH_MAX 108
+//#define USE_CLONE
 
-//#define SOCKETDIR "/var/run/ust/socks"
-#define SOCKETDIR "/tmp/socks"
-#define SOCKETDIRLEN sizeof(SOCKETDIR)
 #define USTSIGNAL SIGIO
 
 #define MAX_MSG_SIZE (100)
@@ -24,6 +24,10 @@
 
 char consumer_stack[10000];
 
+struct list_head blocked_consumers = LIST_HEAD_INIT(blocked_consumers);
+
+static struct ustcomm_app ustcomm_app;
+
 struct tracecmd { /* no padding */
 	uint32_t size;
 	uint16_t command;
@@ -43,15 +47,27 @@ struct trctl_msg {
 	char payload[94];
 };
 
-pid_t mypid;
-char mysocketfile[UNIX_PATH_MAX] = "";
-int pfd = -1;
-
 struct consumer_channel {
 	int fd;
 	struct ltt_channel_struct *chan;
 };
 
+struct blocked_consumer {
+	int fd_consumer;
+	int fd_producer;
+	int tmp_poll_idx;
+
+	/* args to ustcomm_send_reply */
+	struct ustcomm_server server;
+	struct ustcomm_source src;
+
+	/* args to ltt_do_get_subbuf */
+	struct rchan_buf *rbuf;
+	struct ltt_channel_buf_struct *lttbuf;
+
+	struct list_head list;
+};
+
 int consumer(void *arg)
 {
 	int result;
@@ -85,7 +101,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;
@@ -118,60 +134,29 @@ 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(&lttbuf->offset), rbuf->chan) - consumed_old);
-//		CPRINTF("Commit count %ld", local_read(&lttbuf->commit_count[0]));
-//
-//
-//		sleep(1);
-//	}
 }
 
 void start_consumer(void)
 {
+#ifdef USE_CLONE
 	int result;
 
 	result = clone(consumer, consumer_stack+sizeof(consumer_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM | CLONE_SIGHAND | CLONE_THREAD, NULL);
 	if(result == -1) {
 		perror("clone");
 	}
+#else
+	pthread_t thread;
+
+	pthread_create(&thread, NULL, consumer, NULL);
+#endif
 }
 
 static void print_markers(void)
 {
 	struct marker_iter iter;
 
+	lock_markers();
 	marker_iter_reset(&iter);
 	marker_iter_start(&iter);
 
@@ -179,6 +164,7 @@ static void print_markers(void)
 		fprintf(stderr, "marker: %s_%s \"%s\"\n", iter.marker->channel, iter.marker->name, iter.marker->format);
 		marker_iter_next(&iter);
 	}
+	unlock_markers();
 }
 
 void do_command(struct tracecmd *cmd)
@@ -211,112 +197,531 @@ void notif_cb(void)
 	}
 }
 
-char recvbuf[10000];
+static int inform_consumer_daemon(void)
+{
+	ustcomm_request_consumer(getpid(), "metadata");
+	ustcomm_request_consumer(getpid(), "ust");
+}
+
+void process_blocked_consumers(void)
+{
+	int n_fds = 0;
+	struct pollfd *fds;
+	struct blocked_consumer *bc;
+	int idx = 0;
+	char inbuf;
+	int result;
+
+	list_for_each_entry(bc, &blocked_consumers, list) {
+		n_fds++;
+	}
+
+	fds = (struct pollfd *) malloc(n_fds * sizeof(struct pollfd));
+	if(fds == NULL) {
+		ERR("malloc returned NULL");
+		return;
+	}
+
+	list_for_each_entry(bc, &blocked_consumers, list) {
+		fds[idx].fd = bc->fd_producer;
+		fds[idx].events = POLLIN;
+		bc->tmp_poll_idx = idx;
+		idx++;
+	}
+
+	result = poll(fds, n_fds, 0);
+	if(result == -1) {
+		PERROR("poll");
+		return -1;
+	}
+
+	list_for_each_entry(bc, &blocked_consumers, list) {
+		if(fds[bc->tmp_poll_idx].revents) {
+			long consumed_old = 0;
+			char *reply;
+
+			result = read(bc->fd_producer, &inbuf, 1);
+			if(result == -1) {
+				PERROR("read");
+				continue;
+			}
+			if(result == 0) {
+				DBG("PRODUCER END");
+
+				close(bc->fd_producer);
+
+				__list_del(bc->list.prev, bc->list.next);
+
+				result = ustcomm_send_reply(&bc->server, "END", &bc->src);
+				if(result < 0) {
+					ERR("ustcomm_send_reply failed");
+					continue;
+				}
+
+				continue;
+			}
+
+			result = ltt_do_get_subbuf(bc->rbuf, bc->lttbuf, &consumed_old);
+			if(result == -EAGAIN) {
+				WARN("missed buffer?");
+				continue;
+			}
+			else if(result < 0) {
+				DBG("ltt_do_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);
+
+			__list_del(bc->list.prev, bc->list.next);
+		}
+	}
+
+}
 
 int 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;
+		int len;
+		struct ustcomm_source src;
 
-		for(;;) {
-			struct trctl_msg msg;
-			int len;
+		process_blocked_consumers();
 
-			result = len = recvfrom(pfd, recvbuf, sizeof(recvbuf), 0, &addr, &addrlen);
-			if(result == -1) {
-				PERROR("recvfrom");
+		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;
+		}
+
+		DBG("received a message! it's: %s\n", recvbuf);
+		len = strlen(recvbuf);
+
+		if(!strcmp(recvbuf, "print_markers")) {
+			print_markers();
+		}
+		else if(!strcmp(recvbuf, "trace_setup")) {
+			DBG("trace setup");
+
+			result = ltt_trace_setup(trace_name);
+			if(result < 0) {
+				ERR("ltt_trace_setup failed");
+				return;
+			}
+
+			result = ltt_trace_set_type(trace_name, trace_type);
+			if(result < 0) {
+				ERR("ltt_trace_set_type 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;
+			}
+		}
+		else if(!strcmp(recvbuf, "trace_start")) {
+			DBG("trace start");
+
+			result = ltt_trace_start(trace_name);
+			if(result < 0) {
+				ERR("ltt_trace_start failed");
 				continue;
 			}
+		}
+		else if(!strcmp(recvbuf, "trace_stop")) {
+			DBG("trace stop");
 
-			if(recvbuf[len-1] == '\n')
-				recvbuf[len-1] = '\0';
+			result = ltt_trace_stop(trace_name);
+			if(result < 0) {
+				ERR("ltt_trace_stop failed");
+				return;
+			}
+		}
+		else if(!strcmp(recvbuf, "trace_destroy")) {
 
-			fprintf(stderr, "received a message! it's: %s\n", recvbuf);
+			DBG("trace destroy");
 
+			result = ltt_trace_destroy(trace_name);
+			if(result < 0) {
+				ERR("ltt_trace_destroy failed");
+				return;
+			}
+		}
+		else if(nth_token_is(recvbuf, "get_shmid", 0) == 1) {
+			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;
+			}
 
-			if(!strcmp(recvbuf, "print_markers")) {
-				print_markers();
+			ltt_lock_traces();
+			trace = _ltt_trace_find(trace_name);
+			ltt_unlock_traces();
+
+			if(trace == NULL) {
+				CPRINTF("cannot find trace!");
+				return 1;
 			}
-			else if(!strcmp(recvbuf, "trace_setup")) {
-				DBG("trace setup");
 
-				result = ltt_trace_setup(trace_name);
-				if(result < 0) {
-					ERR("ltt_trace_setup failed");
-					return;
-				}
+			for(i=0; i<trace->nr_channels; i++) {
+				struct rchan *rchan = trace->channels[i].trans_channel_data;
+				struct rchan_buf *rbuf = rchan->buf;
 
-				result = ltt_trace_set_type(trace_name, trace_type);
-				if(result < 0) {
-					ERR("ltt_trace_set_type failed");
-					return;
+				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(!strcmp(recvbuf, "trace_alloc")) {
-				DBG("trace alloc");
+		}
+		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;
+			}
 
-				result = ltt_trace_alloc(trace_name);
-				if(result < 0) {
-					ERR("ltt_trace_alloc failed");
-					return;
+			ltt_lock_traces();
+			trace = _ltt_trace_find(trace_name);
+			ltt_unlock_traces();
+
+			if(trace == NULL) {
+				CPRINTF("cannot find trace!");
+				return 1;
+			}
+
+			for(i=0; i<trace->nr_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(!strcmp(recvbuf, "trace_start")) {
-				DBG("trace start");
+		}
+		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;
+			}
 
-				result = ltt_trace_start(trace_name);
-				if(result < 0) {
-					ERR("ltt_trace_start failed");
-					return;
+			ltt_lock_traces();
+			trace = _ltt_trace_find(trace_name);
+			ltt_unlock_traces();
+
+			if(trace == NULL) {
+				CPRINTF("cannot find trace!");
+				return 1;
+			}
+
+			for(i=0; i<trace->nr_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(!strcmp(recvbuf, "trace_stop")) {
-				DBG("trace stop");
+		}
+		else if(nth_token_is(recvbuf, "load_probe_lib", 0) == 1) {
+			char *libfile;
 
-				result = ltt_trace_stop(trace_name);
-				if(result < 0) {
-					ERR("ltt_trace_stop failed");
-					return;
+			libfile = nth_token(recvbuf, 1);
+
+			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; i<trace->nr_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;
+					int fd;
+					struct blocked_consumer *bc;
+
+					bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer));
+					if(bc == NULL) {
+						ERR("malloc returned NULL");
+						goto next_cmd;
+					}
+					bc->fd_consumer = src.fd;
+					bc->fd_producer = lttbuf->data_ready_fd_read;
+					bc->rbuf = rbuf;
+					bc->lttbuf = lttbuf;
+					bc->src = src;
+					bc->server = ustcomm_app.server;
+
+					list_add(&bc->list, &blocked_consumers);
+
+					break;
 				}
 			}
-			else if(!strcmp(recvbuf, "trace_destroy")) {
+		}
+		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("trace destroy");
+			DBG("put_subbuf");
 
-				result = ltt_trace_destroy(trace_name);
-				if(result < 0) {
-					ERR("ltt_trace_destroy failed");
-					return;
+			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; i<trace->nr_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; i<trace->nr_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_conn:;
+
+	next_cmd:
+		free(recvbuf);
 	}
 }
 
+static char listener_stack[16384];
+
 void create_listener(void)
 {
 	int result;
 	static char listener_stack[16384];
+	//char *listener_stack = malloc(16384);
 
+#ifdef USE_CLONE
 	result = clone(listener_main, listener_stack+sizeof(listener_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM | CLONE_SIGHAND | CLONE_THREAD, NULL);
 	if(result == -1) {
 		perror("clone");
 	}
+#else
+	pthread_t thread;
+
+	pthread_create(&thread, NULL, listener_main, NULL);
+#endif
 }
 
-/* The signal handler itself. */
+/* The signal handler itself. Signals must be setup so there cannot be
+   nested signals. */
 
 void sighandler(int sig)
 {
+	static char have_listener = 0;
 	DBG("sighandler");
-	create_listener();
+
+	if(!have_listener) {
+		create_listener();
+		have_listener = 1;
+	}
 }
 
 /* Called by the app signal handler to chain it to us. */
@@ -328,56 +733,20 @@ void chain_signal(void)
 
 static int init_socket(void)
 {
-	int result;
-	int fd;
-	char pidstr[6];
-	int pidlen;
-
-	struct sockaddr_un addr;
-	
-	result = fd = socket(PF_UNIX, SOCK_DGRAM, 0);
-	if(result == -1) {
-		PERROR("socket");
-		return -1;
-	}
-
-	addr.sun_family = AF_UNIX;
-
-	result = snprintf(addr.sun_path, UNIX_PATH_MAX, "%s/%d", SOCKETDIR, mypid);
-	if(result >= UNIX_PATH_MAX) {
-		ERR("string overflow allocating socket name");
-		goto close_sock;
-	}
-	//DBG("opening socket at %s", addr.sun_path);
-
-	result = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
-	if(result == -1) {
-		PERROR("bind");
-		goto close_sock;
-	}
-
-	strcpy(mysocketfile, addr.sun_path);
-
-	pfd = fd;
-	return 0;
-
-	close_sock:
-	close(fd);
-
-	return -1;
+	return ustcomm_init_app(getpid(), &ustcomm_app);
 }
 
 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)
@@ -438,7 +807,18 @@ static void __attribute__((constructor(1000))) init()
 
 	DBG("UST_TRACE constructor");
 
-	mypid = getpid();
+	/* Must create socket before signal handler to prevent races.
+         */
+	result = init_socket();
+	if(result == -1) {
+		ERR("init_socket error");
+		return;
+	}
+	result = init_signal_handler();
+	if(result == -1) {
+		ERR("init_signal_handler error");
+		return;
+	}
 
 	if(getenv("UST_TRACE")) {
 		char trace_name[] = "auto";
@@ -481,22 +861,10 @@ static void __attribute__((constructor(1000))) init()
 			ERR("ltt_trace_start failed");
 			return;
 		}
-		start_consumer();
+		//start_consumer();
+		inform_consumer_daemon();
 	}
 
-	/* Must create socket before signal handler to prevent races
-         * on pfd variable.
-         */
-	result = init_socket();
-	if(result == -1) {
-		ERR("init_socket error");
-		return;
-	}
-	result = init_signal_handler();
-	if(result == -1) {
-		ERR("init_signal_handler error");
-		return;
-	}
 
 	return;
 
@@ -526,7 +894,8 @@ static void __attribute__((destructor)) fini()
 	}
 
 	/* FIXME: wait for the consumer to be done */
-	sleep(3);
+	DBG("waiting 5 sec for consume");
+	sleep(5);
 
 	destroy_socket();
 }