Skip to content

add command-line option --version to print Darshan version #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 12, 2025
Merged

add command-line option --version to print Darshan version #1051

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8583db0
darshan-parser.c add command-line option --version to print Darshan v…
wkliao Jul 11, 2025
c21aec7
darshan-parser.c use PACKAGE_VERSION instead of VERSION
wkliao Jul 11, 2025
3dde16b
darshan-convert.c add command-line option --version to print Darshan …
wkliao Jul 11, 2025
797f552
darshan-diff.c add command-line option --version to print Darshan ver…
wkliao Jul 11, 2025
c6deac9
darshan-dxt-parser.c add command-line option --version to print Darsh…
wkliao Jul 11, 2025
a81ae9e
darshan-merge.c add command-line option --version to print Darshan ve…
wkliao Jul 11, 2025
bc8a876
darshan-analyzer.c add command-line option --version to print Darshan…
wkliao Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions darshan-util/darshan-parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
/*
* Options
*/
#define OPTION_BASE (1 << 0) /* darshan log fields */
#define OPTION_TOTAL (1 << 1) /* aggregated fields */
#define OPTION_PERF (1 << 2) /* derived performance */
#define OPTION_FILE (1 << 3) /* file count totals */
#define OPTION_BASE (1 << 0) /* Darshan log fields */
#define OPTION_TOTAL (1 << 1) /* aggregated fields */
#define OPTION_PERF (1 << 2) /* derived performance */
#define OPTION_FILE (1 << 3) /* file count totals */
#define OPTION_VERSION (1 << 4) /* print Darshan version number */
#define OPTION_SHOW_INCOMPLETE (1 << 7) /* show what we have, even if log is incomplete */
#define OPTION_ALL (\
OPTION_BASE|\
Expand All @@ -57,11 +58,13 @@ void daos_print_total_file(struct darshan_daos_object *pfile, int daos_ver);
int usage (char *exename)
{
fprintf(stderr, "Usage: %s [options] <filename>\n", exename);
fprintf(stderr, " --all : all sub-options are enabled\n");
fprintf(stderr, " --base : darshan log field data [default]\n");
fprintf(stderr, " --file : total file counts\n");
fprintf(stderr, " --perf : derived perf data\n");
fprintf(stderr, " --total : aggregated darshan field data\n");
fprintf(stderr, " --help : prints this help message and exits\n");
fprintf(stderr, " --version : prints Darshan version number and exits\n");
fprintf(stderr, " --all : all sub-options are enabled\n");
fprintf(stderr, " --base : Darshan log field data [default]\n");
fprintf(stderr, " --file : total file counts\n");
fprintf(stderr, " --perf : derived perf data\n");
fprintf(stderr, " --total : aggregated Darshan field data\n");
fprintf(stderr, " --show-incomplete : display results even if log is incomplete\n");

exit(1);
Expand All @@ -80,6 +83,7 @@ int parse_args (int argc, char **argv, char **filename)
{"total", 0, NULL, OPTION_TOTAL},
{"show-incomplete", 0, NULL, OPTION_SHOW_INCOMPLETE},
{"help", 0, NULL, 0},
{"version", 0, NULL, OPTION_VERSION},
{0, 0, 0, 0}
};

Expand All @@ -101,6 +105,9 @@ int parse_args (int argc, char **argv, char **filename)
case OPTION_SHOW_INCOMPLETE:
mask |= c;
break;
case OPTION_VERSION:
printf("%s\n",VERSION);
Copy link

@carns carns Jul 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if it makes any difference in practice, but I think PACKAGE_VERSION is the more conventional macro to use here? Otherwise this looks good to me.

exit(0);
case 0:
case '?':
default:
Expand Down Expand Up @@ -349,7 +356,7 @@ int main(int argc, char **argv)
"\n# To avoid this error, consult the darshan-runtime\n"
"# documentation and consider setting the\n"
"# DARSHAN_EXCLUDE_DIRS environment variable to prevent\n"
"# Darshan from instrumenting unecessary files.\n");
"# Darshan from instrumenting unnecessary files.\n");
if(fd->mod_map[i].len == 0)
continue; // no data to parse
}
Expand All @@ -365,7 +372,7 @@ int main(int argc, char **argv)
"\n# To avoid this error, consult the darshan-runtime\n"
"# documentation and consider setting the\n"
"# DARSHAN_EXCLUDE_DIRS environment variable to prevent\n"
"# Darshan from instrumenting unecessary files.\n");
"# Darshan from instrumenting unnecessary files.\n");
fprintf(stderr,
"\n# You can display the (incomplete) data that is\n"
"# present in this log using the --show-incomplete\n"
Expand Down
Loading