X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=hello%2Fhello.c;h=0533173dee211171e320d5868eeb325240121643;hb=f99be40702e206d2cef5aa056623d7b07f21f942;hp=51979861e28b0e37003c1ec7fb6600887701bb7a;hpb=b6bf28ecd4c07e7865d340f1600a35d6edc05ec8;p=ust.git

diff --git a/hello/hello.c b/hello/hello.c
index 5197986..0533173 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -1,8 +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,
@@ -11,34 +21,63 @@ void probe(const struct marker *mdata,
 	printf("In probe\n");
 }
 
-void try_map()
+void inthandler(int sig)
 {
-	char *m;
+	printf("in handler\n");
+	exit(0);
+}
 
-	/* 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;
+int init_int_handler(void)
+{
+	int result;
+	struct sigaction act;
+
+	result = sigemptyset(&act.sa_mask);
+	if(result == -1) {
+		PERROR("sigemptyset");
+		return -1;
 	}
 
-	printf("The mapping is at %p.\n", m);
-	strcpy(m, "Hello, Mapping!");
+	act.sa_handler = inthandler;
+	act.sa_flags = SA_RESTART;
+
+	/* Only defer ourselves. Also, try to restart interrupted
+	 * syscalls to disturb the traced program as little as possible.
+	 */
+	result = sigaction(SIGINT, &act, NULL);
+	if(result == -1) {
+		PERROR("sigaction");
+		return -1;
+	}
+
+	return 0;
 }
 
 int main()
 {
-	//ltt_trace_create();
+	int result;
+	int i;
 
-	try_map();
+	init_int_handler();
 
 	printf("Hello, World!\n");
 
-	marker_probe_register("abc", "testmark", "", probe, NULL);
+	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");
 
-	trace_mark(abc, testmark, "", MARK_NOARGS);
+	ltt_trace_stop("auto");
+	ltt_trace_destroy("auto");
 
+	DBG("TRACE STOPPED");
 	scanf("%*s");
 
 	return 0;
 }
+
+MARKER_LIB