#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
-#include <urcu-bp.h>
-#include <urcu/compiler.h>
-#include <urcu/uatomic.h>
#include <uuid/uuid.h>
-#include <lttng/tracepoint.h>
#include <errno.h>
#include <sys/shm.h>
#include <sys/ipc.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <urcu-bp.h>
+#include <urcu/compiler.h>
+#include <urcu/uatomic.h>
+#include <urcu/arch.h>
+
+#include <lttng/tracepoint.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
-#include "lttng/core.h"
+
+#include <usterr-signal-safe.h>
+#include <helper.h>
+
#include "ltt-tracer.h"
#include "ltt-tracer-core.h"
-#include "lttng/wait.h"
+#include "wait.h"
#include "../libringbuffer/shm.h"
-
-typedef u32 uint32_t;
-#include <lttng/kcompat/jhash.h>
+#include "jhash.h"
/*
* The sessions mutex is the centralized mutex across UST tracing
* control and probe registration. All operations within this file are
* called by the communication thread, under ust_lock protection.
*/
-static DEFINE_MUTEX(sessions_mutex);
+static pthread_mutex_t sessions_mutex = PTHREAD_MUTEX_INITIALIZER;
void ust_lock(void)
{
struct cds_hlist_head *head;
struct ust_pending_probe *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 = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
e = zmalloc(sizeof(struct ust_pending_probe) + name_len);
struct ust_pending_probe *e;
const char *name = desc->name;
size_t name_len = strlen(name) + 1;
- u32 hash = jhash(name, name_len - 1, 0);
+ uint32_t hash = jhash(name, name_len - 1, 0);
int ret = 0;
head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
int *shm_fd, int *wait_fd,
- uint64_t *memory_map_size)
+ uint64_t *memory_map_size,
+ struct ltt_channel *chan_priv_init)
{
struct ltt_channel *chan = NULL;
struct ltt_transport *transport;
transport_name);
goto notransport;
}
+ chan_priv_init->id = session->free_chan_id++;
+ chan_priv_init->session = session;
/*
* Note: the channel creation op already writes into the packet
* headers. Therefore the "chan" information used as input
chan = transport->ops.channel_create("[lttng]", buf_addr,
subbuf_size, num_subbuf, switch_timer_interval,
read_timer_interval, shm_fd, wait_fd,
- memory_map_size);
+ memory_map_size, chan_priv_init);
if (!chan)
goto create_error;
- chan->session = session;
- chan->id = session->free_chan_id++;
chan->enabled = 1;
chan->ops = &transport->ops;
cds_list_add(&chan->list, &session->chan);
ret = lttng_metadata_printf(session,
"event {\n"
- " name = %s;\n"
+ " name = \"%s\";\n"
" id = %u;\n"
" stream_id = %u;\n",
event->desc->name,