From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 12 Nov 2014 23:18:33 +0000 (-0500)
Subject: Cleanup: remove "disabled" flag for new release cycle
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1e199c04cd2f0b9c378d89a11e42c516d5f8d90e;p=lttng-tools.git

Cleanup: remove "disabled" flag for new release cycle

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index ac980fd45..1f6fd5273 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -419,11 +419,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 		ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
 		goto error_free_event;
 	}
-	/*
-	 * Fix for enabler race. Enable is now done explicitly by
-	 * sessiond after setting filter.
-	 */
-	lue->attr.disabled = 1;
 
 	/* Same layout. */
 	lue->filter_expression = filter_expression;
diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 7e4bf9405..c2d20747a 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1471,27 +1471,6 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 			}
 			goto error;
 		}
-	} else {
-		ret = disable_ust_event(app, ua_sess, ua_event);
-		if (ret < 0) {
-			/*
-			 * If we hit an EPERM, something is wrong with our disable 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;
-		}
 	}
 
 error: