Changeset 4158


Ignore:
Timestamp:
Mar 12, 2022, 12:31:16 PM (7 months ago)
Author:
Peter
Message:

fixes #982

Location:
branches/0.19-stable
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/0.19-stable/test/Makefile.am

    r4155 r4158  
    119119  test/scheduler7.test \
    120120  test/scheduler8.test \
     121  test/scheduler9.test \
    121122  test/segment.test test/smart_ptr.test \
    122123  test/smith_waterman.test \
  • branches/0.19-stable/yat/utility/Scheduler.cc

    r4157 r4158  
    2929#include <cassert>
    3030
    31 #include <iostream>
    3231namespace theplu {
    3332namespace yat {
     
    107106  {
    108107    boost::exception_ptr error;
    109     if (data_.error().try_pop(error))
     108    if (data_.error().try_pop(error)) {
     109      if (job_handler_.joinable()) {
     110        // let the job handler know we're waiting
     111        const_cast<JobHandlerData&>(data_).messengers().push(boost::make_shared<SchedulerIsWaiting>());
     112        const_cast<std::thread&>(job_handler_).join();
     113      }
    110114      boost::rethrow_exception(error);
     115    }
    111116  }
    112117
Note: See TracChangeset for help on using the changeset viewer.