projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added pv::view::RowItemIterator
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 1cb7d4ff126f7fda54dfac544a24a599e91dd67d..5c26371b891f2d856fc04342a435ba3fdd413257 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-20,8
+20,6
@@
#include <libsigrokdecode/libsigrokdecode.h>
#include <libsigrokdecode/libsigrokdecode.h>
-#include <boost/thread/thread.hpp>
-
#include <stdexcept>
#include <QDebug>
#include <stdexcept>
#include <QDebug>
@@
-35,11
+33,10
@@
#include <pv/sigsession.h>
#include <pv/view/logicsignal.h>
#include <pv/sigsession.h>
#include <pv/view/logicsignal.h>
-using
boost
::lock_guard;
-using
boost
::mutex;
+using
std
::lock_guard;
+using
std
::mutex;
using boost::optional;
using boost::optional;
-using boost::shared_ptr;
-using boost::unique_lock;
+using std::unique_lock;
using std::deque;
using std::make_pair;
using std::max;
using std::deque;
using std::make_pair;
using std::max;
@@
-47,6
+44,7
@@
using std::min;
using std::list;
using std::map;
using std::pair;
using std::list;
using std::map;
using std::pair;
+using std::shared_ptr;
using std::vector;
using namespace pv::data::decode;
using std::vector;
using namespace pv::data::decode;
@@
-82,18
+80,19
@@
DecoderStack::DecoderStack(pv::SigSession &session,
DecoderStack::~DecoderStack()
{
if (_decode_thread.joinable()) {
DecoderStack::~DecoderStack()
{
if (_decode_thread.joinable()) {
- _decode_thread.interrupt();
+ _interrupt = true;
+ _input_cond.notify_one();
_decode_thread.join();
}
}
_decode_thread.join();
}
}
-const std::list<
boost
::shared_ptr<decode::Decoder> >&
+const std::list<
std
::shared_ptr<decode::Decoder> >&
DecoderStack::stack() const
{
return _stack;
}
DecoderStack::stack() const
{
return _stack;
}
-void DecoderStack::push(
boost
::shared_ptr<decode::Decoder> decoder)
+void DecoderStack::push(
std
::shared_ptr<decode::Decoder> decoder)
{
assert(decoder);
_stack.push_back(decoder);
{
assert(decoder);
_stack.push_back(decoder);
@@
-186,7
+185,8
@@
void DecoderStack::begin_decode()
shared_ptr<pv::data::Logic> data;
if (_decode_thread.joinable()) {
shared_ptr<pv::data::Logic> data;
if (_decode_thread.joinable()) {
- _decode_thread.interrupt();
+ _interrupt = true;
+ _input_cond.notify_one();
_decode_thread.join();
}
_decode_thread.join();
}
@@
-194,7
+194,7
@@
void DecoderStack::begin_decode()
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : _stack)
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : _stack)
- if (!dec->have_required_
probe
s()) {
+ if (!dec->have_required_
channel
s()) {
_error_message = tr("One or more required channels "
"have not been specified");
return;
_error_message = tr("One or more required channels "
"have not been specified");
return;
@@
-256,7
+256,8
@@
void DecoderStack::begin_decode()
if (_samplerate == 0.0)
_samplerate = 1.0;
if (_samplerate == 0.0)
_samplerate = 1.0;
- _decode_thread = boost::thread(&DecoderStack::decode_proc, this);
+ _interrupt = false;
+ _decode_thread = std::thread(&DecoderStack::decode_proc, this);
}
uint64_t DecoderStack::get_max_sample_count() const
}
uint64_t DecoderStack::get_max_sample_count() const
@@
-273,11
+274,10
@@
uint64_t DecoderStack::get_max_sample_count() const
optional<int64_t> DecoderStack::wait_for_data() const
{
unique_lock<mutex> input_lock(_input_mutex);
optional<int64_t> DecoderStack::wait_for_data() const
{
unique_lock<mutex> input_lock(_input_mutex);
- while(!
boost::this_thread::interruption_requested()
&&
-
!_frame_complete &&
_samples_decoded >= _sample_count)
+ while(!
_interrupt && !_frame_complete
&&
+ _samples_decoded >= _sample_count)
_input_cond.wait(input_lock);
_input_cond.wait(input_lock);
- return boost::make_optional(
- !boost::this_thread::interruption_requested() &&
+ return boost::make_optional(!_interrupt &&
(_samples_decoded < _sample_count || !_frame_complete),
_sample_count);
}
(_samples_decoded < _sample_count || !_frame_complete),
_sample_count);
}
@@
-291,9
+291,7
@@
void DecoderStack::decode_data(
const unsigned int chunk_sample_count =
DecodeChunkLength / _snapshot->unit_size();
const unsigned int chunk_sample_count =
DecodeChunkLength / _snapshot->unit_size();
- for (int64_t i = 0;
- !boost::this_thread::interruption_requested() &&
- i < sample_count;
+ for (int64_t i = 0; !_interrupt && i < sample_count;
i += chunk_sample_count)
{
lock_guard<mutex> decode_lock(_global_decode_mutex);
i += chunk_sample_count)
{
lock_guard<mutex> decode_lock(_global_decode_mutex);