X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Faction.c;h=21dee73fafb3463d8fd53077aee9240f74d03fca;hb=ca806b0b247f89c62ac628a7779ae84049a8c2d7;hp=4dabfff303e547bc973c389e5d7baae38954a792;hpb=6a751b953a43c566b74818ec6325db0978e16c66;p=lttng-tools.git

diff --git a/src/common/actions/action.c b/src/common/actions/action.c
index 4dabfff30..21dee73fa 100644
--- a/src/common/actions/action.c
+++ b/src/common/actions/action.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include <assert.h>
 #include <common/error.h>
 #include <common/mi-lttng.h>
 #include <lttng/action/action-internal.h>
@@ -18,7 +17,6 @@
 #include <lttng/action/stop-session-internal.h>
 #include <lttng/error-query-internal.h>
 
-LTTNG_HIDDEN
 const char *lttng_action_type_string(enum lttng_action_type action_type)
 {
 	switch (action_type) {
@@ -46,7 +44,6 @@ enum lttng_action_type lttng_action_get_type(const struct lttng_action *action)
 	return action ? action->type : LTTNG_ACTION_TYPE_UNKNOWN;
 }
 
-LTTNG_HIDDEN
 void lttng_action_init(struct lttng_action *action,
 		enum lttng_action_type type,
 		action_validate_cb validate,
@@ -81,20 +78,18 @@ void action_destroy_ref(struct urcu_ref *ref)
 	action->destroy(action);
 }
 
-LTTNG_HIDDEN
 void lttng_action_get(struct lttng_action *action)
 {
 	urcu_ref_get(&action->ref);
 }
 
-LTTNG_HIDDEN
 void lttng_action_put(struct lttng_action *action)
 {
 	if (!action) {
 		return;
 	}
 
-	assert(action->destroy);
+	LTTNG_ASSERT(action->destroy);
 	urcu_ref_put(&action->ref, action_destroy_ref);
 }
 
@@ -103,7 +98,6 @@ void lttng_action_destroy(struct lttng_action *action)
 	lttng_action_put(action);
 }
 
-LTTNG_HIDDEN
 bool lttng_action_validate(struct lttng_action *action)
 {
 	bool valid;
@@ -124,7 +118,6 @@ end:
 	return valid;
 }
 
-LTTNG_HIDDEN
 int lttng_action_serialize(struct lttng_action *action,
 		struct lttng_payload *payload)
 {
@@ -147,7 +140,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 ssize_t lttng_action_create_from_payload(struct lttng_payload_view *view,
 		struct lttng_action **action)
 {
@@ -222,7 +214,7 @@ ssize_t lttng_action_create_from_payload(struct lttng_payload_view *view,
 		goto end;
 	}
 
-	assert(*action);
+	LTTNG_ASSERT(*action);
 
 	consumed_len = sizeof(struct lttng_action_comm) +
 		       specific_action_consumed_len;
@@ -231,7 +223,6 @@ end:
 	return consumed_len;
 }
 
-LTTNG_HIDDEN
 bool lttng_action_is_equal(const struct lttng_action *a,
 		const struct lttng_action *b)
 {
@@ -250,31 +241,27 @@ bool lttng_action_is_equal(const struct lttng_action *a,
 		goto end;
 	}
 
-	assert(a->equal);
+	LTTNG_ASSERT(a->equal);
 	is_equal = a->equal(a, b);
 end:
 	return is_equal;
 }
 
-LTTNG_HIDDEN
 void lttng_action_increase_execution_request_count(struct lttng_action *action)
 {
 	action->execution_request_counter++;
 }
 
-LTTNG_HIDDEN
 void lttng_action_increase_execution_count(struct lttng_action *action)
 {
 	action->execution_counter++;
 }
 
-LTTNG_HIDDEN
 void lttng_action_increase_execution_failure_count(struct lttng_action *action)
 {
 	uatomic_inc(&action->execution_failure_counter);
 }
 
-LTTNG_HIDDEN
 bool lttng_action_should_execute(const struct lttng_action *action)
 {
 	const struct lttng_rate_policy *policy = NULL;
@@ -297,7 +284,6 @@ end:
 	return execute;
 }
 
-LTTNG_HIDDEN
 enum lttng_action_status lttng_action_add_error_query_results(
 		const struct lttng_action *action,
 		struct lttng_error_query_results *results)
@@ -305,7 +291,6 @@ enum lttng_action_status lttng_action_add_error_query_results(
 	return action->add_error_query_results(action, results);
 }
 
-LTTNG_HIDDEN
 enum lttng_action_status lttng_action_generic_add_error_query_results(
 		const struct lttng_action *action,
 		struct lttng_error_query_results *results)
@@ -338,7 +323,6 @@ end:
 	return action_status;
 }
 
-LTTNG_HIDDEN
 enum lttng_error_code lttng_action_mi_serialize(const struct lttng_trigger *trigger,
 		const struct lttng_action *action,
 		struct mi_writer *writer,
@@ -351,8 +335,8 @@ enum lttng_error_code lttng_action_mi_serialize(const struct lttng_trigger *trig
 	struct lttng_action_path *action_path = NULL;
 	struct lttng_error_query_results *error_query_results = NULL;
 
-	assert(action);
-	assert(writer);
+	LTTNG_ASSERT(action);
+	LTTNG_ASSERT(writer);
 
 	/* Open action. */
 	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_action);
@@ -375,7 +359,7 @@ enum lttng_error_code lttng_action_mi_serialize(const struct lttng_trigger *trig
 		goto close_action_element;
 	}
 
-	assert(action->mi_serialize);
+	LTTNG_ASSERT(action->mi_serialize);
 	ret_code = action->mi_serialize(action, writer);
 	if (ret_code != LTTNG_OK) {
 		goto end;
@@ -397,7 +381,7 @@ enum lttng_error_code lttng_action_mi_serialize(const struct lttng_trigger *trig
 		action_path = lttng_action_path_create(
 				action_path_indexes_raw_pointer,
 				action_path_indexes_size);
-		assert(action_path);
+		LTTNG_ASSERT(action_path);
 
 		ret_code = error_query_callbacks->action_cb(
 				trigger, action_path, &error_query_results);