projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fix: Missing message in LTTNG_DEPRECATED invocation
[lttng-tools.git]
/
src
/
common
/
pipe.c
diff --git
a/src/common/pipe.c
b/src/common/pipe.c
index 868c1f3de839dd71847604062ed063b0acb31b1d..45be43fa3833fe21966b8377a9831e6c185b7540 100644
(file)
--- a/
src/common/pipe.c
+++ b/
src/common/pipe.c
@@
-6,7
+6,6
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
@@
-57,7
+56,7
@@
static int _pipe_read_close(struct lttng_pipe *pipe)
{
int ret, ret_val = 0;
{
int ret, ret_val = 0;
-
assert
(pipe);
+
LTTNG_ASSERT
(pipe);
if (!lttng_pipe_is_read_open(pipe)) {
goto end;
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;
{
int ret, ret_val = 0;
-
assert
(pipe);
+
LTTNG_ASSERT
(pipe);
if (!lttng_pipe_is_write_open(pipe)) {
goto end;
if (!lttng_pipe_is_write_open(pipe)) {
goto end;
@@
-178,7
+177,6
@@
end:
*
* Return a newly allocated lttng pipe on success or else NULL.
*/
*
* Return a newly allocated lttng pipe on success or else NULL.
*/
-LTTNG_HIDDEN
struct lttng_pipe *lttng_pipe_open(int flags)
{
int ret;
struct lttng_pipe *lttng_pipe_open(int flags)
{
int ret;
@@
-215,7
+213,6
@@
error:
*
* Return a newly allocated lttng pipe on success or else NULL.
*/
*
* Return a newly allocated lttng pipe on success or else NULL.
*/
-LTTNG_HIDDEN
struct lttng_pipe *lttng_pipe_named_open(const char *path, mode_t mode,
int flags)
{
struct lttng_pipe *lttng_pipe_named_open(const char *path, mode_t mode,
int flags)
{
@@
-266,12
+263,11
@@
error:
*
* Return 0 on success else a negative value.
*/
*
* Return 0 on success else a negative value.
*/
-LTTNG_HIDDEN
int lttng_pipe_read_close(struct lttng_pipe *pipe)
{
int ret;
int lttng_pipe_read_close(struct lttng_pipe *pipe)
{
int ret;
-
assert
(pipe);
+
LTTNG_ASSERT
(pipe);
/* Handle read side first. */
lock_read_side(pipe);
/* Handle read side first. */
lock_read_side(pipe);
@@
-286,12
+282,11
@@
int lttng_pipe_read_close(struct lttng_pipe *pipe)
*
* Return 0 on success else a negative value.
*/
*
* Return 0 on success else a negative value.
*/
-LTTNG_HIDDEN
int lttng_pipe_write_close(struct lttng_pipe *pipe)
{
int ret;
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);
lock_write_side(pipe);
ret = _pipe_write_close(pipe);
@@
-305,12
+300,11
@@
int lttng_pipe_write_close(struct lttng_pipe *pipe)
*
* Return 0 on success else a negative value.
*/
*
* Return 0 on success else a negative value.
*/
-LTTNG_HIDDEN
int lttng_pipe_close(struct lttng_pipe *pipe)
{
int ret, ret_val = 0;
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) {
ret = lttng_pipe_read_close(pipe);
if (ret < 0) {
@@
-328,7
+322,6
@@
int lttng_pipe_close(struct lttng_pipe *pipe)
/*
* Close and destroy a lttng pipe object. Finally, pipe is freed.
*/
/*
* Close and destroy a lttng pipe object. Finally, pipe is freed.
*/
-LTTNG_HIDDEN
void lttng_pipe_destroy(struct lttng_pipe *pipe)
{
int ret;
void lttng_pipe_destroy(struct lttng_pipe *pipe)
{
int ret;
@@
-342,9
+335,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);
* 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);
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);
/* Close pipes WITHOUT trying to lock the pipes. */
(void) _pipe_read_close(pipe);
@@
-365,13
+358,12
@@
void lttng_pipe_destroy(struct lttng_pipe *pipe)
* Return "count" on success. Return < count on error. errno can be used
* to check the actual error.
*/
* Return "count" on success. Return < count on error. errno can be used
* to check the actual error.
*/
-LTTNG_HIDDEN
ssize_t lttng_pipe_read(struct lttng_pipe *pipe, void *buf, size_t count)
{
ssize_t ret;
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)) {
lock_read_side(pipe);
if (!lttng_pipe_is_read_open(pipe)) {
@@
-391,14
+383,13
@@
error:
* Return "count" on success. Return < count on error. errno can be used
* to check the actual error.
*/
* Return "count" on success. Return < count on error. errno can be used
* to check the actual error.
*/
-LTTNG_HIDDEN
ssize_t lttng_pipe_write(struct lttng_pipe *pipe, const void *buf,
size_t count)
{
ssize_t ret;
ssize_t lttng_pipe_write(struct lttng_pipe *pipe, const void *buf,
size_t count)
{
ssize_t ret;
-
assert
(pipe);
-
assert
(buf);
+
LTTNG_ASSERT
(pipe);
+
LTTNG_ASSERT
(buf);
lock_write_side(pipe);
if (!lttng_pipe_is_write_open(pipe)) {
lock_write_side(pipe);
if (!lttng_pipe_is_write_open(pipe)) {
@@
-421,7
+412,6
@@
error:
* Returns the fd of the read end of the pipe, or -1 if it was already closed or
* released.
*/
* Returns the fd of the read end of the pipe, or -1 if it was already closed or
* released.
*/
-LTTNG_HIDDEN
int lttng_pipe_release_readfd(struct lttng_pipe *pipe)
{
int ret;
int lttng_pipe_release_readfd(struct lttng_pipe *pipe)
{
int ret;
@@
-454,7
+444,6
@@
end:
* Returns the fd of the write end of the pipe, or -1 if it was alwritey closed
* or released.
*/
* Returns the fd of the write end of the pipe, or -1 if it was alwritey closed
* or released.
*/
-LTTNG_HIDDEN
int lttng_pipe_release_writefd(struct lttng_pipe *pipe)
{
int ret;
int lttng_pipe_release_writefd(struct lttng_pipe *pipe)
{
int ret;
This page took
0.026456 seconds
and
4
git commands to generate.