X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=e877e6289f7ef0e32ca88c6ab595f7117a81298b;hb=49d70d5aa7bc256392cc32127616c311c69cdd92;hp=b783c76e2ba8c87f0aa7280408c7c60236c885fe;hpb=9dc7b7ff797a5cbb1e9ffd59e053a04562f306c4;p=ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index b783c76..e877e62 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -39,6 +39,7 @@
 #include <ust/marker.h>
 #include <ust/tracepoint.h>
 #include <ust/tracectl.h>
+#include <ust/clock.h>
 #include "tracer.h"
 #include "usterr.h"
 #include "ustcomm.h"
@@ -73,6 +74,8 @@ static struct cds_list_head ust_socks = CDS_LIST_HEAD_INIT(ust_socks);
 /* volatile because shared between the listener and the main thread */
 int buffers_to_export = 0;
 
+int ust_clock_source;
+
 static long long make_pidunique(void)
 {
 	s64 retval;
@@ -1229,6 +1232,7 @@ free_name:
 
 static void __attribute__((constructor)) init()
 {
+	struct timespec ts;
 	int result;
 	char* autoprobe_val = NULL;
 	char* subbuffer_size_val = NULL;
@@ -1262,6 +1266,15 @@ static void __attribute__((constructor)) init()
 
 	create_listener();
 
+	/* Get clock the clock source type */
+
+	/* Default clock source */
+	ust_clock_source = CLOCK_TRACE;
+	if (clock_gettime(ust_clock_source, &ts) != 0) {
+		ust_clock_source = CLOCK_MONOTONIC;
+		DBG("UST traces will not be synchronized with LTTng traces");
+	}
+
 	autoprobe_val = getenv("UST_AUTOPROBE");
 	if (autoprobe_val) {
 		struct marker_iter iter;