X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fjob.cc;h=52558046ae8ec66ecd580194bf3f51558efd504e;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hp=8cc6ced8ef2e90f81f83d802466f269f8237eb59;hpb=0cbdfdd6c0ef9a1b72070ee741be76332491392a;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 8cc6ced8e..52558046a 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -43,14 +42,14 @@ using std::string; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::function; +using std::function; +using namespace dcpomatic; /** @param film Associated film, or 0 */ Job::Job (shared_ptr film) : _film (film) - , _thread (0) , _state (NEW) , _start_time (0) , _sub_start_time (0) @@ -62,19 +61,21 @@ Job::Job (shared_ptr film) 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 +} - delete _thread; +void +Job::stop_thread () +{ + boost::this_thread::disable_interruption dis; + + _thread.interrupt (); + try { + _thread.join (); + } catch (...) {} } /** Start the job in a separate thread, returning immediately */ @@ -84,9 +85,9 @@ Job::start () 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 - pthread_setname_np (_thread->native_handle(), "job-wrapper"); + pthread_setname_np (_thread.native_handle(), "job-wrapper"); #endif } @@ -94,6 +95,8 @@ Job::start () void Job::run_wrapper () { + start_of_thread (String::compose("Job-%1", json_name())); + try { run (); @@ -103,7 +106,7 @@ Job::run_wrapper () string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf()); try { - boost::filesystem::space_info const s = boost::filesystem::space (e.filename()); + auto const s = boost::filesystem::space (e.filename()); if (s.available < pow (1024, 3)) { m += N_("\n\n"); m += _("The drive that the film is stored on is low in disc space. Free some more space and try again."); @@ -116,6 +119,42 @@ Job::run_wrapper () set_progress (1); set_state (FINISHED_ERROR); + } catch (dcp::StartCompressionError& e) { + + bool done = false; + +#ifdef DCPOMATIC_WINDOWS +#if (__GNUC__ && !__x86_64__) + /* 32-bit */ + set_error ( + _("Failed to encode the DCP."), + _("This error has probably occurred because you are running the 32-bit version of DCP-o-matic and " + "trying to use too many encoding threads. Please reduce the 'number of threads DCP-o-matic should " + "use' in the General tab of Preferences and try again.") + ); + done = true; +#else + /* 64-bit */ + if (running_32_on_64()) { + set_error ( + _("Failed to encode the DCP."), + _("This error has probably occurred because you are running the 32-bit version of DCP-o-matic. Please re-install DCP-o-matic with the 64-bit installer and try again.") + ); + done = true; + } +#endif +#endif + + if (!done) { + set_error ( + e.what (), + string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM + ); + } + + set_progress (1); + set_state (FINISHED_ERROR); + } catch (OpenFileError& e) { set_error ( @@ -158,7 +197,7 @@ Job::run_wrapper () } catch (sub::SubripError& e) { string extra = "Error is near:\n"; - BOOST_FOREACH (string i, e.context()) { + for (auto i: e.context()) { extra += i + "\n"; } @@ -172,21 +211,21 @@ Job::run_wrapper () set_progress (1); set_state (FINISHED_ERROR); - } catch (dcp::MissingAssetError& e) { + } catch (dcp::ReadError& e) { - set_error (e.message(), e.path().string()); + set_error (e.message(), e.detail().get_value_or("")); set_progress (1); set_state (FINISHED_ERROR); - } catch (dcp::DCPReadError& e) { + } catch (KDMError& e) { - set_error (e.message(), e.detail().get_value_or("")); + set_error (e.summary(), e.detail()); set_progress (1); set_state (FINISHED_ERROR); - } catch (KDMError& e) { + } catch (FileError& e) { - set_error (e.summary(), e.detail()); + set_error (e.what(), e.what()); set_progress (1); set_state (FINISHED_ERROR); @@ -441,8 +480,8 @@ Job::status () const s += buffer; if (t > 10 && r > 0) { - boost::posix_time::ptime now = boost::posix_time::second_clock::local_time(); - boost::posix_time::ptime finish = now + boost::posix_time::seconds(r); + auto now = boost::posix_time::second_clock::local_time(); + auto finish = now + boost::posix_time::seconds(r); char finish_string[16]; snprintf (finish_string, sizeof(finish_string), "%02d:%02d", int(finish.time_of_day().hours()), int(finish.time_of_day().minutes())); string day; @@ -507,7 +546,7 @@ Job::remaining_time () const void Job::cancel () { - if (!_thread) { + if (!_thread.joinable()) { return; } @@ -515,11 +554,8 @@ Job::cancel () 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 */