Commit bb5679bb authored by Philip Carns's avatar Philip Carns

bumped version number to reflect improved mount point mapping


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@199 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 8ce1bc7c
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "darshan-config.h" #include "darshan-config.h"
/* update this on file format changes */ /* update this on file format changes */
#define CP_VERSION "1.23" #define CP_VERSION "1.24"
/* size (in bytes) of job record */ /* size (in bytes) of job record */
#define CP_JOB_RECORD_SIZE 1024 #define CP_JOB_RECORD_SIZE 1024
......
...@@ -260,6 +260,8 @@ int darshan_log_getjob(darshan_fd file, struct darshan_job *job) ...@@ -260,6 +260,8 @@ int darshan_log_getjob(darshan_fd file, struct darshan_job *job)
return(0); return(0);
if(strcmp(job->version_string, "1.23") == 0) if(strcmp(job->version_string, "1.23") == 0)
return(0); return(0);
if(strcmp(job->version_string, "1.24") == 0)
return(0);
fprintf(stderr, "Error: incompatible darshan file.\n"); fprintf(stderr, "Error: incompatible darshan file.\n");
fprintf(stderr, "Error: expected version %s, but got %s\n", fprintf(stderr, "Error: expected version %s, but got %s\n",
...@@ -325,9 +327,19 @@ int darshan_log_getfile(darshan_fd fd, struct darshan_job *job, struct darshan_f ...@@ -325,9 +327,19 @@ int darshan_log_getfile(darshan_fd fd, struct darshan_job *job, struct darshan_f
} }
} }
else if(strcmp(job->version_string, "1.23") == 0) else if(strcmp(job->version_string, "1.23") == 0)
{
/* data format is compatible with 1.24 */
ret = gzread(fd, file, sizeof(*file));
if(ret == sizeof(*file))
{
/* got exactly one, correct size record */
return(1);
}
}
else if(strcmp(job->version_string, "1.24") == 0)
{ {
/* make sure this is the current version */ /* make sure this is the current version */
assert(strcmp("1.23", CP_VERSION) == 0); assert(strcmp("1.24", CP_VERSION) == 0);
ret = gzread(fd, file, sizeof(*file)); ret = gzread(fd, file, sizeof(*file));
if(ret == sizeof(*file)) if(ret == sizeof(*file))
...@@ -478,12 +490,17 @@ void darshan_log_close(darshan_fd file) ...@@ -478,12 +490,17 @@ void darshan_log_close(darshan_fd file)
*/ */
void darshan_log_print_version_warnings(struct darshan_job *job) void darshan_log_print_version_warnings(struct darshan_job *job)
{ {
if(strcmp(job->version_string, "1.23") == 0) if(strcmp(job->version_string, "1.24") == 0)
{ {
/* nothing to do, this is the current version */ /* nothing to do, this is the current version */
return; return;
} }
if(strcmp(job->version_string, "1.23") == 0)
{
printf("# WARNING: version 1.23 log format may have incorrect mount point mappings for files with rank > 0\n");
}
if(strcmp(job->version_string, "1.22") == 0) if(strcmp(job->version_string, "1.22") == 0)
{ {
printf("# WARNING: version 1.22 log format does not support the following parameters:\n"); printf("# WARNING: version 1.22 log format does not support the following parameters:\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment