Rework decode sample count getters

[pulseview.git] / pv / data / decoderstack.hpp

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 39e507e88c58a57cde8f605cfc01211b75ab1ea6..37e4888f4ee28767d675b0161f081344fe972c0b 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
-#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 <pv/data/decode/row.hpp>
 #include <pv/data/decode/rowdata.hpp>
+#include <pv/util.hpp>
+
+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;
@@ -58,7 +67,7 @@ class LogicSignal;
 
 namespace data {
 
-class LogicSnapshot;
+class LogicSegment;
 
 namespace decode {
 class Annotation;
@@ -78,28 +87,34 @@ private:
        static const unsigned int DecodeNotifyPeriod;
 
 public:
-       DecoderStack(pv::Session &session_,
-               const srd_decoder *const decoder);
+       DecoderStack(pv::Session &session, const srd_decoder *const dec);
 
        virtual ~DecoderStack();
 
-       const std::list< std::shared_ptr<decode::Decoder> >& stack() const;
-       void push(std::shared_ptr<decode::Decoder> decoder);
+       const list< shared_ptr<decode::Decoder> >& stack() const;
+       void push(shared_ptr<decode::Decoder> decoder);
        void remove(int index);
 
        double samplerate() const;
 
-       double start_time() const;
+       const pv::util::Timestamp& start_time() const;
 
        int64_t samples_decoded() const;
 
-       std::vector<decode::Row> get_visible_rows() const;
+       vector<decode::Row> get_visible_rows() const;
+
+       /**
+        * Helper function for static annotation_callback(),
+        * must be public so the function can access it.
+        * Don't use from outside this class.
+        */
+       uint64_t inc_annotation_count();
 
        /**
         * Extracts sorted annotations between two period into a vector.
         */
        void get_annotation_subset(
-               std::vector<pv::data::decode::Annotation> &dest,
+               vector<pv::data::decode::Annotation> &dest,
                const decode::Row &row, uint64_t start_sample,
                uint64_t end_sample) const;
 
@@ -107,20 +122,19 @@ public:
 
        void clear();
 
-       uint64_t get_max_sample_count() const;
+       uint64_t max_sample_count() const;
 
        void begin_decode();
 
 private:
        boost::optional<int64_t> 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();
 
-       static void annotation_callback(srd_proto_data *pdata,
-               void *decoder);
+       static void annotation_callback(srd_proto_data *pdata, void *decoder_stack);
 
 private Q_SLOTS:
        void on_new_frame();
@@ -130,42 +144,42 @@ private Q_SLOTS:
        void on_frame_ended();
 
 Q_SIGNALS:
-       void new_decode_data();
+       void new_annotations();
 
 private:
        pv::Session &session_;
 
-       double start_time_;
+       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<decode::Decoder> > stack_;
+       list< shared_ptr<decode::Decoder> > stack_;
 
-       std::shared_ptr<pv::data::LogicSnapshot> snapshot_;
+       shared_ptr<pv::data::LogicSegment> segment_;
 
-       mutable std::mutex input_mutex_;
-       mutable std::condition_variable input_cond_;
-       int64_t sample_count_;
+       mutable mutex input_mutex_;
+       mutable condition_variable input_cond_;
+       int64_t sample_count_, annotation_count_;
        bool frame_complete_;
 
-       mutable std::mutex output_mutex_;
+       mutable mutex output_mutex_;
        int64_t samples_decoded_;
 
-       std::map<const decode::Row, decode::RowData> rows_;
+       map<const decode::Row, decode::RowData> rows_;
 
-       std::map<std::pair<const srd_decoder*, int>, decode::Row> class_rows_;
+       map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
        QString error_message_;
 
        std::thread decode_thread_;
-       std::atomic<bool> interrupt_;
+       atomic<bool> interrupt_;
 
        friend struct DecoderStackTest::TwoDecoderStack;
 };
@@ -173,4 +187,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP