#include <vector>
#ifdef _WIN32
-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
#define NOGDI
#define NORESOURCE
#endif
-#include <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
#include <QObject>
#include <QString>
+#include "util.hpp"
+
struct srd_decoder;
struct srd_channel;
std::set< std::shared_ptr<data::SignalData> > get_data() const;
- boost::shared_mutex& signals_mutex() const;
+ double get_samplerate() const;
- const std::unordered_set< std::shared_ptr<view::Signal> >&
+ const std::unordered_set< std::shared_ptr<view::Signal> >
signals() const;
#ifdef ENABLE_DECODE
private:
void set_capture_state(capture_state state);
- void update_signals(std::shared_ptr<devices::Device> device);
+ void update_signals();
std::shared_ptr<view::Signal> signal_from_channel(
std::shared_ptr<sigrok::Channel> channel) const;
- void read_sample_rate(std::shared_ptr<sigrok::Device> device);
-
private:
void sample_thread_proc(std::shared_ptr<devices::Device> device,
std::function<void (const QString)> error_handler);
void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
+ void feed_in_trigger();
+
void feed_in_frame_begin();
void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
- mutable std::mutex sampling_mutex_;
+ mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
capture_state capture_state_;
mutable boost::shared_mutex signals_mutex_;
std::unordered_set< std::shared_ptr<view::Signal> > signals_;
- mutable std::mutex data_mutex_;
+ mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
std::shared_ptr<data::LogicSegment> cur_logic_segment_;
std::thread sampling_thread_;
+ bool out_of_memory_;
+
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();
void signals_changed();
+ void trigger_event(util::Timestamp location);
+
void frame_began();
void data_received();