[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-142-gd8b6e0d

[Service Account]

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, dev-modular has been updated
       via  d8b6e0dc9610db8dcec6a4dce64b12d906526239 (commit)
       via  53c9e15b4b2df3b67e99ee61ace8b456e86a931f (commit)
      from  baa3f7bca57ca182c15462528f6de0a4776f8906 (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 d8b6e0dc9610db8dcec6a4dce64b12d906526239
Author: Shane Snyder <ssnyder at mcs.anl.gov>
Date:   Mon Aug 17 15:21:37 2015 -0500

    update darshan log header to show compression type

commit 53c9e15b4b2df3b67e99ee61ace8b456e86a931f
Author: Shane Snyder <ssnyder at mcs.anl.gov>
Date:   Mon Aug 17 14:58:43 2015 -0500

    change runtime to only write minimal job data

-----------------------------------------------------------------------

Summary of changes:
 darshan-log-format.h               |    8 ++++++++
 darshan-runtime/lib/darshan-core.c |    7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)


Diff of changes:
diff --git a/darshan-log-format.h b/darshan-log-format.h
index 1ef2bc8..8dd1e8f 100644
--- a/darshan-log-format.h
+++ b/darshan-log-format.h
@@ -60,6 +60,13 @@ static char * const darshan_module_names[] =
 };
 #undef X
 
+/* compression method used on darshan log file */
+enum darshan_comp_type
+{
+    DARSHAN_ZLIB_COMP,
+    DARSHAN_BZIP2_COMP,
+};
+
 /* the darshan_log_map structure is used to indicate the location of
  * specific module data in a Darshan log. Note that 'off' and 'len' are
  * the respective offset and length of the data in the file, in *uncompressed*
@@ -80,6 +87,7 @@ struct darshan_header
 {
     char version_string[8];
     int64_t magic_nr;
+    enum darshan_comp_type comp_type;
     struct darshan_log_map rec_map;
     struct darshan_log_map mod_map[DARSHAN_MAX_MODS];
 };
diff --git a/darshan-runtime/lib/darshan-core.c b/darshan-runtime/lib/darshan-core.c
index b8278cd..169dc56 100644
--- a/darshan-runtime/lib/darshan-core.c
+++ b/darshan-runtime/lib/darshan-core.c
@@ -375,7 +375,7 @@ void darshan_core_shutdown()
     if(my_rank == 0)
     {
         void *pointers[2] = {&final_core->log_job, final_core->trailing_data};
-        int lengths[2] = {sizeof(struct darshan_job), DARSHAN_EXE_LEN+1};
+        int lengths[2] = {sizeof(struct darshan_job), strlen(final_core->trailing_data)};
         int comp_buf_sz = 0;
 
         /* compress the job info and the trailing mount/exe data */
@@ -534,6 +534,7 @@ void darshan_core_shutdown()
         /* initialize the remaining header fields */
         strcpy(final_core->log_header.version_string, DARSHAN_LOG_VERSION);
         final_core->log_header.magic_nr = DARSHAN_MAGIC_NR;
+        final_core->log_header.comp_type = DARSHAN_ZLIB_COMP;
 
         all_ret = DARSHAN_MPI_CALL(PMPI_File_write_at)(log_fh, 0, &(final_core->log_header),
             sizeof(struct darshan_header), MPI_BYTE, &status);
@@ -559,7 +560,7 @@ void darshan_core_shutdown()
     DARSHAN_MPI_CALL(PMPI_File_close)(&log_fh);
 
     /* if we got this far, there are no errors, so rename from *.darshan_partial
-     * to *-<logwritetime>.darshan.gz, which indicates that this log file is
+     * to *-<logwritetime>.darshan, which indicates that this log file is
      * complete and ready for analysis
      */
     if(my_rank == 0)
@@ -585,7 +586,7 @@ void darshan_core_shutdown()
                 end_log_time = DARSHAN_MPI_CALL(PMPI_Wtime)();
                 strcat(new_logfile_name, logfile_name);
                 tmp_index = strstr(new_logfile_name, ".darshan_partial");
-                sprintf(tmp_index, "_%d.darshan.gz", (int)(end_log_time-start_log_time+1));
+                sprintf(tmp_index, "_%d.darshan", (int)(end_log_time-start_log_time+1));
                 rename(logfile_name, new_logfile_name);
                 /* set permissions on log file */
 #ifdef __CP_GROUP_READABLE_LOGS


hooks/post-receive
--