{ "create", no_argument, 0, 'c' },
{ "flush", no_argument, 0, 'f' },
{ "entire", no_argument, 0, 'e' },
+ { "progress", no_argument, 0, 'p' },
{ "help", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'V' },
{ 0, 0, 0, 0 },
" vbig [--seed SEED] --verify|--create PATH [SIZE]\n"
"\n"
"Options:\n"
- " --seed, -s Specify random seed as string\n"
- " --seed-file, -S Read random seed from (start of) this file\n"
+ " --seed, -s Specify random seed as string\n"
+ " --seed-file, -S Read random seed from (start of) this file\n"
" --seed-length, -L Set (maximum) seed length to read from file\n"
- " --verify, -v Verify that PATH contains the expected contents\n"
- " --create, -c Create PATH with psuedo-random contents\n"
- " --flush, -f Flush cache\n"
- " --entire, -e Write until full; read until EOF\n"
- " --help, -h Display usage message\n"
- " --version, -V Display version string\n");
+ " --verify, -v Verify that PATH contains the expected contents\n"
+ " --create, -c Create PATH with psuedo-random contents\n"
+ " --flush, -f Flush cache\n"
+ " --entire, -e Write until full; read until EOF\n"
+ " --progress, -p Show progress as we go\n"
+ " --help, -h Display usage message\n"
+ " --version, -V Display version string\n");
}
// Possible modes of operation
BOTH
};
+static void clearprogress();
+
// Report an error and exit
static void fatal(int errno_value, const char *fmt, ...) {
va_list ap;
+ clearprogress();
fprintf(stderr, "ERROR: ");
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
static const char *path;
static bool entireopt = false;
static bool flush = false;
+static bool progress = false;
static long long size;
int main(int argc, char **argv) {
mode_type mode = BOTH;
int n;
char *ep;
- while((n = getopt_long(argc, argv, "+s:S:L:vcefhV", opts, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "+s:S:L:vcepfhV", opts, 0)) >= 0) {
switch(n) {
case 's': seed = optarg; seedlen = strlen(optarg); break;
case 'S': seedpath = optarg; break;
case 'v': mode = VERIFY; break;
case 'c': mode = CREATE; break;
case 'e': entireopt = true; break;
+ case 'p': progress = true; break;
case 'f': flush = true; break;
case 'h': help(); exit(0);
case 'V': puts(VERSION); exit(0);
}
if(seed && seedpath)
fatal(0, "both --seed and --seed-file specified");
+ if(mode == BOTH && !seed && !seedpath) {
+#ifdef HAVE_RANDOM_DEVICE
+ seedpath = RANDOM_DEVICE;
+#else
+ fatal(0, "no --seed or --seed-file specified in --both mode"
+ " and random device not supported on this system");
+#endif
+ }
if(seedpath) {
if(!seedlen)
seedlen = DEFAULT_SEED_LENGTH;
return 0;
}
+static void flushstdout() {
+ if(ferror(stdout) || fflush(stdout))
+ fatal(errno, "flush stdout");
+}
+
+static void clearprogress() {
+ if (!progress) return;
+ printf(" %-10s %*s \r", "", sizeof(long long)*4, "");
+ flushstdout();
+}
+
+static void showprogress(long long amount, const char *show) {
+ if (!progress) return;
+
+ static int counter;
+ if (counter++ < 1000) return;
+ counter = 0;
+
+ int triples = sizeof(amount);
+ char rawbuf[triples*3 + 1];
+ char outbuf[triples*4 + 1];
+ snprintf(rawbuf, sizeof(rawbuf), "% *lld", sizeof(rawbuf)-1, amount);
+ for (int i=0; i<triples; i++) {
+ outbuf[i*4] = ' ';
+ memcpy(outbuf + i*4 + 1, rawbuf + i*3, 3);
+ }
+ outbuf[triples*4] = 0;
+ printf(" %-10s %s...\r", outbuf, show);
+ flushstdout();
+}
+
static long long execute(mode_type mode, bool entire, const char *show) {
Arcfour rng((const char*)seed, seedlen);
FILE *fp = fopen(path, mode == VERIFY ? "rb" : "wb");
}
}
remain -= bytesGenerated;
+ showprogress(size - remain, mode == VERIFY ? "verifying" : "writing");
}
+ clearprogress();
if(mode == VERIFY && !entire && getc(fp) != EOF)
fatal(0, "%s: extended beyond %lld bytes",
path, size);
printf("%lld bytes (%lldM, %lldG) %s\n",
done, done >> 20, done >> 30,
show);
- if(ferror(stdout) || fflush(stdout))
- fatal(errno, "flush stdout");
+ flushstdout();
}
return done;
}