projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSegment: Remove constructor requiring sigrok::Logic
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 441ff3c3df9f327a5ce25f80759eebd11073eac2..f393a1bb84dc06b7034235a88cb110b5879c96a9 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <libsigrokdecode/libsigrokdecode.h>
*/
#include <libsigrokdecode/libsigrokdecode.h>
@@
-35,7
+34,6
@@
using std::lock_guard;
using std::mutex;
using std::lock_guard;
using std::mutex;
-using boost::optional;
using std::unique_lock;
using std::deque;
using std::make_pair;
using std::unique_lock;
using std::deque;
using std::make_pair;
@@
-45,8
+43,11
@@
using std::list;
using std::map;
using std::pair;
using std::shared_ptr;
using std::map;
using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::vector;
using std::vector;
+using boost::optional;
+
using namespace pv::data::decode;
namespace pv {
using namespace pv::data::decode;
namespace pv {
@@
-54,8
+55,8
@@
namespace data {
const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
-const int64_t DecoderStack::DecodeChunkLength =
4096
;
-const unsigned int DecoderStack::DecodeNotifyPeriod =
65536
;
+const int64_t DecoderStack::DecodeChunkLength =
10 * 1024 * 1024
;
+const unsigned int DecoderStack::DecodeNotifyPeriod =
1024
;
mutex DecoderStack::global_srd_mutex_;
mutex DecoderStack::global_srd_mutex_;
@@
-75,8
+76,7
@@
DecoderStack::DecoderStack(pv::Session &session,
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(on_frame_ended()));
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(on_frame_ended()));
- stack_.push_back(shared_ptr<decode::Decoder>(
- new decode::Decoder(dec)));
+ stack_.push_back(make_shared<decode::Decoder>(dec));
}
DecoderStack::~DecoderStack()
}
DecoderStack::~DecoderStack()
@@
-88,13
+88,12
@@
DecoderStack::~DecoderStack()
}
}
}
}
-const std::list< std::shared_ptr<decode::Decoder> >&
-DecoderStack::stack() const
+const list< shared_ptr<decode::Decoder> >& DecoderStack::stack() const
{
return stack_;
}
{
return stack_;
}
-void DecoderStack::push(s
td::s
hared_ptr<decode::Decoder> decoder)
+void DecoderStack::push(shared_ptr<decode::Decoder> decoder)
{
assert(decoder);
stack_.push_back(decoder);
{
assert(decoder);
stack_.push_back(decoder);
@@
-130,7
+129,7
@@
int64_t DecoderStack::samples_decoded() const
return samples_decoded_;
}
return samples_decoded_;
}
-
std::
vector<Row> DecoderStack::get_visible_rows() const
+vector<Row> DecoderStack::get_visible_rows() const
{
lock_guard<mutex> lock(output_mutex_);
{
lock_guard<mutex> lock(output_mutex_);
@@
-146,14
+145,14
@@
std::vector<Row> DecoderStack::get_visible_rows() const
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
- rows.
push_back(Row(decc)
);
+ rows.
emplace_back(decc
);
// Add the decoder rows
for (const GSList *l = decc->annotation_rows; l; l = l->next) {
const srd_decoder_annotation_row *const ann_row =
(srd_decoder_annotation_row *)l->data;
assert(ann_row);
// Add the decoder rows
for (const GSList *l = decc->annotation_rows; l; l = l->next) {
const srd_decoder_annotation_row *const ann_row =
(srd_decoder_annotation_row *)l->data;
assert(ann_row);
- rows.
push_back(Row(decc, ann_row)
);
+ rows.
emplace_back(decc, ann_row
);
}
}
}
}
@@
-161,7
+160,7
@@
std::vector<Row> DecoderStack::get_visible_rows() const
}
void DecoderStack::get_annotation_subset(
}
void DecoderStack::get_annotation_subset(
-
std::
vector<pv::data::decode::Annotation> &dest,
+ vector<pv::data::decode::Annotation> &dest,
const Row &row, uint64_t start_sample,
uint64_t end_sample) const
{
const Row &row, uint64_t start_sample,
uint64_t end_sample) const
{
@@
-191,9
+190,6
@@
void DecoderStack::clear()
void DecoderStack::begin_decode()
{
void DecoderStack::begin_decode()
{
- shared_ptr<pv::view::LogicSignal> logic_signal;
- shared_ptr<pv::data::Logic> data;
-
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
if (decode_thread_.joinable()) {
interrupt_ = true;
input_cond_.notify_one();
@@
-241,11
+237,14
@@
void DecoderStack::begin_decode()
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
- // LogicSignals have the same data/segment
+ // logic signals have the same data/segment
+ pv::data::SignalBase *signalbase;
+ pv::data::Logic *data = nullptr;
+
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (dec && !dec->channels().empty() &&
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (dec && !dec->channels().empty() &&
- ((
logic_signal = (*dec->channels().begin()).second
)) &&
- ((data =
logic_signal->logic_data
())))
+ ((
signalbase = (*dec->channels().begin()).second.get()
)) &&
+ ((data =
signalbase->logic_data().get
())))
break;
if (!data)
break;
if (!data)
@@
-302,20
+301,18
@@
optional<int64_t> DecoderStack::wait_for_data() const
}
void DecoderStack::decode_data(
}
void DecoderStack::decode_data(
- const int64_t sample_count, const unsigned int unit_size,
+ const int64_t
abs_start_samplenum, const int64_t
sample_count, const unsigned int unit_size,
srd_session *const session)
{
srd_session *const session)
{
- uint8_t chunk[DecodeChunkLength];
-
const unsigned int chunk_sample_count =
DecodeChunkLength / segment_->unit_size();
const unsigned int chunk_sample_count =
DecodeChunkLength / segment_->unit_size();
- for (int64_t i =
0
; !interrupt_ && i < sample_count;
+ for (int64_t i =
abs_start_samplenum
; !interrupt_ && i < sample_count;
i += chunk_sample_count) {
const int64_t chunk_end = min(
i + chunk_sample_count, sample_count);
i += chunk_sample_count) {
const int64_t chunk_end = min(
i + chunk_sample_count, sample_count);
-
segment_->get_samples(chunk,
i, chunk_end);
+
const uint8_t* chunk = segment_->get_samples(
i, chunk_end);
if (srd_session_send(session, i, chunk_end, chunk,
(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
if (srd_session_send(session, i, chunk_end, chunk,
(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
@@
-383,8
+380,10
@@
void DecoderStack::decode_proc()
srd_session_start(session);
srd_session_start(session);
+ int64_t abs_start_samplenum = 0;
do {
do {
- decode_data(*sample_count, unit_size, session);
+ decode_data(abs_start_samplenum, *sample_count, unit_size, session);
+ abs_start_samplenum = *sample_count;
} while (error_message_.isEmpty() && (sample_count = wait_for_data()));
// Destroy the session
} while (error_message_.isEmpty() && (sample_count = wait_for_data()));
// Destroy the session