X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=hello%2Fhello.c;h=67b9ef3a9f56f1455e2f43026d46e816d34ed792;hb=20b37a3100b0d8722b361f62fd592520264fb9fa;hp=b4f5216ed9bc8712ca8ff66abf774fd3063fc794;hpb=fbd8191b00521bbe7e52a6d1ff4bb814708f06ba;p=ust.git

diff --git a/hello/hello.c b/hello/hello.c
index b4f5216..67b9ef3 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -14,8 +14,6 @@
 
 
 char consumer_stack[10000];
-char trace_name[] = "theusttrace";
-char trace_type[] = "ustrelay";
 
 #define CPRINTF(fmt, args...) safe_printf(fmt "\n", ## args)
 
@@ -47,6 +45,7 @@ int consumer(void *arg)
 	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);
@@ -200,75 +199,16 @@ int main()
 
 	init_int_handler();
 
-	init_ustrelay_transport();
-
-	printf("page size is %d\n", sysconf(_SC_PAGE_SIZE));
-
-//	extern struct marker __start___markers[] __attribute__((visibility("hidden")));
-//	extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
-//
-//	printf("the executable's markers start at %lx and end at %lx, the size of a marker is %d\n", __start___markers, __stop___markers, sizeof(struct marker));
-
-	marker_control_init();
-
-	//marker_probe_register("abc", "testmark", "", probe, NULL);
-//ust//	marker_probe_register("metadata", "core_marker_id", "channel %s name %s event_id %hu int #1u%zu long #1u%zu pointer #1u%zu size_t #1u%zu alignment #1u%u", probe, NULL);
-//ust//	result = ltt_probe_register(&default_probe);
-//ust//	if(result)
-//ust//		ERR("ltt_probe_register");
-	
-	//result = ltt_marker_connect("metadata", "testev", "default");
-	//if(result)
-	//	ERR("ltt_marker_connect");
-	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(abc, testmark, "", MARK_NOARGS);
-		//trace_mark(metadata, testev, "", MARK_NOARGS);
-		trace_mark(foo, bar, "%s", "FOOBAZ");
-		//trace_mark(metadata, core_marker_id,
-		//	   "channel %s name %s event_id %hu "
-		//	   "int #1u%zu long #1u%zu pointer #1u%zu "
-		//	   "size_t #1u%zu alignment #1u%u",
-		//	   "abc", "def", (unsigned short)1000,
-		//	   sizeof(int), sizeof(long), sizeof(void *),
-		//	   sizeof(size_t), ltt_get_alignment());
+		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;