projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Force usage of assert() condition when NDEBUG is defined
[lttng-tools.git]
/
src
/
common
/
mi-lttng.c
diff --git
a/src/common/mi-lttng.c
b/src/common/mi-lttng.c
index 4da97deede2d81731f9d5c52e962600814b75032..e47994ca2063879937c58ef7278ae2a6fefbcad2 100644
(file)
--- a/
src/common/mi-lttng.c
+++ b/
src/common/mi-lttng.c
@@
-16,10
+16,9
@@
#include <lttng/channel.h>
#include <lttng/snapshot-internal.h>
#include <lttng/channel.h>
#include <lttng/snapshot-internal.h>
-#include <assert.h>
#define MI_SCHEMA_MAJOR_VERSION 4
#define MI_SCHEMA_MAJOR_VERSION 4
-#define MI_SCHEMA_MINOR_VERSION
0
+#define MI_SCHEMA_MINOR_VERSION
1
/* Machine interface namespace URI */
LTTNG_HIDDEN const char * const mi_lttng_xmlns = "xmlns";
/* Machine interface namespace URI */
LTTNG_HIDDEN const char * const mi_lttng_xmlns = "xmlns";
@@
-710,7
+709,6
@@
const char *mi_lttng_eventfieldtype_string(enum lttng_event_field_type val)
LTTNG_HIDDEN
const char *mi_lttng_domaintype_string(enum lttng_domain_type value)
{
LTTNG_HIDDEN
const char *mi_lttng_domaintype_string(enum lttng_domain_type value)
{
- /* Note: This is a *duplicate* of get_domain_str from bin/lttng/utils.c */
switch (value) {
case LTTNG_DOMAIN_KERNEL:
return config_domain_type_kernel;
switch (value) {
case LTTNG_DOMAIN_KERNEL:
return config_domain_type_kernel;
@@
-724,7
+722,7
@@
const char *mi_lttng_domaintype_string(enum lttng_domain_type value)
return config_domain_type_python;
default:
/* Should not have an unknown domain */
return config_domain_type_python;
default:
/* Should not have an unknown domain */
- a
ssert(0
);
+ a
bort(
);
return NULL;
}
}
return NULL;
}
}
@@
-741,7
+739,7
@@
const char *mi_lttng_buffertype_string(enum lttng_buffer_type value)
return config_buffer_type_global;
default:
/* Should not have an unknow buffer type */
return config_buffer_type_global;
default:
/* Should not have an unknow buffer type */
- a
ssert(0
);
+ a
bort(
);
return NULL;
}
}
return NULL;
}
}
@@
-760,7
+758,7
@@
const char *mi_lttng_rotation_state_string(enum lttng_rotation_state value)
return mi_lttng_rotation_state_str_error;
default:
/* Should not have an unknow rotation state. */
return mi_lttng_rotation_state_str_error;
default:
/* Should not have an unknow rotation state. */
- a
ssert(0
);
+ a
bort(
);
return NULL;
}
}
return NULL;
}
}
@@
-774,7
+772,7
@@
const char *mi_lttng_trace_archive_location_relay_protocol_type_string(
return mi_lttng_rotation_location_relay_protocol_str_tcp;
default:
/* Should not have an unknown relay protocol. */
return mi_lttng_rotation_location_relay_protocol_str_tcp;
default:
/* Should not have an unknown relay protocol. */
- a
ssert(0
);
+ a
bort(
);
return NULL;
}
}
return NULL;
}
}
@@
-1048,7
+1046,7
@@
int mi_lttng_session(struct mi_writer *writer,
{
int ret;
{
int ret;
-
assert
(session);
+
LTTNG_ASSERT
(session);
/* Open sessions element */
ret = mi_lttng_writer_open_element(writer,
/* Open sessions element */
ret = mi_lttng_writer_open_element(writer,
@@
-1116,7
+1114,7
@@
int mi_lttng_domain(struct mi_writer *writer,
const char *str_domain;
const char *str_buffer;
const char *str_domain;
const char *str_buffer;
-
assert
(domain);
+
LTTNG_ASSERT
(domain);
/* Open domain element */
ret = mi_lttng_writer_open_element(writer, config_element_domain);
/* Open domain element */
ret = mi_lttng_writer_open_element(writer, config_element_domain);
@@
-1168,7
+1166,7
@@
int mi_lttng_channel(struct mi_writer *writer,
{
int ret = 0;
{
int ret = 0;
-
assert
(channel);
+
LTTNG_ASSERT
(channel);
/* Opening channel element */
ret = mi_lttng_writer_open_element(writer, config_element_channel);
/* Opening channel element */
ret = mi_lttng_writer_open_element(writer, config_element_channel);
@@
-1217,7
+1215,7
@@
int mi_lttng_channel_attr(struct mi_writer *writer,
uint64_t discarded_events, lost_packets, monitor_timer_interval;
int64_t blocking_timeout;
uint64_t discarded_events, lost_packets, monitor_timer_interval;
int64_t blocking_timeout;
-
assert
(attr);
+
LTTNG_ASSERT
(attr);
ret = lttng_channel_get_discarded_event_count(chan, &discarded_events);
if (ret) {
ret = lttng_channel_get_discarded_event_count(chan, &discarded_events);
if (ret) {
This page took
0.025129 seconds
and
4
git commands to generate.