Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
darshan
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
76
Issues
76
List
Boards
Labels
Milestones
Merge Requests
14
Merge Requests
14
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
darshan
darshan
Commits
cc498bfa
Commit
cc498bfa
authored
Jan 14, 2016
by
Shane Snyder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor reorganization of some runtime code
parent
80c07c27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
34 deletions
+36
-34
darshan-runtime/darshan-core.h
darshan-runtime/darshan-core.h
+2
-1
darshan-runtime/lib/darshan-core.c
darshan-runtime/lib/darshan-core.c
+32
-33
darshan-runtime/lib/darshan-posix.c
darshan-runtime/lib/darshan-posix.c
+2
-0
No files found.
darshan-runtime/darshan-core.h
View file @
cc498bfa
...
...
@@ -10,6 +10,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <stdint.h>
#include <limits.h>
#include "uthash.h"
#include "darshan-log-format.h"
...
...
@@ -50,8 +51,8 @@ struct darshan_core_runtime
void
*
log_rec_p
;
void
*
log_mod_p
;
char
mmap_log_name
[
PATH_MAX
];
struct
darshan_core_record_ref
*
rec_hash
;
int
rec_hash_sz
;
int
rec_hash_cnt
;
struct
darshan_core_module
*
mod_array
[
DARSHAN_MAX_MODS
];
char
comp_buf
[
DARSHAN_COMP_BUF_SIZE
];
/* TODO: why is this allocated statically? only used in shutdown */
...
...
darshan-runtime/lib/darshan-core.c
View file @
cc498bfa
...
...
@@ -124,7 +124,6 @@ void darshan_core_initialize(int argc, char **argv)
struct
darshan_core_runtime
*
init_core
=
NULL
;
int
internal_timing_flag
=
0
;
double
init_start
,
init_time
,
init_max
;
char
mmap_log_name
[
PATH_MAX
];
int
mmap_fd
;
int
mmap_size
;
int
sys_page_size
;
...
...
@@ -171,6 +170,26 @@ void darshan_core_initialize(int argc, char **argv)
darshan_mem_alignment
=
1
;
}
/* Use DARSHAN_JOBID_OVERRIDE for the env var for __DARSHAN_JOBID */
envstr
=
getenv
(
DARSHAN_JOBID_OVERRIDE
);
if
(
!
envstr
)
{
envstr
=
__DARSHAN_JOBID
;
}
/* find a job id */
jobid_str
=
getenv
(
envstr
);
if
(
jobid_str
)
{
/* in cobalt we can find it in env var */
ret
=
sscanf
(
jobid_str
,
"%d"
,
&
jobid
);
}
if
(
!
jobid_str
||
ret
!=
1
)
{
/* use pid as fall back */
jobid
=
getpid
();
}
/* allocate structure to track darshan core runtime information */
init_core
=
malloc
(
sizeof
(
*
init_core
));
if
(
init_core
)
...
...
@@ -178,26 +197,6 @@ void darshan_core_initialize(int argc, char **argv)
memset
(
init_core
,
0
,
sizeof
(
*
init_core
));
init_core
->
wtime_offset
=
DARSHAN_MPI_CALL
(
PMPI_Wtime
)();
/* Use DARSHAN_JOBID_OVERRIDE for the env var for __DARSHAN_JOBID */
envstr
=
getenv
(
DARSHAN_JOBID_OVERRIDE
);
if
(
!
envstr
)
{
envstr
=
__DARSHAN_JOBID
;
}
/* find a job id */
jobid_str
=
getenv
(
envstr
);
if
(
jobid_str
)
{
/* in cobalt we can find it in env var */
ret
=
sscanf
(
jobid_str
,
"%d"
,
&
jobid
);
}
if
(
!
jobid_str
||
ret
!=
1
)
{
/* use pid as fall back */
jobid
=
getpid
();
}
sys_page_size
=
sysconf
(
_SC_PAGESIZE
);
assert
(
sys_page_size
>
0
);
...
...
@@ -210,15 +209,15 @@ void darshan_core_initialize(int argc, char **argv)
/* construct a unique temporary log file name for this process
* to write mmap log data to
*/
snprintf
(
mmap_log_name
,
PATH_MAX
,
"/tmp/darshan_job%d.%d"
,
snprintf
(
init_core
->
mmap_log_name
,
PATH_MAX
,
"/tmp/darshan_job%d.%d"
,
jobid
,
my_rank
);
/* create the temporary mmapped darshan log */
mmap_fd
=
open
(
mmap_log_name
,
O_CREAT
|
O_RDWR
|
O_EXCL
,
0644
);
mmap_fd
=
open
(
init_core
->
mmap_log_name
,
O_CREAT
|
O_RDWR
|
O_EXCL
,
0644
);
if
(
mmap_fd
<
0
)
{
fprintf
(
stderr
,
"darshan library warning: "
"unable to create darshan log file %s
\n
"
,
mmap_log_name
);
"unable to create darshan log file %s
\n
"
,
init_core
->
mmap_log_name
);
free
(
init_core
);
return
;
}
...
...
@@ -229,10 +228,10 @@ void darshan_core_initialize(int argc, char **argv)
if
(
ret
<
0
)
{
fprintf
(
stderr
,
"darshan library warning: "
"unable to allocate darshan log file %s
\n
"
,
mmap_log_name
);
"unable to allocate darshan log file %s
\n
"
,
init_core
->
mmap_log_name
);
free
(
init_core
);
close
(
mmap_fd
);
unlink
(
mmap_log_name
);
unlink
(
init_core
->
mmap_log_name
);
return
;
}
...
...
@@ -243,10 +242,10 @@ void darshan_core_initialize(int argc, char **argv)
if
(
mmap_p
==
MAP_FAILED
)
{
fprintf
(
stderr
,
"darshan library warning: "
"unable to mmap darshan log file %s
\n
"
,
mmap_log_name
);
"unable to mmap darshan log file %s
\n
"
,
init_core
->
mmap_log_name
);
free
(
init_core
);
close
(
mmap_fd
);
unlink
(
mmap_log_name
);
unlink
(
init_core
->
mmap_log_name
);
return
;
}
...
...
@@ -713,7 +712,8 @@ void darshan_core_shutdown()
}
}
/* TODO: remove temporary log files after successfully creating darshan log */
/* remove the temporary mmap log files */
unlink
(
final_core
->
mmap_log_name
);
free
(
logfile_name
);
darshan_core_cleanup
(
final_core
);
...
...
@@ -996,7 +996,7 @@ static void darshan_add_record_hashref(struct darshan_core_runtime *core,
{
int
record_size
=
sizeof
(
darshan_record_id
)
+
strlen
(
name
)
+
1
;
if
((
record_size
+
core
->
rec_hash_sz
)
>
DARSHAN_RECORD_BUF_SIZE
)
if
((
record_size
+
core
->
log_hdr_p
->
rec_map
.
len
)
>
DARSHAN_RECORD_BUF_SIZE
)
return
;
*
ref
=
malloc
(
sizeof
(
**
ref
));
...
...
@@ -1013,7 +1013,7 @@ static void darshan_add_record_hashref(struct darshan_core_runtime *core,
#endif
{
/* store the rec id and full file path in record hash buffer */
void
*
tmp_p
=
(
char
*
)
core
->
log_rec_p
+
core
->
rec_hash_sz
;
void
*
tmp_p
=
(
char
*
)
core
->
log_rec_p
+
core
->
log_hdr_p
->
rec_map
.
len
;
*
(
darshan_record_id
*
)
tmp_p
=
id
;
/* set the name pointer for this record to point to the
...
...
@@ -1031,7 +1031,6 @@ static void darshan_add_record_hashref(struct darshan_core_runtime *core,
/* TODO: look at HASH_ADD_KEYPTR, use same strategy (big contig pool) for non-mmap darshan */
HASH_ADD
(
hlink
,
core
->
rec_hash
,
id
,
sizeof
(
darshan_record_id
),
(
*
ref
));
core
->
rec_hash_cnt
++
;
core
->
rec_hash_sz
+=
record_size
;
core
->
log_hdr_p
->
rec_map
.
len
+=
record_size
;
}
...
...
@@ -1454,7 +1453,7 @@ static int darshan_log_write_record_hash(MPI_File log_fh, struct darshan_core_ru
/* collectively write out the record hash to the darshan log */
ret
=
darshan_log_append_all
(
log_fh
,
core
,
core
->
log_rec_p
,
core
->
rec_hash_sz
,
inout_off
);
core
->
log_hdr_p
->
rec_map
.
len
,
inout_off
);
return
(
ret
);
}
...
...
darshan-runtime/lib/darshan-posix.c
View file @
cc498bfa
...
...
@@ -1714,6 +1714,8 @@ static struct posix_file_runtime* posix_file_by_name(const char *name)
return
(
file
);
}
/* TODO: what happens when there are no more records? */
/* 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
]);
...
...
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