6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-25 16:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Implemented flush, added a call to it from the filter speaker's destructor, to ensure no race conditions on accessing the various bits of instance state there and below.

Browse Source
This commit is contained in:
Thomas Harte 2016-10-19 21:15:04 -04:00
parent ada37abe23
commit 4258401384
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Concurrency/AsyncTaskQueue.cpp
View File

@ -46,7 +46,7 @@ AsyncTaskQueue::~AsyncTaskQueue()
should_destruct_ = true;
enqueue([](){});
thread_->join();
thread_.reset( );
thread_.reset();
}
void AsyncTaskQueue::enqueue(std::function<void(void)> function)
@ -56,8 +56,14 @@ void AsyncTaskQueue::enqueue(std::function<void(void)> function)
processing_condition_.notify_all();
}
void AsyncTaskQueue::synchronise()
void AsyncTaskQueue::flush()
{
// TODO
// std::mutex
std::shared_ptr<std::mutex> flush_mutex(new std::mutex);
std::shared_ptr<std::condition_variable> flush_condition(new std::condition_variable);
std::unique_lock<std::mutex> lock(*flush_mutex);
enqueue([=] () {
std::unique_lock<std::mutex> inner_lock(*flush_mutex);
flush_condition->notify_all();
});
flush_condition->wait(lock);
}

2
Concurrency/AsyncTaskQueue.hpp
View File

@ -39,7 +39,7 @@ class AsyncTaskQueue {
/*!
Blocks the caller until all previously-enqueud functions have completed.
*/
void synchronise();
void flush();
private:
std::unique_ptr<std::thread> thread_;

20
Outputs/Speaker.hpp
View File

@ -26,7 +26,7 @@ namespace Outputs {
Intended to be a parent class, allowing descendants to pick the strategy by which input samples are mapped to
output samples.
*/
class Speaker: public Concurrency::AsyncTaskQueue {
class Speaker {
public:
class Delegate {
public:
@ -85,9 +85,18 @@ class Speaker: public Concurrency::AsyncTaskQueue {
set_needs_updated_filter_coefficients();
}
Speaker() : _buffer_in_progress_pointer(0), _requested_number_of_taps(0), _high_frequency_cut_off(-1.0) {}
Speaker() : _buffer_in_progress_pointer(0), _requested_number_of_taps(0), _high_frequency_cut_off(-1.0), _queue(new Concurrency::AsyncTaskQueue) {}
protected:
void enqueue(std::function<void(void)> function)
{
_queue->enqueue(function);
}
void flush()
{
_queue->flush();
}
std::unique_ptr<int16_t> _buffer_in_progress;
float _high_frequency_cut_off;
int _buffer_size;
@ -109,6 +118,8 @@ class Speaker: public Concurrency::AsyncTaskQueue {
int16_t throwaway_samples[quantity];
get_samples(quantity, throwaway_samples);
}
std::unique_ptr<Concurrency::AsyncTaskQueue> _queue;
};
/*!
@ -123,6 +134,11 @@ class Speaker: public Concurrency::AsyncTaskQueue {
*/
template <class T> class Filter: public Speaker {
public:
~Filter()
{
flush();
}
void run_for_cycles(unsigned int input_cycles)
{
enqueue([=]() {