[PVFS2-CVS] commit by pcarns 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-serv18651/src/io/flow/flowproto-bmi-trove

Modified Files:
	flowproto-multiqueue.c 
Log Message:
filled in final cleanup steps; still need to track down why a BMI assertion
is getting triggered on cancel, though


Index: flowproto-multiqueue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c,v
diff -p -u -r1.60 -r1.61
--- flowproto-multiqueue.c	13 Feb 2004 19:22:22 -0000	1.60
+++ flowproto-multiqueue.c	14 Feb 2004 19:42:36 -0000	1.61
@@ -1509,13 +1509,20 @@ static void handle_io_error(PVFS_error e
 	    /* impossible condition */
 	    assert(0);
 	}
-
-	/* TODO: finish filling this in */
-	assert(0);
+    }
+    else
+    {
+	/* one of the previous cancels came through */
+	flow_data->cleanup_pending_count--;
     }
     
-    /* TODO: finish filling this in */
-    assert(0);
+    if(flow_data->cleanup_pending_count == 0)
+    {
+	/* we are finished, make sure error is marked and state is set */
+	assert(flow_data->parent->error_code);
+	flow_data->parent->state = FLOW_COMPLETE;
+    }
+
     return;
 }