[PVFS2-CVS]
commit by slang in pvfs2/src/io/trove/trove-dbpf: dbpf-dspace.c
CVS commit program
cvs at parl.clemson.edu
Tue Jan 17 11:08:03 EST 2006
Update of /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf
In directory parlweb:/tmp/cvs-serv521
Modified Files:
Tag: dbpf-changes-branch
dbpf-dspace.c
Log Message:
re-adding immediate completion changes after they were removed from merge with HEAD
Index: dbpf-dspace.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-dbpf/dbpf-dspace.c,v
diff -p -u -r1.127.2.2 -r1.127.2.3
--- dbpf-dspace.c 12 Jan 2006 19:43:18 -0000 1.127.2.2
+++ dbpf-dspace.c 17 Jan 2006 16:08:02 -0000 1.127.2.3
@@ -101,7 +101,11 @@ static int dbpf_dspace_create(TROVE_coll
TROVE_context_id context_id,
TROVE_op_id *out_op_id_p)
{
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
dbpf_queued_op_t *q_op_p = NULL;
+#else
+ struct dbpf_op op;
+#endif
struct dbpf_collection *coll_p = NULL;
coll_p = dbpf_collection_find_registered(coll_id);
@@ -110,6 +114,7 @@ static int dbpf_dspace_create(TROVE_coll
return -TROVE_EINVAL;
}
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
q_op_p = dbpf_queued_op_alloc();
if (q_op_p == NULL)
{
@@ -154,6 +159,19 @@ static int dbpf_dspace_create(TROVE_coll
*out_op_id_p = dbpf_queued_op_queue(q_op_p);
return 0;
+#else
+ DBPF_OP_INIT(op,
+ DSPACE_CREATE,
+ OP_QUEUED,
+ handle,
+ coll_p,
+ dbpf_dspace_create_op_svc,
+ user_ptr,
+ flags,
+ context_id,
+ 0);
+ return dbpf_dspace_create_op_svc(&op);
+#endif
}
static int dbpf_dspace_create_op_svc(struct dbpf_op *op_p)
@@ -305,7 +323,11 @@ static int dbpf_dspace_remove(TROVE_coll
TROVE_context_id context_id,
TROVE_op_id *out_op_id_p)
{
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
dbpf_queued_op_t *q_op_p = NULL;
+#else
+ struct dbpf_op op;
+#endif
struct dbpf_collection *coll_p = NULL;
coll_p = dbpf_collection_find_registered(coll_id);
@@ -313,6 +335,8 @@ static int dbpf_dspace_remove(TROVE_coll
{
return -TROVE_EINVAL;
}
+
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
q_op_p = dbpf_queued_op_alloc();
if (q_op_p == NULL)
{
@@ -331,6 +355,19 @@ static int dbpf_dspace_remove(TROVE_coll
*out_op_id_p = dbpf_queued_op_queue(q_op_p);
return 0;
+#else
+ DBPF_OP_INIT(op,
+ DSPACE_REMOVE,
+ OP_QUEUED,
+ handle,
+ coll_p,
+ dbpf_dspace_remove_op_svc,
+ user_ptr,
+ flags,
+ context_id,
+ 0);
+ return dbpf_dspace_remove_op_svc(&op);
+#endif
}
static int dbpf_dspace_remove_op_svc(struct dbpf_op *op_p)
@@ -615,7 +652,12 @@ static int dbpf_dspace_verify(TROVE_coll
TROVE_context_id context_id,
TROVE_op_id *out_op_id_p)
{
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
dbpf_queued_op_t *q_op_p = NULL;
+#else
+ struct dbpf_op op;
+#endif
+
struct dbpf_collection *coll_p = NULL;
coll_p = dbpf_collection_find_registered(coll_id);
@@ -623,6 +665,8 @@ static int dbpf_dspace_verify(TROVE_coll
{
return -TROVE_EINVAL;
}
+
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
q_op_p = dbpf_queued_op_alloc();
if (q_op_p == NULL)
{
@@ -645,6 +689,19 @@ static int dbpf_dspace_verify(TROVE_coll
*out_op_id_p = dbpf_queued_op_queue(q_op_p);
return 0;
+#else
+ DBPF_OP_INIT(op,
+ DSPACE_VERIFY,
+ OP_QUEUED,
+ handle,
+ coll_p,
+ dbpf_dspace_verify_op_svc,
+ user_ptr,
+ flags,
+ context_id,
+ 0);
+ return dbpf_dspace_verify_op_svc(&op);
+#endif
}
static int dbpf_dspace_verify_op_svc(struct dbpf_op *op_p)
@@ -712,7 +769,11 @@ static int dbpf_dspace_getattr(TROVE_col
TROVE_context_id context_id,
TROVE_op_id *out_op_id_p)
{
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
dbpf_queued_op_t *q_op_p = NULL;
+#else
+ struct dbpf_op op;
+#endif
struct dbpf_collection *coll_p = NULL;
TROVE_object_ref ref = {handle, coll_id};
@@ -746,6 +807,8 @@ static int dbpf_dspace_getattr(TROVE_col
{
return -TROVE_EINVAL;
}
+
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
q_op_p = dbpf_queued_op_alloc();
if (q_op_p == NULL)
{
@@ -768,6 +831,19 @@ static int dbpf_dspace_getattr(TROVE_col
*out_op_id_p = dbpf_queued_op_queue(q_op_p);
return 0;
+#else
+ DBPF_OP_INIT(op,
+ DSPACE_GETATTR,
+ OP_QUEUED,
+ handle,
+ coll_p,
+ dbpf_dspace_getattr_op_svc,
+ user_ptr,
+ flags,
+ context_id,
+ 0);
+ return dbpf_dspace_getattr_op_svc(&op);
+#endif
}
static int dbpf_dspace_setattr(TROVE_coll_id coll_id,
@@ -778,7 +854,11 @@ static int dbpf_dspace_setattr(TROVE_col
TROVE_context_id context_id,
TROVE_op_id *out_op_id_p)
{
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
dbpf_queued_op_t *q_op_p = NULL;
+#else
+ struct dbpf_op op;
+#endif
struct dbpf_collection *coll_p = NULL;
coll_p = dbpf_collection_find_registered(coll_id);
@@ -786,6 +866,7 @@ static int dbpf_dspace_setattr(TROVE_col
{
return -TROVE_EINVAL;
}
+#ifndef PVFS2_DBPF_IMMEDIATE_COMPLETION
q_op_p = dbpf_queued_op_alloc();
if (q_op_p == NULL)
{
@@ -808,6 +889,19 @@ static int dbpf_dspace_setattr(TROVE_col
*out_op_id_p = dbpf_queued_op_queue(q_op_p);
return 0;
+#else
+ DBPF_OP_INIT(op,
+ DSPACE_SETATTR,
+ OP_QUEUED,
+ handle,
+ coll_p,
+ dbpf_dspace_setattr_op_svc,
+ user_ptr,
+ flags,
+ context_id,
+ 0);
+ return dbpf_dspace_setattr_op_svc(&op);
+#endif
}
static int dbpf_dspace_setattr_op_svc(struct dbpf_op *op_p)
More information about the PVFS2-CVS
mailing list