projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop threads at the start of their object's destruction in all Job cases.
[dcpomatic.git]
/
src
/
lib
/
job.cc
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index 1416ddfc20c4d1906b785a67ddc8506d40894b17..a83249e798feba99abafc2a09f1393eb8cf5dc18 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-51,7
+51,6
@@
using namespace dcpomatic;
/** @param film Associated film, or 0 */
Job::Job (shared_ptr<const Film> film)
: _film (film)
/** @param film Associated film, or 0 */
Job::Job (shared_ptr<const Film> film)
: _film (film)
- , _thread (0)
, _state (NEW)
, _start_time (0)
, _sub_start_time (0)
, _state (NEW)
, _start_time (0)
, _sub_start_time (0)
@@
-63,19
+62,25
@@
Job::Job (shared_ptr<const Film> film)
Job::~Job ()
{
Job::~Job ()
{
- if (_thread) {
- _thread->interrupt ();
- /* We can't use DCPOMATIC_ASSERT here as it may throw an exception */
- if (_thread->joinable ()) {
- try {
- _thread->join ();
- } catch (...) {
- /* Too late to do anything about this */
- }
- }
+#ifdef DCPOMATIC_DEBUG
+ /* Any subclass should have called stop_thread in its destructor */
+ assert (!_thread.joinable());
+#endif
+}
+
+void
+Job::stop_thread ()
+{
+ if (!_thread.joinable()) {
+ return;
}
}
- delete _thread;
+ _thread.interrupt ();
+ try {
+ _thread.join ();
+ } catch (...) {
+ /* Too late to do anything about this */
+ }
}
/** Start the job in a separate thread, returning immediately */
}
/** Start the job in a separate thread, returning immediately */
@@
-85,9
+90,9
@@
Job::start ()
set_state (RUNNING);
_start_time = time (0);
_sub_start_time = time (0);
set_state (RUNNING);
_start_time = time (0);
_sub_start_time = time (0);
- _thread =
new boost::thread (boost::bind
(&Job::run_wrapper, this));
+ _thread =
boost::thread (boost::bind
(&Job::run_wrapper, this));
#ifdef DCPOMATIC_LINUX
#ifdef DCPOMATIC_LINUX
- pthread_setname_np (_thread
->
native_handle(), "job-wrapper");
+ pthread_setname_np (_thread
.
native_handle(), "job-wrapper");
#endif
}
#endif
}
@@
-173,12
+178,6
@@
Job::run_wrapper ()
set_progress (1);
set_state (FINISHED_ERROR);
set_progress (1);
set_state (FINISHED_ERROR);
- } catch (dcp::MissingAssetError& e) {
-
- set_error (e.message(), e.path().string());
- set_progress (1);
- set_state (FINISHED_ERROR);
-
} catch (dcp::DCPReadError& e) {
set_error (e.message(), e.detail().get_value_or(""));
} catch (dcp::DCPReadError& e) {
set_error (e.message(), e.detail().get_value_or(""));
@@
-514,7
+513,7
@@
Job::remaining_time () const
void
Job::cancel ()
{
void
Job::cancel ()
{
- if (!_thread) {
+ if (!_thread
.joinable()
) {
return;
}
return;
}
@@
-522,11
+521,8
@@
Job::cancel ()
resume ();
}
resume ();
}
- _thread->interrupt ();
- DCPOMATIC_ASSERT (_thread->joinable ());
- _thread->join ();
- delete _thread;
- _thread = 0;
+ _thread.interrupt ();
+ _thread.join ();
}
/** @return true if the job was paused, false if it was not running */
}
/** @return true if the job was paused, false if it was not running */