[PVFS2-CVS] commit by slang in pvfs2/src/io/flow/flowproto-bmi-trove: flowproto-multiqueue.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove
In directory parlweb:/tmp/cvs-serv21766/src/io/flow/flowproto-bmi-trove

Modified Files:
      Tag: slang-sio-branch
	flowproto-multiqueue.c 
Log Message:
fixed a bug in flow caused by outsize being updated correctly in trove now.  Also, s/transfered/transferred/.


Index: flowproto-multiqueue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c,v
diff -p -u -r1.100.2.1 -r1.100.2.2
--- flowproto-multiqueue.c	11 Nov 2005 22:19:07 -0000	1.100.2.1
+++ flowproto-multiqueue.c	17 Nov 2005 23:04:38 -0000	1.100.2.2
@@ -58,6 +58,7 @@ struct fp_queue_item
     int seq;
     void *buffer;
     PVFS_size buffer_used;
+    PVFS_size out_size;
     struct result_chain_entry result_chain;
     int result_chain_count;
     struct qlist_head list_link;
@@ -468,7 +469,7 @@ int fp_multiqueue_cancel(flow_descriptor
         gossip_debug(GOSSIP_CANCEL_DEBUG,
             "PINT_flow_cancel() called on active flow, %lld "
                      "bytes transferred.\n",
-                     lld(flow_d->total_transfered));
+                     lld(flow_d->total_transferred));
         assert(flow_d->state == FLOW_TRANSMITTING);
         handle_io_error(-PVFS_ECANCEL, NULL, flow_data);
     }
@@ -714,7 +715,7 @@ static void bmi_recv_callback_fn(void *u
             result_tmp->result.offset_array,
             result_tmp->result.size_array,
             result_tmp->result.segs,
-            &result_tmp->result.bytes,
+            &q_item->out_size,
             get_data_sync_mode(q_item->parent->dest.u.trove.coll_id),
             NULL,
             &result_tmp->trove_callback,
@@ -998,7 +999,7 @@ static int bmi_send_callback_fn(void *us
 
     PINT_perf_count(PINT_PERF_READ, actual_size, PINT_PERF_ADD);
 
-    flow_data->parent->total_transfered += actual_size;
+    flow_data->parent->total_transferred += actual_size;
 
     if(initial_call_flag)
         flow_data->initial_posts--;
@@ -1159,7 +1160,7 @@ static int bmi_send_callback_fn(void *us
             result_tmp->result.offset_array,
             result_tmp->result.size_array,
             result_tmp->result.segs,
-            &result_tmp->result.bytes,
+            &q_item->out_size,
             0, /* get_data_sync_mode(
                   q_item->parent->dest.u.trove.coll_id), */
             NULL,
@@ -1228,7 +1229,7 @@ static void trove_write_callback_fn(void
 
     result_tmp = &q_item->result_chain;
     do{
-        q_item->parent->total_transfered += result_tmp->result.bytes;
+        q_item->parent->total_transferred += result_tmp->result.bytes;
         PINT_perf_count(PINT_PERF_WRITE, result_tmp->result.bytes, 
             PINT_PERF_ADD);
         old_result_tmp = result_tmp;
@@ -1240,7 +1241,7 @@ static void trove_write_callback_fn(void
     q_item->result_chain_count = 0;
 
     /* if this was the last operation, then mark the flow as done */
-    if(flow_data->parent->total_transfered ==
+    if(flow_data->parent->total_transferred ==
         flow_data->total_bytes_processed &&
         PINT_REQUEST_DONE(flow_data->parent->file_req_state))
     {
@@ -1340,7 +1341,7 @@ static void trove_write_callback_fn(void
 
         if(bytes_processed == 0)
         {        
-            if(flow_data->parent->total_transfered ==
+            if(flow_data->parent->total_transferred ==
                 flow_data->total_bytes_processed &&
                 PINT_REQUEST_DONE(flow_data->parent->file_req_state))
             {
@@ -1496,7 +1497,7 @@ static void mem_to_bmi_callback_fn(void 
     qlist_del(&q_item->list_link);
     qlist_add_tail(&q_item->list_link, &flow_data->dest_list);
 
-    flow_data->parent->total_transfered += actual_size;
+    flow_data->parent->total_transferred += actual_size;
 
     /* are we done? */
     if(PINT_REQUEST_DONE(q_item->parent->file_req_state))
@@ -1679,7 +1680,7 @@ static void bmi_to_mem_callback_fn(void 
     qlist_del(&q_item->list_link);
     qlist_add_tail(&q_item->list_link, &flow_data->src_list);
 
-    flow_data->parent->total_transfered += actual_size;
+    flow_data->parent->total_transferred += actual_size;
 
     /* if this is the result of a receive into an intermediate buffer,
      * then we must copy out */