[Darshan-commits] [Darshan] branch, master, updated. ff60981bc60776e2cb572a66f30f3e36d0f6c426
Service Account
git at mcs.anl.gov
Fri Oct 24 14:48:02 CDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via ff60981bc60776e2cb572a66f30f3e36d0f6c426 (commit)
from 9b5c82c3fb8beb74fe4e3cc06a9be93e99273f33 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ff60981bc60776e2cb572a66f30f3e36d0f6c426
Author: Phil Carns <carns at mcs.anl.gov>
Date: Fri Oct 24 15:47:52 2014 -0400
bump log format for open timestamp change
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 ++---
darshan-log-format.h | 2 +-
darshan-util/darshan-logutils.c | 27 +++++++++++++++++++++++++--
3 files changed, 28 insertions(+), 6 deletions(-)
Diff of changes:
diff --git a/ChangeLog b/ChangeLog
index 32dfabe..da767e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,14 +6,13 @@ darshan-2.3.1-pre1
=============
* Add wrappers for mkstemp(), mkostemp(), mkstemps(), and mkostemps()
* Change OPEN_TIMESTAMP field to report timestamp right before open() is
- invoked rather than after timestamp after open is completed
+ invoked rather than after timestamp after open is completed.
+ NOTE: updated log format version to 2.06 to reflect this change.
* Change start_time and end_time fields in job record to use min and max
(respectively) across all ranks
* Fix bug in write volume data reported in file system table in
darshan-job-summary.pl (reported by Matthieu Dorier)
-TODO: bump log version number and add warnings about semantic changes
-
darshan-2.3.0
=============
* Fix incorrect version numbering in darshan-runtime component of Darshan
diff --git a/darshan-log-format.h b/darshan-log-format.h
index 6fbdae3..c95baaa 100644
--- a/darshan-log-format.h
+++ b/darshan-log-format.h
@@ -19,7 +19,7 @@
#endif
/* update this on file format changes */
-#define CP_VERSION "2.05"
+#define CP_VERSION "2.06"
/* magic number for validating output files and checking byte order */
#define CP_MAGIC_NR 6567223
diff --git a/darshan-util/darshan-logutils.c b/darshan-util/darshan-logutils.c
index d09c95b..aa48820 100644
--- a/darshan-util/darshan-logutils.c
+++ b/darshan-util/darshan-logutils.c
@@ -376,7 +376,14 @@ int darshan_log_getjob(darshan_fd file, struct darshan_job *job)
return(-1);
}
- if(strcmp(file->version, "2.05") == 0)
+ if(strcmp(file->version, "2.06") == 0)
+ {
+ getjob_internal = getjob_internal_204;
+ getfile_internal = getfile_internal_204;
+ file->job_struct_size = sizeof(*job);
+ file->COMPAT_CP_EXE_LEN = CP_EXE_LEN;
+ }
+ else if(strcmp(file->version, "2.05") == 0)
{
getjob_internal = getjob_internal_204;
getfile_internal = getfile_internal_204;
@@ -764,16 +771,24 @@ void darshan_log_close(darshan_fd file)
*/
void darshan_log_print_version_warnings(struct darshan_job *job)
{
- if(strcmp(job->version_string, "2.05") == 0)
+ if(strcmp(job->version_string, "2.06") == 0)
{
/* current version */
return;
}
+ if(strcmp(job->version_string, "2.05") == 0)
+ {
+ printf("# WARNING: version 2.05 log format has the following limitations:\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
+ return;
+ }
+
if(strcmp(job->version_string, "2.04") == 0)
{
printf("# WARNING: version 2.04 log format has the following limitations:\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -784,6 +799,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
*/
printf("# WARNING: version 2.03 log format has the following limitations:\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -792,6 +808,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# WARNING: version 2.01 log format has the following limitations:\n");
printf("# - *_TIMESTAMP fields are not normalized relative to MPI_Init() time.\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -801,6 +818,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# - *_TIMESTAMP fields are not normalized relative to MPI_Init() time.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -810,6 +828,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# - *_TIMESTAMP fields are not normalized relative to MPI_Init() time.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -829,6 +848,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -849,6 +869,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -872,6 +893,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
@@ -902,6 +924,7 @@ void darshan_log_print_version_warnings(struct darshan_job *job)
printf("# - does not store the job id in the file.\n");
printf("# - inaccurate statistics in some multi-threaded cases.\n");
printf("# - CP_F_SLOWEST_RANK_TIME and CP_F_FASTEST_RANK_TIME only report elapsed time at the POSIX level.\n");
+ printf("# - CP_F_OPEN_TIMESTAMP marks when the first open completed rather than when the first open started.\n");
return;
}
hooks/post-receive
--
More information about the Darshan-commits
mailing list