Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Update network-mpi.c #133

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Update network-mpi.c
Added line tw_clock start;,  start = tw_clock_read();, and dest_pe->stats.s_pq += tw_clock_read() - start;. Changed error message to be more explicit, like in the master. Edited tw_net_statistics added to match master.
yaciud authored Aug 7, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 8ee4f477f98d352dcb06070177488cb9953634a9
87 changes: 13 additions & 74 deletions core/network-mpi.c
Original file line number Diff line number Diff line change
@@ -396,7 +396,7 @@ recv_begin(tw_pe *me)
if(!(e = tw_event_grab(me)))
{
if(tw_gvt_inprogress(me))
tw_error(TW_LOC, "out of events in GVT!");
tw_error(TW_LOC, "Out of events in GVT! Consider increasing --extramem");
return changed;
}

@@ -437,11 +437,11 @@ static void
recv_finish(tw_pe *me, tw_event *e, char * buffer)
{
tw_pe *dest_pe;
tw_clock start;

#if ROSS_MEMORY
tw_memory *memory;
tw_memory *last;

tw_fd mem_fd;

size_t mem_size;
@@ -551,7 +551,9 @@ recv_finish(tw_pe *me, tw_event *e, char * buffer)
/* Fast case, we are sending to our own PE and
* there is no rollback caused by this send.
*/
start = tw_clock_read();
tw_pq_enqueue(dest_pe->pq, e);
dest_pe->stats.s_pq += tw_clock_read() - start;
return;
}

@@ -877,31 +879,13 @@ tw_net_statistics(tw_pe * me, tw_statistics * s)

if(MPI_Reduce(&(s->s_net_events),
&me->stats.s_net_events,
16,
17,
MPI_UNSIGNED_LONG_LONG,
MPI_SUM,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if(MPI_Reduce(&s->s_total,
&me->stats.s_total,
8,
MPI_UNSIGNED_LONG_LONG,
MPI_MAX,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if(MPI_Reduce(&s->s_pe_event_ties,
&me->stats.s_pe_event_ties,
1,
MPI_UNSIGNED_LONG_LONG,
MPI_SUM,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if(MPI_Reduce(&s->s_min_detected_offset,
&me->stats.s_min_detected_offset,
1,
@@ -911,69 +895,24 @@ tw_net_statistics(tw_pe * me, tw_statistics * s)
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if(MPI_Reduce(&s->s_avl,
&me->stats.s_avl,
1,
MPI_UNSIGNED_LONG_LONG,
MPI_MAX,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if (MPI_Reduce(&s->s_buddy,
&me->stats.s_buddy,
1,
MPI_UNSIGNED_LONG_LONG,
MPI_MAX,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if (MPI_Reduce(&s->s_lz4,
&me->stats.s_lz4,
1,
MPI_UNSIGNED_LONG_LONG,
MPI_MAX,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
if(MPI_Reduce(&(s->s_total),
&me->stats.s_total,
16,
MPI_UNSIGNED_LONG_LONG,
MPI_MAX,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if (MPI_Reduce(&s->s_events_past_end,
&me->stats.s_events_past_end,
1,
3,
MPI_UNSIGNED_LONG_LONG,
MPI_SUM,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if (MPI_Reduce(&g_st_stat_comp_ctr,
&me->stats.s_stat_comp,
1,
MPI_UNSIGNED_LONG_LONG,
MPI_MAX,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if (MPI_Reduce(&g_st_stat_write_ctr,
&me->stats.s_stat_write,
1,
MPI_UNSIGNED_LONG_LONG,
MPI_MAX,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

if(MPI_Reduce(&(s->s_alp_nevent_processed),
&me->stats.s_alp_nevent_processed,
2,
MPI_UNSIGNED_LONG_LONG,
MPI_SUM,
(int)g_tw_masternode,
MPI_COMM_ROSS) != MPI_SUCCESS)
tw_error(TW_LOC, "Unable to reduce statistics!");

#ifdef USE_RIO
if (MPI_Reduce(&s->s_rio_load,
&me->stats.s_rio_load,