From 8c956111257abdd08bab43b0dda20deb940c0777 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Thu, 12 Jan 2012 20:49:56 -0800 Subject: [PATCH] Alphabetize the command line options --- doc/USER_GUIDE | 12 ++++++------ src/ior.c | 10 +++++----- src/parse_options.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/USER_GUIDE b/doc/USER_GUIDE index b86f243..d29b631 100644 --- a/doc/USER_GUIDE +++ b/doc/USER_GUIDE @@ -56,18 +56,14 @@ Two ways to run IOR: * 3. OPTIONS * ************** These options are to be used on the command line. E.g., 'IOR -a POSIX -b 4K'. - -A N testNum -- test number for reference in some output -a S api -- API for I/O [POSIX|MPIIO|HDF5|NCMPI] + -A N testNum -- test number for reference in some output -b N blockSize -- contiguous bytes to write per task (e.g.: 8, 4k, 2m, 1g) -B useO_DIRECT -- uses O_DIRECT for POSIX, bypassing I/O buffers -c collective -- collective I/O -C reorderTasksConstant -- changes task ordering to n+1 ordering for readback - -Q N taskPerNodeOffset for read tests use with -C & -Z options (-C constant N, -Z at least N) [!HDF5] - -Z reorderTasksRandom -- changes task ordering to random ordering for readback - -X N reorderTasksRandomSeed -- random seed for -Z option -d N interTestDelay -- delay between reps in seconds -D N deadlineForStonewalling -- seconds before stopping write or read phase - -Y fsyncPerWrite -- perform fsync after each POSIX write -e fsync -- perform fsync upon POSIX write close -E useExistingTestFile -- do not remove test file before write access -f S scriptFile -- test script name @@ -83,8 +79,8 @@ These options are to be used on the command line. E.g., 'IOR -a POSIX -b 4K'. -k keepFile -- don't remove the test file(s) on program exit -K keepFileWithError -- keep error-filled file(s) after data-checking -l storeFileOffset -- use file offset as stored signature - -M S memoryPerNode -- hog memory on the node -m multiFile -- use number of reps (-i) for multiple file count + -M S memoryPerNode -- hog memory on the node -n noFill -- no fill in HDF5 file creation -N N numTasks -- number of tasks that should participate in the test -o S testFile -- full name for test @@ -92,6 +88,7 @@ These options are to be used on the command line. E.g., 'IOR -a POSIX -b 4K'. -p preallocate -- preallocate file size -P useSharedFilePointer -- use shared file pointer [not working] -q quitOnError -- during file error-checking, abort on error + -Q N taskPerNodeOffset for read tests use with -C & -Z options (-C constant N, -Z at least N) [!HDF5] -r readFile -- read existing file -R checkRead -- check read after read -s N segmentCount -- number of segments @@ -105,7 +102,10 @@ These options are to be used on the command line. E.g., 'IOR -a POSIX -b 4K'. -w writeFile -- write file -W checkWrite -- check read after write -x singleXferAttempt -- do not retry transfer if incomplete + -X N reorderTasksRandomSeed -- random seed for -Z option + -Y fsyncPerWrite -- perform fsync after each POSIX write -z randomOffset -- access is to random, not sequential, offsets within a file + -Z reorderTasksRandom -- changes task ordering to random ordering for readback NOTES: * S is a string, N is an integer number. diff --git a/src/ior.c b/src/ior.c index 8656bce..0deb68d 100644 --- a/src/ior.c +++ b/src/ior.c @@ -658,18 +658,14 @@ static void DisplayUsage(char **argv) { char *opts[] = { "OPTIONS:", - " -A N testNum -- test number for reference in some output", " -a S api -- API for I/O [POSIX|MPIIO|HDF5|NCMPI]", + " -A N testNum -- test number for reference in some output", " -b N blockSize -- contiguous bytes to write per task (e.g.: 8, 4k, 2m, 1g)", " -B useO_DIRECT -- uses O_DIRECT for POSIX, bypassing I/O buffers", " -c collective -- collective I/O", " -C reorderTasks -- changes task ordering to n+1 ordering for readback", - " -Q N taskPerNodeOffset for read tests use with -C & -Z options (-C constant N, -Z at least N)", - " -Z reorderTasksRandom -- changes task ordering to random ordering for readback", - " -X N reorderTasksRandomSeed -- random seed for -Z option", " -d N interTestDelay -- delay between reps in seconds", " -D N deadlineForStonewalling -- seconds before stopping write or read phase", - " -Y fsyncPerWrite -- perform fsync after each POSIX write", " -e fsync -- perform fsync upon POSIX write close", " -E useExistingTestFile -- do not remove test file before write access", " -f S scriptFile -- test script name", @@ -693,6 +689,7 @@ static void DisplayUsage(char **argv) " -p preallocate -- preallocate file size", " -P useSharedFilePointer -- use shared file pointer [not working]", " -q quitOnError -- during file error-checking, abort on error", + " -Q N taskPerNodeOffset for read tests use with -C & -Z options (-C constant N, -Z at least N)", " -r readFile -- read existing file", " -R checkRead -- check read after read", " -s N segmentCount -- number of segments", @@ -706,7 +703,10 @@ static void DisplayUsage(char **argv) " -w writeFile -- write file", " -W checkWrite -- check read after write", " -x singleXferAttempt -- do not retry transfer if incomplete", + " -X N reorderTasksRandomSeed -- random seed for -Z option", + " -Y fsyncPerWrite -- perform fsync after each POSIX write", " -z randomOffset -- access is to random, not sequential, offsets within a file", + " -Z reorderTasksRandom -- changes task ordering to random ordering for readback", " ", " NOTE: S is a string, N is an integer number.", " ", diff --git a/src/parse_options.c b/src/parse_options.c index 3353d0f..caf9979 100644 --- a/src/parse_options.c +++ b/src/parse_options.c @@ -387,7 +387,7 @@ IOR_test_t *ReadConfigScript(char *scriptName) IOR_test_t *ParseCommandLine(int argc, char **argv) { static const char *opts = - "A:a:b:BcCQ:ZX:d:D:YeEf:FgG:hHi:j:J:IkKlmM:nN:o:O:pPqrRs:St:T:uU:vVwWxz"; + "a:A:b:BcCd:D:eEf:FgG:hHi:Ij:J:kKlmM:nN:o:O:pPqQ:rRs:St:T:uU:vVwWxX:YzZ"; int c, i; static IOR_test_t *tests = NULL;