[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/io/trove/trove-dbpf: dbpf-bstream-direct.c dbpf-sync.c

CVS commit program cvs at parl.clemson.edu
Thu Dec 11 10:37:57 EST 2008


Update of /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf
In directory parlweb1:/tmp/cvs-serv7888

Modified Files:
	dbpf-bstream-direct.c dbpf-sync.c 
Log Message:
some extra gossip debugging message, remove misleading comment


Index: dbpf-bstream-direct.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf/dbpf-bstream-direct.c,v
diff -p -u -r1.6 -r1.7
--- dbpf-bstream-direct.c	9 Dec 2008 20:05:10 -0000	1.6
+++ dbpf-bstream-direct.c	11 Dec 2008 15:37:57 -0000	1.7
@@ -853,6 +853,9 @@ static int dbpf_bstream_direct_write_op_
 
         if(sync_required == 1)
         {
+            gossip_debug(GOSSIP_DIRECTIO_DEBUG, 
+                "directio updating size for handle %llu\n", llu(ref.handle));
+
             dbpf_open_cache_put(&rw_op->open_ref);
 
             /* We want to hit the coalesce path, so we queue up the setattr */
@@ -864,12 +867,6 @@ static int dbpf_bstream_direct_write_op_
                                 qop_p->op.user_ptr,
                                 TROVE_SYNC,
                                 qop_p->op.context_id);
-            /* TODO: is there a way to handle the case where the flow
-             * protocol attempts to cancel an operation that has turned
-             * into a setattr here?  For now we set the state to IN_SERVICE
-             * so that the cancel path leaves the operation alone while it
-             * is in the PINT_MGMT infrastructure.
-             */
             qop_p->op.state = OP_IN_SERVICE;
             ret = dbpf_sync_coalesce(qop_p, 0, &outcount);
             if(ret < 0)

Index: dbpf-sync.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf/dbpf-sync.c,v
diff -p -u -r1.15 -r1.16
--- dbpf-sync.c	20 Nov 2008 01:17:06 -0000	1.15
+++ dbpf-sync.c	11 Dec 2008 15:37:57 -0000	1.16
@@ -216,9 +216,9 @@ int dbpf_sync_coalesce(dbpf_queued_op_t 
         ret = dbpf_sync_db(dbp, sync_context_type, sync_context);
 
         gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
-                     "[SYNC_COALESCE]: moving op %p with handle: %llu "
+                     "[SYNC_COALESCE]: moving op: %p, handle: %llu , type: %d "
                      "to completion queue\n",
-                     qop_p, llu(qop_p->op.handle));
+                     qop_p, llu(qop_p->op.handle), qop_p->op.type);
 
         if(qop_p->event_type == trove_dbpf_dspace_create_event_id)
         {
@@ -252,9 +252,9 @@ int dbpf_sync_coalesce(dbpf_queued_op_t 
             }
 
             gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
-                         "[SYNC_COALESCE]: moving op: %p with handle: %llu "
+                         "[SYNC_COALESCE]: moving op: %p, handle: %llu , type: %d "
                          "to completion queue\n",
-                         ready_op, llu(ready_op->op.handle));
+                         ready_op, llu(ready_op->op.handle), ready_op->op.type);
 
             dbpf_op_queue_remove(ready_op);
             DBPF_COMPLETION_ADD(ready_op, OP_COMPLETED);



More information about the Pvfs2-cvs mailing list