X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=bffceefd92cf3c8a36ce6e7892d8831bebd5979a;hb=aa7102d7b77e8db772ae1656e4435b2ddd67537c;hp=00c6d9622678b63ef2a964fd7067eb4b5719d907;hpb=84ad93e8f5907bff18feac3e174746815b21c6c1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 00c6d9622..bffceefd9 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1446,7 +1446,32 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 	}
 
 	/* If event not enabled, disable it on the tracer */
-	if (ua_event->enabled == 0) {
+	if (ua_event->enabled) {
+		/*
+		 * We now need to explicitly enable the event, since it
+		 * is now disabled at creation.
+		 */
+		ret = enable_ust_event(app, ua_sess, ua_event);
+		if (ret < 0) {
+			/*
+			 * If we hit an EPERM, something is wrong with our enable call. If
+			 * we get an EEXIST, there is a problem on the tracer side since we
+			 * just created it.
+			 */
+			switch (ret) {
+			case -LTTNG_UST_ERR_PERM:
+				/* Code flow problem */
+				assert(0);
+			case -LTTNG_UST_ERR_EXIST:
+				/* It's OK for our use case. */
+				ret = 0;
+				break;
+			default:
+				break;
+			}
+			goto error;
+		}
+	} else {
 		ret = disable_ust_event(app, ua_sess, ua_event);
 		if (ret < 0) {
 			/*
@@ -1552,7 +1577,7 @@ static void shadow_copy_channel(struct ust_app_channel *ua_chan,
 		}
 		lttng_ht_node_init_ulong(&ua_ctx->node,
 				(unsigned long) ua_ctx->ctx.ctx);
-		lttng_ht_add_unique_ulong(ua_chan->ctx, &ua_ctx->node);
+		lttng_ht_add_ulong(ua_chan->ctx, &ua_ctx->node);
 		cds_list_add_tail(&ua_ctx->list, &ua_chan->ctx_list);
 	}
 
@@ -1955,7 +1980,7 @@ int create_ust_app_channel_context(struct ust_app_session *ua_sess,
 	}
 
 	lttng_ht_node_init_ulong(&ua_ctx->node, (unsigned long) ua_ctx->ctx.ctx);
-	lttng_ht_add_unique_ulong(ua_chan->ctx, &ua_ctx->node);
+	lttng_ht_add_ulong(ua_chan->ctx, &ua_ctx->node);
 	cds_list_add_tail(&ua_ctx->list, &ua_chan->ctx_list);
 
 	ret = create_ust_channel_context(ua_chan, ua_ctx, app);
@@ -2953,9 +2978,9 @@ int ust_app_version(struct ust_app *app)
 	ret = ustctl_tracer_version(app->sock, &app->version);
 	if (ret < 0) {
 		if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
-			ERR("UST app %d verson failed with ret %d", app->sock, ret);
+			ERR("UST app %d version failed with ret %d", app->sock, ret);
 		} else {
-			DBG3("UST app %d verion failed. Application is dead", app->sock);
+			DBG3("UST app %d version failed. Application is dead", app->sock);
 		}
 	}
 
@@ -4238,7 +4263,7 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 
 	pthread_mutex_unlock(&ua_sess->lock);
 
-	if (usess->start_trace) {
+	if (usess->active) {
 		ret = ust_app_start_trace(usess, app);
 		if (ret < 0) {
 			goto error;
@@ -4911,28 +4936,19 @@ void ust_app_destroy(struct ust_app *app)
  * Return 0 on success or else a negative value.
  */
 int ust_app_snapshot_record(struct ltt_ust_session *usess,
-		struct snapshot_output *output, int wait, unsigned int nb_streams)
+		struct snapshot_output *output, int wait, uint64_t max_stream_size)
 {
 	int ret = 0;
 	unsigned int snapshot_done = 0;
 	struct lttng_ht_iter iter;
 	struct ust_app *app;
 	char pathname[PATH_MAX];
-	uint64_t max_stream_size = 0;
 
 	assert(usess);
 	assert(output);
 
 	rcu_read_lock();
 
-	/*
-	 * Compute the maximum size of a single stream if a max size is asked by
-	 * the caller.
-	 */
-	if (output->max_size > 0 && nb_streams > 0) {
-		max_stream_size = output->max_size / nb_streams;
-	}
-
 	switch (usess->buffer_type) {
 	case LTTNG_BUFFER_PER_UID:
 	{
@@ -4962,30 +4978,16 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 			/* Add the UST default trace dir to path. */
 			cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
 					reg_chan, node.node) {
-
-				/*
-				 * Make sure the maximum stream size is not lower than the
-				 * subbuffer size or else it's an error since we won't be able to
-				 * snapshot anything.
-				 */
-				if (max_stream_size &&
-						reg_chan->subbuf_size > max_stream_size) {
-					ret = -EINVAL;
-					DBG3("UST app snapshot record maximum stream size %" PRIu64
-							" is smaller than subbuffer size of %zu",
-							max_stream_size, reg_chan->subbuf_size);
-					goto error;
-				}
-				ret = consumer_snapshot_channel(socket, reg_chan->consumer_key, output, 0,
-						usess->uid, usess->gid, pathname, wait,
+				ret = consumer_snapshot_channel(socket, reg_chan->consumer_key,
+						output, 0, usess->uid, usess->gid, pathname, wait,
 						max_stream_size);
 				if (ret < 0) {
 					goto error;
 				}
 			}
-			ret = consumer_snapshot_channel(socket, reg->registry->reg.ust->metadata_key, output,
-					1, usess->uid, usess->gid, pathname, wait,
-					max_stream_size);
+			ret = consumer_snapshot_channel(socket,
+					reg->registry->reg.ust->metadata_key, output, 1,
+					usess->uid, usess->gid, pathname, wait, max_stream_size);
 			if (ret < 0) {
 				goto error;
 			}
@@ -5027,22 +5029,8 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 
 			cds_lfht_for_each_entry(ua_sess->channels->ht, &chan_iter.iter,
 					ua_chan, node.node) {
-				/*
-				 * Make sure the maximum stream size is not lower than the
-				 * subbuffer size or else it's an error since we won't be able to
-				 * snapshot anything.
-				 */
-				if (max_stream_size &&
-						ua_chan->attr.subbuf_size > max_stream_size) {
-					ret = -EINVAL;
-					DBG3("UST app snapshot record maximum stream size %" PRIu64
-							" is smaller than subbuffer size of %" PRIu64,
-							max_stream_size, ua_chan->attr.subbuf_size);
-					goto error;
-				}
-
-				ret = consumer_snapshot_channel(socket, ua_chan->key, output, 0,
-						ua_sess->euid, ua_sess->egid, pathname, wait,
+				ret = consumer_snapshot_channel(socket, ua_chan->key, output,
+						0, ua_sess->euid, ua_sess->egid, pathname, wait,
 						max_stream_size);
 				if (ret < 0) {
 					goto error;