Fix: sessiond: no rotation performed from null chunk to new chunk

[lttng-tools.git] / src / bin / lttng-sessiond / ust-registry.c

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index d63c750087249ff67c7547eaf74179f0700c8132..4d4094e7361836c5617e42eb61ecea84d56e1ba1 100644 (file)
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -25,17 +25,20 @@
 
 #include "ust-registry.h"
 #include "ust-app.h"
+#include "ust-field-utils.h"
 #include "utils.h"
 #include "lttng-sessiond.h"
 #include "notification-thread-commands.h"
 
+
 /*
  * Hash table match function for event in the registry.
  */
 static int ht_match_event(struct cds_lfht_node *node, const void *_key)
 {
-       struct ust_registry_event *event;
        const struct ust_registry_event *key;
+       struct ust_registry_event *event;
+       int i;
 
        assert(node);
        assert(_key);
@@ -44,17 +47,39 @@ static int ht_match_event(struct cds_lfht_node *node, const void *_key)
        assert(event);
        key = _key;
 
-       /* It has to be a perfect match. */
+       /* It has to be a perfect match. First, compare the event names. */
        if (strncmp(event->name, key->name, sizeof(event->name))) {
                goto no_match;
        }
 
-       /* It has to be a perfect match. */
-       if (strncmp(event->signature, key->signature,
-                       strlen(event->signature))) {
+       /* Compare log levels. */
+       if (event->loglevel_value != key->loglevel_value) {
                goto no_match;
        }
 
+       /* Compare the number of fields. */
+       if (event->nr_fields != key->nr_fields) {
+               goto no_match;
+       }
+
+       /* Compare each field individually. */
+       for (i = 0; i < event->nr_fields; i++) {
+               if (!match_ustctl_field(&event->fields[i], &key->fields[i])) {
+                       goto no_match;
+               }
+       }
+
+       /* Compare model URI. */
+       if (event->model_emf_uri != NULL && key->model_emf_uri == NULL) {
+               goto no_match;
+       } else if(event->model_emf_uri == NULL && key->model_emf_uri != NULL) {
+               goto no_match;
+       } else if (event->model_emf_uri != NULL && key->model_emf_uri != NULL) {
+               if (strcmp(event->model_emf_uri, key->model_emf_uri)) {
+                       goto no_match;
+               }
+       }
+
        /* Match */
        return 1;
 
@@ -62,17 +87,16 @@ no_match:
        return 0;
 }
 
-static unsigned long ht_hash_event(void *_key, unsigned long seed)
+static unsigned long ht_hash_event(const void *_key, unsigned long seed)
 {
-       uint64_t xored_key;
-       struct ust_registry_event *key = _key;
+       uint64_t hashed_key;
+       const struct ust_registry_event *key = _key;
 
        assert(key);
 
-       xored_key = (uint64_t) (hash_key_str(key->name, seed) ^
-                       hash_key_str(key->signature, seed));
+       hashed_key = (uint64_t) hash_key_str(key->name, seed);
 
-       return hash_key_u64(&xored_key, seed);
+       return hash_key_u64(&hashed_key, seed);
 }
 
 static int compare_enums(const struct ust_registry_enum *reg_enum_a,
@@ -534,8 +558,8 @@ struct ust_registry_enum *
        struct lttng_ht_iter iter;
 
        cds_lfht_lookup(session->enums->ht,
-                       ht_hash_enum((void *) &reg_enum_lookup, lttng_ht_seed),
-                       ht_match_enum, &reg_enum_lookup, &iter.iter);
+                       ht_hash_enum((void *) reg_enum_lookup, lttng_ht_seed),
+                       ht_match_enum, reg_enum_lookup, &iter.iter);
        node = lttng_ht_iter_get_node_str(&iter);
        if (!node) {
                goto end;
@@ -856,7 +880,9 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
                const char *root_shm_path,
                const char *shm_path,
                uid_t euid,
-               gid_t egid)
+               gid_t egid,
+               uint64_t tracing_id,
+               uid_t tracing_uid)
 {
        int ret;
        struct ust_registry_session *session;
@@ -938,6 +964,9 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
                goto error;
        }
 
+       session->tracing_id = tracing_id;
+       session->tracing_uid = tracing_uid;
+
        pthread_mutex_lock(&session->lock);
        ret = ust_metadata_session_statedump(session, app, major, minor);
        pthread_mutex_unlock(&session->lock);
@@ -1007,7 +1036,8 @@ void ust_registry_session_destroy(struct ust_registry_session *reg)
                 * Try deleting the directory hierarchy.
                 */
                (void) run_as_rmdir_recursive(reg->root_shm_path,
-                               reg->uid, reg->gid);
+                               reg->uid, reg->gid,
+                               LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG);
        }
        /* Destroy the enum hash table */
        if (reg->enums) {