Index: libcfa/src/concurrency/stats.cfa
===================================================================
--- libcfa/src/concurrency/stats.cfa	(revision a06023f31f2874dece1185526cd49d37b944d463)
+++ libcfa/src/concurrency/stats.cfa	(revision fec3e9a093643c46f1787bf2042fab386e27afca)
@@ -33,8 +33,8 @@
 			stats->io.submit.slow       = 0;
 			stats->io.flush.external    = 0;
-			stats->io.calls.count       = 0;
+			stats->io.calls.flush       = 0;
 			stats->io.calls.submitted   = 0;
+			stats->io.calls.drain       = 0;
 			stats->io.calls.completed   = 0;
-			stats->io.calls.blocks      = 0;
 			stats->io.calls.errors.busy = 0;
 			stats->io.poller.sleeps     = 0;
@@ -67,8 +67,8 @@
 			__atomic_fetch_add( &cltr->io.submit.slow      , proc->io.submit.slow      , __ATOMIC_SEQ_CST ); proc->io.submit.slow       = 0;
 			__atomic_fetch_add( &cltr->io.flush.external   , proc->io.flush.external   , __ATOMIC_SEQ_CST ); proc->io.flush.external    = 0;
-			__atomic_fetch_add( &cltr->io.calls.count      , proc->io.calls.count      , __ATOMIC_SEQ_CST ); proc->io.calls.count       = 0;
+			__atomic_fetch_add( &cltr->io.calls.flush      , proc->io.calls.flush      , __ATOMIC_SEQ_CST ); proc->io.calls.flush       = 0;
 			__atomic_fetch_add( &cltr->io.calls.submitted  , proc->io.calls.submitted  , __ATOMIC_SEQ_CST ); proc->io.calls.submitted   = 0;
+			__atomic_fetch_add( &cltr->io.calls.drain      , proc->io.calls.drain      , __ATOMIC_SEQ_CST ); proc->io.calls.drain       = 0;
 			__atomic_fetch_add( &cltr->io.calls.completed  , proc->io.calls.completed  , __ATOMIC_SEQ_CST ); proc->io.calls.completed   = 0;
-			__atomic_fetch_add( &cltr->io.calls.blocks     , proc->io.calls.blocks     , __ATOMIC_SEQ_CST ); proc->io.calls.blocks      = 0;
 			__atomic_fetch_add( &cltr->io.calls.errors.busy, proc->io.calls.errors.busy, __ATOMIC_SEQ_CST ); proc->io.calls.errors.busy = 0;
 			__atomic_fetch_add( &cltr->io.poller.sleeps    , proc->io.poller.sleeps    , __ATOMIC_SEQ_CST ); proc->io.poller.sleeps     = 0;
@@ -110,6 +110,6 @@
 				double avgfasts = ((double)io.submit.fast) / total_submits;
 
-				double avgsubs = ((double)io.calls.submitted) / io.calls.count;
-				double avgcomp = ((double)io.calls.completed) / io.calls.count;
+				double avgsubs = ((double)io.calls.submitted) / io.calls.flush;
+				double avgcomp = ((double)io.calls.completed) / io.calls.drain;
 
 				__cfaabi_bits_print_safe( STDOUT_FILENO,
@@ -129,5 +129,5 @@
 					, io.submit.fast, io.submit.slow, avgfasts
 					, io.flush.external
-					, io.calls.count, io.calls.blocks, io.calls.errors.busy
+					, io.calls.flush, io.calls.drain, io.calls.errors.busy
 					, io.calls.submitted, avgsubs
 					, io.calls.completed, avgcomp