* ioping -c|-w: do not oversleep

This commit addresses two similar (but distinct) bugs.

(1) 'ioping -c' was needlessly sleeping after the last iteration
(and before showing final stats). Fix it by moving the check
to before the usleep(), not after.

(2) 'ioping -w' was going over the time limit specified. For example,
'ioping -w 7 -i 2' was taking 8 seconds to run, not 7 or less.
Fix it by moving the check to before usleep(), and taking
the interval (ie usleep argument) into account.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>

ioping.c

@@ -406,13 +406,7 @@ int main (int argc, char **argv)
 	part_sum2 = time_sum2 = 0;
 	time_total = now();
 
-	while (!exiting) {
-		if (count && request >= count)
-			break;
-
-		if (deadline && now() >= deadline)
-			break;
-
+	while (1) {
 		request++;
 
 		if (randomize)
@@ -466,8 +460,16 @@ int main (int argc, char **argv)
 		if (woffset + size > wsize)
 			woffset = 0;
 
-		if (!exiting)
-			usleep(interval);
+		if (exiting)
+			break;
+
+		if (count && request >= count)
+			break;
+
+		if (deadline && now() >= deadline)
+			break;
+
+		usleep(interval);
 	}
 
 	time_total = now() - time_total;