X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=030358241f663548265493bd2459c00977be0013;hb=df0f840ba686e3fe670c9906fd46330fff65da07;hp=a822071400c84938a3b7c19b68f3f8cb09f626a7;hpb=4466912fc280873b6432973b287a48bf9c959b6c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index a82207140..030358241 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -393,7 +393,7 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan,
 
 	ua_ctx->handle = ua_ctx->obj->handle;
 
-	DBG2("UST app context added to channel %s successfully", ua_chan->name);
+	DBG2("UST app context created successfully for channel %s", ua_chan->name);
 
 error:
 	return ret;
@@ -416,7 +416,7 @@ int create_ust_event_context(struct ust_app_event *ua_event,
 
 	ua_ctx->handle = ua_ctx->obj->handle;
 
-	DBG2("UST app context added to event %s successfully", ua_event->name);
+	DBG2("UST app context created successfully for event %s", ua_event->name);
 
 error:
 	return ret;
@@ -865,6 +865,8 @@ static struct ust_app_session *create_ust_app_session(
 		ret = ustctl_create_session(app->key.sock);
 		if (ret < 0) {
 			ERR("Creating session for app pid %d", app->key.pid);
+			/* This means that the tracer is gone... */
+			ua_sess = (void*) -1UL;
 			goto error;
 		}
 
@@ -1275,6 +1277,13 @@ int ust_app_register(struct ust_register_msg *msg, int sock)
 		close(sock);
 		return -EINVAL;
 	}
+	if (msg->major != LTTNG_UST_COMM_MAJOR) {
+		ERR("Registration failed: application \"%s\" (pid: %d) has "
+			"communication protocol version %u.%u, but sessiond supports 2.x.\n",
+			msg->name, msg->pid, msg->major, msg->minor);
+		close(sock);
+		return -EINVAL;
+	}
 	lta = zmalloc(sizeof(struct ust_app));
 	if (lta == NULL) {
 		PERROR("malloc");
@@ -1420,8 +1429,7 @@ int ust_app_list_events(struct lttng_event **events)
 				}
 			}
 			memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN);
-			memcpy(tmp[count].loglevel, uiter.loglevel, LTTNG_UST_SYM_NAME_LEN);
-			tmp[count].loglevel_value = uiter.loglevel_value;
+			tmp[count].loglevel = uiter.loglevel;
 			tmp[count].type = LTTNG_UST_TRACEPOINT;
 			tmp[count].pid = app->key.pid;
 			tmp[count].enabled = -1;
@@ -1751,8 +1759,11 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		 */
 		ua_sess = create_ust_app_session(usess, app);
 		if (ua_sess == NULL) {
-			/* Major problem here and it's maybe the tracer or malloc() */
+			/* The malloc() failed. */
 			goto error;
+		} else if (ua_sess == (void *) -1UL) {
+			/* The application's socket is not valid. Contiuing */
+			continue;
 		}
 
 		/* Create channel onto application */
@@ -1924,6 +1935,9 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		goto skip_setup;
 	}
 
+	/* Indicate that the session has been started once */
+	ua_sess->started = 1;
+
 	ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
 	if (ret < 0) {
 		goto error_rcu_unlock;
@@ -1980,7 +1994,6 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 	if (ret < 0) {
 		goto error_rcu_unlock;
 	}
-	ua_sess->started = 1;
 
 skip_setup:
 	/* This start the UST tracing */
@@ -2026,10 +2039,12 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		goto error_rcu_unlock;
 	}
 
-	/* Not started, continuing. */
-	if (ua_sess->started == 0) {
-		goto end;
-	}
+	/*
+	 * If started = 0, it means that stop trace has been called for a session
+	 * that was never started. This is a code flow error and should never
+	 * happen.
+	 */
+	assert(ua_sess->started == 1);
 
 	/* This inhibits UST tracing */
 	ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
@@ -2060,8 +2075,6 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 				ret);
 	}
 
-	ua_sess->started = 0;
-
 end:
 	rcu_read_unlock();
 	return 0;
@@ -2203,11 +2216,12 @@ int ust_app_destroy_trace_all(struct ltt_ust_session *usess)
 void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 {
 	int ret = 0;
-	struct lttng_ht_iter iter, uiter;
+	struct lttng_ht_iter iter, uiter, iter_ctx;
 	struct ust_app *app;
 	struct ust_app_session *ua_sess;
 	struct ust_app_channel *ua_chan;
 	struct ust_app_event *ua_event;
+	struct ust_app_ctx *ua_ctx;
 
 	if (usess == NULL) {
 		ERR("No UST session on global update. Returning");
@@ -2247,6 +2261,16 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 			continue;
 		}
 
+		cds_lfht_for_each_entry(ua_chan->ctx->ht, &iter_ctx.iter, ua_ctx,
+				node.node) {
+			ret = create_ust_channel_context(ua_chan, ua_ctx, app);
+			if (ret < 0) {
+				/* FIXME: Should we quit here or continue... */
+				continue;
+			}
+		}
+
+
 		/* For each events */
 		cds_lfht_for_each_entry(ua_chan->events->ht, &uiter.iter, ua_event,
 				node.node) {
@@ -2255,6 +2279,16 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 				/* FIXME: Should we quit here or continue... */
 				continue;
 			}
+
+			/* Add context on events. */
+			cds_lfht_for_each_entry(ua_event->ctx->ht, &iter_ctx.iter,
+					ua_ctx, node.node) {
+				ret = create_ust_event_context(ua_event, ua_ctx, app);
+				if (ret < 0) {
+					/* FIXME: Should we quit here or continue... */
+					continue;
+				}
+			}
 		}
 	}