[Pvfs2-cvs] commit by pw in pvfs2/src/io/trove/trove-dbpf:
dbpf-op-queue.c dbpf-thread.h
CVS commit program
cvs at parl.clemson.edu
Tue Dec 5 15:37:40 EST 2006
Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb1:/tmp/cvs-serv30797/src/io/trove/trove-dbpf
Modified Files:
dbpf-op-queue.c dbpf-thread.h
Log Message:
fixes for no __PVFS2_TROVE_THREADED__
Index: dbpf-op-queue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-op-queue.c,v
diff -u -p -p -u -r1.28 -r1.29
--- dbpf-op-queue.c 20 Sep 2006 04:36:13 -0000 1.28
+++ dbpf-op-queue.c 5 Dec 2006 20:37:40 -0000 1.29
@@ -18,10 +18,10 @@ gen_mutex_t dbpf_op_queue_mutex = GEN_MU
extern dbpf_op_queue_p dbpf_completion_queue_array[TROVE_MAX_CONTEXTS];
extern gen_mutex_t *dbpf_completion_queue_array_mutex[TROVE_MAX_CONTEXTS];
-extern pthread_cond_t dbpf_op_completed_cond;
#ifdef __PVFS2_TROVE_THREADED__
extern pthread_cond_t dbpf_op_incoming_cond;
+extern pthread_cond_t dbpf_op_completed_cond;
#endif
/* dbpf_queued_op_put_and_dequeue()
Index: dbpf-thread.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-thread.h,v
diff -u -p -p -u -r1.10 -r1.11
--- dbpf-thread.h 20 Sep 2006 04:36:14 -0000 1.10
+++ dbpf-thread.h 5 Dec 2006 20:37:40 -0000 1.11
@@ -45,10 +45,14 @@ do {
dbpf_completion_queue_array[__add_op->op.context_id],__add_op); \
} while(0)
+#ifdef __PVFS2_TROVE_THREADED__
#define DBPF_COMPLETION_SIGNAL() \
do { \
pthread_cond_signal(&dbpf_op_completed_cond); \
} while(0)
+#else
+#define DBPF_COMPLETION_SIGNAL() do { } while (0)
+#endif
#define DBPF_COMPLETION_FINISH(__context_id) \
do { \
More information about the Pvfs2-cvs
mailing list