X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=e28b3159d73c1408b58b072850f2bb89a45d59eb;hb=aa08b4413291fabcbd1b1144377d37034ad361de;hp=d4cd5942d7bed35cc0663445c6f3c713aa0a62bf;hpb=2944a62989b8466e0d551e37a0be0e8e6cd69905;p=ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index d4cd594..e28b315 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -29,9 +29,9 @@
 
 #include <urcu-bp.h>
 
-#include "marker.h"
+#include <ust/marker.h>
 #include "tracer.h"
-#include "localerr.h"
+#include "usterr.h"
 #include "ustcomm.h"
 #include "relay.h" /* FIXME: remove */
 #include "marker-control.h"
@@ -117,7 +117,7 @@ static void print_markers(FILE *fp)
 	marker_iter_start(&iter);
 
 	while(iter.marker) {
-		fprintf(fp, "marker: %s/%s %d \"%s\"\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format);
+		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);
 		marker_iter_next(&iter);
 	}
 	unlock_markers();
@@ -837,7 +837,7 @@ static void auto_probe_connect(struct marker *m)
 	if(result && result != -EEXIST)
 		ERR("ltt_marker_connect (marker = %s/%s, errno = %d)", m->channel, m->name, -result);
 
-	DBG("auto connected marker %s %s to probe default", m->channel, m->name);
+	DBG("auto connected marker %s (addr: %p) %s to probe default", m->channel, m, m->name);
 
 }