[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 parlweb1:/tmp/cvs-serv7682/src/io/flow/flowproto-bmi-trove

Modified Files:
      Tag: he-branch
	flowproto-multiqueue.c 
Log Message:
reverse merge of latest changes from HEAD to he branch.


Index: flowproto-multiqueue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c,v
diff -p -u -r1.118.2.1 -r1.118.2.2
--- flowproto-multiqueue.c	7 Apr 2008 16:31:23 -0000	1.118.2.1
+++ flowproto-multiqueue.c	21 May 2008 18:55:23 -0000	1.118.2.2
@@ -636,7 +636,6 @@ int fp_multiqueue_post(flow_descriptor  
             bmi_send_callback_fn(&(flow_data->prealloc_array[i]), 0, 0, 1);
             if(flow_data->dest_last_posted)
             {
-                flow_data->initial_posts = 0;
                 break;
             }
         }
@@ -959,7 +958,10 @@ static void trove_read_callback_fn(void 
                 q_item->parent->hints);
             flow_data->next_seq_to_send++;
             if(q_item->last)
+            {
+                flow_data->initial_posts = 0;
                 flow_data->dest_last_posted = 1;
+            }
             gossip_debug(GOSSIP_FLOW_PROTO_DEBUG,
                 "%s: (post send time) ini posts: %d, pending: %d, last: %d\n",
                 __func__,
@@ -1173,7 +1175,10 @@ static int bmi_send_callback_fn(void *us
          * is no work to do, trigger manually
          */
         if(flow_data->total_bytes_processed == 0)
+        {
+            flow_data->initial_posts = 0;
             flow_data->dest_last_posted = 1;
+        }
     }
 
     if(bytes_processed == 0)
@@ -1217,6 +1222,7 @@ static int bmi_send_callback_fn(void *us
              * to prevent further trying to start other qitems from being
              * posted
              */
+            flow_data->initial_posts = 0;
             flow_data->dest_last_posted = 1;
             return 0;
         }