X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=hello%2Fhello.c;h=44aa882bc1def1efa6cb5db6cb59237c5cc4b266;hb=5f54827b88b093974e4bf58f67490036718644c7;hp=51979861e28b0e37003c1ec7fb6600887701bb7a;hpb=e1152c3706f5140e7267f75dc597daa1a9c579a6;p=ust.git

diff --git a/hello/hello.c b/hello/hello.c
index 5197986..44aa882 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -3,6 +3,8 @@
 #include <sys/mman.h>
 
 #include "../libmarkers/marker.h"
+#include "usterr.h"
+#include "tracer.h"
 
 void probe(const struct marker *mdata,
 		void *probe_private, void *call_private,
@@ -11,30 +13,55 @@ void probe(const struct marker *mdata,
 	printf("In probe\n");
 }
 
-void try_map()
+//ust// void try_map()
+//ust// {
+//ust// 	char *m;
+//ust// 
+//ust// 	/* maybe add MAP_LOCKED */
+//ust// 	m = mmap(NULL, 4096, PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE , -1, 0);
+//ust// 	if(m == (char*)-1) {
+//ust// 		perror("mmap");
+//ust// 		return;
+//ust// 	}
+//ust// 
+//ust// 	printf("The mapping is at %p.\n", m);
+//ust// 	strcpy(m, "Hello, Mapping!");
+//ust// }
+
+int main()
 {
-	char *m;
+	int result;
+
+	init_ustrelay_transport();
+
+	char trace_name[] = "theusttrace";
+	char trace_type[] = "usttrace";
+
+	marker_probe_register("abc", "testmark", "", probe, NULL);
+	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);
 
-	/* maybe add MAP_LOCKED */
-	m = mmap(NULL, 4096, PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE , -1, 0);
-	if(m == (char*)-1) {
-		perror("mmap");
-		return;
+	result = ltt_trace_setup(trace_name);
+	if(result < 0) {
+		ERR("ltt_trace_setup failed");
+		return 1;
 	}
 
-	printf("The mapping is at %p.\n", m);
-	strcpy(m, "Hello, Mapping!");
-}
+//ust//	result = ltt_trace_set_type(trace_name, trace_type);
+//ust//	if(result < 0) {
+//ust//		ERR("ltt_trace_set_type failed");
+//ust//		return 1;
+//ust//	}
 
-int main()
-{
-	//ltt_trace_create();
+	result = ltt_trace_alloc(trace_name);
+	if(result < 0) {
+		ERR("ltt_trace_alloc failed");
+		return 1;
+	}
 
-	try_map();
+//	try_map();
 
 	printf("Hello, World!\n");
 
-	marker_probe_register("abc", "testmark", "", probe, NULL);
 
 	trace_mark(abc, testmark, "", MARK_NOARGS);