Commit e126fea1 authored by Francois Tessier's avatar Francois Tessier

Merge branch 'master' of xgitlab.cels.anl.gov:ftessier/TAPIOCA

parents 84616544 4b562591
......@@ -193,8 +193,10 @@ int Tapioca::Write (MPI_File fileHandle, MPI_Offset offset, void *buf,
*/
while ( this->roundsIds[targetRoundIdx] > this->currentRound_ ) {
for ( i = 0; i < this->nAggr_ ; i++ ) {
fprintf (stdout, "[INFO] %d calls 1st GlobalFence, buff %d, dat %s (r: %d)\n", this->commRank_, (this->currentRound_ % NBUFFERS), var, this->currentRound_);
fprintf (stdout, "[INFO] %d calls 1st GlobalFence, buff %d, dat %s (r: %d, f: %d)\n", this->commRank_, (this->currentRound_ % NBUFFERS), var, this->currentRound_, this->currentFence_);
this->GlobalFence (var);
fprintf (stdout, "[INFO] %d passes 1st GlobalFence, buff %d, dat %s (r: %d, f: %d)\n", this->commRank_, (this->currentRound_ % NBUFFERS), var, this->currentRound_, this->currentFence_);
this->currentFence_++;
this->roundCounter_++;
}
......@@ -241,8 +243,10 @@ int Tapioca::Write (MPI_File fileHandle, MPI_Offset offset, void *buf,
*/
if ( this->currentDataSize_ == this->rankDataSize_) {
while ( this->roundCounter_ < this->totalRounds_) {
fprintf (stdout, "[INFO] %d calls 2nt GlobalFence, buff %d, dat %s (r: %d)\n", this->commRank_, (this->currentRound_ % NBUFFERS), var, this->currentRound_);
fprintf (stdout, "[INFO] %d calls 2nd GlobalFence, buff %d, dat %s (r: %d, f: %d)\n", this->commRank_, (this->currentRound_ % NBUFFERS), var, this->currentRound_, this->currentFence_);
this->GlobalFence (var);
fprintf (stdout, "[INFO] %d passes 2nd GlobalFence, buff %d, dat %s (r: %d, f: %d)\n", this->commRank_, (this->currentRound_ % NBUFFERS), var, this->currentRound_, this->currentFence_);
this->currentFence_++;
if ( (this->roundCounter_ % this->nAggr_) == 0 ) {
if ( this->amAnAggr_ ) {
......@@ -253,7 +257,7 @@ int Tapioca::Write (MPI_File fileHandle, MPI_Offset offset, void *buf,
//this->iPush (fileHandle, &iRequest);
}
fprintf (stdout, "[INFO] %d increment 2nd currentRound (r: %d)\n", this->commRank_, this->currentRound_);
fprintf (stdout, "[INFO] %d increment 2nd currentRound (r: %d, rc: %d, nag: %d)\n", this->commRank_, this->currentRound_, this->roundCounter_, this->nAggr_);
this->currentRound_++;
}
......@@ -416,6 +420,8 @@ void Tapioca::SetDefaultValues ()
this->currentDataSize_ = 0;
this->nCommit_ = 0;
this->writeDevNull_ = false;
/* DEBUG */
this->currentFence_ = 1;
}
......
......@@ -176,6 +176,9 @@ class Tapioca
/* TIMING */
double startAggrTime, endAggrTime, totAggrTime;
double startIOTime, endIOTime, totIOTime;
/* DEBUG */
int currentFence_;
};
#endif /* AGGREGATION_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment