Changeset 8962

Timestamp:

07/19/11 16:55:27 (22 months ago)

Author:

mtmoore

Message:

small build change for libuuid and printing of temp change for handle printing in pvfs2-db-display

Location:

branches/orange-next

Files:

• Makefile.in (modified) (3 diffs)
• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• src/apps/devel/pvfs2-db-display.c (modified) (7 diffs)

branches/orange-next/Makefile.in

@@ -191 +191 @@
 PICFLAGS = -fPIC
 LIBS += -lpvfs2 @LIBS@ 
+LIBS += -luuid @LIBS@
 LIBS_THREADED += -lpvfs2-threaded @LIBS@
 # need to include external dependency libs when building shared libraries
-DEPLIBS := @LIBS@
+DEPLIBS += @LIBS@
 MMAP_RA_CACHE = @MMAP_RA_CACHE@
 TRUSTED_CONNECTIONS = @TRUSTED_CONNECTIONS@
@@ -317 +318 @@
 SERVERCFLAGS += -D__STATIC_FLOWPROTO_BMI_CACHE__
 
-SERVERLIBS = -lpvfs2-server @LIBS@ @DB_LIB@ -lpthread 
+SERVERLIBS = -lpvfs2-server @LIBS@ @DB_LIB@ -lpthread -luuid
 
 ifdef NEEDS_LIBRT 
@@ -1154 +1155 @@
         # install any development tools built
         for i in $(notdir $(DEVELTOOLS)) ; do \
-                if [ -f $(srcdir)/src/apps/devel/$$i ]; then install -m 755 $(srcdir)/src/apps/devel/$$i $(bindir); fi;\
+                if [ -f $(builddir)/src/apps/devel/$$i ]; then install -m 755 $(srcdir)/src/apps/devel/$$i $(bindir); fi;\
         done
 

branches/orange-next/configure

@@ -11495 +11495 @@
 fi
 
-for ac_header
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
 for ac_header in uuid/uuid.h
 do :
@@ -11516 +11503 @@
 _ACEOF
  LDFLAGS="$LDFLAGS -luuid"
-         SERVER_LDFLAGS="$LDFLAGS -luuid"
 
 fi

branches/orange-next/configure.in

@@ -1106 +1106 @@
 
 dnl check for uuid 
-AC_CHECK_HEADERS
 AC_CHECK_HEADERS(uuid/uuid.h,
     LDFLAGS="$LDFLAGS -luuid"

branches/orange-next/src/apps/devel/pvfs2-db-display.c

@@ -264 +264 @@
     v = val.data;
 
-    printf("(%llu)(%d) -> ", llu(k), key.size);
+    TROVE_handle_unparse(*(TROVE_handle *)key.data, handle_s);
+    printf("(%s)(%d) -> ", handle_s, key.size);
  
     print_ds_type( v->type );
 
-    uuid_unparse(v->handle, handle_s);
+    TROVE_handle_unparse(v->handle, handle_s);
     printf("(fsid: %d)(handle: %s)(uid: %u)(gid: %u)"
            "(perm: %u)(ctime: %llu)(mtime: %llu)(atime: %llu)(%d)\n", 
@@ -281 +282 @@
 {
     struct dbpf_keyval_db_entry *k;
-    uint64_t vh, kh;
     uint32_t vi;
 
 
     k = key.data;
-    uuid_unparse(k->handle, handle_s);
+    TROVE_handle_unparse(k->handle, handle_s);
     printf("(%s)", handle_s);
-    printf("key.size: %d\n", key.size);
-    if( key.size == 8 )
+    if( key.size == 16 )
     {
         printf("()(%d) -> ", key.size);
     }
-    else if( key.size == 16 )
-    {
-        
-        kh = *(uint64_t *)k->key;
-        printf("(%llu)(%d) -> ", llu(kh), key.size);
+    else if( key.size == 32 )
+    {
+        TROVE_handle_unparse(*(TROVE_handle *)k->key, handle_s);
+        printf("(%s)(%d) -> ", handle_s, key.size);
     }
     else
@@ -306 +304 @@
     if( strncmp(k->key, "dh", 3) == 0 || strncmp(k->key, "de", 3) == 0 )
     {
-        vh = *(uint64_t *)val.data;
-        printf("(%llu)(%d)\n", llu(vh), val.size);
+        TROVE_handle_unparse(*(TROVE_handle *)val.data, handle_s);
+        printf("(%s)(%d)\n", handle_s, val.size);
     }
 
@@ -319 +317 @@
        printf("(%s)(%d)\n", dname, val.size );
     }
-
-    else if( strlen(k->key) > 2 && val.size == 8 )
+    
+    else if( strlen(k->key) > 2 && val.size == 16 )
     {
         /* should be cases of filename to handle */
-        vh = *(uint64_t *)val.data;
-        printf("(%llu)(%d)\n", llu(vh), val.size );
-    }
- 
+        TROVE_handle_unparse(*(TROVE_handle *)val.data, handle_s);
+        printf("(%s)(%d)\n", handle_s, val.size );
+    }
+    
     else if( (key.size == 8 || key.size == 16 ) && val.size == 4 )
     {
@@ -332 +330 @@
         printf("(%u)(%d)\n", vi, val.size );
     }
+    
 /*
  * not implemented
@@ -353 +352 @@
     {
         /* just print out the size of the data, try not to segfault */
-        printf("(%d)\n",  val.size);
+        printf("unhandled(%d)\n",  val.size);
     }
 
@@ -362 +361 @@
 {
     char *k, *vs;
-    uint64_t vu;
     k = key.data;
     printf("(%s)(%d) -> ", k, key.size);
-    if( val.size == 8 )
-    {
-        vu = *(uint64_t *)val.data;
-        printf("(%llu)(%d)\n", llu(vu), val.size);
+
+
+    if( val.size == 16 )
+    {
+        TROVE_handle_unparse(*(TROVE_handle*)val.data, handle_s);
+        printf("(%s)(%d)\n", handle_s, val.size);
     }
     else