Changeset 9332

Timestamp:

06/12/12 08:39:31 (12 months ago)

Author:

wolf

Message:

added option to print handles in hex

Files:

• branches/stable/src/apps/devel/pvfs2-db-display.c (modified) (13 diffs)

branches/stable/src/apps/devel/pvfs2-db-display.c

@@ -44 +44 @@
 } options_t;
 
+/* globals */
 static options_t opts;
+int hex = 0;
 
 int open_db( DB **db_p, char *path, int type, int flags);
@@ -241 +243 @@
     k = key.data;
     v = *(int32_t *)val.data;
-    printf("(%s)(%d) -> (%d)(%d)\n", k, key.size, v, val.size);
+    if (hex) 
+        printf("(%s)(%d) -> (%x)(%d)\n", k, key.size, v, val.size);
+    else
+        printf("(%s)(%d) -> (%d)(%d)\n", k, key.size, v, val.size);
     return;
 }
@@ -251 +256 @@
     k = key.data;
     v = *(int32_t *)val.data;
-    printf("(%s)(%d) -> (%d)(%d)\n", k, key.size, v, val.size);
+    if (hex) 
+        printf("(%s)(%d) -> (%x)(%d)\n", k, key.size, v, val.size);
+    else
+        printf("(%s)(%d) -> (%d)(%d)\n", k, key.size, v, val.size);
     return;
 }
@@ -263 +271 @@
     v = val.data;
 
-    printf("(%llu)(%d) -> ", llu(k), key.size);
+    if (hex)
+        printf("(%llx)(%d) -> ", llu(k), key.size);
+    else
+        printf("(%llu)(%d) -> ", llu(k), key.size);
  
     print_ds_type( v->type );
 
-    printf("(fsid: %d)(handle: %llu)(uid: %u)(gid: %u)"
+    if (hex) {
+        printf("(fsid: %d)(handle: %llx)(uid: %u)(gid: %u)"
            "(perm: %u)(ctime: %llu)(mtime: %llu)(atime: %llu)(%d)\n", 
            v->fs_id, llu(v->handle), v->uid, v->gid, v->mode,
            llu(v->ctime), llu(v->mtime), llu(v->atime), val.size);
+    } 
+    else {
+        printf("(fsid: %d)(handle: %llu)(uid: %u)(gid: %u)"
+           "(perm: %u)(ctime: %llu)(mtime: %llu)(atime: %llu)(%d)\n", 
+           v->fs_id, llu(v->handle), v->uid, v->gid, v->mode,
+           llu(v->ctime), llu(v->mtime), llu(v->atime), val.size);
+    }
 
     /* union elements are not printed */
@@ -284 +303 @@
 
     k = key.data;
-    printf("(%llu)", llu(k->handle));
+    if (hex)
+        printf("(%llx)", llu(k->handle));
+    else
+        printf("(%llu)", llu(k->handle));
     if( key.size == 8 )
     {
@@ -292 +314 @@
     {
         kh = *(uint64_t *)k->key;
-        printf("(%llu)(%d) -> ", llu(kh), key.size);
+        if (hex)
+            printf("(%llx)(%d) -> ", llu(kh), key.size);
+        else
+            printf("(%llu)(%d) -> ", llu(kh), key.size);
     }
     else
@@ -305 +330 @@
         {
             vh = *(uint64_t *)(val.data + s);
-            printf("(%llu)", llu(vh));
+            if (hex)
+                printf("(%llx)", llu(vh));
+            else
+                printf("(%llu)", llu(vh));
             s += sizeof(TROVE_handle);
         }
@@ -326 +354 @@
         /* should be cases of filename to handle */
         vh = *(uint64_t *)val.data;
-        printf("(%llu)(%d)\n", llu(vh), val.size );
+        if (hex)
+            printf("(%llx)(%d)\n", llu(vh), val.size );
+        else
+            printf("(%llu)(%d)\n", llu(vh), val.size );
     }
  
@@ -332 +363 @@
     {
         vi = *(uint32_t *)val.data;
-        printf("(%u)(%d)\n", vi, val.size );
+        if (hex)
+            printf("(%x)(%d)\n", vi, val.size );
+        else
+            printf("(%u)(%d)\n", vi, val.size );
     }
 /*
@@ -370 +404 @@
     {
         vu = *(uint64_t *)val.data;
-        printf("(%llu)(%d)\n", llu(vu), val.size);
+        if (hex)
+            printf("(%llx)(%d)\n", llu(vu), val.size);
+        else
+            printf("(%llu)(%d)\n", llu(vu), val.size);
     }
     else
@@ -389 +426 @@
         {"dbpath",1,0,0},
         {"hexdir",1,0,0},
+        {"hexhandles",0,0,0},
         {0,0,0,0}
     };
@@ -410 +448 @@
             case 3: /* hexdir */
                 strncpy(opts.hexdir, optarg, PATH_MAX);
+                break;
+            case 4: /* hexhandles */
+                hex = 1;
                 break;
             default:
@@ -448 +489 @@
                     "\t--verbose\t\tEnable verbose output\n"
                     "\t--help\t\t\tThis message.\n"
+                    "\t--hexhandles\t\tPrint handles in hex\n"
                     "\t--dbpath <path>\t\tThe path of the server's "
                     "StorageSpace. The path\n\t\t\t\tshould contain "