Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Glenn K. Lockwood
darshan
Commits
583afaa1
Commit
583afaa1
authored
Nov 30, 2020
by
Shane Snyder
Browse files
Merge branch 'carns/dev-warnings' into 'master'
Carns/dev warnings See merge request
darshan/darshan!68
parents
8cfe80ee
860e3348
Changes
5
Hide whitespace changes
Inline
Side-by-side
darshan-runtime/lib/darshan-core.c
View file @
583afaa1
...
...
@@ -1083,13 +1083,17 @@ static void darshan_get_exe_and_mounts(struct darshan_core_runtime *core,
if
(
fh
)
{
ii
=
0
;
s
=
fgets
(
cmdl
,
DARSHAN_EXE_LEN
,
fh
);
for
(
i
=
1
;
i
<
DARSHAN_EXE_LEN
;
i
++
)
{
if
(
cmdl
[
i
]
==
0
&&
ii
==
0
)
{
cmdl
[
i
]
=
' '
;
ii
=
1
;
}
else
if
(
cmdl
[
i
]
==
0
&&
ii
==
1
)
{
break
;
}
else
{
ii
=
0
;
if
(
!
s
)
sprintf
(
cmdl
,
"%s <unknown args>"
,
__progname_full
);
else
{
for
(
i
=
1
;
i
<
DARSHAN_EXE_LEN
;
i
++
)
{
if
(
cmdl
[
i
]
==
0
&&
ii
==
0
)
{
cmdl
[
i
]
=
' '
;
ii
=
1
;
}
else
if
(
cmdl
[
i
]
==
0
&&
ii
==
1
)
{
break
;
}
else
{
ii
=
0
;
}
}
}
fclose
(
fh
);
...
...
darshan-runtime/lib/darshan-dxt.c
View file @
583afaa1
...
...
@@ -280,9 +280,6 @@ void dxt_posix_runtime_initialize()
#endif
.
mod_shutdown_func
=
&
dxt_posix_shutdown
};
int
ret
;
double
tmpfloat
;
char
*
envstr
;
/* determine whether tracing should be generally disabled/enabled */
if
(
getenv
(
"DXT_ENABLE_IO_TRACE"
))
...
...
@@ -348,9 +345,6 @@ void dxt_mpiio_runtime_initialize()
#endif
.
mod_shutdown_func
=
&
dxt_mpiio_shutdown
};
int
ret
;
double
tmpfloat
;
char
*
envstr
;
/* determine whether tracing should be generally disabled/enabled */
if
(
getenv
(
"DXT_ENABLE_IO_TRACE"
))
...
...
darshan-runtime/lib/darshan-posix.c
View file @
583afaa1
...
...
@@ -247,7 +247,7 @@ static int darshan_mem_alignment = 1;
#define POSIX_RECORD_READ(__ret, __fd, __pread_flag, __pread_offset, __aligned, __tm1, __tm2) do { \
struct posix_file_record_ref* rec_ref; \
size
_t stride; \
int64
_t stride; \
int64_t this_offset; \
int64_t file_alignment; \
struct darshan_common_val_counter *cvc; \
...
...
@@ -310,7 +310,7 @@ static int darshan_mem_alignment = 1;
#define POSIX_RECORD_WRITE(__ret, __fd, __pwrite_flag, __pwrite_offset, __aligned, __tm1, __tm2) do { \
struct posix_file_record_ref* rec_ref; \
size
_t stride; \
int64
_t stride; \
int64_t this_offset; \
int64_t file_alignment; \
struct darshan_common_val_counter *cvc; \
...
...
darshan-util/darshan-hdf5-logutils.c
View file @
583afaa1
...
...
@@ -224,14 +224,18 @@ static int darshan_log_get_hdf5_dataset(darshan_fd fd, void** hdf5_buf_p)
{
fprintf
(
stderr
,
"Error: Invalid H5D module version number (got %d)
\n
"
,
fd
->
mod_ver
[
DARSHAN_H5D_MOD
]);
return
(
-
1
);
ret
=
-
1
;
goto
exit
;
}
if
(
*
hdf5_buf_p
==
NULL
)
{
ds
=
malloc
(
sizeof
(
*
ds
));
if
(
!
ds
)
return
(
-
1
);
{
ret
=
-
1
;
goto
exit
;
}
}
if
(
fd
->
mod_ver
[
DARSHAN_H5D_MOD
]
==
DARSHAN_H5D_VER
)
...
...
darshan-util/darshan-logutils.c
View file @
583afaa1
...
...
@@ -2097,7 +2097,6 @@ void darshan_log_get_name_records(darshan_fd fd,
{
int
ret
;
struct
darshan_name_record_ref
*
name_hash
=
NULL
;
struct
darshan_name_record_ref
*
ref
=
NULL
;
struct
darshan_name_record_ref
*
tmp
=
NULL
;
struct
darshan_name_record_ref
*
curr
=
NULL
;
...
...
@@ -2140,7 +2139,6 @@ void darshan_log_get_filtered_name_records(darshan_fd fd,
int
ret
;
struct
darshan_name_record_ref
*
name_hash
=
NULL
;
struct
darshan_name_record_ref
*
ref
=
NULL
;
struct
darshan_name_record_ref
*
tmp
=
NULL
;
struct
darshan_name_record_ref
*
curr
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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