#define _LGPL_SOURCE
#include <errno.h>
-#include <lttng/tracepoint.h>
-#include <lttng/tracepoint-internal.h>
-#include <lttng/core.h>
-#include <lttng/kcompat/kcompat.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <urcu/arch.h>
#include <urcu-bp.h>
#include <urcu/hlist.h>
#include <urcu/uatomic.h>
+#include <urcu/compiler.h>
+
+#include <lttng/tracepoint.h>
-#include <lttng/usterr-signal-safe.h>
+#include <usterr-signal-safe.h>
+#include <helper.h>
+
+#include "tracepoint-internal.h"
#include "ltt-tracer-core.h"
+#include "jhash.h"
+#include "error.h"
/* Set to 1 to enable tracepoint debug output */
static const int tracepoint_debug;
static inline void release_probes(void *old)
{
if (old) {
- struct tp_probes *tp_probes = _ust_container_of(old,
+ struct tp_probes *tp_probes = caa_container_of(old,
struct tp_probes, probes[0]);
synchronize_rcu();
free(tp_probes);
struct cds_hlist_head *head;
struct cds_hlist_node *node;
struct tracepoint_entry *e;
- u32 hash = jhash(name, strlen(name), 0);
+ uint32_t hash = jhash(name, strlen(name), 0);
head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
cds_hlist_for_each_entry(e, node, head, hlist) {
struct cds_hlist_node *node;
struct tracepoint_entry *e;
size_t name_len = strlen(name) + 1;
- u32 hash = jhash(name, name_len-1, 0);
+ uint32_t hash = jhash(name, name_len-1, 0);
head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
cds_hlist_for_each_entry(e, node, head, hlist) {
{
need_update = 1;
if (old) {
- struct tp_probes *tp_probes = _ust_container_of(old,
+ struct tp_probes *tp_probes = caa_container_of(old,
struct tp_probes, probes[0]);
cds_list_add(&tp_probes->u.list, &old_probes);
}
* Returns 0 if current not found.
* Returns 1 if current found.
*
- * Called with tracepoint mutex held
+ * Called with UST lock held
*/
int lib_get_iter_tracepoints(struct tracepoint_iter *iter)
{
* Returns whether a next tracepoint has been found (1) or not (0).
* Will return the first tracepoint in the range if the input tracepoint is
* NULL.
- * Called with tracepoint mutex held.
+ * Called with UST lock held.
*/
int tracepoint_get_iter_range(struct tracepoint * const **tracepoint,
struct tracepoint * const *begin, struct tracepoint * const *end)
}
/*
- * Called with tracepoint mutex held.
+ * Called with UST lock held.
*/
static void tracepoint_get_iter(struct tracepoint_iter *iter)
{
/*
* iter->tracepoint may be invalid because we blindly incremented it.
* Make sure it is valid by marshalling on the tracepoints, getting the
- * tracepoints from following modules if necessary.
+ * tracepoints from following library if necessary.
*/
tracepoint_get_iter(iter);
}