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

diff --git a/libtracectl/tracectl.c b/libtracectl/tracectl.c
index aca3abc..917937f 100644
--- a/libtracectl/tracectl.c
+++ b/libtracectl/tracectl.c
@@ -4,102 +4,752 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#define UNIX_PATH_MAX 108
+#include <sched.h>
+#include <fcntl.h>
+#include <poll.h>
+
+#include "marker.h"
+#include "tracer.h"
+#include "localerr.h"
+#include "ustcomm.h"
+#include "relay.h" /* FIXME: remove */
+
+//#define USE_CLONE
 
-//#define SOCKETDIR "/var/run/ust/socks"
-#define SOCKETDIR "/tmp/socks"
-#define SOCKETDIRLEN sizeof(SOCKETDIR)
 #define USTSIGNAL SIGIO
 
-#define DBG(fmt, args...) fprintf(stderr, fmt "\n", ## args)
-#define WARN(fmt, args...) fprintf(stderr, "usertrace: WARNING: " fmt "\n", ## args)
-#define ERR(fmt, args...) fprintf(stderr, "usertrace: ERROR: " fmt "\n", ## args)
-#define PERROR(call) perror("usertrace: ERROR: " call)
+#define MAX_MSG_SIZE (100)
+#define MSG_NOTIF 1
+#define MSG_REGISTER_NOTIF 2
+
+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;
 };
 
+//struct listener_arg {
+//	int pipe_fd;
+//};
 
-pid_t mypid;
-char mysocketfile[UNIX_PATH_MAX] = "";
+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];
+};
 
-void do_command(struct tracecmd *cmd)
+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;
+	int fd;
+	char str[] = "Hello, this is the consumer.\n";
+	struct ltt_trace_struct *trace;
+	struct consumer_channel *consumer_channels;
+	int i;
+	char trace_name[] = "auto";
+
+	ltt_lock_traces();
+	trace = _ltt_trace_find(trace_name);
+	ltt_unlock_traces();
+
+	if(trace == NULL) {
+		CPRINTF("cannot find trace!");
+		return 1;
+	}
+
+	consumer_channels = (struct consumer_channel *) malloc(trace->nr_channels * sizeof(struct consumer_channel));
+	if(consumer_channels == NULL) {
+		ERR("malloc returned NULL");
+		return 1;
+	}
+
+	CPRINTF("opening trace files");
+	for(i=0; i<trace->nr_channels; i++) {
+		char tmp[100];
+		struct ltt_channel_struct *chan = &trace->channels[i];
+
+		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, 00600);
+		if(result == -1) {
+			perror("open");
+			return -1;
+		}
+		CPRINTF("\topened trace file %s", tmp);
+		
+	}
+	CPRINTF("done opening trace files");
+
+	for(;;) {
+		/*wait*/
+
+		for(i=0; i<trace->nr_channels; i++) {
+			struct rchan *rchan = consumer_channels[i].chan->trans_channel_data;
+			struct rchan_buf *rbuf = rchan->buf;
+			struct ltt_channel_buf_struct *lttbuf = consumer_channels[i].chan->buf;
+			long consumed_old;
+
+			result = ltt_do_get_subbuf(rbuf, lttbuf, &consumed_old);
+			if(result < 0) {
+				DBG("ltt_do_get_subbuf: error: %s", strerror(-result));
+			}
+			else {
+				DBG("success!");
+
+				result = write(consumer_channels[i].fd, rbuf->buf_data + (consumed_old & (2 * 4096-1)), 4096);
+				ltt_do_put_subbuf(rbuf, lttbuf, consumed_old);
+			}
+		}
+
+		sleep(1);
+	}
 }
 
-void receive_commands()
+void start_consumer(void)
 {
-}
+#ifdef USE_CLONE
+	int result;
 
-/* The signal handler itself. */
+	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;
 
-void sighandler(int sig)
+	pthread_create(&thread, NULL, consumer, NULL);
+#endif
+}
+
+static void print_markers(void)
 {
-	DBG("sighandler");
-	receive_commands();
+	struct marker_iter iter;
+
+	lock_markers();
+	marker_iter_reset(&iter);
+	marker_iter_start(&iter);
+
+	while(iter.marker) {
+		fprintf(stderr, "marker: %s_%s \"%s\"\n", iter.marker->channel, iter.marker->name, iter.marker->format);
+		marker_iter_next(&iter);
+	}
+	unlock_markers();
 }
 
-/* Called by the app signal handler to chain it to us. */
+void do_command(struct tracecmd *cmd)
+{
+}
 
-void chain_signal()
+void receive_commands()
 {
-	sighandler(USTSIGNAL);
 }
 
-int init_socket()
+int fd_notif = -1;
+void notif_cb(void)
 {
 	int result;
-	int fd;
-	char pidstr[6];
-	int pidlen;
+	struct trctl_msg msg;
+
+	/* FIXME: fd_notif should probably be protected by a spinlock */
+
+	if(fd_notif == -1)
+		return;
+
+	msg.type = MSG_NOTIF;
+	msg.size = sizeof(msg.type);
 
-	struct sockaddr_un addr;
-	
-	result = fd = socket(PF_UNIX, SOCK_SEQPACKET, 0);
+	/* FIXME: don't block here */
+	result = write(fd_notif, &msg, msg.size+sizeof(msg.size));
 	if(result == -1) {
-		PERROR("socket");
-		return -1;
+		PERROR("write");
+		return;
 	}
+}
+
+static int inform_consumer_daemon(void)
+{
+	ustcomm_request_consumer(getpid(), "metadata");
+	ustcomm_request_consumer(getpid(), "ust");
+}
 
-	addr.sun_family = AF_UNIX;
+void process_blocked_consumers(void)
+{
+	int n_fds = 0;
+	struct pollfd *fds;
+	struct blocked_consumer *bc;
+	int idx = 0;
+	char inbuf;
+	int result;
 
-	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;
+	list_for_each_entry(bc, &blocked_consumers, list) {
+		n_fds++;
 	}
-	//DBG("opening socket at %s", addr.sun_path);
 
-	result = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
-	if(result == -1) {
-		PERROR("bind");
-		goto close_sock;
+	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++;
 	}
 
-	strcpy(mysocketfile, addr.sun_path);
+	result = poll(fds, n_fds, 0);
+	if(result == -1) {
+		PERROR("poll");
+		return -1;
+	}
 
-	close_sock:
-	close(fd);
+	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);
+		}
+	}
 
-	return -1;
 }
 
-void destroy_socket()
+int listener_main(void *p)
 {
 	int result;
 
-	if(mysocketfile[0] == '\0')
-		return;
+	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;
+
+		process_blocked_consumers();
+
+		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");
+
+			result = ltt_trace_stop(trace_name);
+			if(result < 0) {
+				ERR("ltt_trace_stop failed");
+				return;
+			}
+		}
+		else if(!strcmp(recvbuf, "trace_destroy")) {
+
+			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;
+			}
+
+			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;
+				struct rchan_buf *rbuf = rchan->buf;
+
+				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; 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(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; 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(nth_token_is(recvbuf, "load_probe_lib", 0) == 1) {
+			char *libfile;
+
+			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(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; 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_cmd:
+		free(recvbuf);
+	}
+}
+
+static char listener_stack[16384];
+
+void create_listener(void)
+{
+	int result;
+	static char listener_stack[16384];
+	//char *listener_stack = malloc(16384);
 
-	result = unlink(mysocketfile);
+#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("unlink");
+		perror("clone");
 	}
+#else
+	pthread_t thread;
+
+	pthread_create(&thread, NULL, listener_main, NULL);
+#endif
 }
 
-int init_signal_handler(void)
+/* 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");
+
+	if(!have_listener) {
+		create_listener();
+		have_listener = 1;
+	}
+}
+
+/* Called by the app signal handler to chain it to us. */
+
+void chain_signal(void)
+{
+	sighandler(USTSIGNAL);
+}
+
+static int init_socket(void)
+{
+	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");
+//	}
+}
+
+static int init_signal_handler(void)
 {
 	/* Attempt to handler SIGIO. If the main program wants to
 	 * handle it, fine, it'll override us. They it'll have to
@@ -130,15 +780,91 @@ int init_signal_handler(void)
 	return 0;
 }
 
-void __attribute__((constructor)) init()
+static void auto_probe_connect(struct marker *m)
 {
 	int result;
 
-	mypid = getpid();
+	result = ltt_marker_connect(m->channel, m->name, "default");
+	if(result)
+		ERR("ltt_marker_connect");
 
-	/* if using instead seperate thread, then should create thread */
-	result = init_signal_handler();
+	DBG("just auto connected marker %s %s to probe default", m->channel, m->name);
+}
+
+static void __attribute__((constructor(101))) init0()
+{
+	DBG("UST_AUTOPROBE constructor");
+	if(getenv("UST_AUTOPROBE")) {
+		marker_set_new_marker_cb(auto_probe_connect);
+	}
+}
+
+static void fini(void);
+
+static void __attribute__((constructor(1000))) init()
+{
+	int result;
+
+	DBG("UST_TRACE constructor");
+
+	/* 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";
+		char trace_type[] = "ustrelay";
+
+		DBG("starting early tracing");
+
+		/* Ensure marker control is initialized */
+		init_marker_control();
+
+		/* Ensure relay is initialized */
+		init_ustrelay_transport();
+
+		/* Ensure markers are initialized */
+		init_markers();
+
+		/* In case. */
+		ltt_channels_register("ust");
+
+		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;
+		}
+
+		result = ltt_trace_alloc(trace_name);
+		if(result < 0) {
+			ERR("ltt_trace_alloc failed");
+			return;
+		}
+
+		result = ltt_trace_start(trace_name);
+		if(result < 0) {
+			ERR("ltt_trace_start failed");
+			return;
+		}
+		//start_consumer();
+		inform_consumer_daemon();
+	}
+
 
 	return;
 
@@ -149,7 +875,27 @@ void __attribute__((constructor)) init()
 /* This is only called if we terminate normally, not with an unhandled signal,
  * so we cannot rely on it. */
 
-void __attribute__((destructor)) fini()
+static void __attribute__((destructor)) fini()
 {
+	int result;
+
+	/* if trace running, finish it */
+
+	DBG("destructor stopping traces");
+
+	result = ltt_trace_stop("auto");
+	if(result == -1) {
+		ERR("ltt_trace_stop error");
+	}
+
+	result = ltt_trace_destroy("auto");
+	if(result == -1) {
+		ERR("ltt_trace_destroy error");
+	}
+
+	/* FIXME: wait for the consumer to be done */
+	DBG("waiting 5 sec for consume");
+	sleep(5);
+
 	destroy_socket();
 }