diff options
| author | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2017-01-30 14:52:04 +0530 |
|---|---|---|
| committer | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2017-01-30 19:31:50 +0530 |
| commit | ff74a2144e02af11373375f8d40e9b312a0dd0c6 (patch) | |
| tree | afc7d16d2d5fc1e2a562467dd619beb65712c5dc /utils.h | |
| parent | 46e546b65a717fcf9a17d905152e861d05a4a9be (diff) | |
gluster-block: walk through the cleanups
better naming of variables and functions,
variable initialization, also fix few leaks
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Diffstat (limited to 'utils.h')
| -rw-r--r-- | utils.h | 145 |
1 files changed, 84 insertions, 61 deletions
@@ -17,7 +17,7 @@ # include <stdbool.h> # include <string.h> # include <errno.h> -#include <time.h> +# include <time.h> /* Target Create */ @@ -46,6 +46,89 @@ # define FAILED_DELETING_IQN "failed while deleting IQN" # define FAILED_DELETING_FILE "failed while deleting block file from gluster volume" + +# define ERROR(fmt, ...) \ + do { \ + fprintf(stderr, "Error: " fmt " [at %s+%d :<%s>]\n", \ + __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__); \ + } while (0) + +# define MSG(fmt, ...) \ + do { \ + fprintf(stdout, fmt, __VA_ARGS__); \ + } while (0) + +# define LOG(str, level, fmt, ...) \ + do { \ + FILE *fd; \ + if (!strcmp(str, "mgmt")) \ + fd = fopen (DAEMON_LOG_FILE, "a"); \ + else if (strcmp(str, "cli")) \ + fd = fopen (CLI_LOG_FILE, "a"); \ + else if (strcmp(str, "gfapi")) \ + fd = fopen (GFAPI_LOG_FILE, "a"); \ + else \ + fd = stderr; \ + fprintf(fd, "[%lu] %s: " fmt " [at %s+%d :<%s>]\n", \ + (unsigned long)time(NULL), LogLevelLookup[level],\ + __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__); \ + fclose(fd); \ + } while (0) + +# define METALOCK(lkfd) \ + do { \ + struct flock lock = {0, }; \ + memset (&lock, 0, sizeof(lock)); \ + lock.l_type = F_WRLCK; \ + if (glfs_posix_lock (lkfd, F_SETLKW, &lock)) { \ + LOG("mgmt", ERROR, "%s", "glfs_posix_lock: failed"); \ + ret = -1; \ + goto out; \ + } \ + } while (0) + +# define METAUPDATE(a, ...) \ + do { \ + char *write; \ + asprintf(&write, __VA_ARGS__); \ + if(glfs_write (a, write, strlen(write), 0) < 0) { \ + LOG("mgmt", ERROR, "%s", "glfs_write: failed"); \ + ret = -1; \ + goto out; \ + } \ + GB_FREE(write); \ + } while (0) + +# define METAUNLOCK(lkfd) \ + do { \ + struct flock lock = {0, }; \ + lock.l_type = F_UNLCK; \ + if (glfs_posix_lock(lkfd, F_SETLKW, &lock)) { \ + LOG("mgmt", ERROR, "%s", "glfs_posix_lock: failed"); \ + ret = -1; \ + } \ + } while (0) + + +# define CALLOC(x) \ + calloc(1, x) + +# define GB_ALLOC_N(ptr, count) \ + gbAllocN(&(ptr), sizeof(*(ptr)), (count), \ + __FILE__, __FUNCTION__, __LINE__) \ + +# define GB_ALLOC(ptr) \ + gbAlloc(&(ptr), sizeof(*(ptr)), \ + __FILE__, __FUNCTION__, __LINE__) + +# define GB_STRDUP(dst, src) \ + gbStrdup(&(dst), src, \ + __FILE__, __FUNCTION__, __LINE__) + +# define GB_FREE(ptr) \ + gbFree(1 ? (void *) &(ptr) : (ptr)) + + typedef enum LogLevel { NONE = 0, EMERGENCY = 1, @@ -76,66 +159,6 @@ static const char *const LogLevelLookup[] = { [LOGLEVEL__MAX] = NULL, }; -# define ERROR(fmt, ...) \ - fprintf(stderr, "Error: " fmt " [at %s+%d :<%s>]\n", \ - __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__) - -# define MSG(fmt, ...) \ - fprintf(stdout, fmt, __VA_ARGS__) - -# define LOG(str, level, fmt, ...) {\ - static FILE *fd; \ - if (!strcmp(str, "mgmt")) \ - fd = fopen (DAEMON_LOG_FILE, "a"); \ - else if (strcmp(str, "cli")) \ - fd = fopen (CLI_LOG_FILE, "a"); \ - else if (strcmp(str, "gfapi")) \ - fd = fopen (GFAPI_LOG_FILE, "a"); \ - else \ - fd = stderr; \ - fprintf(fd, "[%lu] %s: " fmt " [at %s+%d :<%s>]\n", \ - (unsigned long)time(NULL), LogLevelLookup[level], \ - __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__); \ - fclose(fd); \ - } - -# define METALOCK(a, b) {\ - memset (&a, 0, sizeof(a)); \ - a.l_type = F_WRLCK; \ - if (glfs_posix_lock (b, F_SETLKW, &a)) {\ - ERROR("%s", "glfs_posix_lock: failed");\ - goto out;\ - }\ - } - -# define METAUPDATE(a, b, ...) {\ - asprintf(&b, __VA_ARGS__);\ - if(glfs_write (a, b, strlen(b), 0) < 0) {\ - ERROR("%s", "glfs_write: failed");\ - goto out;\ - }\ - GB_FREE(b); \ - } - -# define METAUNLOCK(a, b) {\ - a.l_type = F_UNLCK; \ - glfs_posix_lock(b, F_SETLKW, &a); \ - } - - -# define CALLOC(x) calloc(1, x) - -# define GB_ALLOC_N(ptr, count) gbAllocN(&(ptr), sizeof(*(ptr)), (count), \ - __FILE__, __FUNCTION__, __LINE__) - -# define GB_ALLOC(ptr) gbAlloc(&(ptr), sizeof(*(ptr)), \ - __FILE__, __FUNCTION__, __LINE__) - -# define GB_STRDUP(dst, src) gbStrdup(&(dst), src, \ - __FILE__, __FUNCTION__, __LINE__) - -# define GB_FREE(ptr) gbFree(1 ? (void *) &(ptr) : (ptr)) - typedef enum Metakey { VOLUME = 0, GBID = 1, |