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
/
lib
/
lttng-ctl
/
lttng-ctl.c
diff --git
a/src/lib/lttng-ctl/lttng-ctl.c
b/src/lib/lttng-ctl/lttng-ctl.c
index 7ad1fe13291b8f40599ad60ce197bbbfc5c6dae5..46d9cb1c3a805067ac3c37af45fd30ace416a63f 100644
(file)
--- a/
src/lib/lttng-ctl/lttng-ctl.c
+++ b/
src/lib/lttng-ctl/lttng-ctl.c
@@
-11,7
+11,6
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <grp.h>
#include <stdio.h>
#include <stdlib.h>
#include <grp.h>
#include <stdio.h>
#include <stdlib.h>
@@
-198,7
+197,7
@@
static int recv_data_sessiond(void *buf, size_t len)
{
int ret;
{
int ret;
-
assert
(len > 0);
+
LTTNG_ASSERT
(len > 0);
if (!connected) {
ret = -LTTNG_ERR_NO_SESSIOND;
if (!connected) {
ret = -LTTNG_ERR_NO_SESSIOND;
@@
-614,8
+613,8
@@
int lttng_ctl_ask_sessiond_payload(struct lttng_payload_view *message,
struct lttcomm_lttng_msg llm;
const int fd_count = lttng_payload_view_get_fd_handle_count(message);
struct lttcomm_lttng_msg llm;
const int fd_count = lttng_payload_view_get_fd_handle_count(message);
-
assert
(reply->buffer.size == 0);
-
assert
(lttng_dynamic_pointer_array_get_count(&reply->_fd_handles) == 0);
+
LTTNG_ASSERT
(reply->buffer.size == 0);
+
LTTNG_ASSERT
(lttng_dynamic_pointer_array_get_count(&reply->_fd_handles) == 0);
ret = connect_sessiond();
if (ret < 0) {
ret = connect_sessiond();
if (ret < 0) {
@@
-1021,7
+1020,7
@@
static char *set_agent_filter(const char *filter, struct lttng_event *ev)
int err;
char *agent_filter = NULL;
int err;
char *agent_filter = NULL;
-
assert
(ev);
+
LTTNG_ASSERT
(ev);
/* Don't add filter for the '*' event. */
if (strcmp(ev->name, "*") != 0) {
/* Don't add filter for the '*' event. */
if (strcmp(ev->name, "*") != 0) {
@@
-1134,7
+1133,7
@@
int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
if (ev->name[0] == '\0') {
/* Enable all events. */
ret = lttng_strncpy(ev->name, "*", sizeof(ev->name));
if (ev->name[0] == '\0') {
/* Enable all events. */
ret = lttng_strncpy(ev->name, "*", sizeof(ev->name));
-
assert
(ret == 0);
+
LTTNG_ASSERT
(ret == 0);
}
COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
}
COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
@@
-1279,7
+1278,7
@@
int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
goto mem_error;
}
goto mem_error;
}
-
assert
(fd_count == 0 || fd_count == 1);
+
LTTNG_ASSERT
(fd_count == 0 || fd_count == 1);
if (fd_count == 1) {
struct fd_handle *h =
lttng_payload_view_pop_fd_handle(&view);
if (fd_count == 1) {
struct fd_handle *h =
lttng_payload_view_pop_fd_handle(&view);
@@
-2053,7
+2052,7
@@
int lttng_destroy_session(const char *session_name)
ret = (int) -ret_code;
goto end;
}
ret = (int) -ret_code;
goto end;
}
-
assert
(handle);
+
LTTNG_ASSERT
(handle);
/* Block until the completion of the destruction of the session. */
status = lttng_destruction_handle_wait_for_completion(handle, -1);
/* Block until the completion of the destruction of the session. */
status = lttng_destruction_handle_wait_for_completion(handle, -1);
@@
-2883,7
+2882,7
@@
int lttng_session_daemon_alive(void)
* No socket path set. Weird error which means the constructor
* was not called.
*/
* No socket path set. Weird error which means the constructor
* was not called.
*/
- a
ssert(0
);
+ a
bort(
);
}
ret = try_connect_sessiond(sessiond_sock_path);
}
ret = try_connect_sessiond(sessiond_sock_path);
This page took
0.025652 seconds
and
4
git commands to generate.