#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"
e->call = marker_probe_cb_noarg;
else
e->call = marker_probe_cb;
- trace_mark(metadata, core_marker_format,
+ __ust_marker(0, metadata, core_marker_format, NULL,
"channel %s name %s format %s",
e->channel, e->name, e->format);
} else {
return -ENOMEM;
entry->format_allocated = 1;
- trace_mark(metadata, core_marker_format,
+ __ust_marker(0, metadata, core_marker_format, NULL,
"channel %s name %s format %s",
entry->channel, entry->name, entry->format);
return 0;
WARN_ON(!elem->tp_cb);
/*
* It is ok to directly call the probe registration because type
- * checking has been done in the __trace_mark_tp() macro.
+ * checking has been done in the __ust_marker_tp() macro.
*/
if (active) {
WARN_ON(!elem->tp_cb);
/*
* It is ok to directly call the probe registration because type
- * checking has been done in the __trace_mark_tp() macro.
+ * checking has been done in the __ust_marker_tp() macro.
*/
ret = tracepoint_probe_unregister_noupdate(elem->tp_name,
elem->tp_cb, NULL);
pthread_mutex_lock(&markers_mutex);
for (iter = begin; iter < end; iter++) {
+ if (!*iter)
+ continue; /* skip dummy */
mark_entry = get_marker((*iter)->channel, (*iter)->name);
if (mark_entry) {
set_marker(mark_entry, *iter, !!mark_entry->refcount);
/*
* 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);
}
goto error_unregister_channel;
entry->event_id = ret;
ret = 0;
- trace_mark(metadata, core_marker_id,
+ __ust_marker(0, metadata, core_marker_id, NULL,
"channel %s name %s event_id %hu "
"int #1u%zu long #1u%zu pointer #1u%zu "
"size_t #1u%zu alignment #1u%u",
struct marker * const *begin,
struct marker * const *end)
{
- if (!*marker && begin != end) {
+ if (!*marker && begin != end)
*marker = begin;
- return 1;
+ while (*marker >= begin && *marker < end) {
+ if (!**marker)
+ (*marker)++; /* skip dummy */
+ else
+ return 1;
}
- if (*marker >= begin && *marker < end)
- return 1;
return 0;
}
//ust// EXPORT_SYMBOL_GPL(marker_get_iter_range);
for (i = 0; i < MARKER_TABLE_SIZE; i++) {
head = &marker_table[i];
cds_hlist_for_each_entry(entry, node, head, hlist) {
- __trace_mark(0, metadata, core_marker_id,
+ __ust_marker(0, metadata, core_marker_id,
&call_data,
"channel %s name %s event_id %hu "
"int #1u%zu long #1u%zu pointer #1u%zu "
sizeof(void *), sizeof(size_t),
ltt_get_alignment());
if (entry->format)
- __trace_mark(0, metadata,
+ __ust_marker(0, metadata,
core_marker_format,
&call_data,
"channel %s name %s format %s",
{
if (new_marker_cb) {
struct marker * const *m;
- for(m=start; m < end; m++) {
- new_marker_cb(*m);
+
+ for(m = start; m < end; m++) {
+ if (*m)
+ new_marker_cb(*m);
}
}
}
int marker_register_lib(struct marker * const *markers_start, int markers_count)
{
- struct lib *pl;
+ struct lib *pl, *iter;
pl = (struct lib *) zmalloc(sizeof(struct lib));
/* FIXME: maybe protect this with its own mutex? */
lock_markers();
+
+ /*
+ * We sort the libs by struct lib pointer address.
+ */
+ cds_list_for_each_entry_reverse(iter, &libs, list) {
+ BUG_ON(iter == pl); /* Should never be in the list twice */
+ if (iter < pl) {
+ /* We belong to the location right after iter. */
+ cds_list_add(&pl->list, &iter->list);
+ goto lib_added;
+ }
+ }
+ /* We should be added at the head of the list */
cds_list_add(&pl->list, &libs);
+lib_added:
unlock_markers();
new_markers(markers_start, markers_start + markers_count);
/* FIXME: update just the loaded lib */
lib_update_markers();
- DBG("just registered a markers section from %p and having %d markers", markers_start, markers_count);
+ DBG("just registered a markers section from %p and having %d markers (minus dummy markers)", markers_start, markers_count);
return 0;
}
}
}
-void __attribute__((constructor)) destroy_markers(void)
+void __attribute__((destructor)) destroy_markers(void)
{
marker_unregister_lib(__start___markers_ptrs);
}