ust: continue moving communication stuff to libustcomm and cleanup

[ust.git] / hello / hello.c

diff --git a/hello/hello.c b/hello/hello.c
index d6429f133ba339e411fb01250f96de5d0bcb3756..3bbb2bd94961523bb7721fae991ef5a5740e423a 100644 (file)
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -13,146 +13,6 @@
 #include "relay.h"
 
 
-char consumer_stack[10000];
-char trace_name[] = "theusttrace";
-char trace_type[] = "ustrelay";
-
-#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;
-
-       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", 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; 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) {
-                               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(&lttbuf->offset), rbuf->chan) - consumed_old);
-//             CPRINTF("Commit count %ld", local_read(&lttbuf->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,
@@ -200,46 +60,15 @@ int main()
 
        init_int_handler();
 
-       result = ltt_marker_connect("foo", "bar", "default");
-       if(result)
-               ERR("ltt_marker_connect");
-
-       result = ltt_trace_setup(trace_name);
-       if(result < 0) {
-               ERR("ltt_trace_setup failed");
-               return 1;
-       }
-
-       result = ltt_trace_set_type(trace_name, trace_type);
-       if(result < 0) {
-               ERR("ltt_trace_set_type failed");
-               return 1;
-       }
-
-       result = ltt_trace_alloc(trace_name);
-       if(result < 0) {
-               ERR("ltt_trace_alloc failed");
-               return 1;
-       }
-
-       result = ltt_trace_start(trace_name);
-       if(result < 0) {
-               ERR("ltt_trace_start failed");
-               return 1;
-       }
-
-       start_consumer();
        printf("Hello, World!\n");
 
        sleep(1);
-       for(i=0; i<50; i++) {
-               trace_mark(foo, bar, "%s", "FOOBAZ");
+       for(i=0; i<5000; i++) {
+               trace_mark(ust, bar, "str %s", "FOOBAZ");
+               trace_mark(ust, bar2, "number1 %d number2 %d", 53, 9800);
                usleep(100000);
        }
 
-       ltt_trace_stop(trace_name);
-       ltt_trace_destroy(trace_name);
-
        scanf("%*s");
 
        return 0;