X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fpipe.hpp;h=d46e65d6833a32b97228e7a76573aaca829e2b64;hp=4e6afc567831868c570ab36c2fa8998fd8357ca0;hb=HEAD;hpb=0038180de36c422cfaeade1145fa9fbc9436b8ad diff --git a/src/common/pipe.hpp b/src/common/pipe.hpp index 4e6afc567..5249061f8 100644 --- a/src/common/pipe.hpp +++ b/src/common/pipe.hpp @@ -21,16 +21,12 @@ enum lttng_pipe_state { /* Close both side of pipe. */ int lttng_pipe_close(struct lttng_pipe *pipe); +void lttng_pipe_destroy(struct lttng_pipe *pipe); struct lttng_pipe { - static void _lttng_pipe_close_wrapper(lttng_pipe *pipe) - { - lttng_pipe_close(pipe); - } - using uptr = std::unique_ptr< lttng_pipe, - lttng::details::create_unique_class::deleter>; + lttng::memory::create_deleter_class::deleter>; /* Read: 0, Write: 1. */ int fd[2]; @@ -79,15 +75,12 @@ static inline int lttng_pipe_get_writefd(const struct lttng_pipe *pipe) } struct lttng_pipe *lttng_pipe_open(int flags); -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); int lttng_pipe_write_close(struct lttng_pipe *pipe); int lttng_pipe_read_close(struct lttng_pipe *pipe); -void lttng_pipe_destroy(struct lttng_pipe *pipe); ssize_t lttng_pipe_read(struct lttng_pipe *pipe, void *buf, size_t count); -ssize_t lttng_pipe_write(struct lttng_pipe *pipe, const void *buf, - size_t count); +ssize_t lttng_pipe_write(struct lttng_pipe *pipe, const void *buf, size_t count); /* Returns and releases the read end of the pipe. */ int lttng_pipe_release_readfd(struct lttng_pipe *pipe); /* Returns and releases the write end of the pipe. */