Commit 547114f8 authored by Philip Carns's avatar Philip Carns

updated log format


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@565 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 9a4acb38
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#endif #endif
/* update this on file format changes */ /* update this on file format changes */
#define CP_VERSION "2.01" #define CP_VERSION "2.02"
/* magic number for validating output files and checking byte order */ /* magic number for validating output files and checking byte order */
#define CP_MAGIC_NR 6567223 #define CP_MAGIC_NR 6567223
......
...@@ -350,7 +350,13 @@ int darshan_log_getjob(darshan_fd file, struct darshan_job *job) ...@@ -350,7 +350,13 @@ int darshan_log_getjob(darshan_fd file, struct darshan_job *job)
return(-1); return(-1);
} }
if(strcmp(file->version, "2.01") == 0) if(strcmp(file->version, "2.02") == 0)
{
getjob_internal = getjob_internal_201;
getfile_internal = getfile_internal_200;
file->job_struct_size = sizeof(*job);
}
else if(strcmp(file->version, "2.01") == 0)
{ {
getjob_internal = getjob_internal_201; getjob_internal = getjob_internal_201;
getfile_internal = getfile_internal_200; getfile_internal = getfile_internal_200;
...@@ -685,17 +691,23 @@ void darshan_log_close(darshan_fd file) ...@@ -685,17 +691,23 @@ 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, "2.01") == 0) if(strcmp(job->version_string, "2.02") == 0)
{ {
/* current version */ /* current version */
return; return;
} }
if(strcmp(job->version_string, "2.01") == 0)
{
printf("# WARNING: version 2.01 log format has the following limitations:\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
return;
}
if(strcmp(job->version_string, "2.00") == 0) if(strcmp(job->version_string, "2.00") == 0)
{ {
/* no characterization functionality missing, printf("# WARNING: version 2.00 log format has the following limitations:\n");
* just internal darshan metadata printf("# - inaccurate statistics in some multi-threaded cases.\n");
*/
return; return;
} }
...@@ -710,7 +722,9 @@ void darshan_log_print_version_warnings(struct darshan_job *job) ...@@ -710,7 +722,9 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# CP_F_SLOWEST_RANK_TIME\n"); printf("# CP_F_SLOWEST_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_TIME\n"); printf("# CP_F_VARIANCE_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_BYTES\n"); printf("# CP_F_VARIANCE_RANK_BYTES\n");
printf("# It also does not store the job id in the log file.\n"); printf("# WARNING: version 1.24 log format has the following limitations:\n");
printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
return; return;
} }
...@@ -725,8 +739,10 @@ void darshan_log_print_version_warnings(struct darshan_job *job) ...@@ -725,8 +739,10 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# CP_F_SLOWEST_RANK_TIME\n"); printf("# CP_F_SLOWEST_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_TIME\n"); printf("# CP_F_VARIANCE_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_BYTES\n"); printf("# CP_F_VARIANCE_RANK_BYTES\n");
printf("# It also may have incorrect mount point mappings for files with rank > 0\n"); printf("# WARNING: version 1.23 log format has the following limitations:\n");
printf("# It also does not store the job id in the log file.\n"); printf("# - may have incorrect mount point mappings for files with rank > 0.\n");
printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
return; return;
} }
...@@ -743,9 +759,11 @@ void darshan_log_print_version_warnings(struct darshan_job *job) ...@@ -743,9 +759,11 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# CP_F_SLOWEST_RANK_TIME\n"); printf("# CP_F_SLOWEST_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_TIME\n"); printf("# CP_F_VARIANCE_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_BYTES\n"); printf("# CP_F_VARIANCE_RANK_BYTES\n");
printf("# It does not record mounted file systems, mount points, or fs types.\n"); printf("# WARNING: version 1.22 log format has the following limitations:\n");
printf("# It attributes syncs to cumulative metadata time, rather than cumulative write time.\n"); printf("# - does not record mounted file systems, mount points, or fs types.\n");
printf("# It also does not store the job id in the log file.\n"); printf("# - attributes syncs to cumulative metadata time, rather than cumulative write time.\n");
printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
return; return;
} }
...@@ -769,10 +787,11 @@ void darshan_log_print_version_warnings(struct darshan_job *job) ...@@ -769,10 +787,11 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# CP_F_SLOWEST_RANK_TIME\n"); printf("# CP_F_SLOWEST_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_TIME\n"); printf("# CP_F_VARIANCE_RANK_TIME\n");
printf("# CP_F_VARIANCE_RANK_BYTES\n"); printf("# CP_F_VARIANCE_RANK_BYTES\n");
printf("# It does not record mounted file systems, mount points, or fs types.\n"); printf("# WARNING: version 1.21 log format has the following limitations:\n");
printf("# It attributes syncs to cumulative metadata time, rather than cumulative write time.\n"); printf("# - does not record mounted file systems, mount points, or fs types.\n");
printf("#\n"); printf("# - attributes syncs to cumulative metadata time, rather than cumulative write time.\n");
printf("# It also does not store the job id in the file.\n"); printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
return; return;
} }
......
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