X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=6913487d5611aef301313668612d70370d25d5b8;hp=1990655ef638368955a52b1f705422cc606db20b;hb=3b016e589cc2229f0d3be8e6e61e8eeed8b7e9e6;hpb=da860cab17385f982e501d8a9f8295fe4a24f43d diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c index 1990655ef..6913487d5 100644 --- a/src/bin/lttng-sessiond/ust-registry.c +++ b/src/bin/lttng-sessiond/ust-registry.c @@ -89,14 +89,23 @@ static int compare_enums(const struct ust_registry_enum *reg_enum_a, entries_a = ®_enum_a->entries[i]; entries_b = ®_enum_b->entries[i]; - if (entries_a->start != entries_b->start) { + if (entries_a->start.value != entries_b->start.value) { ret = -1; goto end; } - if (entries_a->end != entries_b->end) { + if (entries_a->end.value != entries_b->end.value) { ret = -1; goto end; } + if (entries_a->start.signedness != entries_b->start.signedness) { + ret = -1; + goto end; + } + if (entries_a->end.signedness != entries_b->end.signedness) { + ret = -1; + goto end; + } + if (strcmp(entries_a->string, entries_b->string)) { ret = -1; goto end; @@ -860,6 +869,8 @@ int ust_registry_session_init(struct ust_registry_session **sessionp, session->uid = euid; session->gid = egid; session->next_enum_id = 0; + session->major = major; + session->minor = minor; strncpy(session->root_shm_path, root_shm_path, sizeof(session->root_shm_path)); session->root_shm_path[sizeof(session->root_shm_path) - 1] = '\0';