[PVFS2-CVS] commit by slang in pvfs2/src/io/trove/trove-handle-mgmt: trove-extentlist.c trove-handle-mgmt.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/trove/trove-handle-mgmt
In directory parlweb:/tmp/cvs-serv439/src/io/trove/trove-handle-mgmt

Modified Files:
	trove-extentlist.c trove-handle-mgmt.c 
Log Message:
* malloc.h is obsolete in freebsd, check for it
* No error.h in freebsd
* linux allows Lu,Lx, and Ld to be interchangeable with llu,llx, and
lld.  Other platforms (solaris, bsd) don't.  Replaced all the L*
with ll*.
* bsd doesn't have mntent.h.  use fstab.h and our own funcs.
* bsd doesn't know about ssize_t.  Use size_t instead.
* bsd doesn't have asm errnos.  Check for each of those
errno macros and if not defined define to -1
* check for db3/db.h db4/db.h header if db path is specified using
--with-db
* darwin has aio support builtin, doesn't need -lrt
* remove kernel stuff in pvfs2-types.h that sets WORDSIZE.  gcc
defines __LP64__ on archs with 64bit longs so we use that instead.
* darwin's open doesn't accept O_LARGEFILE.  off_t is an int64 by
default.  define O_LARGEFILE if it hasn't been.
* need to run ranlib on darwin after libpvfs2.a gets installed to regenerate
table of contents



Index: trove-extentlist.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-handle-mgmt/trove-extentlist.c,v
diff -p -u -r1.30 -r1.31
--- trove-extentlist.c	25 Oct 2005 18:01:00 -0000	1.30
+++ trove-extentlist.c	10 Nov 2005 01:27:09 -0000	1.31
@@ -235,7 +235,7 @@ static int extentlist_coalesce_extent(
         e->first = (*lesser)->first;
         if (avlremove(n, (*lesser)->first) == 0)
         {
-            gossip_err("error removing key %Lu\n", Lu((*lesser)->first));
+            gossip_err("error removing key %llu\n", llu((*lesser)->first));
             return COALESCE_ERROR;
         }
         merge_lesser = 1;
@@ -246,7 +246,7 @@ static int extentlist_coalesce_extent(
         e->last = (*greater)->last;
         if (avlremove(n, (*greater)->first) == 0)
         {
-            gossip_err("error removing key %Lu\n", Lu((*greater)->first));
+            gossip_err("error removing key %llu\n", llu((*greater)->first));
             return COALESCE_ERROR;
         }
         merge_greater = 1;
@@ -256,7 +256,7 @@ static int extentlist_coalesce_extent(
     {
         if (avlinsert(n, e) == 0)
         {
-            gossip_lerr("error inserting key %Lu\n", Lu(e->first));
+            gossip_lerr("error inserting key %llu\n", llu(e->first));
             return COALESCE_ERROR;
         }
         else
@@ -392,7 +392,7 @@ int extentlist_peek_handles(
     do
     {
         gossip_debug(GOSSIP_TROVE_DEBUG, "extentlist_peek_handles: "
-                     "providing handle %Lu\n", Lu(handle));
+                     "providing handle %llu\n", llu(handle));
 
         out_handle_array[(*returned_handle_count)++] = handle;
 
@@ -440,8 +440,8 @@ int extentlist_peek_handles_from_extent(
 
         gossip_debug(
             GOSSIP_TROVE_DEBUG, "extentlist_peek_handles_from_range: "
-            "got %Lu [%Lu-%Lu]\n", Lu(handle), 
-            Lu(tmp_extent.first), Lu(tmp_extent.last));
+            "got %llu [%llu-%llu]\n", llu(handle), 
+            llu(tmp_extent.first), llu(tmp_extent.last));
 
         out_handle_array[(*returned_handle_count)++] = handle;
 
@@ -484,8 +484,8 @@ static void extent_show(struct avlnode *
     struct TROVE_handle_extent *e =
         (struct TROVE_handle_extent *)(n->d);
 
-    gossip_debug(GOSSIP_TROVE_DEBUG, "lb: %Lu ub: %Lu\n",
-                 Lu(e->first), Lu(e->last));
+    gossip_debug(GOSSIP_TROVE_DEBUG, "lb: %llu ub: %llu\n",
+                 llu(e->first), llu(e->last));
 }
 
 static void extent_count(struct avlnode *n, int param, int depth)

Index: trove-handle-mgmt.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-handle-mgmt/trove-handle-mgmt.c,v
diff -p -u -r1.42 -r1.43
--- trove-handle-mgmt.c	18 Oct 2005 18:37:28 -0000	1.42
+++ trove-handle-mgmt.c	10 Nov 2005 01:27:09 -0000	1.43
@@ -105,8 +105,8 @@ static int trove_check_handle_ranges(TRO
                                                     handles[i]))
                     {
                         gossip_debug(
-                            GOSSIP_TROVE_DEBUG, "handle %Lu is invalid "
-                            "(out of bounds)\n", Lu(handles[i]));
+                            GOSSIP_TROVE_DEBUG, "handle %llu is invalid "
+                            "(out of bounds)\n", llu(handles[i]));
                         return -1;
                     }
 
@@ -116,7 +116,7 @@ static int trove_check_handle_ranges(TRO
                     {
 			gossip_debug(
                             GOSSIP_TROVE_DEBUG, "could not remove "
-                            "handle %Lu\n", Lu(handles[i]));
+                            "handle %llu\n", llu(handles[i]));
 			break;
 		    }
                 }