From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joel Becker Date: Mon Mar 10 15:58:18 2008 Subject: [Ocfs2-devel] [PATCH 10/11] ocfs2/dlm: Move dlm_print_one_mle() from dlmmaster.c to dlmdebug.c In-Reply-To: <1205187389-3563-11-git-send-email-sunil.mushran@oracle.com> References: <1205187389-3563-1-git-send-email-sunil.mushran@oracle.com> <1205187389-3563-11-git-send-email-sunil.mushran@oracle.com> Message-ID: <20080310225740.GD31998@mail.oracle.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ocfs2-devel@oss.oracle.com On Mon, Mar 10, 2008 at 03:16:28PM -0700, Sunil Mushran wrote: > This patch helps in consolidating debugging related functions in dlmdebug.c. > > Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker > --- > fs/ocfs2/dlm/dlmdebug.c | 154 ++++++++++++++++++++++++--------------------- > fs/ocfs2/dlm/dlmdebug.h | 2 + > fs/ocfs2/dlm/dlmmaster.c | 89 +-------------------------- > 3 files changed, 85 insertions(+), 160 deletions(-) > > diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c > index a109005..58e4579 100644 > --- a/fs/ocfs2/dlm/dlmdebug.c > +++ b/fs/ocfs2/dlm/dlmdebug.c > @@ -268,11 +268,6 @@ const char *dlm_errname(enum dlm_status err) > } > EXPORT_SYMBOL_GPL(dlm_errname); > > - > -#ifdef CONFIG_DEBUG_FS > - > -static struct dentry *dlm_debugfs_root = NULL; > - > /* NOTE: This function converts a lockname into a string. It uses knowledge > * of the format of the lockname that should be outside the purview of the dlm. > * We are adding only to make dlm debugging slightly easier. > @@ -299,6 +294,88 @@ static int stringify_lockname(const char *lockname, int locklen, > return out; > } > > +static int stringify_nodemap(unsigned long *nodemap, int maxnodes, > + char *buf, int len) > +{ > + int out = 0; > + int i = -1; > + > + while ((i = find_next_bit(nodemap, maxnodes, i + 1)) < maxnodes) > + out += snprintf(buf + out, len - out, "%d ", i); > + > + return out; > +} > + > +static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len) > +{ > + int out = 0; > + unsigned int namelen; > + const char *name; > + char *mle_type; > + > + if (mle->type != DLM_MLE_MASTER) { > + namelen = mle->u.name.len; > + name = mle->u.name.name; > + } else { > + namelen = mle->u.res->lockname.len; > + name = mle->u.res->lockname.name; > + } > + > + if (mle->type == DLM_MLE_BLOCK) > + mle_type = "BLK"; > + else if (mle->type == DLM_MLE_MASTER) > + mle_type = "MAS"; > + else > + mle_type = "MIG"; > + > + out += stringify_lockname(name, namelen, buf + out, len - out); > + out += snprintf(buf + out, len - out, > + "\t%3s\tmas=%3u\tnew=%3u\tevt=%1d\tuse=%1d\tref=%3d\n", > + mle_type, mle->master, mle->new_master, > + !list_empty(&mle->hb_events), > + !!mle->inuse, > + atomic_read(&mle->mle_refs.refcount)); > + > + out += snprintf(buf + out, len - out, "Maybe="); > + out += stringify_nodemap(mle->maybe_map, O2NM_MAX_NODES, > + buf + out, len - out); > + out += snprintf(buf + out, len - out, "\n"); > + > + out += snprintf(buf + out, len - out, "Vote="); > + out += stringify_nodemap(mle->vote_map, O2NM_MAX_NODES, > + buf + out, len - out); > + out += snprintf(buf + out, len - out, "\n"); > + > + out += snprintf(buf + out, len - out, "Response="); > + out += stringify_nodemap(mle->response_map, O2NM_MAX_NODES, > + buf + out, len - out); > + out += snprintf(buf + out, len - out, "\n"); > + > + out += snprintf(buf + out, len - out, "Node="); > + out += stringify_nodemap(mle->node_map, O2NM_MAX_NODES, > + buf + out, len - out); > + out += snprintf(buf + out, len - out, "\n"); > + > + out += snprintf(buf + out, len - out, "\n"); > + > + return out; > +} > + > +void dlm_print_one_mle(struct dlm_master_list_entry *mle) > +{ > + char *buf; > + > + buf = (char *) get_zeroed_page(GFP_NOFS); > + if (buf) { > + dump_mle(mle, buf, PAGE_SIZE - 1); > + free_page((unsigned long)buf); > + } > +} > + > +#ifdef CONFIG_DEBUG_FS > + > +static struct dentry *dlm_debugfs_root = NULL; > + > #define DLM_DEBUGFS_DIR "o2dlm" > #define DLM_DEBUGFS_DLM_STATE "dlm_state" > #define DLM_DEBUGFS_LOCKING_STATE "locking_state" > @@ -326,18 +403,6 @@ static void dlm_debug_get(struct dlm_debug_ctxt *dc) > kref_get(&dc->debug_refcnt); > } > > -static int stringify_nodemap(unsigned long *nodemap, int maxnodes, > - char *buf, int len) > -{ > - int out = 0; > - int i = -1; > - > - while ((i = find_next_bit(nodemap, maxnodes, i + 1)) < maxnodes) > - out += snprintf(buf + out, len - out, "%d ", i); > - > - return out; > -} > - > static struct debug_buffer *debug_buffer_allocate(void) > { > struct debug_buffer *db = NULL; > @@ -455,61 +520,6 @@ static struct file_operations debug_purgelist_fops = { > /* end - purge list funcs */ > > /* begin - debug mle funcs */ > -static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len) > -{ > - int out = 0; > - unsigned int namelen; > - const char *name; > - char *mle_type; > - > - if (mle->type != DLM_MLE_MASTER) { > - namelen = mle->u.name.len; > - name = mle->u.name.name; > - } else { > - namelen = mle->u.res->lockname.len; > - name = mle->u.res->lockname.name; > - } > - > - if (mle->type == DLM_MLE_BLOCK) > - mle_type = "BLK"; > - else if (mle->type == DLM_MLE_MASTER) > - mle_type = "MAS"; > - else > - mle_type = "MIG"; > - > - out += stringify_lockname(name, namelen, buf + out, len - out); > - out += snprintf(buf + out, len - out, > - "\t%3s\tmas=%3u\tnew=%3u\tevt=%1d\tuse=%1d\tref=%3d\n", > - mle_type, mle->master, mle->new_master, > - !list_empty(&mle->hb_events), > - !!mle->inuse, > - atomic_read(&mle->mle_refs.refcount)); > - > - out += snprintf(buf + out, len - out, "Maybe="); > - out += stringify_nodemap(mle->maybe_map, O2NM_MAX_NODES, > - buf + out, len - out); > - out += snprintf(buf + out, len - out, "\n"); > - > - out += snprintf(buf + out, len - out, "Vote="); > - out += stringify_nodemap(mle->vote_map, O2NM_MAX_NODES, > - buf + out, len - out); > - out += snprintf(buf + out, len - out, "\n"); > - > - out += snprintf(buf + out, len - out, "Response="); > - out += stringify_nodemap(mle->response_map, O2NM_MAX_NODES, > - buf + out, len - out); > - out += snprintf(buf + out, len - out, "\n"); > - > - out += snprintf(buf + out, len - out, "Node="); > - out += stringify_nodemap(mle->node_map, O2NM_MAX_NODES, > - buf + out, len - out); > - out += snprintf(buf + out, len - out, "\n"); > - > - out += snprintf(buf + out, len - out, "\n"); > - > - return out; > -} > - > static int debug_mle_print(struct dlm_ctxt *dlm, struct debug_buffer *db) > { > struct dlm_master_list_entry *mle; > diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h > index 8857743..d34a62a 100644 > --- a/fs/ocfs2/dlm/dlmdebug.h > +++ b/fs/ocfs2/dlm/dlmdebug.h > @@ -25,6 +25,8 @@ > #ifndef DLMDEBUG_H > #define DLMDEBUG_H > > +void dlm_print_one_mle(struct dlm_master_list_entry *mle); > + > #ifdef CONFIG_DEBUG_FS > > struct dlm_debug_ctxt { > diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c > index 94cadcb..efc015c 100644 > --- a/fs/ocfs2/dlm/dlmmaster.c > +++ b/fs/ocfs2/dlm/dlmmaster.c > @@ -48,6 +48,7 @@ > #include "dlmapi.h" > #include "dlmcommon.h" > #include "dlmdomain.h" > +#include "dlmdebug.h" > > #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER) > #include "cluster/masklog.h" > @@ -91,94 +92,6 @@ static inline int dlm_mle_equal(struct dlm_ctxt *dlm, > return 1; > } > > -#define dlm_print_nodemap(m) _dlm_print_nodemap(m,#m) > -static void _dlm_print_nodemap(unsigned long *map, const char *mapname) > -{ > - int i; > - printk("%s=[ ", mapname); > - for (i=0; i - if (test_bit(i, map)) > - printk("%d ", i); > - printk("]"); > -} > - > -static void dlm_print_one_mle(struct dlm_master_list_entry *mle) > -{ > - int refs; > - char *type; > - char attached; > - u8 master; > - unsigned int namelen; > - const char *name; > - struct kref *k; > - unsigned long *maybe = mle->maybe_map, > - *vote = mle->vote_map, > - *resp = mle->response_map, > - *node = mle->node_map; > - > - k = &mle->mle_refs; > - if (mle->type == DLM_MLE_BLOCK) > - type = "BLK"; > - else if (mle->type == DLM_MLE_MASTER) > - type = "MAS"; > - else > - type = "MIG"; > - refs = atomic_read(&k->refcount); > - master = mle->master; > - attached = (list_empty(&mle->hb_events) ? 'N' : 'Y'); > - > - if (mle->type != DLM_MLE_MASTER) { > - namelen = mle->u.name.len; > - name = mle->u.name.name; > - } else { > - namelen = mle->u.res->lockname.len; > - name = mle->u.res->lockname.name; > - } > - > - mlog(ML_NOTICE, "%.*s: %3s refs=%3d mas=%3u new=%3u evt=%c inuse=%d ", > - namelen, name, type, refs, master, mle->new_master, attached, > - mle->inuse); > - dlm_print_nodemap(maybe); > - printk(", "); > - dlm_print_nodemap(vote); > - printk(", "); > - dlm_print_nodemap(resp); > - printk(", "); > - dlm_print_nodemap(node); > - printk(", "); > - printk("\n"); > -} > - > -#if 0 > -/* Code here is included but defined out as it aids debugging */ > - > -static void dlm_dump_mles(struct dlm_ctxt *dlm) > -{ > - struct dlm_master_list_entry *mle; > - > - mlog(ML_NOTICE, "dumping all mles for domain %s:\n", dlm->name); > - spin_lock(&dlm->master_lock); > - list_for_each_entry(mle, &dlm->master_list, list) > - dlm_print_one_mle(mle); > - spin_unlock(&dlm->master_lock); > -} > - > -int dlm_dump_all_mles(const char __user *data, unsigned int len) > -{ > - struct dlm_ctxt *dlm; > - > - spin_lock(&dlm_domain_lock); > - list_for_each_entry(dlm, &dlm_domains, list) { > - mlog(ML_NOTICE, "found dlm: %p, name=%s\n", dlm, dlm->name); > - dlm_dump_mles(dlm); > - } > - spin_unlock(&dlm_domain_lock); > - return len; > -} > -EXPORT_SYMBOL_GPL(dlm_dump_all_mles); > - > -#endif /* 0 */ > - > static struct kmem_cache *dlm_lockres_cache = NULL; > static struct kmem_cache *dlm_lockname_cache = NULL; > static struct kmem_cache *dlm_mle_cache = NULL; > -- > 1.5.3.6 > > > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel@oss.oracle.com > http://oss.oracle.com/mailman/listinfo/ocfs2-devel -- Life's Little Instruction Book #226 "When someone hugs you, let them be the first to let go." Joel Becker Principal Software Developer Oracle E-mail: joel.becker@oracle.com Phone: (650) 506-8127