X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;fp=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=c5ee4b11ed02052a77f014103b675e93336d6f71;hp=c7037a482bfcdeccf70e0159089467196b690a79;hb=163f4ee3e311b2f782b6ef46c930980f443acb69;hpb=df9542428e02e1b63ac8a023cda7164a68c8ef34

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index c7037a482..c5ee4b11e 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2110,95 +2110,115 @@ end:
 }
 
 static
-int handle_notification_thread_command_remove_tracer_event_source(
-		struct notification_thread_state *state,
-		int tracer_event_source_fd,
-		enum lttng_error_code *_cmd_result)
+struct notification_event_tracer_event_source_element *
+find_tracer_event_source_element(struct notification_thread_state *state,
+		int tracer_event_source_fd)
 {
-	int ret = 0;
-	bool found = false;
-	enum lttng_error_code cmd_result = LTTNG_OK;
-	struct notification_event_tracer_event_source_element *source_element = NULL, *tmp;
+	struct notification_event_tracer_event_source_element *source_element;
 
-	cds_list_for_each_entry_safe(source_element, tmp,
+	cds_list_for_each_entry(source_element,
 			&state->tracer_event_sources_list, node) {
-		if (source_element->fd != tracer_event_source_fd) {
-			continue;
+		if (source_element->fd == tracer_event_source_fd) {
+			goto end;
 		}
-
-		DBG("Removed tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
-				tracer_event_source_fd,
-				lttng_domain_type_str(source_element->domain));
-		cds_list_del(&source_element->node);
-		found = true;
-		break;
 	}
 
-	if (!found) {
-		/*
-		 * This is temporarily allowed since the poll activity set is
-		 * not properly cleaned-up for the moment. This is adressed in
-		 * an upcoming fix.
-		 */
-		source_element = NULL;
-		goto end;
-	}
+	source_element = NULL;
+end:
+	return NULL;
+}
 
-	if (!source_element->is_fd_in_poll_set) {
-		/* Skip the poll set removal. */
-		goto end;
-	}
+static
+int remove_tracer_event_source_from_pollset(
+		struct notification_thread_state *state,
+		struct notification_event_tracer_event_source_element *source_element)
+{
+	int ret = 0;
+
+	assert(source_element->is_fd_in_poll_set);
 
 	DBG3("Removing tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
-			tracer_event_source_fd,
+			source_element->fd,
 			lttng_domain_type_str(source_element->domain));
 
 	/* Removing the fd from the event poll set. */
-	ret = lttng_poll_del(&state->events, tracer_event_source_fd);
+	ret = lttng_poll_del(&state->events, source_element->fd);
 	if (ret < 0) {
 		ERR("Failed to remove tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
-				tracer_event_source_fd,
+				source_element->fd,
 				lttng_domain_type_str(source_element->domain));
-		cmd_result = LTTNG_ERR_FATAL;
+		ret = -1;
 		goto end;
 	}
 
 	source_element->is_fd_in_poll_set = false;
 
-	ret = drain_event_notifier_notification_pipe(state, tracer_event_source_fd,
+	ret = drain_event_notifier_notification_pipe(state, source_element->fd,
 			source_element->domain);
 	if (ret) {
 		ERR("Error draining event notifier notification: tracer_event_source_fd = %d, domain = %s",
-				tracer_event_source_fd,
+				source_element->fd,
 				lttng_domain_type_str(source_element->domain));
-		cmd_result = LTTNG_ERR_FATAL;
+		ret = -1;
 		goto end;
 	}
 
-	/*
-	 * The drain_event_notifier_notification_pipe() call might have read
-	 * data from an fd that we received in event in the latest _poll_wait()
-	 * call. Make sure the thread call poll_wait() again to ensure we have
-	 * a clean state.
-	 */
-	state->restart_poll = true;
-
 end:
-	free(source_element);
-	*_cmd_result = cmd_result;
 	return ret;
 }
 
-int handle_notification_thread_remove_tracer_event_source_no_result(
+int handle_notification_thread_tracer_event_source_died(
 		struct notification_thread_state *state,
 		int tracer_event_source_fd)
 {
-	int ret;
-	enum lttng_error_code cmd_result;
+	int ret = 0;
+	struct notification_event_tracer_event_source_element *source_element;
+
+	source_element = find_tracer_event_source_element(state,
+			tracer_event_source_fd);
+
+	assert(source_element);
+
+	ret = remove_tracer_event_source_from_pollset(state, source_element);
+	if (ret) {
+		ERR("Failed to remove dead tracer event source from poll set");
+	}
 
-	ret = handle_notification_thread_command_remove_tracer_event_source(
-			state, tracer_event_source_fd, &cmd_result);
-	(void) cmd_result;
+	return ret;
+}
+
+static
+int handle_notification_thread_command_remove_tracer_event_source(
+		struct notification_thread_state *state,
+		int tracer_event_source_fd,
+		enum lttng_error_code *_cmd_result)
+{
+	int ret = 0;
+	enum lttng_error_code cmd_result = LTTNG_OK;
+	struct notification_event_tracer_event_source_element *source_element = NULL;
+
+	source_element = find_tracer_event_source_element(state,
+			tracer_event_source_fd);
+
+	assert(source_element);
+
+	/* Remove the tracer source from the list. */
+	cds_list_del(&source_element->node);
+
+	if (!source_element->is_fd_in_poll_set) {
+		/* Skip the poll set removal. */
+		goto end;
+	}
+
+	ret = remove_tracer_event_source_from_pollset(state, source_element);
+	if (ret) {
+		ERR("Failed to remove tracer event source from poll set");
+		cmd_result = LTTNG_ERR_FATAL;
+	}
+
+end:
+	free(source_element);
+	*_cmd_result = cmd_result;
 	return ret;
 }