X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=libust%2Fmarker.c;h=a64b46fc688f42bbaaa132a0b9984f6e4df2bfa3;hb=30ffe2794fc413035208cdd2a7a061bc208e210f;hp=788d87691beb0ddc6fd4f51efb2df7cad151545c;hpb=f08ebbe29cc9f6fa1c108907be5d9d92d297067e;p=ust.git

diff --git a/libust/marker.c b/libust/marker.c
index 788d876..a64b46f 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -27,7 +27,7 @@
 #include <ust/marker.h>
 #include <ust/tracepoint.h>
 
-#include "usterr.h"
+#include "usterr_signal_safe.h"
 #include "channels.h"
 #include "tracercore.h"
 #include "tracer.h"
@@ -693,20 +693,6 @@ void marker_update_probe_range(struct marker * const *begin,
 			/*
 			 * ignore error, continue
 			 */
-
-			/* This is added for UST. We emit a core_marker_id event
-			 * for markers that are already registered to a probe
-			 * upon library load. Otherwise, no core_marker_id will
-			 * be generated for these markers. Is this the right thing
-			 * to do?
-			 */
-			trace_mark(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",
-				   (*iter)->channel, (*iter)->name, mark_entry->event_id,
-				   sizeof(int), sizeof(long), sizeof(void *),
-				   sizeof(size_t), ltt_get_alignment());
 		} else {
 			disable_marker(*iter);
 		}
@@ -1387,8 +1373,7 @@ lib_added:
 	/* FIXME: update just the loaded lib */
 	lib_update_markers();
 
-	/* markers_count - 1: skip dummy */
-	DBG("just registered a markers section from %p and having %d markers", markers_start, markers_count - 1);
+	DBG("just registered a markers section from %p and having %d markers (minus dummy markers)", markers_start, markers_count);
 	
 	return 0;
 }