Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions darshan-runtime/lib/darshan-dxt.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ static struct dxt_file_record_ref *dxt_posix_track_new_file_record(
darshan_record_id rec_id);
static struct dxt_file_record_ref *dxt_mpiio_track_new_file_record(
darshan_record_id rec_id);
void annotate_trace_segment(char *extra_info_str);

/* DXT output/cleanup routines for darshan-core */
static void dxt_posix_output(
Expand Down Expand Up @@ -262,6 +263,7 @@ void dxt_posix_write(darshan_record_id rec_id, int64_t offset,
rec_ref->write_traces[file_rec->write_count].length = length;
rec_ref->write_traces[file_rec->write_count].start_time = start_time;
rec_ref->write_traces[file_rec->write_count].end_time = end_time;
annotate_trace_segment(rec_ref->write_traces[file_rec->write_count].extra_info);
file_rec->write_count += 1;

DXT_UNLOCK();
Expand Down Expand Up @@ -307,6 +309,7 @@ void dxt_posix_read(darshan_record_id rec_id, int64_t offset,
rec_ref->read_traces[file_rec->read_count].length = length;
rec_ref->read_traces[file_rec->read_count].start_time = start_time;
rec_ref->read_traces[file_rec->read_count].end_time = end_time;
annotate_trace_segment(rec_ref->read_traces[file_rec->read_count].extra_info);
file_rec->read_count += 1;

DXT_UNLOCK();
Expand Down Expand Up @@ -352,6 +355,7 @@ void dxt_mpiio_write(darshan_record_id rec_id, int64_t offset,
rec_ref->write_traces[file_rec->write_count].offset = offset;
rec_ref->write_traces[file_rec->write_count].start_time = start_time;
rec_ref->write_traces[file_rec->write_count].end_time = end_time;
annotate_trace_segment(rec_ref->write_traces[file_rec->write_count].extra_info);
file_rec->write_count += 1;

DXT_UNLOCK();
Expand Down Expand Up @@ -397,6 +401,7 @@ void dxt_mpiio_read(darshan_record_id rec_id, int64_t offset,
rec_ref->read_traces[file_rec->read_count].offset = offset;
rec_ref->read_traces[file_rec->read_count].start_time = start_time;
rec_ref->read_traces[file_rec->read_count].end_time = end_time;
annotate_trace_segment(rec_ref->read_traces[file_rec->read_count].extra_info);
file_rec->read_count += 1;

DXT_UNLOCK();
Expand Down Expand Up @@ -760,6 +765,23 @@ static struct dxt_file_record_ref *dxt_mpiio_track_new_file_record(
return(rec_ref);
}

void annotate_trace_segment(char *extra_info_str)
{
char *extra_info_env = getenv("DARSHAN_DXT_EXTRA_INFO");
if (extra_info_env != NULL) {
strncpy(extra_info_str, extra_info_env, EXTRA_INFO_LEN-1);
} else {
extra_info_str[0] = '\0';
}
unsigned long pthread_id = (unsigned long)pthread_self();
if(strlen(extra_info_str))
strcat(extra_info_str, " ");
snprintf(extra_info_str + strlen(extra_info_str), EXTRA_INFO_LEN-1-strlen(extra_info_str),
"pthread_id=%lu", pthread_id);

return;
}

static void dxt_free_record_data(void *rec_ref_p, void *user_ptr)
{
struct dxt_file_record_ref *dxt_rec_ref = (struct dxt_file_record_ref *)rec_ref_p;
Expand Down
1 change: 1 addition & 0 deletions darshan-util/pydarshan/darshan/backend/api_def_c.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
int64_t length;
double start_time;
double end_time;
char extra_info[64];
} segment_info;

/* counter names */
Expand Down
6 changes: 4 additions & 2 deletions darshan-util/pydarshan/darshan/backend/cffi_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,8 @@ def log_get_dxt_record(log, mod_name, reads=True, writes=True, dtype='dict'):
"offset": segments[i].offset,
"length": segments[i].length,
"start_time": segments[i].start_time,
"end_time": segments[i].end_time
"end_time": segments[i].end_time,
"extra_info": ffi.string(segments[i].extra_info).decode("utf-8")
}
rec['write_segments'].append(seg)

Expand All @@ -637,7 +638,8 @@ def log_get_dxt_record(log, mod_name, reads=True, writes=True, dtype='dict'):
"offset": segments[i].offset,
"length": segments[i].length,
"start_time": segments[i].start_time,
"end_time": segments[i].end_time
"end_time": segments[i].end_time,
"extra_info": ffi.string(segments[i].extra_info).decode("utf-8")
}
rec['read_segments'].append(seg)

Expand Down
Loading