X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=hello%2Fhello.c;h=88087dff3a1a6d36488310f0135e4eba7e58e76e;hb=a584bc4edb73e3f4c0023c42f2fdbc816fb6eab0;hp=1c97db939e9a5740846e9015c6be74d098ea77b6;hpb=ba6459ba344b54a4f7775e431447be79fd7790f8;p=lttng-ust.git

diff --git a/hello/hello.c b/hello/hello.c
index 1c97db93..88087dff 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -1,11 +1,18 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include "../libmarkers/marker.h"
 #include "usterr.h"
 #include "tracer.h"
 #include "marker-control.h"
+#include "relay.h"
+
+
 
 void probe(const struct marker *mdata,
 		void *probe_private, void *call_private,
@@ -14,23 +21,6 @@ void probe(const struct marker *mdata,
 	printf("In probe\n");
 }
 
-//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// }
-
-//sig_atomic_t must_quit;
-
 void inthandler(int sig)
 {
 	printf("in handler\n");
@@ -63,145 +53,25 @@ int init_int_handler(void)
 	return 0;
 }
 
-//ust// DEFINE_MUTEX(probes_mutex);
-//ust// 
-//ust// static LIST_HEAD(probes_registered_list);
-//ust// 
-//ust// int ltt_marker_connect(const char *channel, const char *mname,
-//ust// 		       const char *pname)
-//ust// 
-//ust// {
-//ust// 	int ret;
-//ust// 	struct ltt_active_marker *pdata;
-//ust// 	struct ltt_available_probe *probe;
-//ust// 
-//ust// 	ltt_lock_traces();
-//ust// 	mutex_lock(&probes_mutex);
-//ust// 	probe = get_probe_from_name(pname);
-//ust// 	if (!probe) {
-//ust// 		ret = -ENOENT;
-//ust// 		goto end;
-//ust// 	}
-//ust// 	pdata = marker_get_private_data(channel, mname, probe->probe_func, 0);
-//ust// 	if (pdata && !IS_ERR(pdata)) {
-//ust// 		ret = -EEXIST;
-//ust// 		goto end;
-//ust// 	}
-//ust// 	pdata = kmem_cache_zalloc(markers_loaded_cachep, GFP_KERNEL);
-//ust// 	if (!pdata) {
-//ust// 		ret = -ENOMEM;
-//ust// 		goto end;
-//ust// 	}
-//ust// 	pdata->probe = probe;
-//ust// 	/*
-//ust// 	 * ID has priority over channel in case of conflict.
-//ust// 	 */
-//ust// 	ret = marker_probe_register(channel, mname, NULL,
-//ust// 		probe->probe_func, pdata);
-//ust// 	if (ret)
-//ust// 		kmem_cache_free(markers_loaded_cachep, pdata);
-//ust// 	else
-//ust// 		list_add(&pdata->node, &markers_loaded_list);
-//ust// end:
-//ust// 	mutex_unlock(&probes_mutex);
-//ust// 	ltt_unlock_traces();
-//ust// 	return ret;
-//ust// }
-//ust// 
-//ust// 
-//ust// int ltt_probe_register(struct ltt_available_probe *pdata)
-//ust// {
-//ust// 	int ret = 0;
-//ust// 	int comparison;
-//ust// 	struct ltt_available_probe *iter;
-//ust// 
-//ust// 	mutex_lock(&probes_mutex);
-//ust// 	list_for_each_entry_reverse(iter, &probes_registered_list, node) {
-//ust// 		comparison = strcmp(pdata->name, iter->name);
-//ust// 		if (!comparison) {
-//ust// 			ret = -EBUSY;
-//ust// 			goto end;
-//ust// 		} else if (comparison > 0) {
-//ust// 			/* We belong to the location right after iter. */
-//ust// 			list_add(&pdata->node, &iter->node);
-//ust// 			goto end;
-//ust// 		}
-//ust// 	}
-//ust// 	/* Should be added at the head of the list */
-//ust// 	list_add(&pdata->node, &probes_registered_list);
-//ust// end:
-//ust// 	mutex_unlock(&probes_mutex);
-//ust// 	return ret;
-//ust// }
-//ust// 
-//ust// 
-//ust// struct ltt_available_probe default_probe = {
-//ust// 	.name = "default",
-//ust// 	.format = NULL,
-//ust// 	.probe_func = ltt_vtrace,
-//ust// 	.callbacks[0] = ltt_serialize_data,
-//ust// };
-
 int main()
 {
 	int result;
+	int i;
 
 	init_int_handler();
 
-	init_ustrelay_transport();
-
-	printf("page size is %d\n", sysconf(_SC_PAGE_SIZE));
-
-	char trace_name[] = "theusttrace";
-	char trace_type[] = "ustrelay";
-
-	marker_control_init();
-
-	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);
-//ust//	result = ltt_probe_register(&default_probe);
-//ust//	if(result)
-//ust//		ERR("ltt_probe_register");
-	
-	result = ltt_marker_connect("abc", "testmark2", "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;
-	}
-
-
 	printf("Hello, World!\n");
 
-	for(;;) {
-		trace_mark(abc, testmark, "", MARK_NOARGS);
-		trace_mark(abc, testmark2, "", MARK_NOARGS);
-		sleep(1);
+	sleep(1);
+	for(i=0; i<50; i++) {
+		trace_mark(ust, bar, "str %s", "FOOBAZ");
+		trace_mark(ust, bar2, "number1 %d number2 %d", 53, 9800);
+		usleep(100000);
 	}
 
 	scanf("%*s");
 
 	return 0;
 }
+
+MARKER_LIB