[Pvfs2-cvs] commit by sson in pvfs2/src/server: io.sm pipeline.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv1795/src/server

Modified Files:
      Tag: as-branch
	io.sm pipeline.sm 
Log Message:
Applied Phil's patch that fixes size mismatches between js_p->actual_size and *out_size_p in the job_trove_bstream_{read,write}_list call, and revised pipeline.sm accordingly.



Index: io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/io.sm,v
diff -p -u -r1.73.6.7 -r1.73.6.8
--- io.sm	28 Apr 2009 21:36:02 -0000	1.73.6.7
+++ io.sm	29 Apr 2009 18:55:03 -0000	1.73.6.8
@@ -251,7 +251,7 @@ static PINT_sm_action start_pipelining_s
 			    &seg_handle);
 
     s_op->u.io.seg_handle = seg_handle;
-    gen_mutex_init(&s_op->u.io.mutex);
+    gen_mutex_init(&s_op->u.io.mutex); /* FIXME: */
     for(i=0; i<s_op->u.io.num_of_buffers; i++) {
 	PINT_segpool_register(seg_handle, &id[i]);
 	pipeline_op = malloc(sizeof(*pipeline_op));
@@ -396,7 +396,8 @@ static PINT_sm_action io_cleanup(
 	free(pipeline_op);
     }
 
-    gen_mutex_destroy(&s_op->u.io.mutex);
+    gen_mutex_destroy(&s_op->u.io.mutex); /* FIXME: */
+
     /* let go of our encoded response buffer, if we appear to have
      * made one
      */

Index: pipeline.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/Attic/pipeline.sm,v
diff -p -u -r1.1.2.1 -r1.1.2.2
--- pipeline.sm	28 Apr 2009 21:36:02 -0000	1.1.2.1
+++ pipeline.sm	29 Apr 2009 18:55:03 -0000	1.1.2.2
@@ -305,12 +305,11 @@ static PINT_sm_action check_done(struct 
     js_p->error_code = 0;
     struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent;
 
+    /* FIMXE: do we really need this lock? */
     gen_mutex_lock(&parent_s_op->u.io.mutex);
-    if(s_op->u.pipeline.io_type == PVFS_IO_READ)
-	parent_s_op->u.io.total_transferred += js_p->actual_size;
-    else if(s_op->u.pipeline.io_type == PVFS_IO_WRITE)
-	parent_s_op->u.io.total_transferred += s_op->u.pipeline.out_size;
+    parent_s_op->u.io.total_transferred += js_p->actual_size;
     gen_mutex_unlock(&parent_s_op->u.io.mutex);
+    
     gossip_debug(GOSSIP_IO_DEBUG, "%s: total_transferred=%ld\n", __func__,
 		 parent_s_op->u.io.total_transferred);
     gossip_debug(GOSSIP_IO_DEBUG, "%s: count=%d\n", __func__,