From: Mathieu Desnoyers Date: Tue, 20 Dec 2011 18:12:30 +0000 (-0500) Subject: Rename sessiond internal "uid" fields to "id" X-Git-Tag: v2.0-pre16~13 X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=a991f516ac2783c833ebbc6ac0ac3c0e4ca71371;hp=f56a39affe149956ac64b399859952e9586de930;p=lttng-tools.git Rename sessiond internal "uid" fields to "id" Ensure we don't confuse "user ID" (UID) and session unique ID (session_id or id). Signed-off-by: Mathieu Desnoyers --- diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c index dc43edb4d..759b276a6 100644 --- a/lttng-sessiond/main.c +++ b/lttng-sessiond/main.c @@ -1874,7 +1874,6 @@ static int create_ust_session(struct ltt_session *session, struct lttng_domain *domain, struct ucred *creds) { int ret; - unsigned int sess_uid; gid_t gid; struct ltt_ust_session *lus = NULL; @@ -1888,8 +1887,7 @@ static int create_ust_session(struct ltt_session *session, DBG("Creating UST session"); - sess_uid = session->uid; - lus = trace_ust_create_session(session->path, sess_uid, domain); + lus = trace_ust_create_session(session->path, session->id, domain); if (lus == NULL) { ret = LTTCOMM_UST_SESS_FAIL; goto error; diff --git a/lttng-sessiond/session.c b/lttng-sessiond/session.c index bf16f76cb..30ae681b3 100644 --- a/lttng-sessiond/session.c +++ b/lttng-sessiond/session.c @@ -216,10 +216,10 @@ int session_create(char *name, char *path) /* Add new session to the session list */ session_lock_list(); - new_session->uid = add_session_list(new_session); + new_session->id = add_session_list(new_session); session_unlock_list(); - DBG("Tracing session %s created in %s with UID %d", name, path, new_session->uid); + DBG("Tracing session %s created in %s with ID %d", name, path, new_session->id); return LTTCOMM_OK; diff --git a/lttng-sessiond/session.h b/lttng-sessiond/session.h index 9d8bd32aa..fd164007f 100644 --- a/lttng-sessiond/session.h +++ b/lttng-sessiond/session.h @@ -68,7 +68,7 @@ struct ltt_session { pthread_mutex_t lock; struct cds_list_head list; int enabled; /* enabled/started flag */ - int uid; + int id; /* session unique identifier */ }; /* Prototypes */ diff --git a/lttng-sessiond/trace-ust.c b/lttng-sessiond/trace-ust.c index 8fd144b6b..96f7374f7 100644 --- a/lttng-sessiond/trace-ust.c +++ b/lttng-sessiond/trace-ust.c @@ -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 */ @@ -507,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); diff --git a/lttng-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h index e834d2f6e..a2ed3cb91 100644 --- a/lttng-sessiond/trace-ust.h +++ b/lttng-sessiond/trace-ust.h @@ -99,7 +99,7 @@ struct ltt_ust_domain_exec { /* UST session */ struct ltt_ust_session { - int uid; /* Unique identifier of session */ + int id; /* Unique identifier of session */ int start_trace; char pathname[PATH_MAX]; struct ltt_ust_domain_global domain_global; @@ -125,7 +125,7 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct cds_lfht *ht, /* * Create functions malloc() the data structure. */ -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); struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr, char *path); diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c index 2ea8e1436..1b5d6fbf1 100644 --- a/lttng-sessiond/ust-app.c +++ b/lttng-sessiond/ust-app.c @@ -769,7 +769,7 @@ static void shadow_copy_session(struct ust_app_session *ua_sess, DBG2("Shadow copy of session handle %d", ua_sess->handle); - ua_sess->uid = usess->uid; + ua_sess->id = usess->id; ret = snprintf(ua_sess->path, PATH_MAX, "%s/%s-%d-%s", @@ -817,13 +817,13 @@ void __lookup_session_by_app(struct ltt_ust_session *usess, { /* Get right UST app session from app */ (void) hashtable_lookup(app->sessions, - (void *) ((unsigned long) usess->uid), sizeof(void *), + (void *) ((unsigned long) usess->id), sizeof(void *), iter); } /* * Return ust app session from the app session hashtable using the UST session - * uid. + * id. */ static struct ust_app_session *lookup_session_by_app( struct ltt_ust_session *usess, struct ust_app *app) @@ -857,8 +857,8 @@ static struct ust_app_session *create_ust_app_session( ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { - DBG2("UST app pid: %d session uid %d not found, creating it", - app->key.pid, usess->uid); + DBG2("UST app pid: %d session id %d not found, creating it", + app->key.pid, usess->id); ua_sess = alloc_ust_app_session(); if (ua_sess == NULL) { /* Only malloc can failed so something is really wrong */ @@ -881,7 +881,7 @@ static struct ust_app_session *create_ust_app_session( /* Add ust app session to app's HT */ hashtable_node_init(&ua_sess->node, - (void *)((unsigned long) ua_sess->uid), sizeof(void *)); + (void *)((unsigned long) ua_sess->id), sizeof(void *)); hashtable_add_unique(app->sessions, &ua_sess->node); DBG2("UST app session created successfully with handle %d", ret); @@ -1050,8 +1050,8 @@ static int enable_ust_app_channel(struct ust_app_session *ua_sess, ua_chan_node = hashtable_lookup(ua_sess->channels, (void *)uchan->name, strlen(uchan->name), &iter); if (ua_chan_node == NULL) { - DBG2("Unable to find channel %s in ust session uid %u", - uchan->name, ua_sess->uid); + DBG2("Unable to find channel %s in ust session id %u", + uchan->name, ua_sess->id); goto error; } @@ -1082,8 +1082,8 @@ static struct ust_app_channel *create_ust_app_channel( ua_chan_node = hashtable_lookup(ua_sess->channels, (void *)uchan->name, strlen(uchan->name), &iter); if (ua_chan_node == NULL) { - DBG2("Unable to find channel %s in ust session uid %u", - uchan->name, ua_sess->uid); + DBG2("Unable to find channel %s in ust session id %u", + uchan->name, ua_sess->id); ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr); if (ua_chan == NULL) { goto error; @@ -1478,8 +1478,8 @@ int ust_app_disable_channel_glb(struct ltt_ust_session *usess, goto error; } - DBG2("UST app disabling channel %s from global domain for session uid %d", - uchan->name, usess->uid); + DBG2("UST app disabling channel %s from global domain for session id %d", + uchan->name, usess->id); rcu_read_lock(); @@ -1533,8 +1533,8 @@ int ust_app_enable_channel_glb(struct ltt_ust_session *usess, goto error; } - DBG2("UST app enabling channel %s to global domain for session uid %d", - uchan->name, usess->uid); + DBG2("UST app enabling channel %s to global domain for session id %d", + uchan->name, usess->id); rcu_read_lock(); @@ -1574,7 +1574,7 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, struct ust_app_event *ua_event; DBG("UST app disabling event %s for all apps in channel " - "%s for session uid %d", uevent->attr.name, uchan->name, usess->uid); + "%s for session id %d", uevent->attr.name, uchan->name, usess->id); rcu_read_lock(); @@ -1592,8 +1592,8 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, ua_chan_node = hashtable_lookup(ua_sess->channels, (void *)uchan->name, strlen(uchan->name), &uiter); if (ua_chan_node == NULL) { - DBG2("Channel %s not found in session uid %d for app pid %d." - "Skipping", uchan->name, usess->uid, app->key.pid); + DBG2("Channel %s not found in session id %d for app pid %d." + "Skipping", uchan->name, usess->id, app->key.pid); continue; } ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); @@ -1635,7 +1635,7 @@ int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, struct ust_app_event *ua_event; DBG("UST app disabling all event for all apps in channel " - "%s for session uid %d", uchan->name, usess->uid); + "%s for session id %d", uchan->name, usess->id); rcu_read_lock(); @@ -1688,8 +1688,8 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, goto error; } - DBG2("UST app adding channel %s to global domain for session uid %d", - uchan->name, usess->uid); + DBG2("UST app adding channel %s to global domain for session id %d", + uchan->name, usess->id); rcu_read_lock(); @@ -1732,8 +1732,8 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, struct ust_app_channel *ua_chan; struct ust_app_event *ua_event; - DBG("UST app enabling event %s for all apps for session uid %d", - uevent->attr.name, usess->uid); + DBG("UST app enabling event %s for all apps for session id %d", + uevent->attr.name, usess->id); /* * NOTE: At this point, this function is called only if the session and @@ -1793,8 +1793,8 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; - DBG("UST app creating event %s for all apps for session uid %d", - uevent->attr.name, usess->uid); + DBG("UST app creating event %s for all apps for session id %d", + uevent->attr.name, usess->id); /* * NOTE: At this point, this function is called only if the session and @@ -2130,8 +2130,8 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) goto error; } - DBG2("UST app global update for app sock %d for session uid %d", sock, - usess->uid); + DBG2("UST app global update for app sock %d for session id %d", sock, + usess->id); rcu_read_lock(); diff --git a/lttng-sessiond/ust-app.h b/lttng-sessiond/ust-app.h index a5ae56a21..00a421864 100644 --- a/lttng-sessiond/ust-app.h +++ b/lttng-sessiond/ust-app.h @@ -88,8 +88,8 @@ struct ust_app_session { int enabled; /* started: has the session been in started state at any time ? */ int started; /* allows detection of start vs restart. */ - int handle; /* Used has unique identifier */ - unsigned int uid; + int handle; /* used has unique identifier for app session */ + int id; /* session unique identifier */ struct ltt_ust_metadata *metadata; struct cds_lfht *channels; /* Registered channels */ struct cds_lfht_node node;