From 6ad9e6d22a0992e474060e80238553f851cf80c6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 25 Aug 2015 21:06:12 +0200 Subject: m + doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/libmdsclient/comm.c | 23 ++++++++++++++++++++--- src/libmdsclient/comm.h | 30 +++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/libmdsclient/comm.c b/src/libmdsclient/comm.c index 6c1f34f..3284043 100644 --- a/src/libmdsclient/comm.c +++ b/src/libmdsclient/comm.c @@ -25,9 +25,13 @@ /** * Initialise a connection descriptor * - * @param this The connection descriptor + * @param this The connection descriptor * @return Zero on success, -1 on error, `ernno` * will have been set accordingly on error + * + * @throws EAGAIN See pthread_mutex_init(3) + * @throws ENOMEM See pthread_mutex_init(3) + * @throws EPERM See pthread_mutex_init(3) */ int libmds_connection_initialise(libmds_connection_t* restrict this) { @@ -51,14 +55,15 @@ int libmds_connection_initialise(libmds_connection_t* restrict this) * * @throws ENOMEM Out of memory, Possibly, the process hit the RLIMIT_AS or * RLIMIT_DATA limit described in getrlimit(2). + * @throws EAGAIN See pthread_mutex_init(3) + * @throws EPERM See pthread_mutex_init(3) */ libmds_connection_t* libmds_connection_create(void) { libmds_connection_t* rc = malloc(sizeof(libmds_connection_t)); if (rc == NULL) return NULL; - libmds_connection_initialise(rc); - return rc; + return libmds_connection_initialise(rc) ? NULL : rc; } @@ -107,6 +112,18 @@ void libmds_connection_free(libmds_connection_t* restrict this) } +/** + * Wrapper for `libmds_connection_send_unlocked` that locks + * the mutex of the connection + * + * @param this The connection descriptor, must not be `NULL` + * @param message The message to send, must not be `NULL` + * @param length The length of the message, should be positive + * @return Zero on success, -1 on error, `ernno` + * will have been set accordingly on error + * + * @throws See pthread_mutex_lock(3) + */ int libmds_connection_send(libmds_connection_t* restrict this, const char* message, size_t length) { int r, saved_errno; diff --git a/src/libmdsclient/comm.h b/src/libmdsclient/comm.h index 833fa97..7b2f46c 100644 --- a/src/libmdsclient/comm.h +++ b/src/libmdsclient/comm.h @@ -73,6 +73,10 @@ typedef struct libmds_connection * @param this The connection descriptor * @return Zero on success, -1 on error, `ernno` * will have been set accordingly on error + * + * @throws EAGAIN See pthread_mutex_init(3) + * @throws ENOMEM See pthread_mutex_init(3) + * @throws EPERM See pthread_mutex_init(3) */ __attribute__((nonnull)) int libmds_connection_initialise(libmds_connection_t* restrict this); @@ -85,6 +89,8 @@ int libmds_connection_initialise(libmds_connection_t* restrict this); * * @throws ENOMEM Out of memory, Possibly, the process hit the RLIMIT_AS or * RLIMIT_DATA limit described in getrlimit(2). + * @throws EAGAIN See pthread_mutex_init(3) + * @throws EPERM See pthread_mutex_init(3) */ libmds_connection_t* libmds_connection_create(void); @@ -103,8 +109,18 @@ void libmds_connection_destroy(libmds_connection_t* restrict this); */ void libmds_connection_free(libmds_connection_t* restrict this); + /** - * TODO doc + * Wrapper for `libmds_connection_send_unlocked` that locks + * the mutex of the connection + * + * @param this The connection descriptor, must not be `NULL` + * @param message The message to send, must not be `NULL` + * @param length The length of the message, should be positive + * @return Zero on success, -1 on error, `ernno` + * will have been set accordingly on error + * + * @throws See pthread_mutex_lock(3) */ __attribute__((nonnull)) int libmds_connection_send(libmds_connection_t* restrict this, const char* message, size_t length); @@ -122,7 +138,8 @@ int libmds_connection_send_unlocked(libmds_connection_t* restrict this, const ch * @param this:libmds_connection_t* The connection descriptor, must not be `NULL` * @return :int Zero on success, -1 on error, `errno` * will have been set accordingly on error - * @throws See pthread_mutex_lock(3) + * + * @throws See pthread_mutex_lock(3) */ #define libmds_connection_lock(this) \ (errno = pthread_mutex_lock(&((this)->mutex)), (errno ? 0 : -1)) @@ -134,7 +151,8 @@ int libmds_connection_send_unlocked(libmds_connection_t* restrict this, const ch * @param this:libmds_connection_t* The connection descriptor, must not be `NULL` * @return :int Zero on success, -1 on error, `errno` * will have been set accordingly on error - * @throws See pthread_mutex_trylock(3) + * + * @throws See pthread_mutex_trylock(3) */ #define libmds_connection_trylock(this) \ (errno = pthread_mutex_trylock(&((this)->mutex)), (errno ? 0 : -1)) @@ -148,7 +166,8 @@ int libmds_connection_send_unlocked(libmds_connection_t* restrict this, const ch * function shall fail, must not be `NULL` * @return :int Zero on success, -1 on error, `errno` * will have been set accordingly on error - * @throws See pthread_mutex_timedlock(3) + * + * @throws See pthread_mutex_timedlock(3) */ #define libmds_connection_timedlock(this, deadline) \ (errno = pthread_mutex_timedlock(&((this)->mutex), deadline), (errno ? 0 : -1)) @@ -160,7 +179,8 @@ int libmds_connection_send_unlocked(libmds_connection_t* restrict this, const ch * @param this:libmds_connection_t* The connection descriptor, must not be `NULL` * @return :int Zero on success, -1 on error, `errno` * will have been set accordingly on error - * @throws See pthread_mutex_unlock(3) + * + * @throws See pthread_mutex_unlock(3) */ #define libmds_connection_unlock(this) \ (errno = pthread_mutex_unlock(&((this)->mutex)), (errno ? 0 : -1)) -- cgit v1.2.3-70-g09d2