From 2ab34a9c675a6167caed3326b6973854e8529843 Mon Sep 17 00:00:00 2001 From: Mohamed Ashiq Date: Tue, 19 May 2015 15:46:01 +0530 Subject: mem-pool,stack,store,syncop,timer/libglusterfs : Porting to a new logging framework Backport of http://review.gluster.org/10827 Cherry picked from 2b9b3ef3b646989bbc0412dca187b3f5fcad3283 >Change-Id: Idd3dcaf7eeea5207b3a5210676ce3df64153197f >BUG: 1194640 >Signed-off-by: Mohamed Ashiq >Reviewed-on: http://review.gluster.org/10827 >Reviewed-by: Pranith Kumar Karampuri >Tested-by: NetBSD Build System Change-Id: Idd3dcaf7eeea5207b3a5210676ce3df64153197f BUG: 1217722 Signed-off-by: Mohamed Ashiq Reviewed-on: http://review.gluster.org/11478 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- libglusterfs/src/syncop.c | 91 ++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 40 deletions(-) (limited to 'libglusterfs/src/syncop.c') diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index c3b0efea7d2..5ee4e2d33d5 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -14,6 +14,7 @@ #endif #include "syncop.h" +#include "libglusterfs-messages.h" int syncopctx_setfsuid (void *uid) @@ -262,20 +263,21 @@ __run (struct synctask *task) case SYNCTASK_SUSPEND: break; case SYNCTASK_RUN: - gf_log (task->xl->name, GF_LOG_DEBUG, - "re-running already running task"); + gf_msg_debug (task->xl->name, 0, "re-running already running" + " task"); env->runcount--; break; case SYNCTASK_WAIT: env->waitcount--; break; case SYNCTASK_DONE: - gf_log (task->xl->name, GF_LOG_WARNING, - "running completed task"); + gf_msg (task->xl->name, GF_LOG_WARNING, 0, + LG_MSG_COMPLETED_TASK, "running completed task"); return; case SYNCTASK_ZOMBIE: - gf_log (task->xl->name, GF_LOG_WARNING, - "attempted to wake up zombie!!"); + gf_msg (task->xl->name, GF_LOG_WARNING, 0, + LG_MSG_WAKE_UP_ZOMBIE, "attempted to wake up " + "zombie!!"); return; } @@ -301,16 +303,19 @@ __wait (struct synctask *task) env->runcount--; break; case SYNCTASK_WAIT: - gf_log (task->xl->name, GF_LOG_WARNING, - "re-waiting already waiting task"); + gf_msg (task->xl->name, GF_LOG_WARNING, 0, + LG_MSG_REWAITING_TASK, "re-waiting already waiting " + "task"); env->waitcount--; break; case SYNCTASK_DONE: - gf_log (task->xl->name, GF_LOG_WARNING, + gf_msg (task->xl->name, GF_LOG_WARNING, 0, + LG_MSG_COMPLETED_TASK, "running completed task"); return; case SYNCTASK_ZOMBIE: - gf_log (task->xl->name, GF_LOG_WARNING, + gf_msg (task->xl->name, GF_LOG_WARNING, 0, + LG_MSG_SLEEP_ZOMBIE, "attempted to sleep a zombie!!"); return; } @@ -336,8 +341,9 @@ synctask_yield (struct synctask *task) (void) gf_backtrace_save (task->btbuf); } if (swapcontext (&task->ctx, &task->proc->sched) < 0) { - gf_log ("syncop", GF_LOG_ERROR, - "swapcontext failed (%s)", strerror (errno)); + gf_msg ("syncop", GF_LOG_ERROR, errno, + LG_MSG_SWAPCONTEXT_FAILED, "swapcontext failed (%s)", + strerror (errno)); } THIS = oldTHIS; @@ -488,16 +494,14 @@ synctask_create (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk, INIT_LIST_HEAD (&newtask->waitq); if (getcontext (&newtask->ctx) < 0) { - gf_log ("syncop", GF_LOG_ERROR, - "getcontext failed (%s)", + gf_msg ("syncop", GF_LOG_ERROR, errno, + LG_MSG_GETCONTEXT_FAILED, "getcontext failed (%s)", strerror (errno)); goto err; } newtask->stack = GF_CALLOC (1, env->stacksize, gf_common_mt_syncstack); if (!newtask->stack) { - gf_log ("syncop", GF_LOG_ERROR, - "out of memory for stack"); goto err; } @@ -648,8 +652,8 @@ synctask_switchto (struct synctask *task) #endif if (swapcontext (&task->proc->sched, &task->ctx) < 0) { - gf_log ("syncop", GF_LOG_ERROR, - "swapcontext failed (%s)", strerror (errno)); + gf_msg ("syncop", GF_LOG_ERROR, errno, LG_MSG_SWAPCONTEXT_FAILED, + "swapcontext failed"); } if (task->state == SYNCTASK_DONE) { @@ -874,22 +878,25 @@ __synclock_lock (struct synclock *lock) case LOCK_TASK: if (task == lock->owner) { lock->lock++; - gf_log ("", GF_LOG_TRACE, "Recursive lock called by " - "sync task.owner= %p,lock=%d", lock->owner, lock->lock); + gf_msg_trace ("", 0, "Recursive lock called by" + " sync task.owner= %p,lock=%d", + lock->owner, lock->lock); return 0; } break; case LOCK_THREAD: if (pthread_self () == lock->owner_tid) { lock->lock++; - gf_log ("", GF_LOG_TRACE, "Recursive lock called by " - "thread ,owner=%u lock=%d", (unsigned int) lock->owner_tid, - lock->lock); + gf_msg_trace ("", 0, "Recursive lock called by" + " thread ,owner=%u lock=%d", + (unsigned int) lock->owner_tid, + lock->lock); return 0; } break; default: - gf_log ("", GF_LOG_CRITICAL, "unknown lock type"); + gf_msg ("", GF_LOG_CRITICAL, 0, + LG_MSG_UNKNOWN_LOCK_TYPE, "unknown lock type"); break; } } @@ -974,7 +981,8 @@ __synclock_unlock (synclock_t *lock) return -1; if (lock->lock == 0) { - gf_log ("", GF_LOG_CRITICAL, "Unlock called before lock "); + gf_msg ("", GF_LOG_CRITICAL, 0, LG_MSG_UNLOCK_BEFORE_LOCK, + "Unlock called before lock "); return -1; } curr = synctask_get (); @@ -986,23 +994,27 @@ __synclock_unlock (synclock_t *lock) case LOCK_TASK: if (curr == lock->owner) { lock->lock--; - gf_log ("", GF_LOG_TRACE, "Unlock success %p, remaining" - " locks=%d", lock->owner, lock->lock); + gf_msg_trace ("", 0, "Unlock success %p, remaining" + " locks=%d", lock->owner, lock->lock); } else { - gf_log ("", GF_LOG_WARNING, "Unlock called by %p, but" - " lock held by %p", curr, lock->owner); + gf_msg ("", GF_LOG_WARNING, 0, LG_MSG_LOCK_OWNER_ERROR, + "Unlock called by %p, but lock held by %p", + curr, lock->owner); } break; case LOCK_THREAD: if (pthread_self () == lock->owner_tid) { lock->lock--; - gf_log ("", GF_LOG_TRACE, "Unlock success %u, remaining" - " locks=%d", (unsigned int)lock->owner_tid, lock->lock); + gf_msg_trace ("", 0, "Unlock success %u, remaining " + "locks=%d", + (unsigned int)lock->owner_tid, + lock->lock); } else { - gf_log ("", GF_LOG_WARNING, "Unlock called by %u, but" - " lock held by %u", (unsigned int) pthread_self(), - (unsigned int) lock->owner_tid); + gf_msg ("", GF_LOG_WARNING, 0, LG_MSG_LOCK_OWNER_ERROR, + "Unlock called by %u, but lock held by %u", + (unsigned int) pthread_self(), + (unsigned int) lock->owner_tid); } break; @@ -1250,9 +1262,8 @@ syncop_readdirp_cbk (call_frame_t *frame, gf_dirent_free (&(args->entries)); break; } - gf_log (this->name, GF_LOG_TRACE, - "adding entry=%s, count=%d", - tmp->d_name, count); + gf_msg_trace (this->name, 0, "adding entry=%s, " + "count=%d", tmp->d_name, count); list_add_tail (&tmp->list, &(args->entries.list)); count++; } @@ -1326,9 +1337,9 @@ syncop_readdir_cbk (call_frame_t *frame, gf_dirent_free (&(args->entries)); break; } - gf_log (this->name, GF_LOG_TRACE, - "adding entry=%s, count=%d", - tmp->d_name, count); + gf_msg_trace (this->name, 0, "adding " + "entry=%s, count=%d", tmp->d_name, + count); list_add_tail (&tmp->list, &(args->entries.list)); count++; } -- cgit