X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=d8adccde214925f2f9cd68d20ef65dadc3617951;hp=7e263a7636f9188f492131a0824b2b4b127f4a89;hb=7cc9a73c638bff0a86d7ea802ebd7fa3b4716ca9;hpb=b0a5f0fbc428de5cd15a5c86f95a12f32e8c3c88

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 7e263a763..d8adccde2 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -34,7 +34,7 @@
 
 #include "buffer-registry.h"
 #include "fd-limit.h"
-#include "health.h"
+#include "health-sessiond.h"
 #include "ust-app.h"
 #include "ust-consumer.h"
 #include "ust-ctl.h"
@@ -104,7 +104,7 @@ static int ht_match_ust_app_event(struct cds_lfht_node *node, const void *_key)
 	event = caa_container_of(node, struct ust_app_event, node.node);
 	key = _key;
 
-	/* Match the 3 elements of the key: name, filter and loglevel. */
+	/* Match the 4 elements of the key: name, filter, loglevel, exclusions */
 
 	/* Event name */
 	if (strncmp(event->attr.name, key->name, sizeof(event->attr.name)) != 0) {
@@ -140,6 +140,21 @@ static int ht_match_ust_app_event(struct cds_lfht_node *node, const void *_key)
 		}
 	}
 
+	/* One of the exclusions is NULL, fail. */
+	if ((key->exclusion && !event->exclusion) || (!key->exclusion && event->exclusion)) {
+		goto no_match;
+	}
+
+	if (key->exclusion && event->exclusion) {
+		/* Both exclusions exists, check count followed by the names. */
+		if (event->exclusion->count != key->exclusion->count ||
+				memcmp(event->exclusion->names, key->exclusion->names,
+					event->exclusion->count * LTTNG_UST_SYM_NAME_LEN) != 0) {
+			goto no_match;
+		}
+	}
+
+
 	/* Match. */
 	return 1;
 
@@ -166,6 +181,7 @@ static void add_unique_ust_app_event(struct ust_app_channel *ua_chan,
 	key.name = event->attr.name;
 	key.filter = event->filter;
 	key.loglevel = event->attr.loglevel;
+	key.exclusion = event->exclusion;
 
 	node_ptr = cds_lfht_add_unique(ht->ht,
 			ht->hash_fct(event->node.key, lttng_ht_seed),
@@ -271,7 +287,8 @@ void delete_ust_app_event(int sock, struct ust_app_event *ua_event)
 	assert(ua_event);
 
 	free(ua_event->filter);
-
+	if (ua_event->exclusion != NULL)
+		free(ua_event->exclusion);
 	if (ua_event->obj != NULL) {
 		ret = ustctl_release_object(sock, ua_event->obj);
 		if (ret < 0 && ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
@@ -364,6 +381,7 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
 
 	/* Wipe context */
 	cds_lfht_for_each_entry(ua_chan->ctx->ht, &iter.iter, ua_ctx, node.node) {
+		cds_list_del(&ua_ctx->list);
 		ret = lttng_ht_del(ua_chan->ctx, &iter);
 		assert(!ret);
 		delete_ust_app_ctx(sock, ua_ctx);
@@ -825,6 +843,7 @@ struct ust_app_channel *alloc_ust_app_channel(char *name,
 	lttng_ht_node_init_str(&ua_chan->node, ua_chan->name);
 
 	CDS_INIT_LIST_HEAD(&ua_chan->streams.head);
+	CDS_INIT_LIST_HEAD(&ua_chan->ctx_list);
 
 	/* Copy attributes */
 	if (attr) {
@@ -916,6 +935,8 @@ struct ust_app_ctx *alloc_ust_app_ctx(struct lttng_ust_context *uctx)
 		goto error;
 	}
 
+	CDS_INIT_LIST_HEAD(&ua_ctx->list);
+
 	if (uctx) {
 		memcpy(&ua_ctx->ctx, uctx, sizeof(ua_ctx->ctx));
 	}
@@ -953,8 +974,7 @@ error:
  * Find an ust_app using the sock and return it. RCU read side lock must be
  * held before calling this helper function.
  */
-static
-struct ust_app *find_app_by_sock(int sock)
+struct ust_app *ust_app_find_by_sock(int sock)
 {
 	struct lttng_ht_node_ulong *node;
 	struct lttng_ht_iter iter;
@@ -1002,7 +1022,8 @@ error:
  * Return an ust_app_event object or NULL on error.
  */
 static struct ust_app_event *find_ust_app_event(struct lttng_ht *ht,
-		char *name, struct lttng_ust_filter_bytecode *filter, int loglevel)
+		char *name, struct lttng_ust_filter_bytecode *filter, int loglevel,
+		const struct lttng_event_exclusion *exclusion)
 {
 	struct lttng_ht_iter iter;
 	struct lttng_ht_node_str *node;
@@ -1016,6 +1037,8 @@ static struct ust_app_event *find_ust_app_event(struct lttng_ht *ht,
 	key.name = name;
 	key.filter = filter;
 	key.loglevel = loglevel;
+	/* lttng_event_exclusion and lttng_ust_event_exclusion structures are similar */
+	key.exclusion = (struct lttng_ust_event_exclusion *)exclusion;
 
 	/* Lookup using the event name as hash and a custom match fct. */
 	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
@@ -1051,6 +1074,12 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan,
 			ERR("UST app create channel context failed for app (pid: %d) "
 					"with ret %d", app->pid, ret);
 		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
 			DBG3("UST app disable event failed. Application is dead.");
 		}
 		goto error;
@@ -1089,6 +1118,12 @@ int set_ust_event_filter(struct ust_app_event *ua_event,
 			ERR("UST app event %s filter failed for app (pid: %d) "
 					"with ret %d", ua_event->attr.name, app->pid, ret);
 		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
 			DBG3("UST app filter event failed. Application is dead.");
 		}
 		goto error;
@@ -1101,6 +1136,47 @@ error:
 	return ret;
 }
 
+/*
+ * Set event exclusions on the tracer.
+ */
+static
+int set_ust_event_exclusion(struct ust_app_event *ua_event,
+		struct ust_app *app)
+{
+	int ret;
+
+	health_code_update();
+
+	if (!ua_event->exclusion || !ua_event->exclusion->count) {
+		ret = 0;
+		goto error;
+	}
+
+	ret = ustctl_set_exclusion(app->sock, ua_event->exclusion,
+			ua_event->obj);
+	if (ret < 0) {
+		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
+			ERR("UST app event %s exclusions failed for app (pid: %d) "
+					"with ret %d", ua_event->attr.name, app->pid, ret);
+		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
+			DBG3("UST app event exclusion failed. Application is dead.");
+		}
+		goto error;
+	}
+
+	DBG2("UST exclusion set successfully for event %s", ua_event->name);
+
+error:
+	health_code_update();
+	return ret;
+}
+
 /*
  * Disable the specified event on to UST tracer for the UST session.
  */
@@ -1118,6 +1194,12 @@ static int disable_ust_event(struct ust_app *app,
 					"and session handle %d with ret %d",
 					ua_event->attr.name, app->pid, ua_sess->handle, ret);
 		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
 			DBG3("UST app disable event failed. Application is dead.");
 		}
 		goto error;
@@ -1148,6 +1230,12 @@ static int disable_ust_channel(struct ust_app *app,
 					"and session handle %d with ret %d",
 					ua_chan->name, app->pid, ua_sess->handle, ret);
 		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
 			DBG3("UST app disable channel failed. Application is dead.");
 		}
 		goto error;
@@ -1178,6 +1266,12 @@ static int enable_ust_channel(struct ust_app *app,
 					"and session handle %d with ret %d",
 					ua_chan->name, app->pid, ua_sess->handle, ret);
 		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
 			DBG3("UST app enable channel failed. Application is dead.");
 		}
 		goto error;
@@ -1210,6 +1304,12 @@ static int enable_ust_event(struct ust_app *app,
 					"and session handle %d with ret %d",
 					ua_event->attr.name, app->pid, ua_sess->handle, ret);
 		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
 			DBG3("UST app enable event failed. Application is dead.");
 		}
 		goto error;
@@ -1290,6 +1390,12 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 			ERR("Error ustctl create event %s for app pid: %d with ret %d",
 					ua_event->attr.name, app->pid, ret);
 		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
 			DBG3("UST app create event failed. Application is dead.");
 		}
 		goto error;
@@ -1310,6 +1416,14 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 		}
 	}
 
+	/* Set exclusions for the event */
+	if (ua_event->exclusion) {
+		ret = set_ust_event_exclusion(ua_event, app);
+		if (ret < 0) {
+			goto error;
+		}
+	}
+
 	/* If event not enabled, disable it on the tracer */
 	if (ua_event->enabled == 0) {
 		ret = disable_ust_event(app, ua_sess, ua_event);
@@ -1345,6 +1459,8 @@ error:
 static void shadow_copy_event(struct ust_app_event *ua_event,
 		struct ltt_ust_event *uevent)
 {
+	size_t exclusion_alloc_size;
+
 	strncpy(ua_event->name, uevent->attr.name, sizeof(ua_event->name));
 	ua_event->name[sizeof(ua_event->name) - 1] = '\0';
 
@@ -1358,6 +1474,16 @@ static void shadow_copy_event(struct ust_app_event *ua_event,
 		ua_event->filter = alloc_copy_ust_app_filter(uevent->filter);
 		/* Filter might be NULL here in case of ENONEM. */
 	}
+
+	/* Copy exclusion data */
+	if (uevent->exclusion) {
+		exclusion_alloc_size = sizeof(struct lttng_ust_event_exclusion) +
+				LTTNG_UST_SYM_NAME_LEN * uevent->exclusion->count;
+		ua_event->exclusion = zmalloc(exclusion_alloc_size);
+		if (ua_event->exclusion) {
+			memcpy(ua_event->exclusion, uevent->exclusion, exclusion_alloc_size);
+		}
+	}
 }
 
 /*
@@ -1395,7 +1521,7 @@ static void shadow_copy_channel(struct ust_app_channel *ua_chan,
 	ua_chan->enabled = uchan->enabled;
 	ua_chan->tracing_channel_id = uchan->id;
 
-	cds_lfht_for_each_entry(uchan->ctx->ht, &iter.iter, uctx, node.node) {
+	cds_list_for_each_entry(uctx, &uchan->ctx_list, list) {
 		ua_ctx = alloc_ust_app_ctx(&uctx->ctx);
 		if (ua_ctx == NULL) {
 			continue;
@@ -1403,12 +1529,13 @@ 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);
+		cds_list_add_tail(&ua_ctx->list, &ua_chan->ctx_list);
 	}
 
 	/* Copy all events from ltt ust channel to ust app channel */
 	cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
 		ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
-				uevent->filter, uevent->attr.loglevel);
+				uevent->filter, uevent->attr.loglevel, uevent->exclusion);
 		if (ua_event == NULL) {
 			DBG2("UST event %s not found on shadow copy channel",
 					uevent->attr.name);
@@ -1457,6 +1584,7 @@ static void shadow_copy_session(struct ust_app_session *ua_sess,
 	/* There is only one consumer object per session possible. */
 	ua_sess->consumer = usess->consumer;
 	ua_sess->output_traces = usess->output_traces;
+	ua_sess->live_timer_interval = usess->live_timer_interval;
 
 	switch (ua_sess->buffer_type) {
 	case LTTNG_BUFFER_PER_PID:
@@ -1727,6 +1855,13 @@ static int create_ust_app_session(struct ltt_ust_session *usess,
 						app->pid, ret);
 			} else {
 				DBG("UST app creating session failed. Application is dead");
+				/*
+				 * This is normal behavior, an application can die during the
+				 * creation process. Don't report an error so the execution can
+				 * continue normally. This will get flagged ENOTCONN and the
+				 * caller will handle it.
+				 */
+				ret = 0;
 			}
 			delete_ust_app_session(-1, ua_sess, app);
 			if (ret != -ENOMEM) {
@@ -1795,6 +1930,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);
+	cds_list_add_tail(&ua_ctx->list, &ua_chan->ctx_list);
 
 	ret = create_ust_channel_context(ua_chan, ua_ctx, app);
 	if (ret < 0) {
@@ -2512,7 +2648,7 @@ int create_ust_app_event(struct ust_app_session *ua_sess,
 
 	/* Get event node */
 	ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
-			uevent->filter, uevent->attr.loglevel);
+			uevent->filter, uevent->attr.loglevel, uevent->exclusion);
 	if (ua_event != NULL) {
 		ret = -EEXIST;
 		goto end;
@@ -2994,6 +3130,12 @@ int ust_app_list_events(struct lttng_event **events)
 							app->sock, ret);
 				} else {
 					DBG3("UST app tp list get failed. Application is dead");
+					/*
+					 * This is normal behavior, an application can die during the
+					 * creation process. Don't report an error so the execution can
+					 * continue normally. Continue normal execution.
+					 */
+					break;
 				}
 				goto rcu_error;
 			}
@@ -3088,6 +3230,12 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 							app->sock, ret);
 				} else {
 					DBG3("UST app tp list field failed. Application is dead");
+					/*
+					 * This is normal behavior, an application can die during the
+					 * creation process. Don't report an error so the execution can
+					 * continue normally.
+					 */
+					break;
 				}
 				goto rcu_error;
 			}
@@ -3558,7 +3706,7 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess,
 
 		/* Get event node */
 		ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
-				uevent->filter, uevent->attr.loglevel);
+				uevent->filter, uevent->attr.loglevel, uevent->exclusion);
 		if (ua_event == NULL) {
 			DBG3("UST app enable event %s not found for app PID %d."
 					"Skipping app", uevent->attr.name, app->pid);
@@ -3703,6 +3851,13 @@ skip_setup:
 					app->pid, ret);
 		} else {
 			DBG("UST app start session failed. Application is dead.");
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			pthread_mutex_unlock(&ua_sess->lock);
+			goto end;
 		}
 		goto error_unlock;
 	}
@@ -3778,6 +3933,12 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 					app->pid, ret);
 		} else {
 			DBG("UST app stop session failed. Application is dead.");
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			goto end_unlock;
 		}
 		goto error_rcu_unlock;
 	}
@@ -3801,6 +3962,7 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		(void) push_metadata(registry, ua_sess->consumer);
 	}
 
+end_unlock:
 	pthread_mutex_unlock(&ua_sess->lock);
 end_no_session:
 	rcu_read_unlock();
@@ -3855,8 +4017,11 @@ int ust_app_flush_trace(struct ltt_ust_session *usess, struct ust_app *app)
 			} else {
 				DBG3("UST app failed to flush %s. Application is dead.",
 						ua_chan->name);
-				/* No need to continue. */
-				break;
+				/*
+				 * This is normal behavior, an application can die during the
+				 * creation process. Don't report an error so the execution can
+				 * continue normally.
+				 */
 			}
 			/* Continuing flushing all buffers */
 			continue;
@@ -4052,7 +4217,7 @@ 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, iter_ctx;
+	struct lttng_ht_iter iter, uiter;
 	struct ust_app *app;
 	struct ust_app_session *ua_sess = NULL;
 	struct ust_app_channel *ua_chan;
@@ -4067,7 +4232,7 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 
 	rcu_read_lock();
 
-	app = find_app_by_sock(sock);
+	app = ust_app_find_by_sock(sock);
 	if (app == NULL) {
 		/*
 		 * Application can be unregistered before so this is possible hence
@@ -4124,8 +4289,11 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 			}
 		}
 
-		cds_lfht_for_each_entry(ua_chan->ctx->ht, &iter_ctx.iter, ua_ctx,
-				node.node) {
+		/*
+		 * Add context using the list so they are enabled in the same order the
+		 * user added them.
+		 */
+		cds_list_for_each_entry(ua_ctx, &ua_chan->ctx_list, list) {
 			ret = create_ust_channel_context(ua_chan, ua_ctx, app);
 			if (ret < 0) {
 				goto error_unlock;
@@ -4264,7 +4432,7 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess,
 	ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
 
 	ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name,
-			uevent->filter, uevent->attr.loglevel);
+			uevent->filter, uevent->attr.loglevel, uevent->exclusion);
 	if (ua_event == NULL) {
 		ret = create_ust_app_event(ua_sess, ua_chan, uevent, app);
 		if (ret < 0) {
@@ -4655,7 +4823,8 @@ static int add_event_ust_registry(int sock, int sobjd, int cobjd, char *name,
 	 */
 	ret_code = ust_registry_create_event(registry, chan_reg_key,
 			sobjd, cobjd, name, sig, nr_fields, fields, loglevel,
-			model_emf_uri, ua_sess->buffer_type, &event_id);
+			model_emf_uri, ua_sess->buffer_type, &event_id,
+			app);
 
 	/*
 	 * The return value is returned to ustctl so in case of an error, the
@@ -4940,7 +5109,7 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 						reg_chan->subbuf_size > max_stream_size) {
 					ret = -EINVAL;
 					DBG3("UST app snapshot record maximum stream size %" PRIu64
-							" is smaller than subbuffer size of %" PRIu64,
+							" is smaller than subbuffer size of %zu",
 							max_stream_size, reg_chan->subbuf_size);
 					goto error;
 				}