Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
darshan
darshan
Commits
b4ec5840
Commit
b4ec5840
authored
Jun 11, 2018
by
Shane Snyder
Browse files
Merge branch 'master' into 'issue-241-fopen-upconvert'
# Conflicts: # ChangeLog
parents
615f5396
81683bb5
Changes
10
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
b4ec5840
...
...
@@ -7,6 +7,8 @@ Darshan-3.1.7
* bug fix for darshan-parser backwards compatibility: Darshan logs generated
by Darshan versions prior to 3.1.0 may have included stdio counters that
were not properly up-converted. Reported by Teng Wang.
* bug fix to MiB reported in I/O performance estimate of
darshan-job-summary.pl when both posix and stdio access is present
Darshan-3.1.6
=============
...
...
darshan-runtime/lib/darshan-posix.c
View file @
b4ec5840
...
...
@@ -1435,6 +1435,8 @@ static void posix_record_reduction_op(void* infile_v, void* inoutfile_v,
for
(
j
=
POSIX_OPENS
;
j
<=
POSIX_FDSYNCS
;
j
++
)
{
tmp_file
.
counters
[
j
]
=
infile
->
counters
[
j
]
+
inoutfile
->
counters
[
j
];
if
(
tmp_file
.
counters
[
j
]
<
0
)
/* make sure invalid counters are -1 exactly */
tmp_file
.
counters
[
j
]
=
-
1
;
}
tmp_file
.
counters
[
POSIX_MODE
]
=
infile
->
counters
[
POSIX_MODE
];
...
...
darshan-test/automated/common/build.sh
View file @
b4ec5840
#!/bin/bash
#
# B
ase build script which calls the system specific version.
# B
uild darshan runtime and util code
#
fcount
=
0
runtime_status
=
0
util_status
=
0
runtime_result
=
""
util_result
=
""
thedate
=
$(
date
)
status
=
0
cd
build/darshan-runtime
make
&&
make
install
runtime_status
=
$?
if
[
$runtime_status
-ne
0
]
;
then
fcount
=
$((
fcount+1
))
;
runtime_result
=
"<error type='
$runtime_status
' message='build failed' />"
fi
if
[[
$NODE_LABELS
=
~
"mcs"
]]
;
then
source
darshan-test/automated/mcs/build.sh
status
=
$?
else
# unknown machine
status
=
100
cd
../../build/darshan-util
make
&&
make
install
util_status
=
$?
if
[
$util_status
-ne
0
]
;
then
fcount
=
$((
fcount+1
))
;
util_result
=
"<error type='
$util_status
' message='build failed' />"
fi
exit
$status
cd
../../
;
echo
"
<testsuites>
<testsuite name='build' tests='2' failures='
$fcount
' time='
$thedate
'>
<testcase name='darshan-runtime' time='
$thedate
'>
$runtime_result
</testcase>
<testcase name='darshan-util' time='
$thedate
'>
$util_result
</testcase>
</testsuite>
</testsuites>
"
>
build-result.xml
exit
$fcount
darshan-test/automated/common/configure.sh
View file @
b4ec5840
...
...
@@ -5,9 +5,13 @@
status
=
0
if
[[
$NODE_LABELS
=
~
"mcs"
]]
;
if
[[
$NODE_LABELS
=
~
"CINOW"
||
$NODE_LABELS
=
~
"mcs"
]]
;
then
source
darshan-test/automated/mcs/configure.sh
source
darshan-test/automated/generic/configure.sh
status
=
$?
elif
[[
$NODE_LABELS
=
~
"Theta"
]]
;
then
source
darshan-test/automated/theta/configure.sh
status
=
$?
else
# unknown machine
...
...
darshan-test/automated/
mcs
/configure.sh
→
darshan-test/automated/
generic
/configure.sh
View file @
b4ec5840
...
...
@@ -10,7 +10,7 @@ util_result=""
thedate
=
$(
date
)
cd
build/darshan-runtime
../../darshan-runtime/configure
--prefix
=
$basedir
/install
--with-mem-align
=
16
--with-jobid-env
=
DARSHAN_JOBID
--with-log-path
=
$basedir
/logs
--with-log-path-by-env
=
DARSHAN_LOGPATH
CC
=
mpicc
../../darshan-runtime/configure
--prefix
=
$basedir
/install
--with-mem-align
=
16
--with-jobid-env
=
DARSHAN_JOBID
--with-log-path
=
$basedir
/logs
CC
=
mpicc
runtime_status
=
$?
if
[
$runtime_status
-ne
0
]
;
then
fcount
=
$((
fcount+1
))
;
...
...
darshan-test/automated/
mcs/build
.sh
→
darshan-test/automated/
theta/configure
.sh
View file @
b4ec5840
#!/bin/bash
#
# Build darshan runtime and util code
#
# Run configure for runtime and utils
basedir
=
$PWD
status
=
0
fcount
=
0
runtime_status
=
0
util_status
=
0
runtime_result
=
""
util_result
=
""
thedate
=
$(
date
)
# unload any darshan module and use GNU compilers
module unload darshan
module switch PrgEnv-intel PrgEnv-gnu
cd
build/darshan-runtime
make
&&
make
install
../../darshan-runtime/configure
--prefix
=
$basedir
/install
--with-mem-align
=
64
--with-jobid-env
=
COBALT_JOBID
--with-log-path
=
$basedir
/logs
--disable-cuserid
--host
=
x86_64
CC
=
cc
runtime_status
=
$?
if
[
$runtime_status
-ne
0
]
;
then
fcount
=
$((
fcount+1
))
;
runtime_result
=
"<error type='
$runtime_status
' message='
build
failed' />"
runtime_result
=
"<error type='
$runtime_status
' message='
configure
failed' />"
fi
cd
../
../build/
darshan-util
make
&&
make
install
cd
../darshan-util
../../darshan-util/configure
--prefix
=
$basedir
/
install
util_status
=
$?
if
[
$util_status
-ne
0
]
;
then
fcount
=
$((
fcount+1
))
;
util_result
=
"<error type='
$util_status
' message='
build
failed' />"
util_result
=
"<error type='
$util_status
' message='
configure
failed' />"
fi
cd
../../
;
echo
"
<testsuites>
<testsuite name='
build
' tests='2' failures='
$fcount
' time='
$thedate
'>
<testsuite name='
configure
' tests='2' failures='
$fcount
' time='
$thedate
'>
<testcase name='darshan-runtime' time='
$thedate
'>
$runtime_result
</testcase>
...
...
@@ -38,6 +42,5 @@ echo "
</testcase>
</testsuite>
</testsuites>
"
>
build-result.xml
"
>
configure-result.xml
exit
$fcount
darshan-test/regression/cray-module-alcf/env.sh
View file @
b4ec5840
...
...
@@ -29,7 +29,7 @@ export DARSHAN_CXX=CC
export
DARSHAN_F77
=
ftn
export
DARSHAN_F90
=
ftn
export
DARSHAN_RUNJOB
=
"cray-module-alcf
/runjob.sh
"
export
DARSHAN_RUNJOB
=
$DARSHAN_TESTDIR
/
$DARSHAN_PLATFORM
/runjob.sh
module unload darshan
>
& /dev/null
module load
$DARSHAN_PATH
/share/craype-2.x/modulefiles/
darshan-test/regression/cray-module-nersc/env.sh
View file @
b4ec5840
...
...
@@ -29,7 +29,7 @@ export DARSHAN_CXX=CC
export
DARSHAN_F77
=
ftn
export
DARSHAN_F90
=
ftn
export
DARSHAN_RUNJOB
=
"cray-module-nersc
/runjob.sh
"
export
DARSHAN_RUNJOB
=
$DARSHAN_TESTDIR
/
$DARSHAN_PLATFORM
/runjob.sh
module unload darshan
>
& /dev/null
module load
$DARSHAN_PATH
/share/craype-2.x/modulefiles/
darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
View file @
b4ec5840
...
...
@@ -166,8 +166,8 @@ while($line = <PARSE_OUT>)
{
if
(
$current_module
eq
"
STDIO
")
{
(
$junk
,
$perf_mbytes
)
=
split
('
:
',
$line
,
2
);
$stdio_perf_mbytes
=
$perf_mbytes
/ 1024 /
1024
;
(
$junk
,
$
stdio_
perf_mbytes
)
=
split
('
:
',
$line
,
2
);
$stdio_perf_mbytes
=
$
stdio_
perf_mbytes
/ 1024 /
1024
;
$stdio_perf_mbytes
=
sprintf
("
%.1f
",
$stdio_perf_mbytes
);
}
elsif
(
$perf_mbytes
==
0
)
...
...
darshan-util/darshan-posix-logutils.c
View file @
b4ec5840
...
...
@@ -400,6 +400,8 @@ static void darshan_log_agg_posix_files(void *rec, void *agg_rec, int init_flag)
case
POSIX_SIZE_WRITE_1G_PLUS
:
/* sum */
agg_psx_rec
->
counters
[
i
]
+=
psx_rec
->
counters
[
i
];
if
(
agg_psx_rec
->
counters
[
i
]
<
0
)
/* make sure invalid counters are -1 exactly */
agg_psx_rec
->
counters
[
i
]
=
-
1
;
break
;
case
POSIX_MODE
:
case
POSIX_MEM_ALIGNMENT
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment