Skip to contentSkip to conversation

ocfs2: add dlm_ctxt printing for dlm debugging

PATCH New wengang wang 2 participants 4 messages Jan 16, 2008 – Jan 30, 2008 OCFS2

lore
Share & tools
lore

wengang wang

author
#0 lore raw

PATCH 1/1 ocfs2: add dlm_ctxt printing for dlm debugging

add dlm_ctxt printing for dlm debugging
cat /proc/fs/ocfs2_dlm/<domain>/ctxt shows dlm_ctxt
after adding this, what stat prints is a subset of what ctxt prints. but stat remains.

this patch is against ocfs2-1.2 svn head.

Signed-off-by wengang wang <[email protected]>
---
 dlmdebug.c |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
ocfs2/dlm/dlmdebug.c +64 -0
Index: fs/ocfs2/dlm/dlmdebug.c
===================================================================
@@ -61,6 +61,8 @@ static int dlm_parse_domain_and_lockres(
 
 static int dlm_proc_stats(char *page, char **start, off_t off,
 			  int count, int *eof, void *data);
+static int dlm_proc_ctxts(char *page, char **start, off_t off,
+			  int count, int *eof, void *data);
 
 typedef int (dlm_debug_func_t)(const char __user *data, unsigned int len);
 

@@ -120,6 +122,7 @@ static struct file_operations dlm_debug_
 #define OCFS2_DLM_PROC_PATH "fs/ocfs2_dlm"
 #define DLM_DEBUG_PROC_NAME "debug"
 #define DLM_STAT_PROC_NAME  "stat"
+#define DLM_CTXT_PROC_NAME  "ctxt"
 
 static struct proc_dir_entry *ocfs2_dlm_proc;
 

@@ -172,6 +175,61 @@ static int dlm_proc_stats(char *page, ch
 	return len;
 }
 
+static int dlm_proc_ctxts(char *page, char **start, off_t off,
+			  int count, int *eof, void *data)
+{
+	int len = 0, i;
+	struct dlm_ctxt *dlm = data;
+
+	len += sprintf(page + len, "purge=%d, num=%u, key=0x%08x, ",
+			dlm->purge_count, dlm->node_num, dlm->key);
+	len += sprintf(page + len, "joining=%u, reco.new=%u, ",
+			dlm->joining_node, dlm->reco.new_master);
+	len += sprintf(page + len, "reco.dead=%u, reco.state=%u, ",
+			dlm->reco.dead_node, dlm->reco.state);
+	len += sprintf(page + len, "local=%d, remote=%d, ",
+			atomic_read(&dlm->local_resources),
+			atomic_read(&dlm->remote_resources));
+	len += sprintf(page + len, "unknown=%d, refs=%d, ",
+			atomic_read(&dlm->dlm_refs.refcount),
+			atomic_read(&dlm->unknown_resources));
+	len += sprintf(page + len, "state=%d, joins=%u, ",
+			dlm->dlm_state, dlm->num_joins);
+
+	len += sprintf(page + len, "live=");
+	for (i = 0; i < O2NM_MAX_NODES; i++) {
+		if (test_bit(i,dlm->live_nodes_map))
+			len += sprintf(page + len,"%d ",i);
+	}
+	len += sprintf(page + len,", ");
+
+	len += sprintf(page + len, "domain=");
+	for (i = 0; i < O2NM_MAX_NODES; i++) {
+		if (test_bit(i,dlm->domain_map))
+			len += sprintf(page + len,"%d ",i);
+	}
+	len += sprintf(page + len,", ");
+
+	len += sprintf(page + len, "recovery=");
+	for (i = 0; i < O2NM_MAX_NODES; i++) {
+		if (test_bit(i,dlm->recovery_map))
+			len += sprintf(page + len,"%d ",i);
+	}
+	len += sprintf(page + len,"\n");
+
+	if (len <= off + count)
+		*eof = 1;
+	
+	*start = page + off;
+	len -= off;
+	if (len > count)
+		len = count;
+	if(len < 0)
+		len = 0;
+
+	return len;
+}
+
 void dlm_proc_add_domain(struct dlm_ctxt *dlm)
 {
 	struct proc_dir_entry *entry;

@@ -183,6 +241,11 @@ void dlm_proc_add_domain(struct dlm_ctxt
 					       dlm_proc_stats, (char *)dlm);
 		if (entry)
 			entry->owner = THIS_MODULE;
+		entry = create_proc_read_entry(DLM_CTXT_PROC_NAME,
+						S_IFREG | S_IRUGO, dlm->dlm_proc,
+						dlm_proc_ctxts, (char *)dlm);
+		if (entry)
+			entry->owner = THIS_MODULE;
 	}
 }
 

@@ -190,6 +253,7 @@ void dlm_proc_del_domain(struct dlm_ctxt
 {
 	if (dlm->dlm_proc) {
 		remove_proc_entry(DLM_STAT_PROC_NAME, dlm->dlm_proc);
+		remove_proc_entry(DLM_CTXT_PROC_NAME, dlm->dlm_proc);
 		remove_proc_entry(dlm->name, ocfs2_dlm_proc);
 	}
 }
#1 lore raw

PATCH 1/1 ocfs2: add dlm_ctxt printing for dlm debugging

Wengang,

Please follow coding standards. Links to it are there in the wiki. If in doubt, look at the existing code and follow the same.

For e.g., indentation has to be a tab. Not 4 spaces or 8 spaces. A tab.

Hint: Look at the tops of the files.
/* -*- mode: c; c-basic-offset: 8; -*-
* vim: noexpandtab sw=8 ts=8 sts=0:

Secondly, you are printing all the elements of structure in one line. When I had said a single line, I meant a few important elements. Afterall, the output needs to be readable. If you are printing more, split it into different lines... keep it concise and yet readable.

Also, see what proc_stat prints. No point duplicating the info.

Thanks
Sunil

Quoted 123 lines · wengang wang

add dlm_ctxt printing for dlm debugging
cat /proc/fs/ocfs2_dlm/<domain>/ctxt shows dlm_ctxt
after adding this, what stat prints is a subset of what ctxt prints. but stat remains.

this patch is against ocfs2-1.2 svn head.

Signed-off-by wengang wang <[email protected]>

---
dlmdebug.c | 64
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 64 insertions(+)

Index: fs/ocfs2/dlm/dlmdebug.c
===================================================================

ocfs2/dlm/dlmdebug.c (working copy) renamed from ocfs2/dlm/dlmdebug.c (revision 3078) +2 -0
@@ -61,6 +61,8 @@ static int dlm_parse_domain_and_lockres(
 
 static int dlm_proc_stats(char *page, char **start, off_t off,
              int count, int *eof, void *data);
+static int dlm_proc_ctxts(char *page, char **start, off_t off,
+              int count, int *eof, void *data);

typedef int (dlm_debug_func_t)(const char __user *data, unsigned int len);

ocfs2/dlm/dlmdebug.c (working copy) renamed from ocfs2/dlm/dlmdebug.c (revision 3078) +62 -0
@@ -120,6 +122,7 @@ static struct file_operations dlm_debug_
 #define OCFS2_DLM_PROC_PATH "fs/ocfs2_dlm"
 #define DLM_DEBUG_PROC_NAME "debug"
 #define DLM_STAT_PROC_NAME  "stat"
+#define DLM_CTXT_PROC_NAME  "ctxt"
 
 static struct proc_dir_entry *ocfs2_dlm_proc;
 

@@ -172,6 +175,61 @@ static int dlm_proc_stats(char *page, ch
    return len;
 }
 
+static int dlm_proc_ctxts(char *page, char **start, off_t off,
+              int count, int *eof, void *data)
+{
+    int len = 0, i;
+    struct dlm_ctxt *dlm = data;
+
+    len += sprintf(page + len, "purge=%d, num=%u, key=0x%08x, ",
+            dlm->purge_count, dlm->node_num, dlm->key);
+    len += sprintf(page + len, "joining=%u, reco.new=%u, ",
+            dlm->joining_node, dlm->reco.new_master);
+    len += sprintf(page + len, "reco.dead=%u, reco.state=%u, ",
+            dlm->reco.dead_node, dlm->reco.state);
+    len += sprintf(page + len, "local=%d, remote=%d, ",
+            atomic_read(&dlm->local_resources),
+            atomic_read(&dlm->remote_resources));
+    len += sprintf(page + len, "unknown=%d, refs=%d, ",
+            atomic_read(&dlm->dlm_refs.refcount),
+            atomic_read(&dlm->unknown_resources));
+    len += sprintf(page + len, "state=%d, joins=%u, ",
+            dlm->dlm_state, dlm->num_joins);
+
+    len += sprintf(page + len, "live=");
+    for (i = 0; i < O2NM_MAX_NODES; i++) {
+        if (test_bit(i,dlm->live_nodes_map))
+            len += sprintf(page + len,"%d ",i);
+    }
+    len += sprintf(page + len,", ");
+
+    len += sprintf(page + len, "domain=");
+    for (i = 0; i < O2NM_MAX_NODES; i++) {
+        if (test_bit(i,dlm->domain_map))
+            len += sprintf(page + len,"%d ",i);
+    }
+    len += sprintf(page + len,", ");
+
+    len += sprintf(page + len, "recovery=");
+    for (i = 0; i < O2NM_MAX_NODES; i++) {
+        if (test_bit(i,dlm->recovery_map))
+            len += sprintf(page + len,"%d ",i);
+    }
+    len += sprintf(page + len,"\n");
+
+    if (len <= off + count)
+        *eof = 1;
+   
+    *start = page + off;
+    len -= off;
+    if (len > count)
+        len = count;
+    if(len < 0)
+        len = 0;
+
+    return len;
+}
+
 void dlm_proc_add_domain(struct dlm_ctxt *dlm)
 {
    struct proc_dir_entry *entry;

@@ -183,6 +241,11 @@ void dlm_proc_add_domain(struct dlm_ctxt
                           dlm_proc_stats, (char *)dlm);
        if (entry)
            entry->owner = THIS_MODULE;
+        entry = create_proc_read_entry(DLM_CTXT_PROC_NAME,
+                        S_IFREG | S_IRUGO, dlm->dlm_proc,
+                        dlm_proc_ctxts, (char *)dlm);
+        if (entry)
+            entry->owner = THIS_MODULE;
    }
 }
 

@@ -190,6 +253,7 @@ void dlm_proc_del_domain(struct dlm_ctxt
 {
    if (dlm->dlm_proc) {
        remove_proc_entry(DLM_STAT_PROC_NAME, dlm->dlm_proc);
+        remove_proc_entry(DLM_CTXT_PROC_NAME, dlm->dlm_proc);
        remove_proc_entry(dlm->name, ocfs2_dlm_proc);
    }
 }

_______________________________________________
Ocfs2-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/ocfs2-devel

author
#2 lore raw

PATCH 1/1 ocfs2: add dlm_ctxt printing for dlm debugging

Hi Sunil,

for indentation, I did use tab and no space is used.
can you tell where spaces are used in the patch?
(maybe the thunderbird did something changing that, but while editing that email, I checked and confirmed it's tabs...)

the revised output will be

purge_count=0, node_num=1, joining_node=255, reco.new_master=255, reco.dead_node=255, reco.state=0
dlm_refs=1, dlm_state=1, num_joins=1, live_nodes_map=1 , domain_map=1 , recovery_map=

first line ends after reco.state=x
in live_nodes_map, domain_map and recovery_map, existing node numbers are printed.
what printed in stat are removed.

is that ok?

thanks,
wengang.

Quoted 146 lines · Sunil Mushran

Wengang,

Please follow coding standards. Links to it are there in the wiki. If in doubt, look at the existing code and follow the same.

For e.g., indentation has to be a tab. Not 4 spaces or 8 spaces. A tab.

Hint: Look at the tops of the files.
/* -*- mode: c; c-basic-offset: 8; -*-
* vim: noexpandtab sw=8 ts=8 sts=0:

Secondly, you are printing all the elements of structure in one line. When I had said a single line, I meant a few important elements. Afterall, the output needs to be readable. If you are printing more, split it into different lines... keep it concise and yet readable.

Also, see what proc_stat prints. No point duplicating the info.

Thanks
Sunil

Quoted 122 lines · wengang wang

add dlm_ctxt printing for dlm debugging
cat /proc/fs/ocfs2_dlm/<domain>/ctxt shows dlm_ctxt
after adding this, what stat prints is a subset of what ctxt prints. but stat remains.

this patch is against ocfs2-1.2 svn head.

Signed-off-by wengang wang <[email protected]>

---
dlmdebug.c | 64
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 64 insertions(+)

Index: fs/ocfs2/dlm/dlmdebug.c
===================================================================

ocfs2/dlm/dlmdebug.c (working copy) renamed from ocfs2/dlm/dlmdebug.c (revision 3078) +2 -0
@@ -61,6 +61,8 @@ static int dlm_parse_domain_and_lockres(
 
 static int dlm_proc_stats(char *page, char **start, off_t off,
              int count, int *eof, void *data);
+static int dlm_proc_ctxts(char *page, char **start, off_t off,
+              int count, int *eof, void *data);

typedef int (dlm_debug_func_t)(const char __user *data, unsigned int len);

ocfs2/dlm/dlmdebug.c (working copy) renamed from ocfs2/dlm/dlmdebug.c (revision 3078) +61 -0
@@ -120,6 +122,7 @@ static struct file_operations dlm_debug_
 #define OCFS2_DLM_PROC_PATH "fs/ocfs2_dlm"
 #define DLM_DEBUG_PROC_NAME "debug"
 #define DLM_STAT_PROC_NAME  "stat"
+#define DLM_CTXT_PROC_NAME  "ctxt"
 
 static struct proc_dir_entry *ocfs2_dlm_proc;
 

@@ -172,6 +175,61 @@ static int dlm_proc_stats(char *page, ch
    return len;
 }
 
+static int dlm_proc_ctxts(char *page, char **start, off_t off,
+              int count, int *eof, void *data)
+{
+    int len = 0, i;
+    struct dlm_ctxt *dlm = data;
+
+    len += sprintf(page + len, "purge=%d, num=%u, key=0x%08x, ",
+            dlm->purge_count, dlm->node_num, dlm->key);
+    len += sprintf(page + len, "joining=%u, reco.new=%u, ",
+            dlm->joining_node, dlm->reco.new_master);
+    len += sprintf(page + len, "reco.dead=%u, reco.state=%u, ",
+            dlm->reco.dead_node, dlm->reco.state);
+    len += sprintf(page + len, "local=%d, remote=%d, ",
+            atomic_read(&dlm->local_resources),
+            atomic_read(&dlm->remote_resources));
+    len += sprintf(page + len, "unknown=%d, refs=%d, ",
+            atomic_read(&dlm->dlm_refs.refcount),
+            atomic_read(&dlm->unknown_resources));
+    len += sprintf(page + len, "state=%d, joins=%u, ",
+            dlm->dlm_state, dlm->num_joins);
+
+    len += sprintf(page + len, "live=");
+    for (i = 0; i < O2NM_MAX_NODES; i++) {
+        if (test_bit(i,dlm->live_nodes_map))
+            len += sprintf(page + len,"%d ",i);
+    }
+    len += sprintf(page + len,", ");
+
+    len += sprintf(page + len, "domain=");
+    for (i = 0; i < O2NM_MAX_NODES; i++) {
+        if (test_bit(i,dlm->domain_map))
+            len += sprintf(page + len,"%d ",i);
+    }
+    len += sprintf(page + len,", ");
+
+    len += sprintf(page + len, "recovery=");
+    for (i = 0; i < O2NM_MAX_NODES; i++) {
+        if (test_bit(i,dlm->recovery_map))
+            len += sprintf(page + len,"%d ",i);
+    }
+    len += sprintf(page + len,"\n");
+
+    if (len <= off + count)
+        *eof = 1;
+   +    *start = page + off;
+    len -= off;
+    if (len > count)
+        len = count;
+    if(len < 0)
+        len = 0;
+
+    return len;
+}
+
 void dlm_proc_add_domain(struct dlm_ctxt *dlm)
 {
    struct proc_dir_entry *entry;

@@ -183,6 +241,11 @@ void dlm_proc_add_domain(struct dlm_ctxt
                           dlm_proc_stats, (char *)dlm);
        if (entry)
            entry->owner = THIS_MODULE;
+        entry = create_proc_read_entry(DLM_CTXT_PROC_NAME,
+                        S_IFREG | S_IRUGO, dlm->dlm_proc,
+                        dlm_proc_ctxts, (char *)dlm);
+        if (entry)
+            entry->owner = THIS_MODULE;
    }
 }
 

@@ -190,6 +253,7 @@ void dlm_proc_del_domain(struct dlm_ctxt
 {
    if (dlm->dlm_proc) {
        remove_proc_entry(DLM_STAT_PROC_NAME, dlm->dlm_proc);
+        remove_proc_entry(DLM_CTXT_PROC_NAME, dlm->dlm_proc);
        remove_proc_entry(dlm->name, ocfs2_dlm_proc);
    }
 }

_______________________________________________
Ocfs2-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/ocfs2-devel

Signature · 7 lines
Wengang Wang
Member of Technical Staff
Oracle Asia R&D Center
Open Source Technologies Development

Tel:      +86 10 8278 6265
Mobile:   +86 13381078925
author
#3 lore raw

PATCH 1/1 ocfs2: add dlm_ctxt printing for dlm debugging

In reply to Sunil Mushran

revised patch.

add dlm_ctxt printing for dlm debugging
cat /proc/fs/ocfs2_dlm/<domain>/ctxt shows dlm_ctxt shows stuff as:
purge_count=0, node_num=1, joining_node=255, reco.new_master=255, reco.dead_node=255, reco.state=0
refs=1, state=1, num_joins=1, live_nodes_map=1 , domain_map=1 , recovery_map=

this patch is against ocfs2-1.2 svn head.

Signed-off-by wengang wang <[email protected]>
 dlmdebug.c |   59 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: ocfs2_dlm_ctxt_dump.patch
Type: text/x-patch
Size: 2968 bytes
Desc: not available
Url : http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20080131/4a1bada0/ocfs2_dlm_ctxt_dump.bin