X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=d32deba978ac8d2500fa6a222d07a520a2db2ebc;hb=fc1caebc8a71283c7766549ebed47300d1b52945;hp=4f016bb08215ae43844adf50f1c651d50716b489;hpb=9c6bb08180ab0a65bbf3d47247a9d36e257fa44a;p=ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 4f016bb..d32deba 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -74,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;
@@ -98,11 +100,11 @@ static void print_markers(FILE *fp)
 
 	while (iter.marker) {
 		fprintf(fp, "marker: %s/%s %d \"%s\" %p\n",
-			iter.marker->channel,
-			iter.marker->name,
-			(int)imv_read(iter.marker->state),
-			iter.marker->format,
-			iter.marker->location);
+			(*iter.marker)->channel,
+			(*iter.marker)->name,
+			(int)imv_read((*iter.marker)->state),
+			(*iter.marker)->format,
+			(*iter.marker)->location);
 		marker_iter_next(&iter);
 	}
 	unlock_markers();
@@ -117,7 +119,7 @@ static void print_trace_events(FILE *fp)
 	trace_event_iter_start(&iter);
 
 	while (iter.trace_event) {
-		fprintf(fp, "trace_event: %s\n", iter.trace_event->name);
+		fprintf(fp, "trace_event: %s\n", (*iter.trace_event)->name);
 		trace_event_iter_next(&iter);
 	}
 	unlock_trace_events();
@@ -353,7 +355,7 @@ static int set_subbuf_size(const char *trace_name, const char *ch_name,
 	}
 
 	channel->subbuf_size = power;
-	DBG("the set_subbuf_size for the requested channel is %u", channel->subbuf_size);
+	DBG("the set_subbuf_size for the requested channel is %zu", channel->subbuf_size);
 
 unlock_traces:
 	ltt_unlock_traces();
@@ -391,7 +393,7 @@ static int set_subbuf_num(const char *trace_name, const char *ch_name,
 	}
 
 	channel->subbuf_cnt = num;
-	DBG("the set_subbuf_cnt for the requested channel is %zd", channel->subbuf_cnt);
+	DBG("the set_subbuf_cnt for the requested channel is %u", channel->subbuf_cnt);
 
 unlock_traces:
 	ltt_unlock_traces();
@@ -826,7 +828,7 @@ static void process_marker_cmd(int sock, int command,
 {
 	struct ustcomm_header _reply_header;
 	struct ustcomm_header *reply_header = &_reply_header;
-	int result;
+	int result = 0;
 
 	memset(reply_header, 0, sizeof(*reply_header));
 
@@ -1230,6 +1232,7 @@ free_name:
 
 static void __attribute__((constructor)) init()
 {
+	struct timespec ts;
 	int result;
 	char* autoprobe_val = NULL;
 	char* subbuffer_size_val = NULL;
@@ -1264,7 +1267,7 @@ static void __attribute__((constructor)) init()
 	create_listener();
 
 	/* Get clock the clock source type */
-	struct timespec ts;
+
 	/* Default clock source */
 	ust_clock_source = CLOCK_TRACE;
 	if (clock_gettime(ust_clock_source, &ts) != 0) {
@@ -1311,8 +1314,8 @@ static void __attribute__((constructor)) init()
 
 		DBG("now iterating on markers already registered");
 		while (iter.marker) {
-			DBG("now iterating on marker %s", iter.marker->name);
-			auto_probe_connect(iter.marker);
+			DBG("now iterating on marker %s", (*iter.marker)->name);
+			auto_probe_connect(*iter.marker);
 			marker_iter_next(&iter);
 		}
 	}