From 00263e3ecacb015eef144998160cb9f949fa1f21 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sun, 21 Oct 2018 13:51:28 +0200 Subject: [PATCH] better help --- appender.c | 26 ++++++++++----- common.c | 3 +- generator.c | 14 +++++++-- reader.c | 2 +- sorter.c | 91 ++++++++++++++++++++++++++++++++++++++++++----------- tape.c | 4 +++ 6 files changed, 110 insertions(+), 30 deletions(-) diff --git a/appender.c b/appender.c index 37311f3..09ee25e 100644 --- a/appender.c +++ b/appender.c @@ -1,9 +1,10 @@ -#include +#include #include "tape.h" #include "record.h" #include "common.h" -#define WANT_IOSTAT 1 +#define WANT_IOSTAT 1 +#define WANT_SUMMARY 2 char* filename; char flags; @@ -13,7 +14,7 @@ void init_args(int args, char* argv[]) optparse_t options; optparse_init(&options, argv); - for (char opt; opt != -1; opt = optparse(&options, "qvi")) { + for (char opt; opt != -1; opt = optparse(&options, "qsvi")) { switch (opt) { case 'q': verbosity--; @@ -23,6 +24,10 @@ void init_args(int args, char* argv[]) break; case 'i': flags |= WANT_IOSTAT; + break; + case 's': + flags |= WANT_SUMMARY; + break; } } @@ -31,9 +36,14 @@ void init_args(int args, char* argv[]) void help(const char* name) { printf( - "Append record to given tape at the end.\n" + "Appends records to given tape at the end.\n" "Usage:\n" - "\t%s [options] \n", + "\t%s [options] \n" + "Options:\n" + "\t-q|v|vv - verbosity level, q for quiet, v for vervose vv for debug\n" + "\t-s - summary of records (R) and runs (S)\n" + "\t-i - summary IO stats\n" + , name ); } @@ -56,12 +66,14 @@ int main(int argc, const char* argv[]) records++; } - printfv(VERBOSITY_NORMAL, "Appended %zu record to %s.\n", records, argv[1]); + if (flags & WANT_SUMMARY) { + printfv(VERBOSITY_NORMAL, "Appended %zu record to %s.\n", records, argv[1]); + } if (flags & WANT_IOSTAT) { iostats(); } tape_close(tape); - return 1; + return EXIT_SUCCESS; } diff --git a/common.c b/common.c index b3152ad..85563aa 100644 --- a/common.c +++ b/common.c @@ -18,5 +18,6 @@ void printfv(verbosity_t level, const char* format, ...) void iostats() { - printfv(VERBOSITY_QUIET, "IO R: %u W: %u\n", reads, writes); + printfv(VERBOSITY_QUIET, "%u IO R: %u W: %u\n", reads + writes, reads, writes); } + diff --git a/generator.c b/generator.c index e32098c..47abc7a 100644 --- a/generator.c +++ b/generator.c @@ -8,10 +8,20 @@ double range_rand(double from, double to) return (double)rand() / RAND_MAX * (to - from) + from; } +void help(const char* name) { + printf( + "Generates given number of records.\n" + "Usage:\n" + "\t%s \n" + , + name + ); +} + int main(int argc, const char* argv[]) { if (argc < 4) { - printf("usage: %s min max count\n", argv[0]); + help(argv[0]); return -1; } @@ -24,5 +34,5 @@ int main(int argc, const char* argv[]) printf("%lf %lf\n", range_rand(from, to), range_rand(from, to)); } - return 1; + return EXIT_SUCCESS; } diff --git a/reader.c b/reader.c index bbe9342..fec700e 100644 --- a/reader.c +++ b/reader.c @@ -96,5 +96,5 @@ int main(int argc, char* argv[]) iostats(); } - return 1; + return EXIT_SUCCESS; } diff --git a/sorter.c b/sorter.c index 3badc9f..373922c 100644 --- a/sorter.c +++ b/sorter.c @@ -7,13 +7,55 @@ #define SGN(x) ((x > 0) - (x < 0)) -char* tmp_format = "tmp.%s.tape"; +#define WANT_SUMMARY 1 +#define WANT_IOSTAT 2 +#define WANT_STOP 4 + +char *in_filename, *out_filename; +char flags; +char *tmp_format = "tmp.%s.tape"; +size_t n = 100; typedef struct { record_t record; tape_t* tape; } entry_t; +void init_args(int args, char* argv[]) +{ + optparse_t options; + optparse_init(&options, argv); + + for (char opt; opt != -1; opt = optparse(&options, "qvipsn:t:")) { + switch (opt) { + case 'q': + verbosity--; + break; + case 'v': + verbosity++; + break; + case 'i': + flags |= WANT_IOSTAT; + break; + case 's': + flags |= WANT_SUMMARY; + break; + case 'p': + flags |= WANT_STOP; + break; + case 'n': + sscanf(options.optarg, "%zu", &n); + break; + case 't': + tmp_format = options.optarg; + break; + } + } + + in_filename = optparse_arg(&options); + out_filename = optparse_arg(&options); +} + char chartosymbol(unsigned id) { // normalize id id = id % 62; @@ -55,7 +97,15 @@ void help(const char* name) { printf( "Sorts reocrds from tape.\n" "Usage:\n" - "\t%s \n", + "\t%s [options] \n" + "Options:\n" + "\t-q|v|vv - verbosity level, q for quiet, v for vervose vv for debug\n" + "\t-s - summary of records (R) and runs (S)\n" + "\t-i - summary IO stats\n" + "\t-p - pause after each iteration\n" + "\t-n buffers - number of buffers, must be greater than 2 (default: 100)\n" + "\t-t format - temporary tape file name format, must include %%s identifier (default: tmp.%%s.tape)\n" + , name ); } @@ -159,12 +209,6 @@ unsigned join_tapes(tape_t** tapes, size_t n, tape_t* out) { return records; } -void print_entry(void* e) -{ - entry_t* entry = e; - printf("%lf ", record_length(entry->record)); -} - unsigned iteration(size_t i, size_t n) { size_t in_offset = (i % 2) * n; @@ -197,28 +241,33 @@ unsigned iteration(size_t i, size_t n) return series; } -int main(int argc, const char* argv[]) +int main(int argc, char* argv[]) { if (argc < 3) { help(argv[0]); return 0; } - size_t n = 100; + init_args(argc, argv); - tape_t* in = tape_open(argv[1], "rb"); - tape_t* out = tape_open(argv[2], "wb"); + tape_t* in = tape_open(in_filename, "rb"); + tape_t* out = tape_open(out_filename, "wb"); size_t series = make_series(in, n); - printf("Created %zu series.\n", series); + printfv(VERBOSITY_NORMAL, "Created %zu series using %zu buffers.\n", series, n); unsigned i = 0; while (series > n) { - printf("Iteration %u.\n", i); + printfv(VERBOSITY_NORMAL, "Iteration %u.\n", i); series = iteration(i++, n); + + if (flags & WANT_STOP) { + printf("Look at the files and press ENTER to continue..."); + getchar(); + } } - printf("Final iteration.\n"); + printfv(VERBOSITY_NORMAL, "Final iteration.\n"); size_t offset = (i % 2) * n; tape_t** in_tapes = malloc(series * sizeof(tape_t*)); for (unsigned i = 0; i < series; i++) { @@ -227,12 +276,16 @@ int main(int argc, const char* argv[]) join_tapes(in_tapes, series, out); - printf("Sorted file %s into %s in %u iterations.\n", in->name, out->name, i + 1); - tape_close(in); tape_close(out); - printf("%u IO R: %u W: %u\n", reads + writes, reads, writes); + if (flags & WANT_SUMMARY) { + printf("Sorted file %s into %s in %u iterations.\n", in_filename, out_filename, i + 1); + } - return 1; + if (flags & WANT_IOSTAT) { + iostats(); + } + + return EXIT_SUCCESS; } diff --git a/tape.c b/tape.c index 5453653..06a4edb 100644 --- a/tape.c +++ b/tape.c @@ -77,6 +77,10 @@ void _tape_load_block(tape_t* tape, unsigned n) void _tape_flush(tape_t* tape) { + if (tape->offset == 0) { + return; + } + printfv(VERBOSITY_DEBUG, "Flushing block %d (%u bytes) of %s.\n", tape->block, tape->offset, tape->name); fseek(tape->file, tape->block * PAGE_SIZE, SEEK_SET);