projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Move definition of MaxChunkSize
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 2668df2937acb3e29035ab39ceffaf86953f1195..5402df4f8539f4ebd51728277562f33342d1ffd2 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>
@@
-55,9
+54,9
@@
namespace data {
const double DecoderStack::DecodeMargin = 1.0;
const double DecoderStack::DecodeThreshold = 0.2;
const int64_t DecoderStack::DecodeChunkLength = 4096;
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 unsigned int DecoderStack::DecodeNotifyPeriod =
1024
;
-mutex DecoderStack::global_
decode
_mutex_;
+mutex DecoderStack::global_
srd
_mutex_;
DecoderStack::DecoderStack(pv::Session &session,
const srd_decoder *const dec) :
DecoderStack::DecoderStack(pv::Session &session,
const srd_decoder *const dec) :
@@
-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)
@@
-272,9
+271,9
@@
uint64_t DecoderStack::max_sample_count() const
{
uint64_t max_sample_count = 0;
{
uint64_t max_sample_count = 0;
- for (
auto i = rows_.cbegin(); i != rows_.end(); i++
)
+ for (
const auto& row : rows_
)
max_sample_count = max(max_sample_count,
max_sample_count = max(max_sample_count,
-
(*i)
.second.get_max_sample());
+
row
.second.get_max_sample());
return max_sample_count;
}
return max_sample_count;
}
@@
-282,11
+281,22
@@
uint64_t DecoderStack::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_);
+
+ // Do wait if we decoded all samples but we're still capturing
+ // Do not wait if we're done capturing
while (!interrupt_ && !frame_complete_ &&
while (!interrupt_ && !frame_complete_ &&
- samples_decoded_ >= sample_count_)
+ (samples_decoded_ >= sample_count_) &&
+ (session_.get_capture_state() != Session::Stopped)) {
+
input_cond_.wait(input_lock);
input_cond_.wait(input_lock);
+ }
+
+ // Return value is valid if we're not aborting the decode,
return boost::make_optional(!interrupt_ &&
return boost::make_optional(!interrupt_ &&
- (samples_decoded_ < sample_count_ || !frame_complete_),
+ // and there's more work to do...
+ (samples_decoded_ < sample_count_ || !frame_complete_) &&
+ // and if the end of the data hasn't been reached yet
+ (!((samples_decoded_ >= sample_count_) && (session_.get_capture_state() == Session::Stopped))),
sample_count_);
}
sample_count_);
}
@@
-294,18
+304,15
@@
void DecoderStack::decode_data(
const int64_t sample_count, const unsigned int unit_size,
srd_session *const session)
{
const int64_t sample_count, const unsigned int unit_size,
srd_session *const session)
{
- uint8_t chunk[DecodeChunkLength];
-
const unsigned int chunk_sample_count =
DecodeChunkLength / segment_->unit_size();
for (int64_t i = 0; !interrupt_ && i < sample_count;
i += chunk_sample_count) {
const unsigned int chunk_sample_count =
DecodeChunkLength / segment_->unit_size();
for (int64_t i = 0; !interrupt_ && i < sample_count;
i += chunk_sample_count) {
- lock_guard<mutex> decode_lock(global_decode_mutex_);
const int64_t chunk_end = min(
i + chunk_sample_count, 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) {
@@
-333,6
+340,9
@@
void DecoderStack::decode_proc()
assert(segment_);
assert(segment_);
+ // Prevent any other decode threads from accessing libsigrokdecode
+ lock_guard<mutex> srd_lock(global_srd_mutex_);
+
// Create the session
srd_session_new(&session);
assert(session);
// Create the session
srd_session_new(&session);
assert(session);