Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Shane Snyder
darshan
Commits
05acb6d4
Commit
05acb6d4
authored
Dec 08, 2015
by
Shane Snyder
Browse files
introduce base record concept in posix mod
parent
9d7f638b
Changes
3
Hide whitespace changes
Inline
Side-by-side
darshan-log-format.h
View file @
05acb6d4
...
...
@@ -120,11 +120,10 @@ struct darshan_job
char
metadata
[
DARSHAN_JOB_METADATA_LEN
];
};
/* minimal record stored for each file/object accessed by Darshan */
struct
darshan_record
struct
darshan_base_record
{
char
*
name
;
darshan_record_id
id
;
int64_t
rank
;
};
#endif
/* __DARSHAN_LOG_FORMAT_H */
darshan-posix-log-format.h
View file @
05acb6d4
...
...
@@ -170,8 +170,7 @@ enum darshan_posix_f_indices
*/
struct
darshan_posix_file
{
darshan_record_id
f_id
;
int64_t
rank
;
struct
darshan_base_record
base_rec
;
int64_t
counters
[
POSIX_NUM_INDICES
];
double
fcounters
[
POSIX_F_NUM_INDICES
];
};
...
...
darshan-runtime/lib/darshan-posix.c
View file @
05acb6d4
...
...
@@ -1717,13 +1717,14 @@ static struct posix_file_runtime* posix_file_by_name(const char *name)
/* no existing record, assign a new file record from the global array */
file
=
&
(
posix_runtime
->
file_runtime_array
[
posix_runtime
->
file_array_ndx
]);
file
->
file_record
=
&
(
posix_runtime
->
file_record_array
[
posix_runtime
->
file_array_ndx
]);
file
->
file_record
->
f_
id
=
file_id
;
file
->
file_record
->
rank
=
my_rank
;
file
->
file_record
->
base_rec
.
id
=
file_id
;
file
->
file_record
->
base_rec
.
rank
=
my_rank
;
file
->
file_record
->
counters
[
POSIX_MEM_ALIGNMENT
]
=
darshan_mem_alignment
;
file
->
file_record
->
counters
[
POSIX_FILE_ALIGNMENT
]
=
file_alignment
;
/* add new record to file hash table */
HASH_ADD
(
hlink
,
posix_runtime
->
file_hash
,
file_record
->
f_id
,
sizeof
(
darshan_record_id
),
file
);
HASH_ADD
(
hlink
,
posix_runtime
->
file_hash
,
file_record
->
base_rec
.
id
,
sizeof
(
darshan_record_id
),
file
);
posix_runtime
->
file_array_ndx
++
;
if
(
newname
!=
name
)
...
...
@@ -1816,9 +1817,9 @@ static int posix_record_compare(const void* a_p, const void* b_p)
const
struct
darshan_posix_file
*
a
=
a_p
;
const
struct
darshan_posix_file
*
b
=
b_p
;
if
(
a
->
rank
<
b
->
rank
)
if
(
a
->
base_rec
.
rank
<
b
->
base_rec
.
rank
)
return
1
;
if
(
a
->
rank
>
b
->
rank
)
if
(
a
->
base_rec
.
rank
>
b
->
base_rec
.
rank
)
return
-
1
;
return
0
;
...
...
@@ -1883,8 +1884,8 @@ static void posix_record_reduction_op(void* infile_v, void* inoutfile_v,
for
(
i
=
0
;
i
<*
len
;
i
++
)
{
memset
(
&
tmp_file
,
0
,
sizeof
(
struct
darshan_posix_file
));
tmp_file
.
f_
id
=
infile
->
f_
id
;
tmp_file
.
rank
=
-
1
;
tmp_file
.
base_rec
.
id
=
infile
->
base_rec
.
id
;
tmp_file
.
base_rec
.
rank
=
-
1
;
/* sum */
for
(
j
=
POSIX_OPENS
;
j
<=
POSIX_FDSYNCS
;
j
++
)
...
...
@@ -2265,7 +2266,7 @@ static void posix_get_output_data(
/* initialize fastest/slowest info prior to the reduction */
file
->
file_record
->
counters
[
POSIX_FASTEST_RANK
]
=
file
->
file_record
->
rank
;
file
->
file_record
->
base_rec
.
rank
;
file
->
file_record
->
counters
[
POSIX_FASTEST_RANK_BYTES
]
=
file
->
file_record
->
counters
[
POSIX_BYTES_READ
]
+
file
->
file_record
->
counters
[
POSIX_BYTES_WRITTEN
];
...
...
@@ -2283,7 +2284,7 @@ static void posix_get_output_data(
file
->
file_record
->
fcounters
[
POSIX_F_SLOWEST_RANK_TIME
]
=
file
->
file_record
->
fcounters
[
POSIX_F_FASTEST_RANK_TIME
];
file
->
file_record
->
rank
=
-
1
;
file
->
file_record
->
base_rec
.
rank
=
-
1
;
}
/* sort the array of files descending by rank so that we get all of the
...
...
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