X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=8a9e0e45c9116cee863b8e245044de78923016bf;hb=3afe5afea4536c613f814fc094088c2074c74915;hp=979a56fa0699f306075609f1e5959cbd65056624;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 979a56f..8a9e0e4 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -14,12 +14,11 @@
* 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 .
*/
-#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_H
-#define PULSEVIEW_PV_DATA_DECODERSTACK_H
+#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
+#define PULSEVIEW_PV_DATA_DECODERSTACK_HPP
#include "signaldata.hpp"
@@ -37,6 +36,16 @@
#include
#include
+#include
+
+using std::atomic;
+using std::condition_variable;
+using std::list;
+using std::map;
+using std::mutex;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
struct srd_decoder;
struct srd_decoder_annotation_row;
@@ -50,7 +59,7 @@ struct TwoDecoderStack;
namespace pv {
-class SigSession;
+class Session;
namespace view {
class LogicSignal;
@@ -58,7 +67,7 @@ class LogicSignal;
namespace data {
-class LogicSnapshot;
+class LogicSegment;
namespace decode {
class Annotation;
@@ -67,7 +76,7 @@ class Decoder;
class Logic;
-class DecoderStack : public QObject, public SignalData
+class DecoderStack : public QObject
{
Q_OBJECT
@@ -78,24 +87,27 @@ private:
static const unsigned int DecodeNotifyPeriod;
public:
- DecoderStack(pv::SigSession &session_,
- const srd_decoder *const decoder);
+ DecoderStack(pv::Session &session, const srd_decoder *const dec);
virtual ~DecoderStack();
- const std::list< std::shared_ptr >& stack() const;
- void push(std::shared_ptr decoder);
+ const list< shared_ptr >& stack() const;
+ void push(shared_ptr decoder);
void remove(int index);
+ double samplerate() const;
+
+ const pv::util::Timestamp& start_time() const;
+
int64_t samples_decoded() const;
- std::vector get_visible_rows() const;
+ vector get_visible_rows() const;
/**
* Extracts sorted annotations between two period into a vector.
*/
void get_annotation_subset(
- std::vector &dest,
+ vector &dest,
const decode::Row &row, uint64_t start_sample,
uint64_t end_sample) const;
@@ -103,14 +115,14 @@ public:
void clear();
- uint64_t get_max_sample_count() const;
+ uint64_t max_sample_count() const;
void begin_decode();
private:
boost::optional wait_for_data() const;
- void decode_data(const int64_t sample_count,
+ void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
const unsigned int unit_size, srd_session *const session);
void decode_proc();
@@ -129,36 +141,39 @@ Q_SIGNALS:
void new_decode_data();
private:
- pv::SigSession &session_;
+ pv::Session &session_;
+
+ pv::util::Timestamp start_time_;
+ double samplerate_;
/**
- * This mutex prevents more than one decode operation occuring
- * concurrently.
+ * This mutex prevents more than one thread from accessing
+ * libsigrokdecode concurrently.
* @todo A proper solution should be implemented to allow multiple
- * decode operations.
+ * decode operations in parallel.
*/
- static std::mutex global_decode_mutex_;
+ static mutex global_srd_mutex_;
- std::list< std::shared_ptr > stack_;
+ list< shared_ptr > stack_;
- std::shared_ptr snapshot_;
+ shared_ptr segment_;
- mutable std::mutex input_mutex_;
- mutable std::condition_variable input_cond_;
+ mutable mutex input_mutex_;
+ mutable condition_variable input_cond_;
int64_t sample_count_;
bool frame_complete_;
- mutable std::mutex output_mutex_;
+ mutable mutex output_mutex_;
int64_t samples_decoded_;
- std::map rows_;
+ map rows_;
- std::map, decode::Row> class_rows_;
+ map, decode::Row> class_rows_;
QString error_message_;
std::thread decode_thread_;
- std::atomic interrupt_;
+ atomic interrupt_;
friend struct DecoderStackTest::TwoDecoderStack;
};
@@ -166,4 +181,4 @@ private:
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP