[PVFS2-CVS] commit by neill in pvfs2/src/io/trove/trove-dbpf: dbpf-dspace.c dbpf.h

CVS commit program cvs at parl.clemson.edu
Wed Feb 18 16:30:45 EST 2004


Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb:/tmp/cvs-serv9252/src/io/trove/trove-dbpf

Modified Files:
	dbpf-dspace.c dbpf.h 
Log Message:
- work with robl's configure changes


Index: dbpf-dspace.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-dspace.c,v
diff -p -u -r1.88 -r1.89
--- dbpf-dspace.c	16 Feb 2004 20:17:11 -0000	1.88
+++ dbpf-dspace.c	18 Feb 2004 21:30:45 -0000	1.89
@@ -1320,7 +1320,6 @@ static int dbpf_dspace_test(
      * however, until we get a background thread working on things,
      * this code will do the trick and is a lot faster and shorter.
      */
-
     if (ret != 0)
     {
 	/* operation is done and we are telling the caller;

Index: dbpf.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf.h,v
diff -p -u -r1.36 -r1.37
--- dbpf.h	18 Feb 2004 19:11:19 -0000	1.36
+++ dbpf.h	18 Feb 2004 21:30:45 -0000	1.37
@@ -21,9 +21,20 @@ extern "C" {
 #define LAST_HANDLE_STRING                                  "last_handle"
 #define ROOT_HANDLE_STRING                                  "root_handle"
 
-/* #define TROVE_DB_OPEN_FLAGS                                0 */
-#define TROVE_DB_OPEN_FLAGS      (DB_DIRTY_READ | DB_THREAD)
-#define TROVE_DB_CREATE_FLAGS          (DB_CREATE | DB_EXCL)
+#ifdef HAVE_DB_DIRTY_READ
+#define TROVE_DB_DIRTY_READ DB_DIRTY_READ
+#else
+#define TROVE_DB_DIRTY_READ             0
+#endif /* HAVE_DB_DIRTY_READ */
+
+#ifdef __PVFS2_TROVE_THREADED__
+#define TROVE_DB_THREAD DB_THREAD
+#else
+#define TROVE_DB_THREAD         0
+#endif /* __PVFS2_TROVE_THREADED__ */
+
+#define TROVE_DB_OPEN_FLAGS    (TROVE_DB_DIRTY_READ | TROVE_DB_THREAD)
+#define TROVE_DB_CREATE_FLAGS                    (DB_CREATE | DB_EXCL)
 
 /*
   for more efficient host filesystem accesses, we have



More information about the PVFS2-CVS mailing list