ardour/livetrax
13
0
Fork 0
Code

more refactoring of WaveView threaded code to try to get to heart of crash bug

Browse Source
This commit is contained in:
Paul Davis 2015-06-11 17:04:08 -04:00
parent 077e625734
commit 10643779b6
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/canvas/canvas/wave_view.h
View File

@ -379,8 +379,7 @@ public:
mutable boost::shared_ptr<WaveViewCache::Entry> _current_image;
mutable boost::shared_ptr<WaveViewThreadRequest> current_request;
void send_request (boost::shared_ptr<WaveViewThreadRequest>) const;
bool idle_send_request (boost::shared_ptr<WaveViewThreadRequest>) const;
bool idle_send_request () const;
static WaveViewCache* images;

77
libs/canvas/wave_view.cc
View File

@ -861,9 +861,47 @@ WaveView::queue_get_image (boost::shared_ptr<const ARDOUR::Region> region, frame
req->fill_color = _fill_color;
req->region_amplitude = _region_amplitude;
send_request (req);
if (current_request) {
/* this will stop rendering in progress (which might otherwise
be long lived) for any current request.
*/
current_request->cancel ();
}
start_drawing_thread ();
/* swap requests (protected by lock) */
{
Glib::Threads::Mutex::Lock lm (request_queue_lock);
current_request = req;
}
/* this is always called from the GUI thread (there is only one), and
* the same thread runs the idle callback chain. thus we do not need
* any locks to protect idle_queued - it is only ever set or read in
* the unitary GUI thread.
*/
if (!idle_queued) {
Glib::signal_idle().connect (sigc::mem_fun (*this, &WaveView::idle_send_request));
idle_queued = true;
}
}
bool
WaveView::idle_send_request () const
{
Glib::Threads::Mutex::Lock lm (request_queue_lock);
request_queue.insert (this);
request_cond.signal (); /* wake thread - must be done while holding lock */
idle_queued = false;
return false; /* do not call from idle again */
}
void
WaveView::generate_image (boost::shared_ptr<WaveViewThreadRequest> req, bool in_render_thread) const
{
@ -1371,43 +1409,6 @@ WaveView::cancel_my_render_request () const
current_request.reset ();
}
void
WaveView::send_request (boost::shared_ptr<WaveViewThreadRequest> req) const
{
if (req->type == WaveViewThreadRequest::Draw && current_request) {
/* this will stop rendering in progress (which might otherwise
be long lived) for any current request.
*/
current_request->cancel ();
}
start_drawing_thread ();
/* this is always called from the GUI thread (there is only one), and
* the same thread runs the idle callback chain. thus we do not need
* any locks to protect idle_queued - it is only ever set or read in
* the unitary GUI thread.
*/
if (!idle_queued) {
Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &WaveView::idle_send_request), req));
idle_queued = true;
}
}
bool
WaveView::idle_send_request (boost::shared_ptr<WaveViewThreadRequest> req) const
{
Glib::Threads::Mutex::Lock lm (request_queue_lock);
/* swap requests (protected by lock) */
current_request = req;
request_queue.insert (this);
request_cond.signal (); /* wake thread - must be done while holding lock */
idle_queued = false;
return false; /* do not call from idle again */
}
/*-------------------------------------------------*/
void