projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
decode: Clear error message upon every new session run.
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index bc26f9fccf1a93a2acaa38bea1a86621bca53687..9d80e9b300e26782cc7873d8876ceb6f1372e892 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-32,11
+32,16
@@
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/data/decode/decoder.h>
#include <pv/data/logic.h>
#include <pv/data/logicsnapshot.h>
#include <pv/data/decode/decoder.h>
+#include <pv/data/decode/annotation.h>
#include <pv/view/logicsignal.h>
#include <pv/view/logicsignal.h>
-#include <pv/view/decode/annotation.h>
-using namespace boost;
-using namespace std;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::deque;
+using std::min;
+using std::list;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-47,7
+52,8
@@
const int64_t DecoderStack::DecodeChunkLength = 4096;
mutex DecoderStack::_global_decode_mutex;
mutex DecoderStack::_global_decode_mutex;
-DecoderStack::DecoderStack(const srd_decoder *const dec)
+DecoderStack::DecoderStack(const srd_decoder *const dec) :
+ _samples_decoded(0)
{
_stack.push_back(shared_ptr<decode::Decoder>(
new decode::Decoder(dec)));
{
_stack.push_back(shared_ptr<decode::Decoder>(
new decode::Decoder(dec)));
@@
-87,8
+93,13
@@
void DecoderStack::remove(int index)
_stack.erase(iter);
}
_stack.erase(iter);
}
-const vector< shared_ptr<view::decode::Annotation> >
- DecoderStack::annotations() const
+int64_t DecoderStack::samples_decoded() const
+{
+ lock_guard<mutex> decode_lock(_mutex);
+ return _samples_decoded;
+}
+
+const vector<decode::Annotation> DecoderStack::annotations() const
{
lock_guard<mutex> lock(_mutex);
return _annotations;
{
lock_guard<mutex> lock(_mutex);
return _annotations;
@@
-108,6
+119,8
@@
void DecoderStack::begin_decode()
_decode_thread.interrupt();
_decode_thread.join();
_decode_thread.interrupt();
_decode_thread.join();
+ _samples_decoded = 0;
+
_annotations.clear();
// We get the logic data of the first probe in the list.
_annotations.clear();
// We get the logic data of the first probe in the list.
@@
-116,7
+129,7
@@
void DecoderStack::begin_decode()
BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
if (dec && !dec->probes().empty() &&
((logic_signal = (*dec->probes().begin()).second)) &&
BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
if (dec && !dec->probes().empty() &&
((logic_signal = (*dec->probes().begin()).second)) &&
- ((data = logic_signal->data())))
+ ((data = logic_signal->
logic_
data())))
break;
if (!data)
break;
if (!data)
@@
-124,7
+137,7
@@
void DecoderStack::begin_decode()
// Get the samplerate and start time
_start_time = data->get_start_time();
// Get the samplerate and start time
_start_time = data->get_start_time();
- _samplerate = data->
get_
samplerate();
+ _samplerate = data->samplerate();
if (_samplerate == 0.0)
_samplerate = 1.0;
if (_samplerate == 0.0)
_samplerate = 1.0;
@@
-132,8
+145,16
@@
void DecoderStack::begin_decode()
data);
}
data);
}
-void DecoderStack::clear
_snapshots
()
+void DecoderStack::clear()
{
{
+ _annotations.clear();
+}
+
+uint64_t DecoderStack::get_max_sample_count() const
+{
+ if (_annotations.empty())
+ return 0;
+ return _annotations.back().end_sample();
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@
-151,13
+172,17
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
- const int64_t sample_count = snapshot->get_sample_count() - 1;
+ const int64_t sample_count = snapshot->get_sample_count();
+ const unsigned int chunk_sample_count =
+ DecodeChunkLength / snapshot->unit_size();
+
+ // Clear error message upon every new session run
+ _error_message = QString();
// Create the session
srd_session_new(&session);
assert(session);
// Create the session
srd_session_new(&session);
assert(session);
-
// Create the decoders
BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
{
// Create the decoders
BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
{
@@
-186,13
+211,14
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
srd_session_start(session);
for (int64_t i = 0;
srd_session_start(session);
for (int64_t i = 0;
- !this_thread::interruption_requested() && i < sample_count;
- i += DecodeChunkLength)
+ !boost::this_thread::interruption_requested() &&
+ i < sample_count;
+ i += chunk_sample_count)
{
lock_guard<mutex> decode_lock(_global_decode_mutex);
const int64_t chunk_end = min(
{
lock_guard<mutex> decode_lock(_global_decode_mutex);
const int64_t chunk_end = min(
- i +
DecodeChunkLength
, sample_count);
+ i +
chunk_sample_count
, sample_count);
snapshot->get_samples(chunk, i, chunk_end);
if (srd_session_send(session, i, i + sample_count,
snapshot->get_samples(chunk, i, chunk_end);
if (srd_session_send(session, i, i + sample_count,
@@
-200,6
+226,11
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
_error_message = tr("Failed to initialise decoder");
break;
}
_error_message = tr("Failed to initialise decoder");
break;
}
+
+ {
+ lock_guard<mutex> lock(_mutex);
+ _samples_decoded = chunk_end;
+ }
}
// Destroy the session
}
// Destroy the session
@@
-208,16
+239,15
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
- using
namespace pv::view::decode
;
+ using
pv::data::decode::Annotation
;
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
assert(pdata);
assert(decoder);
DecoderStack *const d = (DecoderStack*)decoder;
- shared_ptr<Annotation> a(new Annotation(pdata));
lock_guard<mutex> lock(d->_mutex);
lock_guard<mutex> lock(d->_mutex);
- d->_annotations.push_back(
a
);
+ d->_annotations.push_back(
Annotation(pdata)
);
d->new_decode_data();
}
d->new_decode_data();
}