From 633fcaf2d954413d16d1282dc4791c0a53acec5f Mon Sep 17 00:00:00 2001

From: Mohamed Ashiq <ashiq333@gmail.com>

Date: Tue, 19 May 2015 15:53:19 +0530

Subject: [PATCH 165/190] call-stub,circ-buff,client_t,compat,dict/libglusterfs : Porting to a new logging framework

Change-Id: Ie7d180e0ab2fed1270d66504606d1b2522884020

BUG: 1231792

Signed-off-by: Mohamed Ashiq Liyazudeen <mliyazud@redhat.com>

Reviewed-on: http://review.gluster.org/10828

Tested-by: NetBSD Build System <jenkins@build.gluster.org>

Tested-by: Gluster Build System <jenkins@build.gluster.com>

Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/51686

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Tested-by: Venky Shankar <vshankar@redhat.com>

---

 libglusterfs/src/call-stub.c |   14 +-

 libglusterfs/src/circ-buff.c |   25 ++--

 libglusterfs/src/client_t.c  |   67 +++++++----

 libglusterfs/src/compat.c    |   58 +++++-----

 libglusterfs/src/dict.c      |  265 +++++++++++++++++++++++++-----------------

 libglusterfs/src/dict.h      |    9 +-

 6 files changed, 256 insertions(+), 182 deletions(-)

diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c

index 128dcf9..f3c3095 100644

--- a/libglusterfs/src/call-stub.c

+++ b/libglusterfs/src/call-stub.c

@@ -18,7 +18,7 @@

 #include "call-stub.h"

 #include "mem-types.h"

-

+#include "libglusterfs-messages.h"

 static call_stub_t *

 stub_new (call_frame_t *frame,

@@ -2285,9 +2285,9 @@ call_resume_wind (call_stub_t *stub)

                 break;

         default:

-                gf_log_callingfn ("call-stub", GF_LOG_ERROR,

-                                  "Invalid value of FOP (%d)",

-                                  stub->fop);

+                gf_msg_callingfn ("call-stub", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ENTRY, "Invalid value of FOP"

+                                  " (%d)", stub->fop);

                 break;

         }

 out:

@@ -2495,9 +2495,9 @@ call_resume_unwind (call_stub_t *stub)

                 break;

         default:

-                gf_log_callingfn ("call-stub", GF_LOG_ERROR,

-                                  "Invalid value of FOP (%d)",

-                                  stub->fop);

+                gf_msg_callingfn ("call-stub", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ENTRY, "Invalid value of FOP"

+                                  " (%d)", stub->fop);

                 break;

         }

 out:

diff --git a/libglusterfs/src/circ-buff.c b/libglusterfs/src/circ-buff.c

index 484ce7d..6259282 100644

--- a/libglusterfs/src/circ-buff.c

+++ b/libglusterfs/src/circ-buff.c

@@ -9,6 +9,7 @@

 */

 #include "circ-buff.h"

+#include "libglusterfs-messages.h"

 void

 cb_destroy_data (circular_buffer_t *cb,

@@ -32,8 +33,8 @@ __cb_add_entry_buffer (buffer_t *buffer, void *item)

         if (buffer->use_once == _gf_true &&

             buffer->used_len == buffer->size_buffer) {

-                gf_log  ("", GF_LOG_WARNING, "buffer %p is use once buffer",

-                         buffer);

+                gf_msg  ("circ-buff", GF_LOG_WARNING, 0, LG_MSG_BUFFER_ERROR,

+                         "buffer %p is use once buffer", buffer);

                 return -1;

         } else {

                 if (buffer->used_len == buffer->size_buffer) {

@@ -59,8 +60,9 @@ __cb_add_entry_buffer (buffer_t *buffer, void *item)

                 buffer->cb[buffer->w_index]->data = item;

                 ret = gettimeofday (&buffer->cb[buffer->w_index]->tv, NULL);

                 if (ret == -1)

-                        gf_log_callingfn ("", GF_LOG_WARNING, "getting time of"

-                                          "the day failed");

+                        gf_msg_callingfn ("circ-buff", GF_LOG_WARNING, 0,

+                                          LG_MSG_GETTIMEOFDAY_FAILED,

+                                          "getting time of the day failed");

                 buffer->w_index++;

                 buffer->w_index %= buffer->size_buffer;

                 //used_buffer size cannot be greater than the total buffer size

@@ -90,10 +92,9 @@ cb_buffer_show (buffer_t *buffer)

 {

         pthread_mutex_lock (&buffer->lock);

         {

-                gf_log ("", GF_LOG_DEBUG, "w_index: %d, size: %"GF_PRI_SIZET

-                        " used_buffer: %d", buffer->w_index,

-                        buffer->size_buffer,

-                        buffer->used_len);

+                gf_msg_debug ("circ-buff", 0, "w_index: %d, size: %"

+                              GF_PRI_SIZET" used_buffer: %d", buffer->w_index,

+                              buffer->size_buffer, buffer->used_len);

         }

         pthread_mutex_unlock (&buffer->lock);

 }

@@ -124,7 +125,9 @@ cb_buffer_dump (buffer_t *buffer, void *data,

                                 if (entry)

                                         fn (entry, data);

                                 else

-                                        gf_log_callingfn ("", GF_LOG_WARNING,

+                                        gf_msg_callingfn ("circ-buff",

+                                                          GF_LOG_WARNING, 0,

+                                                          LG_MSG_NULL_PTR,

                                                           "Null entry in "

                                                           "circular buffer at "

                                                           "index %d.", index);

@@ -150,8 +153,6 @@ cb_buffer_new (size_t buffer_size, gf_boolean_t use_once,

         buffer = GF_CALLOC (1, sizeof (*buffer), gf_common_mt_buffer_t);

         if (!buffer) {

-                gf_log ("", GF_LOG_ERROR, "could not allocate the "

-                        "buffer");

                 goto out;

         }

@@ -159,8 +160,6 @@ cb_buffer_new (size_t buffer_size, gf_boolean_t use_once,

                                 sizeof (circular_buffer_t *),

                                 gf_common_mt_circular_buffer_t);

         if (!buffer->cb) {

-                gf_log ("", GF_LOG_ERROR, "could not allocate the "

-                        "memory for the circular buffer");

                 GF_FREE (buffer);

                 buffer = NULL;

                 goto out;

diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c

index 84257e6..b7462fc 100644

--- a/libglusterfs/src/client_t.c

+++ b/libglusterfs/src/client_t.c

@@ -14,7 +14,7 @@

 #include "client_t.h"

 #include "list.h"

 #include "rpcsvc.h"

-

+#include "libglusterfs-messages.h"

 #ifndef _CONFIG_H

 #define _CONFIG_H

@@ -28,7 +28,8 @@ gf_client_chain_client_entries (cliententry_t *entries, uint32_t startidx,

         uint32_t        i = 0;

         if (!entries) {

-                gf_log_callingfn ("client_t", GF_LOG_WARNING, "!entries");

+                gf_msg_callingfn ("client_t", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "!entries");

                 return -1;

         }

@@ -53,7 +54,8 @@ gf_client_clienttable_expand (clienttable_t *clienttable, uint32_t nr)

         int              ret            = -1;

         if (clienttable == NULL || nr <= clienttable->max_clients) {

-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "invalid argument");

+                gf_msg_callingfn ("client_t", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ARG, "invalid argument");

                 ret = EINVAL;

                 goto out;

         }

@@ -107,7 +109,8 @@ gf_clienttable_alloc (void)

         result = gf_client_clienttable_expand (clienttable,

                                                GF_CLIENTTABLE_INITIAL_SIZE);

         if (result != 0) {

-                gf_log ("client_t", GF_LOG_ERROR,

+                gf_msg ("client_t", GF_LOG_ERROR, 0,

+                        LG_MSG_EXPAND_CLIENT_TABLE_FAILED,

                         "gf_client_clienttable_expand failed");

                 GF_FREE (clienttable);

                 return NULL;

@@ -126,7 +129,8 @@ gf_client_clienttable_destroy (clienttable_t *clienttable)

         int32_t           i             = 0;

         if (!clienttable) {

-                gf_log_callingfn ("client_t", GF_LOG_WARNING, "!clienttable");

+                gf_msg_callingfn ("client_t", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "!clienttable");

                 return;

         }

@@ -168,7 +172,8 @@ gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid)

         unsigned int   i           = 0;

         if (this == NULL || client_uid == NULL) {

-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "invalid argument");

+                gf_msg_callingfn ("client_t", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ARG, "invalid argument");

                 errno = EINVAL;

                 return NULL;

         }

@@ -275,9 +280,10 @@ unlock:

         UNLOCK (&clienttable->lock);

         if (client)

-                gf_log_callingfn ("client_t", GF_LOG_DEBUG, "%s: bind_ref: %d, "

-                                  "ref: %d", client->client_uid,

-                                  client->ref.bind, client->ref.count);

+                gf_msg_callingfn ("client_t", GF_LOG_DEBUG, 0, LG_MSG_BIND_REF,

+                                  "%s: bind_ref: %d, ref: %d",

+                                  client->client_uid, client->ref.bind,

+                                  client->ref.count);

         return client;

 }

@@ -294,8 +300,9 @@ gf_client_put (client_t *client, gf_boolean_t *detached)

         if (bind_ref == 0)

                 unref = _gf_true;

-        gf_log_callingfn ("client_t", GF_LOG_DEBUG, "%s: bind_ref: %d, ref: %d,"

-                          " unref: %d", client->client_uid, client->ref.bind,

+        gf_msg_callingfn ("client_t", GF_LOG_DEBUG, 0, LG_MSG_BIND_REF, "%s: "

+                          "bind_ref: %d, ref: %d, unref: %d",

+                          client->client_uid, client->ref.bind,

                           client->ref.count, unref);

         if (unref) {

                 if (detached)

@@ -308,13 +315,15 @@ client_t *

 gf_client_ref (client_t *client)

 {

         if (!client) {

-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "null client");

+                gf_msg_callingfn ("client_t", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ARG, "null client");

                 return NULL;

         }

         INCREMENT_ATOMIC (client->ref.lock, client->ref.count);

-        gf_log_callingfn ("client_t", GF_LOG_DEBUG, "%s: ref-count %d",

-                          client->client_uid, client->ref.count);

+        gf_msg_callingfn ("client_t", GF_LOG_DEBUG, 0, LG_MSG_REF_COUNT, "%s: "

+                          "ref-count %d", client->client_uid,

+                          client->ref.count);

         return client;

 }

@@ -327,7 +336,8 @@ client_destroy (client_t *client)

         xlator_t          *xtrav       = NULL;

         if (client == NULL){

-                gf_log_callingfn ("xlator", GF_LOG_ERROR, "invalid argument");

+                gf_msg_callingfn ("xlator", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ARG, "invalid argument");

                 goto out;

         }

@@ -389,16 +399,18 @@ gf_client_unref (client_t *client)

         int refcount;

         if (!client) {

-                gf_log_callingfn ("client_t", GF_LOG_ERROR, "client is NULL");

+                gf_msg_callingfn ("client_t", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ARG, "client is NULL");

                 return;

         }

         refcount = DECREMENT_ATOMIC (client->ref.lock, client->ref.count);

-        gf_log_callingfn ("client_t", GF_LOG_DEBUG, "%s: ref-count %d",

-                          client->client_uid, (int)client->ref.count);

+        gf_msg_callingfn ("client_t", GF_LOG_DEBUG, 0, LG_MSG_REF_COUNT, "%s: "

+                          "ref-count %d", client->client_uid,

+                          (int)client->ref.count);

         if (refcount == 0) {

-                gf_log (THIS->name, GF_LOG_INFO, "Shutting down connection %s",

-                        client->client_uid);

+                gf_msg (THIS->name, GF_LOG_INFO, 0, LG_MSG_DISCONNECT_CLIENT,

+                        "Shutting down connection %s", client->client_uid);

                 client_destroy (client);

         }

 }

@@ -582,7 +594,8 @@ clienttable_dump (clienttable_t *clienttable, char *prefix)

         ret = TRY_LOCK (&clienttable->lock);

         {

                 if (ret) {

-                        gf_log ("client_t", GF_LOG_WARNING,

+                        gf_msg ("client_t", GF_LOG_WARNING, 0,

+                                LG_MSG_LOCK_GAIN_FAILED,

                                 "Unable to acquire lock");

                         return;

                 }

@@ -679,7 +692,8 @@ gf_client_dump_fdtables_to_dict (xlator_t *this, dict_t *dict)

         ret = TRY_LOCK (&clienttable->lock);

         {

                 if (ret) {

-                        gf_log ("client_t", GF_LOG_WARNING,

+                        gf_msg ("client_t", GF_LOG_WARNING, 0,

+                                LG_MSG_LOCK_GAIN_FAILED,

                                 "Unable to acquire lock");

                         return -1;

                 }

@@ -721,7 +735,8 @@ gf_client_dump_fdtables (xlator_t *this)

         ret = TRY_LOCK (&clienttable->lock);

         {

                 if (ret) {

-                        gf_log ("client_t", GF_LOG_WARNING,

+                        gf_msg ("client_t", GF_LOG_WARNING, 0,

+                                LG_MSG_LOCK_GAIN_FAILED,

                                 "Unable to acquire lock");

                         return -1;

                 }

@@ -786,7 +801,8 @@ gf_client_dump_inodes_to_dict (xlator_t *this, dict_t *dict)

         ret = TRY_LOCK (&clienttable->lock);

         {

                 if (ret) {

-                        gf_log ("client_t", GF_LOG_WARNING,

+                        gf_msg ("client_t", GF_LOG_WARNING, 0,

+                                LG_MSG_LOCK_GAIN_FAILED,

                                 "Unable to acquire lock");

                         return -1;

                 }

@@ -847,7 +863,8 @@ gf_client_dump_inodes (xlator_t *this)

         ret = TRY_LOCK (&clienttable->lock);

         {

                 if (ret) {

-                        gf_log ("client_t", GF_LOG_WARNING,

+                        gf_msg ("client_t", GF_LOG_WARNING, 0,

+                                LG_MSG_LOCK_GAIN_FAILED,

                                 "Unable to acquire lock");

                         goto out;

                 }

diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c

index 93e7b45..2eb9230 100644

--- a/libglusterfs/src/compat.c

+++ b/libglusterfs/src/compat.c

@@ -30,6 +30,7 @@

 #include "iatt.h"

 #include "inode.h"

 #include "run.h"

+#include "libglusterfs-messages.h"

 #ifdef GF_SOLARIS_HOST_OS

 int

@@ -46,9 +47,9 @@ solaris_fsetxattr(int fd, const char* key, const char *value, size_t size,

                 close (attrfd);

         } else {

                 if (errno != ENOENT)

-                        gf_log ("libglusterfs", GF_LOG_ERROR,

-                                "Couldn't set extended attribute for %d (%d)",

-                                fd, errno);

+                        gf_msg ("libglusterfs", GF_LOG_ERROR, errno,

+                                LG_MSG_SET_ATTRIBUTE_FAILED, "Couldn't set "

+                                "extended attribute for %d", fd);

                 return -1;

         }

@@ -74,9 +75,9 @@ solaris_fgetxattr(int fd, const char* key, char *value, size_t size)

                 close (attrfd);

         } else {

                 if (errno != ENOENT)

-                        gf_log ("libglusterfs", GF_LOG_INFO,

-                                "Couldn't read extended attribute for the file %d (%d)",

-                                fd, errno);

+                        gf_msg ("libglusterfs", GF_LOG_INFO, errno,

+                                LG_MSG_READ_ATTRIBUTE_FAILED, "Couldn't read "

+                                "extended attribute for the file %d", fd);

                 if (errno == ENOENT)

                         errno = ENODATA;

                 return -1;

@@ -173,7 +174,7 @@ solaris_xattr_resolve_path (const char *real_path, char **path)

                 if (lstat (export_path, &statbuf)) {

                         ret = mkdir (export_path, 0777);

                         if (ret && (errno != EEXIST)) {

-                                gf_log (THIS->name, GF_LOG_DEBUG, "mkdir failed,"

+                                gf_msg_debug (THIS->name, 0, "mkdir failed,"

                                         " errno: %d", errno);

                                 goto out;

                         }

@@ -187,9 +188,9 @@ solaris_xattr_resolve_path (const char *real_path, char **path)

                 if (ret) {

                         ret = mknod (xattr_path, S_IFREG|O_WRONLY, 0);

                         if (ret && (errno != EEXIST)) {

-                                gf_log (THIS->name, GF_LOG_WARNING,"Failed to create "

-                                        "mapped file %s, error %d", xattr_path,

-                                        errno);

+                                gf_msg (THIS->name, GF_LOG_WARNING, errno,

+                                        LG_MSG_FILE_OP_FAILED, "Failed to "

+                                        "create mapped file %s", xattr_path);

                                 goto out;

                         }

                 }

@@ -225,9 +226,9 @@ solaris_setxattr(const char *path, const char* key, const char *value,

                 ret = 0;

         } else {

                 if (errno != ENOENT)

-                        gf_log ("libglusterfs", GF_LOG_ERROR,

-                                "Couldn't set extended attribute for %s (%d)",

-                                path, errno);

+                        gf_msg ("libglusterfs", GF_LOG_ERROR, errno,

+                                LG_MSG_SET_ATTRIBUTE_FAILED, "Couldn't set "

+                                "extended attribute for %s", path);

                 ret = -1;

         }

         GF_FREE (mapped_path);

@@ -411,9 +412,9 @@ solaris_getxattr(const char *path,

                 close (attrfd);

         } else {

                 if (errno != ENOENT)

-                        gf_log ("libglusterfs", GF_LOG_INFO,

-                                "Couldn't read extended attribute for the file %s (%s)",

-                                path, strerror (errno));

+                        gf_msg ("libglusterfs", GF_LOG_INFO, errno,

+                                LG_MSG_READ_ATTRIBUTE_FAILED, "Couldn't read "

+                                "extended attribute for the file %s", path);

                 if (errno == ENOENT)

                         errno = ENODATA;

                 ret = -1;

@@ -477,14 +478,16 @@ int solaris_unlink (const char *path)

         if (!ret && mapped_path) {

                 if (lstat(path, &stbuf)) {

-                        gf_log (THIS->name, GF_LOG_WARNING, "Stat failed on mapped"

-                                " file %s with error %d", mapped_path, errno);

+                        gf_msg (THIS->name, GF_LOG_WARNING, errno,

+                                LG_MSG_FILE_OP_FAILED, "Stat failed on "

+                                "mapped file %s", mapped_path);

                         goto out;

                 }

                 if (stbuf.st_nlink == 1) {

                         if(remove (mapped_path))

-                                gf_log (THIS->name, GF_LOG_WARNING, "Failed to remove mapped "

-                                        "file %s. Errno %d", mapped_path, errno);

+                                gf_msg (THIS->name, GF_LOG_WARNING, errno,

+                                        LG_MSG_FILE_OP_FAILED, "Failed to "

+                                        "remove mapped file %s", mapped_path);

                 }

         }

@@ -506,8 +509,9 @@ solaris_rename (const char *old_path, const char *new_path)

         if (!ret && mapped_path) {

                 if (!remove (mapped_path))

-                        gf_log (THIS->name, GF_LOG_WARNING, "Failed to remove mapped "

-                                "file %s. Errno %d", mapped_path, errno);

+                        gf_msg (THIS->name, GF_LOG_WARNING, errno,

+                                LG_MSG_FILE_OP_FAILED, "Failed to remove "

+                                "mapped file %s.", mapped_path);

                 GF_FREE (mapped_path);

         }

@@ -565,18 +569,16 @@ gf_umount_lazy (char *xlname, char *path, int rmdir_flag)

 #endif

         ret = runner_run (&runner);

         if (ret) {

-                gf_log (xlname, GF_LOG_ERROR,

-                        "Lazy unmount of %s failed: %s",

-                        path, strerror (errno));

+                gf_msg (xlname, GF_LOG_ERROR, errno, LG_MSG_UNMOUNT_FAILED,

+                        "Lazy unmount of %s", path);

         }

 #ifdef GF_LINUX_HOST_OS

         if (!ret && rmdir_flag) {

                 ret = rmdir (path);

                 if (ret)

-                         gf_log (xlname, GF_LOG_WARNING,

-                                 "rmdir %s failed: %s",

-                                 path, strerror (errno));

+                        gf_msg (xlname, GF_LOG_WARNING, errno,

+                                LG_MSG_DIR_OP_FAILED, "rmdir %s", path);

         }

 #endif

diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c

index ffc92e7..fc8a42c 100644

--- a/libglusterfs/src/dict.c

+++ b/libglusterfs/src/dict.c

@@ -30,6 +30,7 @@

 #include "byte-order.h"

 #include "globals.h"

 #include "statedump.h"

+#include "libglusterfs-messages.h"

 struct dict_cmp {

         dict_t *dict;

@@ -117,7 +118,8 @@ is_data_equal (data_t *one,

                data_t *two)

 {

         if (!one || !two || !one->data || !two->data) {

-		gf_log_callingfn ("dict", GF_LOG_ERROR,

+		gf_msg_callingfn ("dict", GF_LOG_ERROR, EINVAL,

+                                  LG_MSG_INVALID_ARG,

 				  "input arguments are provided "

 				  "with value data_t as NULL");

                 return -1;

@@ -157,11 +159,11 @@ key_value_cmp (dict_t *one, char *key1, data_t *value1, void *data)

         }

         if (value2 == NULL) {

-                gf_log (THIS->name, GF_LOG_DEBUG,

-                        "'%s' found only on one dict", key1);

+                gf_msg_debug (THIS->name, 0, "'%s' found only on one dict",

+                              key1);

         } else {

-                gf_log (THIS->name, GF_LOG_DEBUG, "'%s' is different in two "

-                        "dicts (%u, %u)", key1, value1->len, value2->len);

+                gf_msg_debug (THIS->name, 0, "'%s' is different in two dicts "

+                              "(%u, %u)", key1, value1->len, value2->len);

         }

         return -1;

@@ -244,7 +246,7 @@ data_t *

 data_copy (data_t *old)

 {

         if (!old) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING,

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, 0, LG_MSG_NULL_PTR,

                                   "old is NULL");

                 return NULL;

         }

@@ -279,7 +281,8 @@ _dict_lookup (dict_t *this, char *key)

 {

         int hashval = 0;

         if (!this || !key) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING,

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG,

                                   "!this || !key (%s)", key);

                 return NULL;

         }

@@ -304,8 +307,9 @@ int32_t

 dict_lookup (dict_t *this, char *key, data_t **data)

 {

         if (!this || !key || !data) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING,

-                                  "!this || !key || !data");

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "!this || !key || "

+                                  "!data");

                 return -1;

         }

@@ -335,7 +339,6 @@ _dict_set (dict_t *this, char *key, data_t *value, gf_boolean_t replace)

         if (!key) {

                 ret = gf_asprintf (&key, "ref:%p", value);

                 if (-1 == ret) {

-                        gf_log ("dict", GF_LOG_WARNING, "asprintf failed %s", key);

                         return -1;

                 }

                 key_free = 1;

@@ -421,8 +424,9 @@ dict_set (dict_t *this,

         int32_t ret;

         if (!this || !value) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING,

-                                  "!this || !value for key=%s", key);

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "!this || !value for "

+                                  "key=%s", key);

                 return -1;

         }

@@ -442,7 +446,8 @@ dict_add (dict_t *this, char *key, data_t *value)

         int32_t ret;

         if (!this || !value) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING,

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG,

                                   "!this || !value for key=%s", key);

                 return -1;

         }

@@ -463,7 +468,8 @@ dict_get (dict_t *this, char *key)

         data_pair_t *pair;

         if (!this || !key) {

-                gf_log_callingfn ("dict", GF_LOG_INFO,

+                gf_msg_callingfn ("dict", GF_LOG_INFO, EINVAL,

+                                  LG_MSG_INVALID_ARG,

                                   "!this || key=%s", (key) ? key : "()");

                 return NULL;

         }

@@ -486,8 +492,8 @@ dict_del (dict_t *this, char *key)

         int hashval = 0;

         if (!this || !key) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING,

-                                  "!this || key=%s", key);

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "!this || key=%s", key);

                 return;

         }

@@ -543,7 +549,8 @@ void

 dict_destroy (dict_t *this)

 {

         if (!this) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "dict is NULL");

                 return;

         }

@@ -581,7 +588,8 @@ dict_unref (dict_t *this)

         int32_t ref;

         if (!this) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "dict is NULL");

                 return;

         }

@@ -600,7 +608,8 @@ dict_t *

 dict_ref (dict_t *this)

 {

         if (!this) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "dict is NULL");

                 return NULL;

         }

@@ -616,10 +625,12 @@ dict_ref (dict_t *this)

 void

 data_unref (data_t *this)

 {

+

         int32_t ref;

         if (!this) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "dict is NULL");

                 return;

         }

@@ -638,7 +649,8 @@ data_t *

 data_ref (data_t *this)

 {

         if (!this) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING, "dict is NULL");

+                gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,

+                                  LG_MSG_INVALID_ARG, "dict is NULL");

                 return NULL;

         }

@@ -663,7 +675,7 @@ int_to_data (int64_t value)

         ret = gf_asprintf (&data->data, "%"PRId64, value);

         if (-1 == ret) {

-                gf_log ("dict", GF_LOG_DEBUG, "asprintf failed");

+                gf_msg_debug ("dict", 0, "asprintf failed");

                 return NULL;

         }

         data->len = strlen (data->data) + 1;

@@ -682,7 +694,7 @@ data_from_int64 (int64_t value)

         }

         ret = gf_asprintf (&data->data, "%"PRId64, value);

         if (-1 == ret) {

-                gf_log ("dict", GF_LOG_DEBUG, "asprintf failed");

+                gf_msg_debug ("dict", 0, "asprintf failed");

                 return NULL;

         }

         data->len = strlen (data->data) + 1;

@@ -701,7 +713,7 @@ data_from_int32 (int32_t value)

         }

         ret = gf_asprintf (&data->data, "%"PRId32, value);

         if (-1 == ret) {

-                gf_log ("dict", GF_LOG_DEBUG, "asprintf failed");

+                gf_msg_debug ("dict", 0, "asprintf failed");

                 return NULL;

         }

@@ -721,7 +733,7 @@ data_from_int16 (int16_t value)

         }

         ret = gf_asprintf (&data->data, "%"PRId16, value);

         if (-1 == ret) {

-                gf_log ("dict", GF_LOG_DEBUG, "asprintf failed");

+                gf_msg_debug ("dict", 0, "asprintf failed");

                 return NULL;

         }

@@ -741,7 +753,7 @@ data_from_int8 (int8_t value)

         }

         ret = gf_asprintf (&data->data, "%d", value);

         if (-1 == ret) {

-                gf_log ("dict", GF_LOG_DEBUG, "asprintf failed");

+                gf_msg_debug ("dict", 0, "asprintf failed");

                 return NULL;

         }

@@ -761,7 +773,7 @@ data_from_uint64 (uint64_t value)

         }

         ret = gf_asprintf (&data->data, "%"PRIu64, value);

         if (-1 == ret) {

-                gf_log ("dict", GF_LOG_DEBUG, "asprintf failed");

+                gf_msg_debug ("dict", 0, "asprintf failed");

                 return NULL;

         }

@@ -803,7 +815,7 @@ data_from_uint32 (uint32_t value)

         }

         ret = gf_asprintf (&data->data, "%"PRIu32, value);

         if (-1 == ret) {

-                gf_log ("dict", GF_LOG_DEBUG, "asprintf failed");

+                gf_msg_debug ("dict", 0, "asprintf failed");

                 return NULL;

         }

@@ -837,7 +849,8 @@ data_t *

 data_from_ptr (void *value)

 {

         if (!value) {

-                gf_log_callingfn ("dict", GF_LOG_WARNING, "value is NULL");