ardour/livetrax
13
0
Fork 0
Code

Fix export threading timeouts when disk operations take long. Might fix other timeout issues also.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11317 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sakari Bergen 2012-01-23 18:54:13 +00:00
parent a71172feb2
commit 0bede516be
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/audiographer/audiographer/general/threader.h
View File

@ -43,7 +43,7 @@ class Threader : public Source<T>, public Sink<T>
* \param thread_pool a thread pool from which all tasks are scheduled
* \param wait_timeout_milliseconds maximum time allowed for threads to use in processing
*/
Threader (Glib::ThreadPool & thread_pool, long wait_timeout_milliseconds = 1000)
Threader (Glib::ThreadPool & thread_pool, long wait_timeout_milliseconds = 500)
: thread_pool (thread_pool)
, readers (0)
, wait_timeout (wait_timeout_milliseconds)
@ -85,14 +85,15 @@ class Threader : public Source<T>, public Sink<T>
void wait()
{
Glib::TimeVal wait_time;
wait_time.assign_current_time();
wait_time.add_milliseconds(wait_timeout);
while (g_atomic_int_get (&readers) != 0) {
Glib::TimeVal wait_time;
wait_time.assign_current_time();
wait_time.add_milliseconds(wait_timeout);
wait_cond.timed_wait(wait_mutex, wait_time);
bool timed_out = (g_atomic_int_get (&readers) != 0);
wait_cond.timed_wait(wait_mutex, wait_time);
}
wait_mutex.unlock();
if (timed_out) { throw Exception (*this, "wait timed out"); }
if (exception) {
throw *exception;
@ -130,4 +131,4 @@ class Threader : public Source<T>, public Sink<T>
} // namespace
#endif //AUDIOGRAPHER_THREADER_H
#endif //AUDIOGRAPHER_THREADER_H