X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fpipe.c;fp=src%2Fcommon%2Fpipe.c;h=e052e6fe09f951bcfd3f7c68090530cd1c39e02b;hp=868c1f3de839dd71847604062ed063b0acb31b1d;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hpb=cc3b9644f017a91d347d7a414387292e3175635e diff --git a/src/common/pipe.c b/src/common/pipe.c index 868c1f3de..e052e6fe0 100644 --- a/src/common/pipe.c +++ b/src/common/pipe.c @@ -6,7 +6,6 @@ */ #define _LGPL_SOURCE -#include #include #include #include @@ -57,7 +56,7 @@ static int _pipe_read_close(struct lttng_pipe *pipe) { int ret, ret_val = 0; - assert(pipe); + LTTNG_ASSERT(pipe); if (!lttng_pipe_is_read_open(pipe)) { goto end; @@ -85,7 +84,7 @@ static int _pipe_write_close(struct lttng_pipe *pipe) { int ret, ret_val = 0; - assert(pipe); + LTTNG_ASSERT(pipe); if (!lttng_pipe_is_write_open(pipe)) { goto end; @@ -271,7 +270,7 @@ int lttng_pipe_read_close(struct lttng_pipe *pipe) { int ret; - assert(pipe); + LTTNG_ASSERT(pipe); /* Handle read side first. */ lock_read_side(pipe); @@ -291,7 +290,7 @@ int lttng_pipe_write_close(struct lttng_pipe *pipe) { int ret; - assert(pipe); + LTTNG_ASSERT(pipe); lock_write_side(pipe); ret = _pipe_write_close(pipe); @@ -310,7 +309,7 @@ int lttng_pipe_close(struct lttng_pipe *pipe) { int ret, ret_val = 0; - assert(pipe); + LTTNG_ASSERT(pipe); ret = lttng_pipe_read_close(pipe); if (ret < 0) { @@ -342,9 +341,9 @@ void lttng_pipe_destroy(struct lttng_pipe *pipe) * succeed so we unlock them after the close pipe below. */ ret = pthread_mutex_trylock(&pipe->read_mutex); - assert(!ret); + LTTNG_ASSERT(!ret); ret = pthread_mutex_trylock(&pipe->write_mutex); - assert(!ret); + LTTNG_ASSERT(!ret); /* Close pipes WITHOUT trying to lock the pipes. */ (void) _pipe_read_close(pipe); @@ -370,8 +369,8 @@ ssize_t lttng_pipe_read(struct lttng_pipe *pipe, void *buf, size_t count) { ssize_t ret; - assert(pipe); - assert(buf); + LTTNG_ASSERT(pipe); + LTTNG_ASSERT(buf); lock_read_side(pipe); if (!lttng_pipe_is_read_open(pipe)) { @@ -397,8 +396,8 @@ ssize_t lttng_pipe_write(struct lttng_pipe *pipe, const void *buf, { ssize_t ret; - assert(pipe); - assert(buf); + LTTNG_ASSERT(pipe); + LTTNG_ASSERT(buf); lock_write_side(pipe); if (!lttng_pipe_is_write_open(pipe)) {