[Darshan-commits] [Git][darshan/darshan][dev-modular] 3 commits: fix random typos in comments
Shane Snyder
xgitlab at cels.anl.gov
Tue Nov 3 13:11:03 CST 2015
Shane Snyder pushed to branch dev-modular at darshan / darshan
Commits:
2950f613 by Shane Snyder at 2015-11-02T16:45:56Z
fix random typos in comments
- - - - -
45eb36b1 by Shane Snyder at 2015-11-03T13:09:06Z
update darshan version in configure
- - - - -
8731ade9 by Shane Snyder at 2015-11-03T13:09:40Z
update darshan modularization docs
- - - - -
9 changed files:
- ChangeLog
- darshan-log-format.h
- darshan-runtime/configure
- darshan-runtime/configure.in
- darshan-runtime/doc/darshan-runtime.txt
- darshan-runtime/lib/darshan-core.c
- darshan-util/configure
- darshan-util/configure.in
- doc/darshan-modularization.txt
Changes:
=====================================
ChangeLog
=====================================
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
Darshan Release Change Log
--------------------------
+Darshan-3.0.0-pre2
+=============
+* add fix to install appropriate headers for linking external
+ applications with darshan-util (reported by Matthieu Dorier)
+* add darshan-util Ruby bindings for the new modularized version
+ of Darshan (3.0) (Matthieu Dorier)
+* add enhancement to darshan-runtime to allow per-module instrumentation
+ memory to be user configurable using a configure option or a runtime
+ environment variable
+
Darshan-3.0.0-pre1
=============
* new version of Darshan with the following features/improvements:
=====================================
darshan-log-format.h
=====================================
--- a/darshan-log-format.h
+++ b/darshan-log-format.h
@@ -86,7 +86,7 @@ typedef uint64_t darshan_record_id;
/* 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* terms
+ * *compressed* terms
*/
struct darshan_log_map
{
=====================================
darshan-runtime/configure
=====================================
--- a/darshan-runtime/configure
+++ b/darshan-runtime/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for darshan-runtime 3.0.0-pre1.
+# Generated by GNU Autoconf 2.69 for darshan-runtime 3.0.0-pre2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='darshan-runtime'
PACKAGE_TARNAME='darshan-runtime'
-PACKAGE_VERSION='3.0.0-pre1'
-PACKAGE_STRING='darshan-runtime 3.0.0-pre1'
+PACKAGE_VERSION='3.0.0-pre2'
+PACKAGE_STRING='darshan-runtime 3.0.0-pre2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1244,7 +1244,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures darshan-runtime 3.0.0-pre1 to adapt to many kinds of systems.
+\`configure' configures darshan-runtime 3.0.0-pre2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1305,7 +1305,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of darshan-runtime 3.0.0-pre1:";;
+ short | recursive ) echo "Configuration of darshan-runtime 3.0.0-pre2:";;
esac
cat <<\_ACEOF
@@ -1409,7 +1409,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-darshan-runtime configure 3.0.0-pre1
+darshan-runtime configure 3.0.0-pre2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1761,7 +1761,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by darshan-runtime $as_me 3.0.0-pre1, which was
+It was created by darshan-runtime $as_me 3.0.0-pre2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4296,7 +4296,7 @@ _ACEOF
fi
-DARSHAN_VERSION="3.0.0-pre1"
+DARSHAN_VERSION="3.0.0-pre2"
@@ -4815,7 +4815,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by darshan-runtime $as_me 3.0.0-pre1, which was
+This file was extended by darshan-runtime $as_me 3.0.0-pre2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4877,7 +4877,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-darshan-runtime config.status 3.0.0-pre1
+darshan-runtime config.status 3.0.0-pre2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
=====================================
darshan-runtime/configure.in
=====================================
--- a/darshan-runtime/configure.in
+++ b/darshan-runtime/configure.in
@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl You may need to use autoheader as well if changing any DEFINEs
dnl sanity checks, output header, location of scripts used here
-AC_INIT([darshan-runtime], [3.0.0-pre1])
+AC_INIT([darshan-runtime], [3.0.0-pre2])
AC_CONFIG_SRCDIR([darshan.h])
AC_CONFIG_AUX_DIR(../maint/config)
AC_CONFIG_HEADER(darshan-runtime-config.h)
=====================================
darshan-runtime/doc/darshan-runtime.txt
=====================================
--- a/darshan-runtime/doc/darshan-runtime.txt
+++ b/darshan-runtime/doc/darshan-runtime.txt
@@ -57,6 +57,8 @@ will be placed.
determine the log path at run time.
* `--with-log-hints=`: specifies hints to use when writing the Darshan log
file. See `./configure --help` for details.
+* `--with-mod-mem=`: specifies the maximum amount of memory (in MiB) that
+each Darshan module can consume.
* `--with-zlib=`: specifies an alternate location for the zlib development
header and library.
* `CC=`: specifies the MPI C compiler to use for compilation.
@@ -474,3 +476,4 @@ behavior at runtime:
* DARSHAN_DISABLE_SHARED_REDUCTION: disables the step in Darshan aggregation in which files that were accessed by all ranks are collapsed into a single cumulative file record at rank 0. This option retains more per-process information at the expense of creating larger log files. Note that it is up to individual instrumentation module implementations whether this environment variable is actually honored.
* DARSHAN_LOGPATH: specifies the path to write Darshan log files to. Note that this directory needs to be formatted using the darshan-mk-log-dirs script.
* DARSHAN_LOGFILE: specifies the path (directory + Darshan log file name) to write the output Darshan log to. This overrides the default Darshan behavior of automatically generating a log file name and adding it to a log file directory formatted using darshan-mk-log-dirs script.
+* DARSHAN_MODMEM: specifies the maximum amount of memory (in MiB) a Darshan instrumentation module can consume at runtime.
=====================================
darshan-runtime/lib/darshan-core.c
=====================================
--- a/darshan-runtime/lib/darshan-core.c
+++ b/darshan-runtime/lib/darshan-core.c
@@ -209,14 +209,14 @@ void darshan_core_initialize(int argc, char **argv)
/* collect information about command line and mounted file systems */
darshan_core->trailing_data = darshan_get_exe_and_mounts(darshan_core);
- }
- /* maybe bootstrap modules with static initializers */
- i = 0;
- while(mod_static_init_fns[i])
- {
- (*mod_static_init_fns[i])();
- i++;
+ /* bootstrap any modules with static initialization routines */
+ i = 0;
+ while(mod_static_init_fns[i])
+ {
+ (*mod_static_init_fns[i])();
+ i++;
+ }
}
}
@@ -980,7 +980,7 @@ static void darshan_get_exe_and_mounts_root(struct darshan_core_runtime *core,
NULL
};
- /* length of exe has already been safety checked in darshan-posix.c */
+ /* length of exe has already been safety checked in darshan initialization */
strcat(trailing_data, core->exe);
space_left = DARSHAN_EXE_LEN - strlen(trailing_data);
=====================================
darshan-util/configure
=====================================
--- a/darshan-util/configure
+++ b/darshan-util/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for darshan-util 3.0.0-pre1.
+# Generated by GNU Autoconf 2.69 for darshan-util 3.0.0-pre2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='darshan-util'
PACKAGE_TARNAME='darshan-util'
-PACKAGE_VERSION='3.0.0-pre1'
-PACKAGE_STRING='darshan-util 3.0.0-pre1'
+PACKAGE_VERSION='3.0.0-pre2'
+PACKAGE_STRING='darshan-util 3.0.0-pre2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1236,7 +1236,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures darshan-util 3.0.0-pre1 to adapt to many kinds of systems.
+\`configure' configures darshan-util 3.0.0-pre2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1297,7 +1297,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of darshan-util 3.0.0-pre1:";;
+ short | recursive ) echo "Configuration of darshan-util 3.0.0-pre2:";;
esac
cat <<\_ACEOF
@@ -1393,7 +1393,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-darshan-util configure 3.0.0-pre1
+darshan-util configure 3.0.0-pre2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1758,7 +1758,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by darshan-util $as_me 3.0.0-pre1, which was
+It was created by darshan-util $as_me 3.0.0-pre2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4105,7 +4105,7 @@ fi
done
-DARSHAN_UTIL_VERSION="3.0.0-pre1"
+DARSHAN_UTIL_VERSION="3.0.0-pre2"
@@ -4621,7 +4621,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by darshan-util $as_me 3.0.0-pre1, which was
+This file was extended by darshan-util $as_me 3.0.0-pre2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4683,7 +4683,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-darshan-util config.status 3.0.0-pre1
+darshan-util config.status 3.0.0-pre2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
=====================================
darshan-util/configure.in
=====================================
--- a/darshan-util/configure.in
+++ b/darshan-util/configure.in
@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl You may need to use autoheader as well if changing any DEFINEs
dnl sanity checks, output header, location of scripts used here
-AC_INIT([darshan-util], [3.0.0-pre1])
+AC_INIT([darshan-util], [3.0.0-pre2])
AC_CONFIG_SRCDIR([darshan-logutils.h])
AC_CONFIG_AUX_DIR(../maint/config)
AC_CONFIG_HEADER(darshan-util-config.h)
=====================================
doc/darshan-modularization.txt
=====================================
--- a/doc/darshan-modularization.txt
+++ b/doc/darshan-modularization.txt
@@ -224,9 +224,10 @@ a module developer must provide to interface with the darshan-core runtime.
* _my_rank_ is a pointer to an integer to store the calling process's application MPI rank in
* _mod_mem_limit_ is a pointer to an integer which will store the amount of memory Darshan
-allows this module to use at runtime. Currently, `darshan-core` will hardcode this value to 2 MiB,
-but in the future this may be changed to optimize Darshan's memory footprint. Note that Darshan
-does not allocate any memory for modules, it just informs a module how much memory it can use.
+allows this module to use at runtime. Darshan's default module memory limit is currently set to
+2 MiB, but the user can choose a different value at configure time (using the `--with-mod-mem`
+configure option) or at runtime (using the DARSHAN_MODMEM environment variable). Note that Darshan
+does not allocate any memory for modules; it just informs a module how much memory it can use.
* _sys_mem_alignment_ is a pointer to an integer which will store the system memory alignment value
Darshan was configured with. This parameter may be set to `NULL` if a module is not concerned with the
@@ -248,8 +249,9 @@ any I/O data.
void darshan_core_register_record(
void *name,
int len,
- int printable_flag,
darshan_module_id mod_id,
+ int printable_flag,
+ int mod_limit_flag,
darshan_record_id *rec_id,
int *file_alignment);
@@ -269,9 +271,13 @@ been previously registered.
string length, but for nonprintable record names (e.g., an integer object identifier), this
is the size of the record name type.
+* _mod_id_ is the identifier for the module attempting to register this record.
+
* _printable_flag_ indicates whether the input record name is a printable ASCII string.
-* _mod_id_ is the identifier for the module attempting to register this record.
+* _mod_limit_flag_ indicates whether the calling module is out of memory to instrument new
+records or not. If this flag is set, darshan-core will not create new records and instead just
+search existing records for one corresponding to input _name_.
* _rec_id_ is a pointer to a variable which will store the unique record identifier generated
by Darshan.
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/40d1dc03b7e336f5127f70a68c3a8069fd92536c...8731ade9ebdf93664a369aee29a6af4e2bb3e02f
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20151103/0f109721/attachment-0001.html>
More information about the Darshan-commits
mailing list