From a584bc4edb73e3f4c0023c42f2fdbc816fb6eab0 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Mon, 23 Feb 2009 12:56:11 -0500 Subject: [PATCH] ust: cleanup: move tracing control to tracectl.c --- hello/hello.c | 140 ----------------- libtracectl/Makefile | 4 +- {libtracing => libtracectl}/marker-control.c | 0 libtracectl/tracectl.c | 149 ++++++++++++++++++- share/usterr.h | 3 + 5 files changed, 154 insertions(+), 142 deletions(-) rename {libtracing => libtracectl}/marker-control.c (100%) diff --git a/hello/hello.c b/hello/hello.c index 67b9ef3..88087df 100644 --- a/hello/hello.c +++ b/hello/hello.c @@ -13,145 +13,6 @@ #include "relay.h" -char consumer_stack[10000]; - -#define CPRINTF(fmt, args...) safe_printf(fmt "\n", ## args) - -int safe_printf(const char *fmt, ...) -{ - static char buf[500]; - va_list ap; - int n; - - va_start(ap, fmt); - - n = vsnprintf(buf, sizeof(buf), fmt, ap); - - write(STDOUT_FILENO, buf, n); - - va_end(ap); -} - -struct consumer_channel { - int fd; - struct ltt_channel_struct *chan; -}; - -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; inr_channels; i++) { - char tmp[100]; - struct ltt_channel_struct *chan = &trace->channels[i]; - - consumer_channels[i].chan = chan; - - snprintf(tmp, sizeof(tmp), "trace/%s", chan->channel_name); - result = consumer_channels[i].fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00644); - if(result == -1) { - perror("open"); - return -1; - } - CPRINTF("\topened trace file %s", tmp); - - } - CPRINTF("done opening trace files"); - - for(;;) { - /*wait*/ - - for(i=0; inr_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) { - CPRINTF("ltt_do_get_subbuf: error: %s", strerror(-result)); - } - else { - CPRINTF("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); - } - -// CPRINTF("consumer: got a trace: %s with %d channels\n", trace_name, trace->nr_channels); -// -// struct ltt_channel_struct *chan = &trace->channels[0]; -// -// CPRINTF("channel 1 (%s) active=%u", chan->channel_name, chan->active & 1); - -// struct rchan *rchan = chan->trans_channel_data; -// struct rchan_buf *rbuf = rchan->buf; -// struct ltt_channel_buf_struct *lttbuf = chan->buf; -// long consumed_old; -// -// result = fd = open("trace.out", O_WRONLY | O_CREAT | O_TRUNC, 00644); -// if(result == -1) { -// perror("open"); -// return -1; -// } - -// for(;;) { -// write(STDOUT_FILENO, str, sizeof(str)); -// -// result = ltt_do_get_subbuf(rbuf, lttbuf, &consumed_old); -// if(result < 0) { -// CPRINTF("ltt_do_get_subbuf: error: %s", strerror(-result)); -// } -// else { -// CPRINTF("success!"); -// -// result = write(fd, rbuf->buf_data + (consumed_old & (2 * 4096-1)), 4096); -// ltt_do_put_subbuf(rbuf, lttbuf, consumed_old); -// } -// -// //CPRINTF("There seems to be %ld bytes available", SUBBUF_TRUNC(local_read(<tbuf->offset), rbuf->chan) - consumed_old); -// CPRINTF("Commit count %ld", local_read(<tbuf->commit_count[0])); -// -// -// sleep(1); -// } -} - -void start_consumer(void) -{ - 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"); - } -} void probe(const struct marker *mdata, void *probe_private, void *call_private, @@ -199,7 +60,6 @@ int main() init_int_handler(); - start_consumer(); printf("Hello, World!\n"); sleep(1); diff --git a/libtracectl/Makefile b/libtracectl/Makefile index 27803da..e304097 100644 --- a/libtracectl/Makefile +++ b/libtracectl/Makefile @@ -1,7 +1,9 @@ all: libtracectl.so libtracectl.so: tracectl.c - gcc -g -shared -fPIC -I../libmarkers -I../share $(CFLAGS) -o libtracectl.so tracectl.c + gcc -g -shared -fPIC -I../libmarkers -I../libtracing -I../share $(CFLAGS) -o libtracectl.so tracectl.c marker-control.c ../share/usterr.c clean: rm -rf *.so *.o + +.PHONY: libtracectl.so diff --git a/libtracing/marker-control.c b/libtracectl/marker-control.c similarity index 100% rename from libtracing/marker-control.c rename to libtracectl/marker-control.c diff --git a/libtracectl/tracectl.c b/libtracectl/tracectl.c index ab62adf..1725bca 100644 --- a/libtracectl/tracectl.c +++ b/libtracectl/tracectl.c @@ -5,8 +5,11 @@ #include #include #include +#include #include "marker.h" +#include "tracer.h" +#include "usterr.h" #define UNIX_PATH_MAX 108 @@ -17,13 +20,15 @@ #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 ERR(fmt, args...) fprintf(stderr, "usertrace: ERROR: " fmt "\n", ## args); fflush(stderr) #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 tracecmd { /* no padding */ uint32_t size; uint16_t command; @@ -47,6 +52,126 @@ pid_t mypid; char mysocketfile[UNIX_PATH_MAX] = ""; int pfd = -1; +struct consumer_channel { + int fd; + struct ltt_channel_struct *chan; +}; + +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; inr_channels; i++) { + char tmp[100]; + struct ltt_channel_struct *chan = &trace->channels[i]; + + consumer_channels[i].chan = chan; + + snprintf(tmp, sizeof(tmp), "trace/%s", chan->channel_name); + result = consumer_channels[i].fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00644); + if(result == -1) { + perror("open"); + return -1; + } + CPRINTF("\topened trace file %s", tmp); + + } + CPRINTF("done opening trace files"); + + for(;;) { + /*wait*/ + + for(i=0; inr_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) { + CPRINTF("ltt_do_get_subbuf: error: %s", strerror(-result)); + } + else { + CPRINTF("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); + } + +// CPRINTF("consumer: got a trace: %s with %d channels\n", trace_name, trace->nr_channels); +// +// struct ltt_channel_struct *chan = &trace->channels[0]; +// +// CPRINTF("channel 1 (%s) active=%u", chan->channel_name, chan->active & 1); + +// struct rchan *rchan = chan->trans_channel_data; +// struct rchan_buf *rbuf = rchan->buf; +// struct ltt_channel_buf_struct *lttbuf = chan->buf; +// long consumed_old; +// +// result = fd = open("trace.out", O_WRONLY | O_CREAT | O_TRUNC, 00644); +// if(result == -1) { +// perror("open"); +// return -1; +// } + +// for(;;) { +// write(STDOUT_FILENO, str, sizeof(str)); +// +// result = ltt_do_get_subbuf(rbuf, lttbuf, &consumed_old); +// if(result < 0) { +// CPRINTF("ltt_do_get_subbuf: error: %s", strerror(-result)); +// } +// else { +// CPRINTF("success!"); +// +// result = write(fd, rbuf->buf_data + (consumed_old & (2 * 4096-1)), 4096); +// ltt_do_put_subbuf(rbuf, lttbuf, consumed_old); +// } +// +// //CPRINTF("There seems to be %ld bytes available", SUBBUF_TRUNC(local_read(<tbuf->offset), rbuf->chan) - consumed_old); +// CPRINTF("Commit count %ld", local_read(<tbuf->commit_count[0])); +// +// +// sleep(1); +// } +} + +void start_consumer(void) +{ + 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"); + } +} static void print_markers(void) { @@ -310,6 +435,8 @@ static void __attribute__((constructor(101))) init0() } } +static void fini(void); + static void __attribute__((constructor(1000))) init() { int result; @@ -359,6 +486,7 @@ static void __attribute__((constructor(1000))) init() ERR("ltt_trace_start failed"); return; } + start_consumer(); } /* Must create socket before signal handler to prevent races @@ -386,5 +514,24 @@ static void __attribute__((constructor(1000))) init() 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 */ + sleep(10); + destroy_socket(); } diff --git a/share/usterr.h b/share/usterr.h index 366718d..83b3222 100644 --- a/share/usterr.h +++ b/share/usterr.h @@ -10,4 +10,7 @@ #define BUG_ON(condition) do { if (unlikely(condition)) ERR("condition not respected (BUG)"); } while(0) #define WARN_ON(condition) do { if (unlikely(condition)) WARN("condition not respected on line %s:%d", __FILE__, __LINE__); } while(0) +#define CPRINTF(fmt, args...) safe_printf(fmt "\n", ## args) + + #endif /* USTERR_H */ -- 2.34.1