projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move view-independent data from view::DecodeTrace to SignalBase
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 556f54e5d5c938454a49486a7aac011bf561c26a..a4fc352d1969fd527951820bbf75e37f8b2b991c 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_S
IGSESSION_H
-#define PULSEVIEW_PV_S
IGSESSION_H
+#ifndef PULSEVIEW_PV_S
ESSION_HPP
+#define PULSEVIEW_PV_S
ESSION_HPP
#include <map>
#include <memory>
#include <map>
#include <memory>
@@
-27,24
+27,32
@@
#include <set>
#include <string>
#include <thread>
#include <set>
#include <string>
#include <thread>
+#include <unordered_set>
#include <vector>
#include <vector>
-#include <boost/thread.hpp>
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
+#include <boost/thread/shared_mutex.hpp>
#include <QObject>
#include <QString>
#include <QObject>
#include <QString>
+#include "util.hpp"
+
struct srd_decoder;
struct srd_channel;
namespace sigrok {
struct srd_decoder;
struct srd_channel;
namespace sigrok {
-
class Analog;
-
class Channel;
-
class Device;
-
class Logic;
-
class Meta;
-
class Packet;
-
class Session;
+class Analog;
+class Channel;
+class Device;
+class Logic;
+class Meta;
+class Packet;
+class Session;
}
namespace pv {
}
namespace pv {
@@
-53,16
+61,19
@@
class DeviceManager;
namespace data {
class Analog;
namespace data {
class Analog;
-class AnalogS
napsho
t;
+class AnalogS
egmen
t;
class Logic;
class Logic;
-class LogicSnapshot;
+class LogicSegment;
+class SignalBase;
class SignalData;
}
class SignalData;
}
+namespace devices {
+class Device;
+}
+
namespace view {
namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
}
class Session : public QObject
}
class Session : public QObject
@@
-85,16
+96,14
@@
public:
const DeviceManager& device_manager() const;
const DeviceManager& device_manager() const;
-
const std::shared_ptr<sigrok::Session>&
session() const;
+
std::shared_ptr<sigrok::Session>
session() const;
- std::shared_ptr<
sigrok
::Device> device() const;
+ std::shared_ptr<
devices
::Device> device() const;
/**
* Sets device instance that will be used in the next capture session.
*/
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(std::shared_ptr<sigrok::Device> device);
-
- void set_file(const std::string &name);
+ void set_device(std::shared_ptr<devices::Device> device);
void set_default_device();
void set_default_device();
@@
-104,39
+113,37
@@
public:
void stop_capture();
void stop_capture();
-
std::set< std::shared_ptr<data::SignalData> > get_data
() const;
+
double get_samplerate
() const;
-
boost::shared_mutex& signals_mutex() const
;
+
void register_view(std::shared_ptr<pv::view::View> view)
;
- const std::vector< std::shared_ptr<view::Signal> >& signals() const;
+ void deregister_view(std::shared_ptr<pv::view::View> view);
+
+ const std::unordered_set< std::shared_ptr<data::SignalBase> >
+ signalbases() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
- std::vector< std::shared_ptr<view::DecodeTrace> >
- get_decode_signals() const;
-
- void remove_decode_signal(view::DecodeTrace *signal);
+ void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
#endif
private:
void set_capture_state(capture_state state);
#endif
private:
void set_capture_state(capture_state state);
- void update_signals(
std::shared_ptr<sigrok::Device> device
);
+ void update_signals();
- std::shared_ptr<
view::Signal> signal
_from_channel(
+ std::shared_ptr<
data::SignalBase> signalbase
_from_channel(
std::shared_ptr<sigrok::Channel> channel) const;
std::shared_ptr<sigrok::Channel> channel) const;
- void read_sample_rate(std::shared_ptr<sigrok::Device>);
-
private:
private:
- void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
- std::function<void (const QString)> error_handler);
+ void sample_thread_proc(std::function<void (const QString)> error_handler);
+
+ void feed_in_header();
- void feed_in_
header(std::shared_ptr<sigrok::Device> device
);
+ void feed_in_
meta(std::shared_ptr<sigrok::Meta> meta
);
- void feed_in_meta(std::shared_ptr<sigrok::Device> device,
- std::shared_ptr<sigrok::Meta> meta);
+ void feed_in_trigger();
void feed_in_frame_begin();
void feed_in_frame_begin();
@@
-149,36
+156,36
@@
private:
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;
- std::shared_ptr<sigrok::Session> session_;
-
- /**
- * The device instance that will be used in the next capture session.
- */
- std::shared_ptr<sigrok::Device> device_;
+ std::shared_ptr<devices::Device> device_;
- std::
vector< std::shared_ptr<view::DecodeTrace> > decode_trace
s_;
+ std::
unordered_set< std::shared_ptr<pv::view::View> > view
s_;
- mutable std::mutex sampling_mutex_;
+ mutable std::mutex sampling_mutex_;
//!< Protects access to capture_state_.
capture_state capture_state_;
capture_state capture_state_;
- mutable boost::shared_mutex signals_mutex_;
- std::vector< std::shared_ptr<view::Signal> > signals_;
- mutable std::mutex data_mutex_;
+ std::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
+ std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
+
+ mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
- std::shared_ptr<data::LogicS
napshot> cur_logic_snapsho
t_;
- std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogS
napsho
t> >
- cur_analog_s
napsho
ts_;
+ std::shared_ptr<data::LogicS
egment> cur_logic_segmen
t_;
+ std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogS
egmen
t> >
+ cur_analog_s
egmen
ts_;
std::thread sampling_thread_;
std::thread sampling_thread_;
+ bool out_of_memory_;
+
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();
void signals_changed();
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();
void frame_began();
void data_received();
@@
-188,4
+195,4
@@
Q_SIGNALS:
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_S
IGSESSION_H
+#endif // PULSEVIEW_PV_S
ESSION_HPP