X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.cpp;h=909ccbff2cc1b6f36eba822957bdfec10a11a957;hb=8a880a84dcb8ee64cbc4a5e04cae6775b4f9babd;hp=9e1aa5300b8416e68fdc4672da8beedce66fc985;hpb=1c9a0b0e83c7e073c4e576c0bed95de335b0e502;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.cpp b/src/bin/lttng-sessiond/notification-thread-events.cpp
index 9e1aa5300..909ccbff2 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.cpp
+++ b/src/bin/lttng-sessiond/notification-thread-events.cpp
@@ -6,46 +6,46 @@
  */
 
 #include "lttng/action/action.h"
-#include "lttng/trigger/trigger-internal.h"
+#include "lttng/trigger/trigger-internal.hpp"
 #define _LGPL_SOURCE
 #include <urcu.h>
 #include <urcu/rculfhash.h>
 
-#include <common/defaults.h>
-#include <common/error.h>
-#include <common/futex.h>
-#include <common/unix.h>
-#include <common/dynamic-buffer.h>
-#include <common/hashtable/utils.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/macros.h>
+#include <common/defaults.hpp>
+#include <common/error.hpp>
+#include <common/futex.hpp>
+#include <common/unix.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/hashtable/utils.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/macros.hpp>
 #include <lttng/condition/condition.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/list-internal.h>
-#include <lttng/domain-internal.h>
-#include <lttng/notification/notification-internal.h>
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/buffer-usage-internal.h>
-#include <lttng/condition/session-consumed-size-internal.h>
-#include <lttng/condition/session-rotation-internal.h>
-#include <lttng/condition/event-rule-matches-internal.h>
-#include <lttng/domain-internal.h>
-#include <lttng/notification/channel-internal.h>
-#include <lttng/trigger/trigger-internal.h>
-#include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/list-internal.hpp>
+#include <lttng/domain-internal.hpp>
+#include <lttng/notification/notification-internal.hpp>
+#include <lttng/condition/condition-internal.hpp>
+#include <lttng/condition/buffer-usage-internal.hpp>
+#include <lttng/condition/session-consumed-size-internal.hpp>
+#include <lttng/condition/session-rotation-internal.hpp>
+#include <lttng/condition/event-rule-matches-internal.hpp>
+#include <lttng/domain-internal.hpp>
+#include <lttng/notification/channel-internal.hpp>
+#include <lttng/trigger/trigger-internal.hpp>
+#include <lttng/event-rule/event-rule-internal.hpp>
 
 #include <time.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <fcntl.h>
 
-#include "condition-internal.h"
-#include "event-notifier-error-accounting.h"
-#include "notification-thread.h"
-#include "notification-thread-events.h"
-#include "notification-thread-commands.h"
-#include "lttng-sessiond.h"
-#include "kernel.h"
+#include "condition-internal.hpp"
+#include "event-notifier-error-accounting.hpp"
+#include "notification-thread.hpp"
+#include "notification-thread-events.hpp"
+#include "notification-thread-commands.hpp"
+#include "lttng-sessiond.hpp"
+#include "kernel.hpp"
 
 #define CLIENT_POLL_MASK_IN (LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP)
 #define CLIENT_POLL_MASK_IN_OUT (CLIENT_POLL_MASK_IN | LPOLLOUT)
@@ -569,7 +569,7 @@ struct session_info *session_info_create(const char *name, uid_t uid, gid_t gid,
 
 	LTTNG_ASSERT(name);
 
-	session_info = (struct session_info *) zmalloc(sizeof(*session_info));
+	session_info = zmalloc<struct session_info>();
 	if (!session_info) {
 		goto end;
 	}
@@ -623,7 +623,7 @@ struct channel_info *channel_info_create(const char *channel_name,
 		struct channel_key *channel_key, uint64_t channel_capacity,
 		struct session_info *session_info)
 {
-	struct channel_info *channel_info = (struct channel_info *) zmalloc(sizeof(*channel_info));
+	struct channel_info *channel_info = zmalloc<struct channel_info>();
 
 	if (!channel_info) {
 		goto end;
@@ -723,7 +723,7 @@ struct notification_client_list *notification_client_list_create(
 	struct cds_lfht_iter iter;
 	struct notification_client_list *client_list;
 
-	client_list = (notification_client_list *) zmalloc(sizeof(*client_list));
+	client_list = zmalloc<notification_client_list>();
 	if (!client_list) {
 		PERROR("Failed to allocate notification client list");
 		goto end;
@@ -755,7 +755,7 @@ struct notification_client_list *notification_client_list_create(
 			continue;
 		}
 
-		client_list_element = (notification_client_list_element *) zmalloc(sizeof(*client_list_element));
+		client_list_element = zmalloc<notification_client_list_element>();
 		if (!client_list_element) {
 			goto error_put_client_list;
 		}
@@ -1123,12 +1123,12 @@ int notification_thread_client_subscribe(struct notification_client *client,
 		}
 	}
 
-	condition_list_element = (lttng_condition_list_element *) zmalloc(sizeof(*condition_list_element));
+	condition_list_element = zmalloc<lttng_condition_list_element>();
 	if (!condition_list_element) {
 		ret = -1;
 		goto error;
 	}
-	client_list_element = (notification_client_list_element *) zmalloc(sizeof(*client_list_element));
+	client_list_element = zmalloc<notification_client_list_element>();
 	if (!client_list_element) {
 		ret = -1;
 		goto error;
@@ -1506,7 +1506,7 @@ struct lttng_session_trigger_list *lttng_session_trigger_list_create(
 {
 	struct lttng_session_trigger_list *list;
 
-	list = (lttng_session_trigger_list *) zmalloc(sizeof(*list));
+	list = zmalloc<lttng_session_trigger_list>();
 	if (!list) {
 		goto end;
 	}
@@ -1557,7 +1557,7 @@ int lttng_session_trigger_list_add(struct lttng_session_trigger_list *list,
 {
 	int ret = 0;
 	struct lttng_trigger_list_element *new_element =
-			(lttng_trigger_list_element *) zmalloc(sizeof(*new_element));
+			zmalloc<lttng_trigger_list_element>();
 
 	if (!new_element) {
 		ret = -1;
@@ -1755,7 +1755,7 @@ int handle_notification_thread_command_add_channel(
 			continue;
 		}
 
-		new_element = (lttng_trigger_list_element *) zmalloc(sizeof(*new_element));
+		new_element = zmalloc<lttng_trigger_list_element>();
 		if (!new_element) {
 			rcu_read_unlock();
 			goto error;
@@ -1769,7 +1769,7 @@ int handle_notification_thread_command_add_channel(
 
 	DBG("Found %i triggers that apply to newly added channel",
 			trigger_count);
-	channel_trigger_list = (lttng_channel_trigger_list *) zmalloc(sizeof(*channel_trigger_list));
+	channel_trigger_list = zmalloc<lttng_channel_trigger_list>();
 	if (!channel_trigger_list) {
 		goto error;
 	}
@@ -2032,7 +2032,7 @@ int handle_notification_thread_command_add_tracer_event_source(
 	enum lttng_error_code cmd_result = LTTNG_OK;
 	struct notification_event_tracer_event_source_element *element = NULL;
 
-	element = (notification_event_tracer_event_source_element *) zmalloc(sizeof(*element));
+	element = zmalloc<notification_event_tracer_event_source_element>();
 	if (!element) {
 		cmd_result = LTTNG_ERR_NOMEM;
 		ret = -1;
@@ -2049,7 +2049,7 @@ int handle_notification_thread_command_add_tracer_event_source(
 			lttng_domain_type_str(domain_type));
 
 	/* Adding the read side pipe to the event poll. */
-	ret = lttng_poll_add(&state->events, tracer_event_source_fd, LPOLLIN | LPOLLERR);
+	ret = lttng_poll_add(&state->events, tracer_event_source_fd, LPOLLPRI | LPOLLIN | LPOLLERR);
 	if (ret < 0) {
 		ERR("Failed to add tracer event source to poll set: tracer_event_source_fd = %d, domain = '%s'",
 				tracer_event_source_fd,
@@ -2501,7 +2501,7 @@ int bind_trigger_to_matching_channels(struct lttng_trigger *trigger,
 				struct lttng_channel_trigger_list,
 				channel_triggers_ht_node);
 
-		trigger_list_element = (lttng_trigger_list_element *) zmalloc(sizeof(*trigger_list_element));
+		trigger_list_element = zmalloc<lttng_trigger_list_element>();
 		if (!trigger_list_element) {
 			ret = -1;
 			goto end;
@@ -2622,7 +2622,7 @@ enum lttng_error_code setup_tracer_notifier(
 	struct lttng_condition *condition = lttng_trigger_get_condition(trigger);
 	struct notification_trigger_tokens_ht_element *trigger_tokens_ht_element = NULL;
 
-	trigger_tokens_ht_element = (notification_trigger_tokens_ht_element *) zmalloc(sizeof(*trigger_tokens_ht_element));
+	trigger_tokens_ht_element = zmalloc<notification_trigger_tokens_ht_element>();
 	if (!trigger_tokens_ht_element) {
 		ret = LTTNG_ERR_NOMEM;
 		goto end;
@@ -2745,7 +2745,7 @@ int handle_notification_thread_command_register_trigger(
 		goto error;
 	}
 
-	trigger_ht_element = (lttng_trigger_ht_element *) zmalloc(sizeof(*trigger_ht_element));
+	trigger_ht_element = zmalloc<lttng_trigger_ht_element>();
 	if (!trigger_ht_element) {
 		ret = -1;
 		goto error;
@@ -3123,28 +3123,43 @@ end:
 	return 0;
 }
 
+static
+int pop_cmd_queue(struct notification_thread_handle *handle,
+		struct notification_thread_command **cmd)
+{
+	int ret;
+	uint64_t counter;
+
+	pthread_mutex_lock(&handle->cmd_queue.lock);
+	ret = lttng_read(handle->cmd_queue.event_fd, &counter, sizeof(counter));
+	if (ret != sizeof(counter)) {
+		ret = -1;
+		goto error_unlock;
+	}
+
+	*cmd = cds_list_first_entry(&handle->cmd_queue.list,
+			struct notification_thread_command, cmd_list_node);
+	cds_list_del(&((*cmd)->cmd_list_node));
+	ret = 0;
+
+error_unlock:
+	pthread_mutex_unlock(&handle->cmd_queue.lock);
+	return ret;
+}
+
 /* Returns 0 on success, 1 on exit requested, negative value on error. */
 int handle_notification_thread_command(
 		struct notification_thread_handle *handle,
 		struct notification_thread_state *state)
 {
 	int ret;
-	uint64_t counter;
 	struct notification_thread_command *cmd;
 
-	/* Read the event pipe to put it back into a quiescent state. */
-	ret = lttng_read(lttng_pipe_get_readfd(handle->cmd_queue.event_pipe), &counter,
-			sizeof(counter));
-	if (ret != sizeof(counter)) {
+	ret = pop_cmd_queue(handle, &cmd);
+	if (ret) {
 		goto error;
 	}
 
-	pthread_mutex_lock(&handle->cmd_queue.lock);
-	cmd = cds_list_first_entry(&handle->cmd_queue.list,
-			struct notification_thread_command, cmd_list_node);
-	cds_list_del(&cmd->cmd_list_node);
-	pthread_mutex_unlock(&handle->cmd_queue.lock);
-
 	DBG("Received `%s` command",
 			notification_command_type_str(cmd->type));
 	switch (cmd->type) {
@@ -3336,7 +3351,7 @@ int handle_notification_thread_client_connect(
 
 	DBG("Handling new notification channel client connection");
 
-	client = (notification_client *) zmalloc(sizeof(*client));
+	client = zmalloc<notification_client>();
 	if (!client) {
 		/* Fatal error. */
 		ret = -1;
@@ -4586,7 +4601,7 @@ struct lttng_event_notifier_notification *recv_one_event_notifier_notification(
 		goto end;
 	}
 
-	capture_buffer = (char *) zmalloc(capture_buffer_size);
+	capture_buffer = calloc<char>(capture_buffer_size);
 	if (!capture_buffer) {
 		ERR("Failed to allocate capture buffer");
 		goto end;
@@ -4889,7 +4904,7 @@ int handle_notification_thread_channel_sample(
 		 */
 		struct channel_state_sample *stored_sample;
 
-		stored_sample = (channel_state_sample *) zmalloc(sizeof(*stored_sample));
+		stored_sample = zmalloc<channel_state_sample>();
 		if (!stored_sample) {
 			ret = -1;
 			goto end_unlock;