Rename sessiond internal "uid" fields to "id"

[lttng-tools.git] / lttng-sessiond / trace-ust.c

diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c
index 1a1304ac1db9a16d0f3cfd5ca05ddbd9fd3cdc37..96f7374f78e37e4fbc1db783c5ee41cf614df722 100644 (file)
--- a/lttng-sessiond/trace-ust.c
+++ b/lttng-sessiond/trace-ust.c
@@ -63,7 +63,7 @@ struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht,
        struct cds_lfht_iter iter;
 
        rcu_read_lock();
-       node = hashtable_lookup(ht, (void *) name, strlen(name), &iter);
+       node = hashtable_lookup(ht, (void *)name, strlen(name), &iter);
        if (node == NULL) {
                rcu_read_unlock();
                goto error;
@@ -84,7 +84,7 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
+struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
                struct lttng_domain *domain)
 {
        int ret;
@@ -98,7 +98,7 @@ struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
        }
 
        /* Init data structure */
-       lus->uid = uid;
+       lus->id = session_id;
        lus->start_trace = 0;
 
        /* Alloc UST domain hash tables */
@@ -158,7 +158,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        }
 
        /* Copy channel name */
-       strncpy(luc->name, chan->name, sizeof(&luc->name));
+       strncpy(luc->name, chan->name, sizeof(luc->name));
        luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
        /* Init node */
@@ -212,6 +212,9 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        case LTTNG_EVENT_TRACEPOINT:
                lue->attr.instrumentation = LTTNG_UST_TRACEPOINT;
                break;
+       case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+               lue->attr.instrumentation = LTTNG_UST_TRACEPOINT_LOGLEVEL;
+               break;
        default:
                ERR("Unknown ust instrumentation type (%d)", ev->type);
                goto error_free_event;
@@ -504,7 +507,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
        rcu_read_lock();
 
-       DBG2("Trace UST destroy session %d", session->uid);
+       DBG2("Trace UST destroy session %d", session->id);
 
        /* Cleaning up UST domain */
        destroy_domain_global(&session->domain_global);