X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.c;h=b96e585001c9bf7f420b0aac1ce274329550ce7c;hp=6a35284fe70eab9435052a86874537d2936b40f7;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hpb=07d2ae956551db46c137f85847a6d2972b1b0c9d diff --git a/src/bin/lttng-sessiond/buffer-registry.c b/src/bin/lttng-sessiond/buffer-registry.c index 6a35284fe..b96e58500 100644 --- a/src/bin/lttng-sessiond/buffer-registry.c +++ b/src/bin/lttng-sessiond/buffer-registry.c @@ -16,6 +16,7 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include #include @@ -25,6 +26,7 @@ #include "fd-limit.h" #include "ust-consumer.h" #include "ust-ctl.h" +#include "utils.h" /* * Set in main.c during initialization process of the daemon. This contains @@ -103,8 +105,9 @@ void buffer_reg_init_uid_registry(void) * * Return 0 on success else a negative value and regp is untouched. */ -int buffer_reg_uid_create(int session_id, uint32_t bits_per_long, uid_t uid, - enum lttng_domain_type domain, struct buffer_reg_uid **regp) +int buffer_reg_uid_create(uint64_t session_id, uint32_t bits_per_long, uid_t uid, + enum lttng_domain_type domain, struct buffer_reg_uid **regp, + const char *shm_path) { int ret = 0; struct buffer_reg_uid *reg = NULL; @@ -119,7 +122,7 @@ int buffer_reg_uid_create(int session_id, uint32_t bits_per_long, uid_t uid, } reg->registry = zmalloc(sizeof(struct buffer_reg_session)); - if (!reg) { + if (!reg->registry) { PERROR("zmalloc buffer registry uid session"); ret = -ENOMEM; goto error; @@ -129,7 +132,12 @@ int buffer_reg_uid_create(int session_id, uint32_t bits_per_long, uid_t uid, reg->bits_per_long = bits_per_long; reg->uid = uid; reg->domain = domain; - + if (shm_path[0]) { + strncpy(reg->shm_path, shm_path, sizeof(reg->shm_path)); + reg->shm_path[sizeof(reg->shm_path) - 1] = '\0'; + DBG3("shm path '%s' is assigned to uid buffer registry for session id %" PRIu64, + reg->shm_path, session_id); + } reg->registry->channels = lttng_ht_new(0, LTTNG_HT_TYPE_U64); if (!reg->registry->channels) { ret = -ENOMEM; @@ -139,7 +147,7 @@ int buffer_reg_uid_create(int session_id, uint32_t bits_per_long, uid_t uid, cds_lfht_node_init(®->node.node); *regp = reg; - DBG3("Buffer registry per UID created id: %d, ABI: %u, uid: %d, domain: %d", + DBG3("Buffer registry per UID created id: %" PRIu64 ", ABI: %u, uid: %d, domain: %d", session_id, bits_per_long, uid, domain); return 0; @@ -161,7 +169,7 @@ void buffer_reg_uid_add(struct buffer_reg_uid *reg) assert(reg); - DBG3("Buffer registry per UID adding to global registry with id: %d", + DBG3("Buffer registry per UID adding to global registry with id: %" PRIu64 , reg->session_id); rcu_read_lock(); @@ -177,7 +185,7 @@ void buffer_reg_uid_add(struct buffer_reg_uid *reg) * * Return the object pointer or NULL on error. */ -struct buffer_reg_uid *buffer_reg_uid_find(int session_id, +struct buffer_reg_uid *buffer_reg_uid_find(uint64_t session_id, uint32_t bits_per_long, uid_t uid) { struct lttng_ht_node_u64 *node; @@ -190,7 +198,7 @@ struct buffer_reg_uid *buffer_reg_uid_find(int session_id, key.bits_per_long = bits_per_long; key.uid = uid; - DBG3("Buffer registry per UID find id: %d, ABI: %u, uid: %d", + DBG3("Buffer registry per UID find id: %" PRIu64 ", ABI: %u, uid: %d", session_id, bits_per_long, uid); /* Custom lookup function since it's a different key. */ @@ -213,7 +221,7 @@ void buffer_reg_init_pid_registry(void) { /* Should be called once. */ assert(!buffer_registry_pid); - buffer_registry_pid = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + buffer_registry_pid = lttng_ht_new(0, LTTNG_HT_TYPE_U64); assert(buffer_registry_pid); DBG3("Global buffer per PID registry initialized"); @@ -224,7 +232,8 @@ void buffer_reg_init_pid_registry(void) * * Return 0 on success else a negative value and regp is untouched. */ -int buffer_reg_pid_create(int session_id, struct buffer_reg_pid **regp) +int buffer_reg_pid_create(uint64_t session_id, struct buffer_reg_pid **regp, + const char *shm_path) { int ret = 0; struct buffer_reg_pid *reg = NULL; @@ -239,7 +248,7 @@ int buffer_reg_pid_create(int session_id, struct buffer_reg_pid **regp) } reg->registry = zmalloc(sizeof(struct buffer_reg_session)); - if (!reg) { + if (!reg->registry) { PERROR("zmalloc buffer registry pid session"); ret = -ENOMEM; goto error; @@ -247,17 +256,23 @@ int buffer_reg_pid_create(int session_id, struct buffer_reg_pid **regp) /* A cast is done here so we can use the session ID as a u64 ht node. */ reg->session_id = session_id; - + if (shm_path[0]) { + strncpy(reg->shm_path, shm_path, sizeof(reg->shm_path)); + reg->shm_path[sizeof(reg->shm_path) - 1] = '\0'; + DBG3("shm path '%s' is assigned to pid buffer registry for session id %" PRIu64, + reg->shm_path, session_id); + } reg->registry->channels = lttng_ht_new(0, LTTNG_HT_TYPE_U64); if (!reg->registry->channels) { ret = -ENOMEM; goto error_session; } - lttng_ht_node_init_ulong(®->node, reg->session_id); + lttng_ht_node_init_u64(®->node, reg->session_id); *regp = reg; - DBG3("Buffer registry per PID created with session id: %d", session_id); + DBG3("Buffer registry per PID created with session id: %" PRIu64, + session_id); return 0; @@ -275,11 +290,11 @@ void buffer_reg_pid_add(struct buffer_reg_pid *reg) { assert(reg); - DBG3("Buffer registry per PID adding to global registry with id: %d", + DBG3("Buffer registry per PID adding to global registry with id: %" PRIu64, reg->session_id); rcu_read_lock(); - lttng_ht_add_unique_ulong(buffer_registry_pid, ®->node); + lttng_ht_add_unique_u64(buffer_registry_pid, ®->node); rcu_read_unlock(); } @@ -289,17 +304,17 @@ void buffer_reg_pid_add(struct buffer_reg_pid *reg) * * Return the object pointer or NULL on error. */ -struct buffer_reg_pid *buffer_reg_pid_find(int session_id) +struct buffer_reg_pid *buffer_reg_pid_find(uint64_t session_id) { - struct lttng_ht_node_ulong *node; + struct lttng_ht_node_u64 *node; struct lttng_ht_iter iter; struct buffer_reg_pid *reg = NULL; struct lttng_ht *ht = buffer_registry_pid; - DBG3("Buffer registry per PID find id: %d", session_id); + DBG3("Buffer registry per PID find id: %" PRIu64, session_id); - lttng_ht_lookup(ht, (void *)((unsigned long) session_id), &iter); - node = lttng_ht_iter_get_node_ulong(&iter); + lttng_ht_lookup(ht, &session_id, &iter); + node = lttng_ht_iter_get_node_u64(&iter); if (!node) { goto end; } @@ -375,6 +390,7 @@ void buffer_reg_stream_add(struct buffer_reg_stream *stream, pthread_mutex_lock(&channel->stream_list_lock); cds_list_add_tail(&stream->lnode, &channel->streams); + channel->stream_count++; pthread_mutex_unlock(&channel->stream_list_lock); } @@ -502,6 +518,7 @@ void buffer_reg_channel_destroy(struct buffer_reg_channel *regp, /* Wipe stream */ cds_list_for_each_entry_safe(sreg, stmp, ®p->streams, lnode) { cds_list_del(&sreg->lnode); + regp->stream_count--; buffer_reg_stream_destroy(sreg, domain); } @@ -548,7 +565,7 @@ static void buffer_reg_session_destroy(struct buffer_reg_session *regp, } rcu_read_unlock(); - lttng_ht_destroy(regp->channels); + ht_cleanup_push(regp->channels); switch (domain) { case LTTNG_DOMAIN_UST: @@ -593,8 +610,8 @@ static void rcu_free_buffer_reg_uid(struct rcu_head *head) static void rcu_free_buffer_reg_pid(struct rcu_head *head) { - struct lttng_ht_node_ulong *node = - caa_container_of(head, struct lttng_ht_node_ulong, head); + struct lttng_ht_node_u64 *node = + caa_container_of(head, struct lttng_ht_node_u64, head); struct buffer_reg_pid *reg = caa_container_of(node, struct buffer_reg_pid, node); @@ -616,7 +633,7 @@ void buffer_reg_uid_destroy(struct buffer_reg_uid *regp, return; } - DBG3("Buffer registry per UID destroy with id: %d, ABI: %u, uid: %d", + DBG3("Buffer registry per UID destroy with id: %" PRIu64 ", ABI: %u, uid: %d", regp->session_id, regp->bits_per_long, regp->uid); if (!consumer) { @@ -678,7 +695,8 @@ void buffer_reg_pid_destroy(struct buffer_reg_pid *regp) return; } - DBG3("Buffer registry per PID destroy with id: %d", regp->session_id); + DBG3("Buffer registry per PID destroy with id: %" PRIu64, + regp->session_id); /* This registry is only used by UST. */ call_rcu(®p->node.head, rcu_free_buffer_reg_pid); @@ -692,6 +710,6 @@ void buffer_reg_pid_destroy(struct buffer_reg_pid *regp) void buffer_reg_destroy_registries(void) { DBG3("Buffer registry destroy all registry"); - lttng_ht_destroy(buffer_registry_uid); - lttng_ht_destroy(buffer_registry_pid); + ht_cleanup_push(buffer_registry_uid); + ht_cleanup_push(buffer_registry_pid); }