X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=b07bf684bcf870c59a2a212712ffec25db037af4;hp=f4e4bedb594e89946907dc56b151f72fd4fa6665;hb=e2456d0adca5c81c2b5fb46e3b90404b4917a3dc;hpb=ef67c0723053abd24b25186597388d84f76b6727

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index f4e4bedb5..b07bf684b 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1194,7 +1194,7 @@ error:
  * Return allocated filter or NULL on error.
  */
 static struct lttng_ust_filter_bytecode *create_ust_bytecode_from_bytecode(
-		struct lttng_filter_bytecode *orig_f)
+		const struct lttng_filter_bytecode *orig_f)
 {
 	struct lttng_ust_filter_bytecode *filter = NULL;
 
@@ -1343,33 +1343,28 @@ error:
 /*
  * Set the filter on the tracer.
  */
-static
-int set_ust_event_filter(struct ust_app_event *ua_event,
-		struct ust_app *app)
+static int set_ust_object_filter(struct ust_app *app,
+		const struct lttng_filter_bytecode *bytecode,
+		struct lttng_ust_object_data *ust_object)
 {
 	int ret;
 	struct lttng_ust_filter_bytecode *ust_bytecode = NULL;
 
 	health_code_update();
 
-	if (!ua_event->filter) {
-		ret = 0;
-		goto error;
-	}
-
-	ust_bytecode = create_ust_bytecode_from_bytecode(ua_event->filter);
+	ust_bytecode = create_ust_bytecode_from_bytecode(bytecode);
 	if (!ust_bytecode) {
 		ret = -LTTNG_ERR_NOMEM;
 		goto error;
 	}
 	pthread_mutex_lock(&app->sock_lock);
 	ret = ustctl_set_filter(app->sock, ust_bytecode,
-			ua_event->obj);
+			ust_object);
 	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-			ERR("UST app event %s filter failed for app (pid: %d) "
-					"with ret %d", ua_event->attr.name, app->pid, ret);
+			ERR("UST app set object filter failed for object %p of app (pid: %d) "
+					"with ret %d", ust_object, app->pid, ret);
 		} else {
 			/*
 			 * This is normal behavior, an application can die during the
@@ -1377,12 +1372,12 @@ int set_ust_event_filter(struct ust_app_event *ua_event,
 			 * continue normally.
 			 */
 			ret = 0;
-			DBG3("UST app filter event failed. Application is dead.");
+			DBG3("Failed to set UST app object filter. Application is dead.");
 		}
 		goto error;
 	}
 
-	DBG2("UST filter set successfully for event %s", ua_event->name);
+	DBG2("UST filter successfully set for object %p", ust_object);
 
 error:
 	health_code_update();
@@ -1392,7 +1387,7 @@ error:
 
 static
 struct lttng_ust_event_exclusion *create_ust_exclusion_from_exclusion(
-		struct lttng_event_exclusion *exclusion)
+		const struct lttng_event_exclusion *exclusion)
 {
 	struct lttng_ust_event_exclusion *ust_exclusion = NULL;
 	size_t exclusion_alloc_size = sizeof(struct lttng_ust_event_exclusion) +
@@ -1414,33 +1409,30 @@ end:
 /*
  * Set event exclusions on the tracer.
  */
-static
-int set_ust_event_exclusion(struct ust_app_event *ua_event,
-		struct ust_app *app)
+static int set_ust_object_exclusions(struct ust_app *app,
+		const struct lttng_event_exclusion *exclusions,
+		struct lttng_ust_object_data *ust_object)
 {
 	int ret;
-	struct lttng_ust_event_exclusion *ust_exclusion = NULL;
+	struct lttng_ust_event_exclusion *ust_exclusions = NULL;
 
-	health_code_update();
+	assert(exclusions && exclusions->count > 0);
 
-	if (!ua_event->exclusion || !ua_event->exclusion->count) {
-		ret = 0;
-		goto error;
-	}
+	health_code_update();
 
-	ust_exclusion = create_ust_exclusion_from_exclusion(
-			ua_event->exclusion);
-	if (!ust_exclusion) {
+	ust_exclusions = create_ust_exclusion_from_exclusion(
+			exclusions);
+	if (!ust_exclusions) {
 		ret = -LTTNG_ERR_NOMEM;
 		goto error;
 	}
 	pthread_mutex_lock(&app->sock_lock);
-	ret = ustctl_set_exclusion(app->sock, ust_exclusion, ua_event->obj);
+	ret = ustctl_set_exclusion(app->sock, ust_exclusions, ust_object);
 	pthread_mutex_unlock(&app->sock_lock);
 	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);
+			ERR("Failed to set UST app exclusions for object %p of app (pid: %d) "
+					"with ret %d", ust_object, app->pid, ret);
 		} else {
 			/*
 			 * This is normal behavior, an application can die during the
@@ -1448,37 +1440,36 @@ int set_ust_event_exclusion(struct ust_app_event *ua_event,
 			 * continue normally.
 			 */
 			ret = 0;
-			DBG3("UST app event exclusion failed. Application is dead.");
+			DBG3("Failed to set UST app object exclusions. Application is dead.");
 		}
 		goto error;
 	}
 
-	DBG2("UST exclusion set successfully for event %s", ua_event->name);
+	DBG2("UST exclusions set successfully for object %p", ust_object);
 
 error:
 	health_code_update();
-	free(ust_exclusion);
+	free(ust_exclusions);
 	return ret;
 }
 
 /*
  * Disable the specified event on to UST tracer for the UST session.
  */
-static int disable_ust_event(struct ust_app *app,
-		struct ust_app_session *ua_sess, struct ust_app_event *ua_event)
+static int disable_ust_object(struct ust_app *app,
+		struct lttng_ust_object_data *object)
 {
 	int ret;
 
 	health_code_update();
 
 	pthread_mutex_lock(&app->sock_lock);
-	ret = ustctl_disable(app->sock, ua_event->obj);
+	ret = ustctl_disable(app->sock, object);
 	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-			ERR("UST app event %s disable failed for app (pid: %d) "
-					"and session handle %d with ret %d",
-					ua_event->attr.name, app->pid, ua_sess->handle, ret);
+			ERR("Failed to disable UST app object %p app (pid: %d) with ret %d",
+					object, app->pid, ret);
 		} else {
 			/*
 			 * This is normal behavior, an application can die during the
@@ -1486,13 +1477,13 @@ static int disable_ust_event(struct ust_app *app,
 			 * continue normally.
 			 */
 			ret = 0;
-			DBG3("UST app disable event failed. Application is dead.");
+			DBG3("Failed to disable UST app object. Application is dead.");
 		}
 		goto error;
 	}
 
-	DBG2("UST app event %s disabled successfully for app (pid: %d)",
-			ua_event->attr.name, app->pid);
+	DBG2("UST app object %p disabled successfully for app (pid: %d)",
+			object, app->pid);
 
 error:
 	health_code_update();
@@ -1580,21 +1571,20 @@ error:
 /*
  * Enable the specified event on to UST tracer for the UST session.
  */
-static int enable_ust_event(struct ust_app *app,
-		struct ust_app_session *ua_sess, struct ust_app_event *ua_event)
+static int enable_ust_object(
+		struct ust_app *app, struct lttng_ust_object_data *ust_object)
 {
 	int ret;
 
 	health_code_update();
 
 	pthread_mutex_lock(&app->sock_lock);
-	ret = ustctl_enable(app->sock, ua_event->obj);
+	ret = ustctl_enable(app->sock, ust_object);
 	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-			ERR("UST app event %s enable failed for app (pid: %d) "
-					"and session handle %d with ret %d",
-					ua_event->attr.name, app->pid, ua_sess->handle, ret);
+			ERR("UST app enable failed for object %p app (pid: %d) with ret %d",
+					ust_object, app->pid, ret);
 		} else {
 			/*
 			 * This is normal behavior, an application can die during the
@@ -1602,13 +1592,13 @@ static int enable_ust_event(struct ust_app *app,
 			 * continue normally.
 			 */
 			ret = 0;
-			DBG3("UST app enable event failed. Application is dead.");
+			DBG3("Failed to enable UST app object. Application is dead.");
 		}
 		goto error;
 	}
 
-	DBG2("UST app event %s enabled successfully for app (pid: %d)",
-			ua_event->attr.name, app->pid);
+	DBG2("UST app object %p enabled successfully for app (pid: %d)",
+			ust_object, app->pid);
 
 error:
 	health_code_update();
@@ -1704,14 +1694,14 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 
 	ua_event->handle = ua_event->obj->handle;
 
-	DBG2("UST app event %s created successfully for pid:%d",
-			ua_event->attr.name, app->pid);
+	DBG2("UST app event %s created successfully for pid:%d object: %p",
+			ua_event->attr.name, app->pid, ua_event->obj);
 
 	health_code_update();
 
 	/* Set filter if one is present. */
 	if (ua_event->filter) {
-		ret = set_ust_event_filter(ua_event, app);
+		ret = set_ust_object_filter(app, ua_event->filter, ua_event->obj);
 		if (ret < 0) {
 			goto error;
 		}
@@ -1719,7 +1709,7 @@ 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);
+		ret = set_ust_object_exclusions(app, ua_event->exclusion, ua_event->obj);
 		if (ret < 0) {
 			goto error;
 		}
@@ -1731,7 +1721,7 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 		 * We now need to explicitly enable the event, since it
 		 * is now disabled at creation.
 		 */
-		ret = enable_ust_event(app, ua_sess, ua_event);
+		ret = enable_ust_object(app, ua_event->obj);
 		if (ret < 0) {
 			/*
 			 * If we hit an EPERM, something is wrong with our enable call. If
@@ -2342,7 +2332,7 @@ int enable_ust_app_event(struct ust_app_session *ua_sess,
 {
 	int ret;
 
-	ret = enable_ust_event(app, ua_sess, ua_event);
+	ret = enable_ust_object(app, ua_event->obj);
 	if (ret < 0) {
 		goto error;
 	}
@@ -2361,7 +2351,7 @@ static int disable_ust_app_event(struct ust_app_session *ua_sess,
 {
 	int ret;
 
-	ret = disable_ust_event(app, ua_sess, ua_event);
+	ret = disable_ust_object(app, ua_event->obj);
 	if (ret < 0) {
 		goto error;
 	}