From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 17 Mar 2021 20:23:25 +0000 (-0400)
Subject: Namespace enum lttng_ust_bytecode_interpreter_ret flags with lttng_ust_ prefix
X-Git-Tag: v2.13.0-rc1~252
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c7abfd47ae5a9b64b80e966fe52c156f8430b92c;p=lttng-ust.git

Namespace enum lttng_ust_bytecode_interpreter_ret flags with lttng_ust_ prefix

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I0106752714ab42f3f6c45191aee0d69d698b1cfe
---

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index bb038bbe..107c746e 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -303,9 +303,9 @@ struct lttng_ust_probe_desc {
 /*
  * Bytecode interpreter return value masks.
  */
-enum lttng_bytecode_interpreter_ret {
-	LTTNG_INTERPRETER_DISCARD = 0,
-	LTTNG_INTERPRETER_RECORD_FLAG = (1ULL << 0),
+enum lttng_ust_bytecode_interpreter_ret {
+	LTTNG_UST_BYTECODE_INTERPRETER_DISCARD = 0,
+	LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG = (1ULL << 0),
 	/* Other bits are kept for future use. */
 };
 
diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 72a0cbec..33aa8d2d 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -828,7 +828,7 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 			_TP_ARGS_DATA_VAR(_args));			      \
 		tp_list_for_each_entry_rcu(__filter_bc_runtime, &__event->filter_bytecode_runtime_head, node) { \
 			if (caa_unlikely(__filter_bc_runtime->interpreter_funcs.filter(__filter_bc_runtime,     \
-					__stackvar.__interpreter_stack_data) & LTTNG_INTERPRETER_RECORD_FLAG)) { \
+				__stackvar.__interpreter_stack_data) & LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG)) { \
 				__filter_record = 1;			      \
 				break;					      \
 			}						      \
diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index 199e615b..c403bcbf 100644
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -381,7 +381,7 @@ void lttng_event_notifier_notification_send(
 			struct lttng_interpreter_output output;
 
 			if (capture_bc_runtime->interpreter_funcs.capture(capture_bc_runtime,
-					stack_data, &output) & LTTNG_INTERPRETER_RECORD_FLAG)
+					stack_data, &output) & LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG)
 				notification_append_capture(&notif, &output);
 			else
 				notification_append_empty_capture(&notif);
diff --git a/liblttng-ust/lttng-bytecode-interpreter.c b/liblttng-ust/lttng-bytecode-interpreter.c
index 765955fd..15ce6363 100644
--- a/liblttng-ust/lttng-bytecode-interpreter.c
+++ b/liblttng-ust/lttng-bytecode-interpreter.c
@@ -151,14 +151,14 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 uint64_t lttng_bytecode_filter_interpret_false(void *filter_data,
 		const char *filter_stack_data)
 {
-	return LTTNG_INTERPRETER_DISCARD;
+	return LTTNG_UST_BYTECODE_INTERPRETER_DISCARD;
 }
 
 uint64_t lttng_bytecode_capture_interpret_false(void *capture_data,
 		const char *capture_stack_data,
 		struct lttng_interpreter_output *output)
 {
-	return LTTNG_INTERPRETER_DISCARD;
+	return LTTNG_UST_BYTECODE_INTERPRETER_DISCARD;
 }
 
 #ifdef INTERPRETER_USE_SWITCH
@@ -700,7 +700,7 @@ again:
 		return -EINVAL;
 	}
 
-	return LTTNG_INTERPRETER_RECORD_FLAG;
+	return LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG;
 }
 
 /*
@@ -876,7 +876,7 @@ uint64_t bytecode_interpret(void *interpreter_data,
 			goto end;
 
 		OP(BYTECODE_OP_RETURN):
-			/* LTTNG_INTERPRETER_DISCARD or LTTNG_INTERPRETER_RECORD_FLAG */
+			/* LTTNG_UST_BYTECODE_INTERPRETER_DISCARD or LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG */
 			/* Handle dynamic typing. */
 			switch (estack_ax_t) {
 			case REG_S64:
@@ -902,7 +902,7 @@ uint64_t bytecode_interpret(void *interpreter_data,
 			goto end;
 
 		OP(BYTECODE_OP_RETURN_S64):
-			/* LTTNG_INTERPRETER_DISCARD or LTTNG_INTERPRETER_RECORD_FLAG */
+			/* LTTNG_UST_BYTECODE_INTERPRETER_DISCARD or LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG */
 			retval = !!estack_ax_v;
 			ret = 0;
 			goto end;
@@ -2484,7 +2484,7 @@ uint64_t bytecode_interpret(void *interpreter_data,
 end:
 	/* Return _DISCARD on error. */
 	if (ret)
-		return LTTNG_INTERPRETER_DISCARD;
+		return LTTNG_UST_BYTECODE_INTERPRETER_DISCARD;
 
 	if (output) {
 		return lttng_bytecode_interpret_format_output(estack_ax(stack, top),