X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=hello%2Fhello.c;h=821bed33ea436ed081bb19c0e8f012be9daab9f1;hb=1f8b0dffac11b11fa7b582b6274c6b4cadf57bb3;hp=3c4843abfa0c3bb5955be89a0ddff6d577a5dad3;hpb=aafb1650caa90246ada3cc2c4ca7fc9493673617;p=ust.git

diff --git a/hello/hello.c b/hello/hello.c
index 3c4843a..821bed3 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -6,160 +6,14 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "../libmarkers/marker.h"
+#include "marker.h"
 #include "usterr.h"
 #include "tracer.h"
 #include "marker-control.h"
 #include "relay.h"
+#include "tp.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; 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,
-		const char *fmt, va_list *args)
-{
-	printf("In probe\n");
-}
-
 void inthandler(int sig)
 {
 	printf("in handler\n");
@@ -199,19 +53,26 @@ int main()
 
 	init_int_handler();
 
-	start_consumer();
 	printf("Hello, World!\n");
 
 	sleep(1);
 	for(i=0; i<50; i++) {
-		trace_mark(foo, bar, "str %s", "FOOBAZ");
-		trace_mark(foo, bar2, "number1 %d number2 %d", 53, 9800);
+		trace_mark(ust, bar, "str %s", "FOOBAZ");
+		trace_mark(ust, bar2, "number1 %d number2 %d", 53, 9800);
+		trace_hello_tptest(i);
 		usleep(100000);
 	}
 
 	scanf("%*s");
 
+	ltt_trace_stop("auto");
+	ltt_trace_destroy("auto");
+
+	DBG("TRACE STOPPED");
+	scanf("%*s");
+
 	return 0;
 }
 
-MARKER_LIB
+MARKER_LIB;
+TRACEPOINT_LIB;