summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-06-17 20:04:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:53:25 -0500
commit551575012b5120f420e346fe70890e03c6fb37bf (patch)
tree069fcce7d10b392707bfc745bf48eae106f0c73b
parent2a3282f872e4e415923626dbd86ce5b34b08be32 (diff)
downloadsamba-551575012b5120f420e346fe70890e03c6fb37bf.tar.gz
samba-551575012b5120f420e346fe70890e03c6fb37bf.tar.bz2
samba-551575012b5120f420e346fe70890e03c6fb37bf.zip
r23534: honour the targetrate even for loadfiles with timestamps
(This used to be commit 24b6aabd11849518f46231358994118a39bb0cb3)
-rw-r--r--source4/torture/nbench/nbench.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index f14da8cd15..b55998e43f 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -88,7 +88,11 @@ again:
if (i > 0 && isdigit(params[0][0])) {
double targett = strtod(params[0], NULL);
- nbio_time_delay(targett);
+ if (target_rate != 0) {
+ nbio_target_rate(target_rate);
+ } else {
+ nbio_time_delay(targett);
+ }
params++;
i--;
} else if (target_rate != 0) {