Changeset 15813d in git for gfanlib/gfanlib_paralleltraverser.cpp
- Timestamp:
- Aug 8, 2016, 2:16:11 PM (8 years ago)
- Branches:
- (u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
- Children:
- 7cc3fdae6091a6fab65626857c1ed2c59f027dcd
- Parents:
- 47a774fa4174b578843d43227fcc351165473747
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gfanlib/gfanlib_paralleltraverser.cpp
r47a774 r15813d 159 159 160 160 public: 161 bool aborting;// Added by Anders161 bool aborting; // Added by Anders 162 162 // Create a new Job. if first_split is not set (or it is -2), the 163 163 // first split will be found. 164 164 Job( vector<TraverseState>* stack = new vector<TraverseState>(), 165 165 int first_split = -2 ) 166 :aborting(false) 166 :aborting(false) // Added by Anders 167 167 { 168 168 if (first_split == -2) { … … 255 255 256 256 int prev_index = traverser->moveToNext(state.next_index, true); 257 aborting=traverser->aborting; 257 aborting=traverser->aborting; /* Added by Anders */ 258 258 steps++; 259 259 … … 409 409 410 410 public: 411 bool aborting;// Added by Anders411 bool aborting; // Added by Anders 412 412 // step_count is the number of algorithm steps taken between 413 413 // possible job transfers. This value should be high (e.g. 100) if … … 417 417 int count, 418 418 int step_count ) 419 :aborting(false) 419 :aborting(false) // Added by Anders 420 420 { 421 421 context_count = count; … … 463 463 bool hasTransfer( void ) 464 464 { 465 465 return !transfers->empty(); 466 466 } 467 467 … … 517 517 518 518 for(deque<JobTransfer*>::const_iterator tr=transfers->begin();tr!=transfers->end();tr++){ 519 519 // for (JobTransfer* tr : *transfers) { 520 520 (*tr)->setJob(NULL); 521 521 } … … 542 542 int step_count = central->hasTransfer() ? 1 : context->step_count; 543 543 544 if(central->aborting)job->aborting=true; 544 if(central->aborting)job->aborting=true; // Added by Anders 545 545 546 546 while (job->step(step_count)) { 547 if(job->aborting)central->aborting=true; 547 if(job->aborting)central->aborting=true; // Added by Anders 548 548 JobTransfer* transfer = central->getTransfer(); 549 549
Note: See TracChangeset
for help on using the changeset viewer.