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
cc619189
Commit
cc619189
authored
Jul 07, 2016
by
Shane Snyder
Browse files
bug fix in bgq back compat code
parent
c522d7f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
darshan-util/darshan-bgq-logutils.c
View file @
cc619189
...
...
@@ -30,7 +30,9 @@ char *bgq_f_counter_names[] = {
};
#undef X
#define DARSHAN_BGQ_FILE_SIZE_1 (112 + sizeof(int))
/* NOTE:
*/
#define DARSHAN_BGQ_FILE_SIZE_1 (112 + 8)
static
int
darshan_log_get_bgq_rec
(
darshan_fd
fd
,
void
*
bgq_buf
);
static
int
darshan_log_put_bgq_rec
(
darshan_fd
fd
,
void
*
bgq_buf
,
int
ver
);
...
...
@@ -70,16 +72,18 @@ static int darshan_log_get_bgq_rec(darshan_fd fd, void* bgq_buf)
rec_len
=
DARSHAN_BGQ_FILE_SIZE_1
;
ret
=
darshan_log_get_mod
(
fd
,
DARSHAN_BGQ_MOD
,
buffer
,
rec_len
);
if
(
ret
==
rec_len
)
if
(
ret
>
0
)
{
/* up-convert old BGQ format to new format */
p
=
buffer
;
memcpy
(
&
(
rec
->
base_rec
),
p
,
sizeof
(
struct
darshan_base_record
));
p
+=
sizeof
(
struct
darshan_base_record
);
p
+=
sizeof
(
int
);
/* skip however long int+padding is */
p
+=
(
rec_len
-
(
BGQ_NUM_INDICES
*
sizeof
(
int64_t
))
-
(
BGQ_F_NUM_INDICES
*
sizeof
(
double
)));
memcpy
(
&
(
rec
->
counters
[
0
]),
p
,
BGQ_NUM_INDICES
*
sizeof
(
int64_t
));
p
+=
(
BGQ_NUM_INDICES
*
sizeof
(
int64_t
));
memcpy
(
&
(
rec
->
fcounters
[
0
]),
p
,
BGQ_F_NUM_INDICES
*
sizeof
(
double
));
ret
=
rec_len
;
}
free
(
buffer
);
}
...
...
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