X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=bbf7c569906c1f9ef7d4db0c2f2fb7c0d446b1cd;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=0704b14756f78ef860b7e283c4e084a4b6f6a40a;hpb=e358ddd51a5be6017f524523ac10d7c17fb78f65;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 0704b1475..bbf7c5699 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -6,7 +6,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,6 +24,7 @@
 /* Mi dependancy */
 #include <common/mi-lttng.h>
 
+#include <lttng/domain-internal.h>
 #include <lttng/event-internal.h>
 
 #include "../command.h"
@@ -199,7 +199,7 @@ int mi_print_exclusion(const struct lttng_dynamic_pointer_array *exclusions)
 	size_t i;
 	const size_t count = lttng_dynamic_pointer_array_get_count(exclusions);
 
-	assert(writer);
+	LTTNG_ASSERT(writer);
 
 	if (count == 0) {
 		ret = 0;
@@ -476,7 +476,7 @@ static int enable_events(char *session_name)
 		dom.buf_type = LTTNG_BUFFER_PER_UID;
 	} else {
 		/* Checked by the caller. */
-		assert(0);
+		abort();
 	}
 
 	if (opt_exclude) {
@@ -486,14 +486,14 @@ static int enable_events(char *session_name)
 		case LTTNG_DOMAIN_LOG4J:
 		case LTTNG_DOMAIN_PYTHON:
 			ERR("Event name exclusions are not yet implemented for %s events",
-					get_domain_str(dom.type));
+					lttng_domain_type_str(dom.type));
 			ret = CMD_ERROR;
 			goto error;
 		case LTTNG_DOMAIN_UST:
 			/* Exclusions supported */
 			break;
 		default:
-			assert(0);
+			abort();
 		}
 	}
 
@@ -553,7 +553,7 @@ static int enable_events(char *session_name)
 			if (opt_loglevel) {
 				int name_search_ret;
 
-				assert(opt_userspace || opt_jul || opt_log4j || opt_python);
+				LTTNG_ASSERT(opt_userspace || opt_jul || opt_log4j || opt_python);
 
 				if (opt_userspace) {
 					enum lttng_loglevel loglevel;
@@ -584,7 +584,7 @@ static int enable_events(char *session_name)
 					goto error;
 				}
 			} else {
-				assert(opt_userspace || opt_jul || opt_log4j || opt_python);
+				LTTNG_ASSERT(opt_userspace || opt_jul || opt_log4j || opt_python);
 				if (opt_userspace) {
 					ev->loglevel = -1;
 				} else if (opt_jul) {
@@ -656,7 +656,7 @@ static int enable_events(char *session_name)
 						goto end;
 					}
 					MSG("All %s tracepoints%s are enabled in channel %s for loglevel %s",
-							get_domain_str(dom.type),
+							lttng_domain_type_str(dom.type),
 							exclusion_string,
 							print_channel_name(channel_name),
 							opt_loglevel);
@@ -670,7 +670,7 @@ static int enable_events(char *session_name)
 						goto end;
 					}
 					MSG("All %s tracepoints%s are enabled in channel %s",
-							get_domain_str(dom.type),
+							lttng_domain_type_str(dom.type),
 							exclusion_string,
 							print_channel_name(channel_name));
 					free(exclusion_string);
@@ -679,7 +679,7 @@ static int enable_events(char *session_name)
 			case LTTNG_EVENT_SYSCALL:
 				if (opt_kernel) {
 					MSG("All %s system calls are enabled in channel %s",
-							get_domain_str(dom.type),
+							lttng_domain_type_str(dom.type),
 							print_channel_name(channel_name));
 				}
 				break;
@@ -693,7 +693,7 @@ static int enable_events(char *session_name)
 						goto end;
 					}
 					MSG("All %s events%s are enabled in channel %s for loglevel %s",
-							get_domain_str(dom.type),
+							lttng_domain_type_str(dom.type),
 							exclusion_string,
 							print_channel_name(channel_name),
 							opt_loglevel);
@@ -707,7 +707,7 @@ static int enable_events(char *session_name)
 						goto end;
 					}
 					MSG("All %s events%s are enabled in channel %s",
-							get_domain_str(dom.type),
+							lttng_domain_type_str(dom.type),
 							exclusion_string,
 							print_channel_name(channel_name));
 					free(exclusion_string);
@@ -843,7 +843,7 @@ static int enable_events(char *session_name)
 				}
 				break;
 			case LTTNG_EVENT_USERSPACE_PROBE:
-				assert(ev->type == LTTNG_EVENT_USERSPACE_PROBE);
+				LTTNG_ASSERT(ev->type == LTTNG_EVENT_USERSPACE_PROBE);
 
 				ret = parse_userspace_probe_opts(opt_userspace_probe, &uprobe_loc);
 				if (ret) {
@@ -998,7 +998,7 @@ static int enable_events(char *session_name)
 			strncpy(ev->name, event_name, LTTNG_SYMBOL_NAME_LEN);
 			ev->name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 		} else {
-			assert(0);
+			abort();
 		}
 
 		if (!opt_filter) {
@@ -1059,7 +1059,7 @@ static int enable_events(char *session_name)
 				case LTTNG_DOMAIN_KERNEL:
 				case LTTNG_DOMAIN_UST:
 					MSG("%s event %s%s created in channel %s",
-						get_domain_str(dom.type),
+						lttng_domain_type_str(dom.type),
 						event_name,
 						exclusion_string,
 						print_channel_name(channel_name));
@@ -1072,12 +1072,12 @@ static int enable_events(char *session_name)
 					 * name for agent domains.
 					 */
 					MSG("%s event %s%s enabled",
-						get_domain_str(dom.type),
+						lttng_domain_type_str(dom.type),
 						event_name,
 						exclusion_string);
 					break;
 				default:
-					assert(0);
+					abort();
 				}
 			}
 			free(exclusion_string);