[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-serv18343/src/server

Modified Files:
      Tag: as-branch
	io.sm pipeline.sm 
Log Message:
fixed a bug in case of simple actsto operations in pipeline.sm.
(it was returning local sum instead of global sum)



Index: io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/io.sm,v
diff -p -u -r1.73.6.26 -r1.73.6.27
--- io.sm	5 Feb 2010 21:22:22 -0000	1.73.6.26
+++ io.sm	11 Feb 2010 22:42:46 -0000	1.73.6.27
@@ -10,7 +10,7 @@
 
 #include <string.h>
 #include <assert.h>
-//#include <stdlib.h> /* sson */
+#include <stdlib.h> /* sson */
 
 #include "server-config.h"
 #include "pvfs2-server.h"
@@ -396,12 +396,14 @@ static PINT_sm_action cleanup_pipeline_s
                      "io: nested sm returned error code: %d\n", tmp_err);
 	if(pipeline_op->u.pipeline.buffer) {
 	    if(s_op->req->u.io.io_type == PVFS_IO_READ) {
+#if 0
 		if(pipeline_op->u.pipeline.op != 0 && 
 		   pipeline_op->u.pipeline.op != (0x5800000f))
 		    if(s_op->u.io.tmp_buffer != NULL)
                         memcpy(s_op->u.io.tmp_buffer, 
                                pipeline_op->u.pipeline.buffer, 
                                sizeof(double));
+#endif
 		BMI_memfree(pipeline_op->u.pipeline.address, 
 			    pipeline_op->u.pipeline.buffer, 
 			    s_op->u.io.buffer_size, BMI_SEND);
@@ -603,7 +605,7 @@ static PINT_sm_action io_send_completion
 		s_op->resp.u.read_completion.result.buffer = s_op->u.io.tmp_buffer;
 		break;
 	    }
-	case (int)0x4c00080b:
+	case (int)0x4c00080b: /* MPI_DOUBLE */
 	    {
 		double *tmp;
 		tmp = s_op->u.io.tmp_buffer;

Index: pipeline.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/Attic/pipeline.sm,v
diff -p -u -r1.1.2.34 -r1.1.2.35
--- pipeline.sm	4 Feb 2010 03:28:02 -0000	1.1.2.34
+++ pipeline.sm	11 Feb 2010 22:42:46 -0000	1.1.2.35
@@ -55,8 +55,8 @@ nested machine pvfs2_pipeline_sm
     state fetch
     {
         run fetch_data;
-	DONE => return;
         success => dispatch;
+        DONE => return;
     }
 
     state dispatch
@@ -1011,8 +1011,8 @@ static PINT_sm_action do_comp_fn(struct 
 
 		    a[0] = result;
 		    *tmp += result;
-		    gossip_debug(GOSSIP_FLOW_PROTO_DEBUG, "sum=%lf\n", 
-				 *tmp);
+		    gossip_debug(GOSSIP_FLOW_PROTO_DEBUG, "sum=%lf, local sum=%lf\n", 
+				 *tmp, result);
 		    break;    
 		case (0x5800000e): /* MEAN */
 		    result = 0;
@@ -1059,6 +1059,9 @@ static PINT_sm_action do_comp_fn(struct 
 		} /* end inner switch */
 		s_op->u.pipeline.buffer = (void *)a;
 		parent_s_op->u.io.tmp_buffer = (void *)tmp;
+                double *tmp1;
+                tmp1 = parent_s_op->u.io.tmp_buffer;
+                gossip_debug(GOSSIP_IO_DEBUG, "%s: sum=%lf\n", __func__, *tmp1);
 	    }
 	    
 	    break;