diff options
| -rw-r--r-- | src/tools/fsync/README | 8 | ||||
| -rw-r--r-- | src/tools/fsync/test_fsync.c | 59 |
2 files changed, 49 insertions, 18 deletions
diff --git a/src/tools/fsync/README b/src/tools/fsync/README index 5bf6f1f2ac7..fee9c62a185 100644 --- a/src/tools/fsync/README +++ b/src/tools/fsync/README @@ -3,7 +3,11 @@ test_fsync This program tests fsync. The tests are described as part of the program output. - Usage: test_fsync [-f filename] [ops_per_test] + Usage: test_fsync [option...] + +Options: + -f, --filename specify filename for test + -o, --ops-per-test operations per test test_fsync is intended to give you a reasonable idea of what the fastest fsync_method is on your specific system, as well as supplying diagnostic @@ -16,6 +20,6 @@ The output filename defaults to test_fsync.out in the current directory. test_fsync should be run in the same filesystem as your transaction log directory (pg_xlog). -Ops-per-test defaults to 2000. Increase this to get more accurate +Operations per test defaults to 2000. Increase this to get more accurate measurements. diff --git a/src/tools/fsync/test_fsync.c b/src/tools/fsync/test_fsync.c index c0c58f67d25..b1cec74fce2 100644 --- a/src/tools/fsync/test_fsync.c +++ b/src/tools/fsync/test_fsync.c @@ -8,6 +8,7 @@ #include "postgres.h" +#include "getopt_long.h" #include "access/xlog_internal.h" #include "access/xlog.h" #include "access/xlogdefs.h" @@ -80,26 +81,52 @@ main(int argc, char *argv[]) void handle_args(int argc, char *argv[]) { - if (argc > 1 && strcmp(argv[1], "-h") == 0) + static struct option long_options[] = { + {"filename", required_argument, NULL, 'f'}, + {"ops-per-test", required_argument, NULL, 'o'}, + {NULL, 0, NULL, 0} + }; + int option; /* Command line option */ + int optindex = 0; /* used by getopt_long */ + + if (argc > 1) { - fprintf(stderr, "test_fsync [-f filename] [ops-per-test]\n"); - exit(1); + if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 || + strcmp(argv[1], "-?") == 0) + { + fprintf(stderr, "test_fsync [-f filename] [ops-per-test]\n"); + exit(0); + } + if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) + { + fprintf(stderr,"test_fsync " PG_VERSION "\n"); + exit(0); + } } - - /* - * arguments: ops_per_test and filename (optional) - */ - if (argc > 2 && strcmp(argv[1], "-f") == 0) + + while ((option = getopt_long(argc, argv, "f:o:", + long_options, &optindex)) != -1) { - filename = argv[2]; - argv += 2; - argc -= 2; + switch (option) + { + case 'f': + filename = strdup(optarg); + break; + + case 'o': + ops_per_test = atoi(optarg); + break; + + default: + fprintf(stderr, + "Try \"%s --help\" for more information.\n", + "test_fsync"); + exit(1); + break; + } } - if (argc > 1) - ops_per_test = atoi(argv[1]); - - printf("Ops-per-test = %d\n\n", ops_per_test); + printf("%d operations per test\n\n", ops_per_test); } void @@ -448,7 +475,7 @@ test_open_syncs(void) } if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG | PG_O_DIRECT, 0)) == -1) - printf(NA_FORMAT, "n/a**\n"); + printf(NA_FORMAT, "o_direct", "n/a**\n"); else { printf(LABEL_FORMAT, "2 open_sync 8k writes"); |