#include <ust/tracepoint.h>
#include <ust/core.h>
#include <ust/kcompat/kcompat.h>
-#include "usterr.h"
+#include "usterr_signal_safe.h"
#define _LGPL_SOURCE
#include <urcu-bp.h>
struct trace_event * const *begin,
struct trace_event * const *end)
{
- if (!*trace_event && begin != end) {
+ if (!*trace_event && begin != end)
*trace_event = begin;
- return 1;
+ while (*trace_event >= begin && *trace_event < end) {
+ if (!**trace_event)
+ (*trace_event)++; /* skip dummy */
+ else
+ return 1;
}
- if (*trace_event >= begin && *trace_event < end)
- return 1;
return 0;
}
int trace_event_register_lib(struct trace_event * const *trace_events_start,
int trace_events_count)
{
- struct trace_event_lib *pl;
+ struct trace_event_lib *pl, *iter;
pl = (struct trace_event_lib *) malloc(sizeof(struct trace_event_lib));
/* FIXME: maybe protect this with its own mutex? */
pthread_mutex_lock(&trace_events_mutex);
+ /*
+ * 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:
pthread_mutex_unlock(&trace_events_mutex);
- DBG("just registered a trace_events section from %p and having %d trace_events", trace_events_start, trace_events_count);
+ /* trace_events_count - 1: skip dummy */
+ DBG("just registered a trace_events section from %p and having %d trace_events (minus dummy trace_event)", trace_events_start, trace_events_count);
return 0;
}