From: Uwe Hermann Date: Sat, 17 Jan 2015 19:11:53 +0000 (+0100) Subject: cxx: Rename include/libsigrok/ to include/libsigrokcxx/. X-Git-Tag: libsigrok-0.4.0~680 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=161dc24d845acfc00108dd33eac7c42430d21e17 cxx: Rename include/libsigrok/ to include/libsigrokcxx/. --- diff --git a/Makefile.am b/Makefile.am index e1143f33..a7cb8244 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,8 +445,8 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS) bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS) library_include_HEADERS += \ - bindings/cxx/include/libsigrok/libsigrokcxx.hpp \ - bindings/cxx/include/libsigrok/enums.hpp + bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \ + bindings/cxx/include/libsigrokcxx/enums.hpp pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc @@ -455,7 +455,7 @@ doxy/xml/index.xml: include/libsigrok/libsigrok.h bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp -bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp +bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \ bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp @@ -469,7 +469,7 @@ cxx-clean: rm -rf doxy/ rm -rf bindings/cxx/doxy/ rm -f bindings/cxx/enums.cpp - rm -f bindings/cxx/include/libsigrok/enums.hpp + rm -f bindings/cxx/include/libsigrokcxx/enums.hpp rm -f bindings/cxx/enums.timestamp CLEAN_EXTRA += cxx-clean @@ -478,7 +478,7 @@ endif CPPXMLDOC = bindings/cxx/doxy/xml/index.xml -$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrokcxx.hpp \ +$(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \ bindings/cxx/enums.timestamp $(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null diff --git a/bindings/cxx/Doxyfile b/bindings/cxx/Doxyfile index c56b336b..73e86538 100644 --- a/bindings/cxx/Doxyfile +++ b/bindings/cxx/Doxyfile @@ -743,7 +743,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = include/libsigrok/libsigrokcxx.hpp +INPUT = include/libsigrokcxx/libsigrokcxx.hpp # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index 3298ce34..9dc003ac 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "libsigrok/libsigrokcxx.hpp" +#include "libsigrokcxx/libsigrokcxx.hpp" #include #include diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py index bfc06b59..53bd000d 100644 --- a/bindings/cxx/enums.py +++ b/bindings/cxx/enums.py @@ -28,8 +28,8 @@ index_file = sys.argv[1] dirname = os.path.dirname(os.path.realpath(__file__)) outdirname = "bindings/cxx" -if not os.path.exists(os.path.join(outdirname, 'include/libsigrok')): - os.makedirs(os.path.join(outdirname, 'include/libsigrok')) +if not os.path.exists(os.path.join(outdirname, 'include/libsigrokcxx')): + os.makedirs(os.path.join(outdirname, 'include/libsigrokcxx')) mapping = dict([ ('sr_loglevel', ('LogLevel', 'Log verbosity level')), @@ -65,7 +65,7 @@ for compound in index.findall('compound'): if name in mapping: classes[member] = mapping[name] -header = open(os.path.join(outdirname, 'include/libsigrok/enums.hpp'), 'w') +header = open(os.path.join(outdirname, 'include/libsigrokcxx/enums.hpp'), 'w') code = open(os.path.join(outdirname, 'enums.cpp'), 'w') swig = open(os.path.join(dirname, '../swig/enums.i'), 'w') diff --git a/bindings/cxx/include/libsigrok/libsigrokcxx.hpp b/bindings/cxx/include/libsigrok/libsigrokcxx.hpp deleted file mode 100644 index 0701688d..00000000 --- a/bindings/cxx/include/libsigrok/libsigrokcxx.hpp +++ /dev/null @@ -1,1028 +0,0 @@ -/* - * This file is part of the libsigrok project. - * - * Copyright (C) 2013-2014 Martin Ling - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * 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, see . - */ - -/** - -@mainpage API Reference - -Introduction ------------- - -The libsigrokcxx API provides an object-oriented C++ interface to the -functionality in libsigrok, including automatic memory and resource management. - -It is built on top of the public libsigrok C API, and is designed to be used as -a standalone alternative API. Programs should not mix usage of the C and C++ -APIs; the C++ interface code needs to have full control of all C API calls for -resources to be managed correctly. - -Memory management ------------------ - -All runtime objects created through the C++ API are passed and accessed via -shared pointers, using the C++11 std::shared_ptr implementation. This means -that a reference count is kept for each object. - -Shared pointers can be copied and assigned in a user's program, automatically -updating their reference count and deleting objects when they are no longer in -use. The C++ interface code also keeps track of internal dependencies between -libsigrok resources, and ensures that objects are not prematurely deleted when -their resources are in use by other objects. - -This means that management of libsigrokcxx objects and their underlying -libsigrok resources can be treated as fully automatic. As long as all shared -pointers to objects are deleted or reassigned when no longer in use, all -underlying resources will be released at the right time. - -Getting started ---------------- - -Usage of the C++ API needs to begin with a call to sigrok::Context::create(). -This will create the global libsigrok context and returns a shared pointer to -the sigrok::Context object. Methods on this object provide access to the -hardware drivers, input and output formats supported by the library, as well -as means of creating other objects such as sessions and triggers. - -Error handling --------------- - -When any libsigrok C API call returns an error, a sigrok::Error exception is -raised, which provides access to the error code and description. - -*/ - -#ifndef LIBSIGROKCXX_HPP -#define LIBSIGROKCXX_HPP - -#include "libsigrok/libsigrok.h" -#include - -#include -#include -#include -#include -#include - -namespace sigrok -{ - -using namespace std; - -/* Forward declarations */ -class SR_API Error; -class SR_API Context; -class SR_API Driver; -class SR_API Device; -class SR_API HardwareDevice; -class SR_API Channel; -class SR_API EventSource; -class SR_API Session; -class SR_API ConfigKey; -class SR_API InputFormat; -class SR_API OutputFormat; -class SR_API LogLevel; -class SR_API ChannelGroup; -class SR_API Trigger; -class SR_API TriggerStage; -class SR_API TriggerMatch; -class SR_API TriggerMatchType; -class SR_API ChannelType; -class SR_API Packet; -class SR_API PacketPayload; -class SR_API PacketType; -class SR_API Quantity; -class SR_API Unit; -class SR_API QuantityFlag; -class SR_API Input; -class SR_API InputDevice; -class SR_API Output; -class SR_API DataType; -class SR_API Option; -class SR_API UserDevice; - -/** Exception thrown when an error code is returned by any libsigrok call. */ -class SR_API Error: public exception -{ -public: - Error(int result); - ~Error() throw(); - const int result; - const char *what() const throw(); -}; - -/* Base template for classes whose resources are owned by a parent object. */ -template -class SR_API ParentOwned -{ -protected: - /* Parent object which owns this child object's underlying structure. - - This shared pointer will be null when this child is unused, but - will be assigned to point to the parent before any shared pointer - to this child is handed out to the user. - - When the reference count of this child falls to zero, this shared - pointer to its parent is reset by a custom deleter on the child's - shared pointer. - - This strategy ensures that the destructors for both the child and - the parent are called at the correct time, i.e. only when all - references to both the parent and all its children are gone. */ - shared_ptr _parent; - - /* Weak pointer for shared_from_this() implementation. */ - weak_ptr _weak_this; - -public: - /* Get parent object that owns this object. */ - shared_ptr parent() - { - return _parent; - } - - /* Note, this implementation will create a new smart_ptr if none exists. */ - shared_ptr shared_from_this() - { - shared_ptr shared; - - if (!(shared = _weak_this.lock())) - { - shared = shared_ptr((Class *) this, reset_parent); - _weak_this = shared; - } - - return shared; - } - - shared_ptr get_shared_pointer(shared_ptr parent) - { - if (!parent) - throw Error(SR_ERR_BUG); - this->_parent = parent; - return shared_from_this(); - } - - shared_ptr get_shared_pointer(Parent *parent) - { - if (!parent) - throw Error(SR_ERR_BUG); - return get_shared_pointer(parent->shared_from_this()); - } -protected: - static void reset_parent(Class *object) - { - if (!object->_parent) - throw Error(SR_ERR_BUG); - object->_parent.reset(); - } - - Struct *_structure; - - ParentOwned(Struct *structure) : - _structure(structure) - { - } -}; - -/* Base template for classes whose resources are owned by the user. */ -template -class SR_API UserOwned : public enable_shared_from_this -{ -public: - shared_ptr shared_from_this() - { - auto shared = enable_shared_from_this::shared_from_this(); - if (!shared) - throw Error(SR_ERR_BUG); - return shared; - } -protected: - Struct *_structure; - - UserOwned(Struct *structure) : - _structure(structure) - { - } - - /* Deleter needed to allow shared_ptr use with protected destructor. */ - class Deleter - { - public: - void operator()(Class *object) { delete object; } - }; -}; - -/** Type of log callback */ -typedef function LogCallbackFunction; - -/** The global libsigrok context */ -class SR_API Context : public UserOwned -{ -public: - /** Create new context */ - static shared_ptr create(); - /** libsigrok package version. */ - string package_version(); - /** libsigrok library version. */ - string lib_version(); - /** Available hardware drivers, indexed by name. */ - map > drivers(); - /** Available input formats, indexed by name. */ - map > input_formats(); - /** Available output formats, indexed by name. */ - map > output_formats(); - /** Current log level. */ - const LogLevel *log_level(); - /** Set the log level. - * @param level LogLevel to use. */ - void set_log_level(const LogLevel *level); - /** Current log domain. */ - string log_domain(); - /** Set the log domain. - * @param value Log domain prefix string. */ - void set_log_domain(string value); - /** Set the log callback. - * @param callback Callback of the form callback(LogLevel, string). */ - void set_log_callback(LogCallbackFunction callback); - /** Set the log callback to the default handler. */ - void set_log_callback_default(); - /** Create a new session. */ - shared_ptr create_session(); - /** Create a new user device. */ - shared_ptr create_user_device( - string vendor, string model, string version); - /** Create a header packet. */ - shared_ptr create_header_packet(Glib::TimeVal start_time); - /** Create a meta packet. */ - shared_ptr create_meta_packet( - map config); - /** Create a logic packet. */ - shared_ptr create_logic_packet( - void *data_pointer, size_t data_length, unsigned int unit_size); - /** Create an analog packet. */ - shared_ptr create_analog_packet( - vector > channels, - float *data_pointer, unsigned int num_samples, const Quantity *mq, - const Unit *unit, vector mqflags); - /** Load a saved session. - * @param filename File name string. */ - shared_ptr load_session(string filename); - /** Create a new trigger. - * @param name Name string for new trigger. */ - shared_ptr create_trigger(string name); - /** Open an input file. - * @param filename File name string. */ - shared_ptr open_file(string filename); - /** Open an input stream based on header data. - * @param header Initial data from stream. */ - shared_ptr open_stream(string header); - map serials(shared_ptr driver); -protected: - map _drivers; - map _input_formats; - map _output_formats; - Session *_session; - LogCallbackFunction _log_callback; - Context(); - ~Context(); - friend class Deleter; - friend class Session; - friend class Driver; -}; - -enum Capability { - GET = SR_CONF_GET, - SET = SR_CONF_SET, - LIST = SR_CONF_LIST -}; - -/** An object that can be configured. */ -class SR_API Configurable -{ -public: - /** Read configuration for the given key. - * @param key ConfigKey to read. */ - Glib::VariantBase config_get(const ConfigKey *key); - /** Set configuration for the given key to a specified value. - * @param key ConfigKey to set. - * @param value Value to set. */ - void config_set(const ConfigKey *key, Glib::VariantBase value); - /** Enumerate available values for the given configuration key. - * @param key ConfigKey to enumerate values for. */ - Glib::VariantContainerBase config_list(const ConfigKey *key); - /** Enumerate available keys, according to a given index key. */ - map > config_keys(const ConfigKey *key); - /** Check for a key in the list from a given index key. */ - bool config_check(const ConfigKey *key, const ConfigKey *index_key); -protected: - Configurable( - struct sr_dev_driver *driver, - struct sr_dev_inst *sdi, - struct sr_channel_group *channel_group); - virtual ~Configurable(); - struct sr_dev_driver *config_driver; - struct sr_dev_inst *config_sdi; - struct sr_channel_group *config_channel_group; -}; - -/** A hardware driver provided by the library */ -class SR_API Driver : - public ParentOwned, - public Configurable -{ -public: - /** Name of this driver. */ - string name(); - /** Long name for this driver. */ - string long_name(); - /** Scan for devices and return a list of devices found. - * @param options Mapping of (ConfigKey, value) pairs. */ - vector > scan( - map options = - map()); -protected: - bool _initialized; - vector _devices; - Driver(struct sr_dev_driver *structure); - ~Driver(); - friend class Context; - friend class HardwareDevice; - friend class ChannelGroup; -}; - -/** A generic device, either hardware or virtual */ -class SR_API Device : public Configurable -{ -public: - /** Vendor name for this device. */ - string vendor(); - /** Model name for this device. */ - string model(); - /** Version string for this device. */ - string version(); - /** Serial number for this device. */ - string serial_number(); - /** Connection ID for this device. */ - string connection_id(); - /** List of the channels available on this device. */ - vector > channels(); - /** Channel groups available on this device, indexed by name. */ - map > channel_groups(); - /** Open device. */ - void open(); - /** Close device. */ - void close(); -protected: - Device(struct sr_dev_inst *structure); - ~Device(); - virtual shared_ptr get_shared_from_this() = 0; - shared_ptr get_channel(struct sr_channel *ptr); - struct sr_dev_inst *_structure; - map _channels; - map _channel_groups; - /** Deleter needed to allow shared_ptr use with protected destructor. */ - class Deleter - { - public: - void operator()(Device *device) { delete device; } - }; - friend class Deleter; - friend class Session; - friend class Channel; - friend class ChannelGroup; - friend class Output; - friend class Analog; -}; - -/** A real hardware device, connected via a driver */ -class SR_API HardwareDevice : - public UserOwned, - public Device -{ -public: - /** Driver providing this device. */ - shared_ptr driver(); -protected: - HardwareDevice(shared_ptr driver, struct sr_dev_inst *structure); - ~HardwareDevice(); - shared_ptr get_shared_from_this(); - shared_ptr _driver; - /** Deleter needed to allow shared_ptr use with protected destructor. */ - class Deleter - { - public: - void operator()(HardwareDevice *device) { delete device; } - }; - friend class Deleter; - friend class Driver; - friend class ChannelGroup; -}; - -/** A virtual device, created by the user */ -class SR_API UserDevice : - public UserOwned, - public Device -{ -public: - /** Add a new channel to this device. */ - shared_ptr add_channel(unsigned int index, const ChannelType *type, string name); -protected: - UserDevice(string vendor, string model, string version); - ~UserDevice(); - shared_ptr get_shared_from_this(); - /** Deleter needed to allow shared_ptr use with protected destructor. */ - class Deleter - { - public: - void operator()(UserDevice *device) { delete device; } - }; - friend class Context; - friend class Deleter; -}; - -/** A channel on a device */ -class SR_API Channel : - public ParentOwned -{ -public: - /** Current name of this channel. */ - string name(); - /** Set the name of this channel. * - * @param name Name string to set. */ - void set_name(string name); - /** Type of this channel. */ - const ChannelType *type(); - /** Enabled status of this channel. */ - bool enabled(); - /** Set the enabled status of this channel. - * @param value Boolean value to set. */ - void set_enabled(bool value); - /** Get the index number of this channel. */ - unsigned int index(); -protected: - Channel(struct sr_channel *structure); - ~Channel(); - const ChannelType * const _type; - friend class Device; - friend class UserDevice; - friend class ChannelGroup; - friend class Session; - friend class TriggerStage; - friend class Context; -}; - -/** A group of channels on a device, which share some configuration */ -class SR_API ChannelGroup : - public ParentOwned, - public Configurable -{ -public: - /** Name of this channel group. */ - string name(); - /** List of the channels in this group. */ - vector > channels(); -protected: - ChannelGroup(Device *device, struct sr_channel_group *structure); - ~ChannelGroup(); - vector _channels; - friend class Device; -}; - -/** A trigger configuration */ -class SR_API Trigger : public UserOwned -{ -public: - /** Name of this trigger configuration. */ - string name(); - /** List of the stages in this trigger. */ - vector > stages(); - /** Add a new stage to this trigger. */ - shared_ptr add_stage(); -protected: - Trigger(shared_ptr context, string name); - ~Trigger(); - shared_ptr _context; - vector _stages; - friend class Deleter; - friend class Context; - friend class Session; -}; - -/** A stage in a trigger configuration */ -class SR_API TriggerStage : - public ParentOwned -{ -public: - /** Index number of this stage. */ - int number(); - /** List of match conditions on this stage. */ - vector > matches(); - /** Add a new match condition to this stage. - * @param channel Channel to match on. - * @param type TriggerMatchType to apply. */ - void add_match(shared_ptr channel, const TriggerMatchType *type); - /** Add a new match condition to this stage. - * @param channel Channel to match on. - * @param type TriggerMatchType to apply. - * @param value Threshold value. */ - void add_match(shared_ptr channel, const TriggerMatchType *type, float value); -protected: - vector _matches; - TriggerStage(struct sr_trigger_stage *structure); - ~TriggerStage(); - friend class Trigger; -}; - -/** A match condition in a trigger configuration */ -class SR_API TriggerMatch : - public ParentOwned -{ -public: - /** Channel this condition matches on. */ - shared_ptr channel(); - /** Type of match. */ - const TriggerMatchType *type(); - /** Threshold value. */ - float value(); -protected: - TriggerMatch(struct sr_trigger_match *structure, shared_ptr channel); - ~TriggerMatch(); - shared_ptr _channel; - friend class TriggerStage; -}; - -/** Type of datafeed callback */ -typedef function, shared_ptr)> - DatafeedCallbackFunction; - -/* Data required for C callback function to call a C++ datafeed callback */ -class SR_PRIV DatafeedCallbackData -{ -public: - void run(const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *pkt); -protected: - DatafeedCallbackFunction _callback; - DatafeedCallbackData(Session *session, - DatafeedCallbackFunction callback); - Session *_session; - friend class Session; -}; - -/** Type of source callback */ -typedef function - SourceCallbackFunction; - -/* Data required for C callback function to call a C++ source callback */ -class SR_PRIV SourceCallbackData -{ -public: - bool run(int revents); -protected: - SourceCallbackData(shared_ptr source); - shared_ptr _source; - friend class Session; -}; - -/** An I/O event source */ -class SR_API EventSource -{ -public: - /** Create an event source from a file descriptor. - * @param fd File descriptor. - * @param events GLib IOCondition event mask. - * @param timeout Timeout in milliseconds. - * @param callback Callback of the form callback(events) */ - static shared_ptr create(int fd, Glib::IOCondition events, - int timeout, SourceCallbackFunction callback); - /** Create an event source from a GLib PollFD - * @param pollfd GLib PollFD - * @param timeout Timeout in milliseconds. - * @param callback Callback of the form callback(events) */ - static shared_ptr create(Glib::PollFD pollfd, int timeout, - SourceCallbackFunction callback); - /** Create an event source from a GLib IOChannel - * @param channel GLib IOChannel. - * @param events GLib IOCondition event mask. - * @param timeout Timeout in milliseconds. - * @param callback Callback of the form callback(events) */ - static shared_ptr create( - Glib::RefPtr channel, Glib::IOCondition events, - int timeout, SourceCallbackFunction callback); -protected: - EventSource(int timeout, SourceCallbackFunction callback); - ~EventSource(); - enum source_type { - SOURCE_FD, - SOURCE_POLLFD, - SOURCE_IOCHANNEL - } _type; - int _fd; - Glib::PollFD _pollfd; - Glib::RefPtr _channel; - Glib::IOCondition _events; - int _timeout; - SourceCallbackFunction _callback; - /** Deleter needed to allow shared_ptr use with protected destructor. */ - class Deleter - { - public: - void operator()(EventSource *source) { delete source; } - }; - friend class Deleter; - friend class Session; - friend class SourceCallbackData; -}; - -/** A virtual device associated with a stored session */ -class SR_API SessionDevice : - public ParentOwned, - public Device -{ -protected: - SessionDevice(struct sr_dev_inst *sdi); - ~SessionDevice(); - shared_ptr get_shared_from_this(); - /** Deleter needed to allow shared_ptr use with protected destructor. */ - class Deleter - { - public: - void operator()(SessionDevice *device) { delete device; } - }; - friend class Deleter; - friend class Session; -}; - -/** A sigrok session */ -class SR_API Session : public UserOwned -{ -public: - /** Add a device to this session. - * @param device Device to add. */ - void add_device(shared_ptr device); - /** List devices attached to this session. */ - vector > devices(); - /** Remove all devices from this session. */ - void remove_devices(); - /** Add a datafeed callback to this session. - * @param callback Callback of the form callback(Device, Packet). */ - void add_datafeed_callback(DatafeedCallbackFunction callback); - /** Remove all datafeed callbacks from this session. */ - void remove_datafeed_callbacks(); - /** Add an I/O event source. - * @param source EventSource to add. */ - void add_source(shared_ptr source); - /** Remove an event source. - * @param source EventSource to remove. */ - void remove_source(shared_ptr source); - /** Start the session. */ - void start(); - /** Run the session event loop. */ - void run(); - /** Stop the session. */ - void stop(); - /** Begin saving session to a file. - * @param filename File name string. */ - void begin_save(string filename); - /** Append a packet to the session file being saved. - * @param packet Packet to append. */ - void append(shared_ptr packet); - /** Append raw logic data to the session file being saved. */ - void append(void *data, size_t length, unsigned int unit_size); - /** Get current trigger setting. */ - shared_ptr trigger(); - /** Get the context. */ - shared_ptr context(); - /** Set trigger setting. - * @param trigger Trigger object to use. */ - void set_trigger(shared_ptr trigger); - /** Get filename this session was loaded from. */ - string filename(); -protected: - Session(shared_ptr context); - Session(shared_ptr context, string filename); - ~Session(); - shared_ptr get_device(const struct sr_dev_inst *sdi); - const shared_ptr _context; - map _owned_devices; - map > _other_devices; - vector _datafeed_callbacks; - map, SourceCallbackData *> _source_callbacks; - string _filename; - bool _saving; - bool _save_initialized; - string _save_filename; - uint64_t _save_samplerate; - shared_ptr _trigger; - friend class Deleter; - friend class Context; - friend class DatafeedCallbackData; - friend class SessionDevice; -}; - -/** A packet on the session datafeed */ -class SR_API Packet : public UserOwned -{ -public: - /** Type of this packet. */ - const PacketType *type(); - /** Payload of this packet. */ - shared_ptr payload(); -protected: - Packet(shared_ptr device, - const struct sr_datafeed_packet *structure); - ~Packet(); - shared_ptr _device; - PacketPayload *_payload; - friend class Deleter; - friend class Session; - friend class Output; - friend class DatafeedCallbackData; - friend class Header; - friend class Meta; - friend class Logic; - friend class Analog; - friend class Context; -}; - -/** Abstract base class for datafeed packet payloads */ -class SR_API PacketPayload -{ -protected: - PacketPayload(); - virtual ~PacketPayload() = 0; - virtual shared_ptr get_shared_pointer(Packet *parent) = 0; - /** Deleter needed to allow shared_ptr use with protected destructor. */ - class Deleter - { - public: - void operator()(PacketPayload *payload) { delete payload; } - }; - friend class Deleter; - friend class Packet; - friend class Output; -}; - -/** Payload of a datafeed header packet */ -class SR_API Header : - public ParentOwned, - public PacketPayload -{ -public: - /* Feed version number. */ - int feed_version(); - /* Start time of this session. */ - Glib::TimeVal start_time(); -protected: - Header(const struct sr_datafeed_header *structure); - ~Header(); - shared_ptr get_shared_pointer(Packet *parent); - friend class Packet; -}; - -/** Payload of a datafeed metadata packet */ -class SR_API Meta : - public ParentOwned, - public PacketPayload -{ -public: - /* Mapping of (ConfigKey, value) pairs. */ - map config(); -protected: - Meta(const struct sr_datafeed_meta *structure); - ~Meta(); - shared_ptr get_shared_pointer(Packet *parent); - map _config; - friend class Packet; -}; - -/** Payload of a datafeed packet with logic data */ -class SR_API Logic : - public ParentOwned, - public PacketPayload -{ -public: - /* Pointer to data. */ - void *data_pointer(); - /* Data length in bytes. */ - size_t data_length(); - /* Size of each sample in bytes. */ - unsigned int unit_size(); -protected: - Logic(const struct sr_datafeed_logic *structure); - ~Logic(); - shared_ptr get_shared_pointer(Packet *parent); - friend class Packet; -}; - -/** Payload of a datafeed packet with analog data */ -class SR_API Analog : - public ParentOwned, - public PacketPayload -{ -public: - /** Pointer to data. */ - float *data_pointer(); - /** Number of samples in this packet. */ - unsigned int num_samples(); - /** Channels for which this packet contains data. */ - vector > channels(); - /** Measured quantity of the samples in this packet. */ - const Quantity *mq(); - /** Unit of the samples in this packet. */ - const Unit *unit(); - /** Measurement flags associated with the samples in this packet. */ - vector mq_flags(); -protected: - Analog(const struct sr_datafeed_analog *structure); - ~Analog(); - shared_ptr get_shared_pointer(Packet *parent); - friend class Packet; -}; - -/** An input format supported by the library */ -class SR_API InputFormat : - public ParentOwned -{ -public: - /** Name of this input format. */ - string name(); - /** Description of this input format. */ - string description(); - /** Options supported by this input format. */ - map > options(); - /** Create an input using this input format. - * @param options Mapping of (option name, value) pairs. */ - shared_ptr create_input(map options = - map()); -protected: - InputFormat(const struct sr_input_module *structure); - ~InputFormat(); - friend class Context; - friend class InputDevice; -}; - -/** An input instance (an input format applied to a file or stream) */ -class SR_API Input : public UserOwned -{ -public: - /** Virtual device associated with this input. */ - shared_ptr device(); - /** Send next stream data. - * @param data Next stream data. */ - void send(string data); - /** Signal end of input data. */ - void end(); -protected: - Input(shared_ptr context, const struct sr_input *structure); - ~Input(); - shared_ptr _context; - InputDevice *_device; - friend class Deleter; - friend class Context; - friend class InputFormat; -}; - -/** A virtual device associated with an input */ -class SR_API InputDevice : - public ParentOwned, - public Device -{ -protected: - InputDevice(shared_ptr input, struct sr_dev_inst *sdi); - ~InputDevice(); - shared_ptr get_shared_from_this(); - shared_ptr _input; - friend class Input; -}; - -/** An option used by an output format */ -class SR_API Option : public UserOwned -{ -public: - /** Short name of this option suitable for command line usage. */ - string id(); - /** Short name of this option suitable for GUI usage. */ - string name(); - /** Description of this option in a sentence. */ - string description(); - /** Default value for this option. */ - Glib::VariantBase default_value(); - /** Possible values for this option, if a limited set. */ - vector values(); -protected: - Option(const struct sr_option *structure, - shared_ptr structure_array); - ~Option(); - shared_ptr _structure_array; - friend class Deleter; - friend class InputFormat; - friend class OutputFormat; -}; - -/** An output format supported by the library */ -class SR_API OutputFormat : - public ParentOwned -{ -public: - /** Name of this output format. */ - string name(); - /** Description of this output format. */ - string description(); - /** Options supported by this output format. */ - map > options(); - /** Create an output using this format. - * @param device Device to output for. - * @param options Mapping of (option name, value) pairs. */ - shared_ptr create_output(shared_ptr device, - map options = - map()); -protected: - OutputFormat(const struct sr_output_module *structure); - ~OutputFormat(); - friend class Context; - friend class Output; -}; - -/** An output instance (an output format applied to a device) */ -class SR_API Output : public UserOwned -{ -public: - /** Update output with data from the given packet. - * @param packet Packet to handle. */ - string receive(shared_ptr packet); -protected: - Output(shared_ptr format, shared_ptr device); - Output(shared_ptr format, - shared_ptr device, map options); - ~Output(); - const shared_ptr _format; - const shared_ptr _device; - const map _options; - friend class Deleter; - friend class OutputFormat; -}; - -/** Base class for objects which wrap an enumeration value from libsigrok */ -template class SR_API EnumValue -{ -public: - /** The integer constant associated with this value. */ - int id() const - { - return static_cast(_id); - } - /** The name associated with this value. */ - string name() const - { - return _name; - } - /** Get value associated with a given integer constant. */ - static const Class *get(int id) - { - auto key = static_cast(id); - if (_values.find(key) == _values.end()) - throw Error(SR_ERR_ARG); - return _values.at(key); - } - /** Get possible values. */ - static std::vector values() - { - std::vector result; - for (auto entry : _values) - result.push_back(entry.second); - return result; - } -protected: - EnumValue(Enum id, const char name[]) : _id(id), _name(name) - { - } - ~EnumValue() - { - } - static const std::map _values; - const Enum _id; - const string _name; -}; - -#include "enums.hpp" - -} - -#endif diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp new file mode 100644 index 00000000..0701688d --- /dev/null +++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp @@ -0,0 +1,1028 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013-2014 Martin Ling + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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, see . + */ + +/** + +@mainpage API Reference + +Introduction +------------ + +The libsigrokcxx API provides an object-oriented C++ interface to the +functionality in libsigrok, including automatic memory and resource management. + +It is built on top of the public libsigrok C API, and is designed to be used as +a standalone alternative API. Programs should not mix usage of the C and C++ +APIs; the C++ interface code needs to have full control of all C API calls for +resources to be managed correctly. + +Memory management +----------------- + +All runtime objects created through the C++ API are passed and accessed via +shared pointers, using the C++11 std::shared_ptr implementation. This means +that a reference count is kept for each object. + +Shared pointers can be copied and assigned in a user's program, automatically +updating their reference count and deleting objects when they are no longer in +use. The C++ interface code also keeps track of internal dependencies between +libsigrok resources, and ensures that objects are not prematurely deleted when +their resources are in use by other objects. + +This means that management of libsigrokcxx objects and their underlying +libsigrok resources can be treated as fully automatic. As long as all shared +pointers to objects are deleted or reassigned when no longer in use, all +underlying resources will be released at the right time. + +Getting started +--------------- + +Usage of the C++ API needs to begin with a call to sigrok::Context::create(). +This will create the global libsigrok context and returns a shared pointer to +the sigrok::Context object. Methods on this object provide access to the +hardware drivers, input and output formats supported by the library, as well +as means of creating other objects such as sessions and triggers. + +Error handling +-------------- + +When any libsigrok C API call returns an error, a sigrok::Error exception is +raised, which provides access to the error code and description. + +*/ + +#ifndef LIBSIGROKCXX_HPP +#define LIBSIGROKCXX_HPP + +#include "libsigrok/libsigrok.h" +#include + +#include +#include +#include +#include +#include + +namespace sigrok +{ + +using namespace std; + +/* Forward declarations */ +class SR_API Error; +class SR_API Context; +class SR_API Driver; +class SR_API Device; +class SR_API HardwareDevice; +class SR_API Channel; +class SR_API EventSource; +class SR_API Session; +class SR_API ConfigKey; +class SR_API InputFormat; +class SR_API OutputFormat; +class SR_API LogLevel; +class SR_API ChannelGroup; +class SR_API Trigger; +class SR_API TriggerStage; +class SR_API TriggerMatch; +class SR_API TriggerMatchType; +class SR_API ChannelType; +class SR_API Packet; +class SR_API PacketPayload; +class SR_API PacketType; +class SR_API Quantity; +class SR_API Unit; +class SR_API QuantityFlag; +class SR_API Input; +class SR_API InputDevice; +class SR_API Output; +class SR_API DataType; +class SR_API Option; +class SR_API UserDevice; + +/** Exception thrown when an error code is returned by any libsigrok call. */ +class SR_API Error: public exception +{ +public: + Error(int result); + ~Error() throw(); + const int result; + const char *what() const throw(); +}; + +/* Base template for classes whose resources are owned by a parent object. */ +template +class SR_API ParentOwned +{ +protected: + /* Parent object which owns this child object's underlying structure. + + This shared pointer will be null when this child is unused, but + will be assigned to point to the parent before any shared pointer + to this child is handed out to the user. + + When the reference count of this child falls to zero, this shared + pointer to its parent is reset by a custom deleter on the child's + shared pointer. + + This strategy ensures that the destructors for both the child and + the parent are called at the correct time, i.e. only when all + references to both the parent and all its children are gone. */ + shared_ptr _parent; + + /* Weak pointer for shared_from_this() implementation. */ + weak_ptr _weak_this; + +public: + /* Get parent object that owns this object. */ + shared_ptr parent() + { + return _parent; + } + + /* Note, this implementation will create a new smart_ptr if none exists. */ + shared_ptr shared_from_this() + { + shared_ptr shared; + + if (!(shared = _weak_this.lock())) + { + shared = shared_ptr((Class *) this, reset_parent); + _weak_this = shared; + } + + return shared; + } + + shared_ptr get_shared_pointer(shared_ptr parent) + { + if (!parent) + throw Error(SR_ERR_BUG); + this->_parent = parent; + return shared_from_this(); + } + + shared_ptr get_shared_pointer(Parent *parent) + { + if (!parent) + throw Error(SR_ERR_BUG); + return get_shared_pointer(parent->shared_from_this()); + } +protected: + static void reset_parent(Class *object) + { + if (!object->_parent) + throw Error(SR_ERR_BUG); + object->_parent.reset(); + } + + Struct *_structure; + + ParentOwned(Struct *structure) : + _structure(structure) + { + } +}; + +/* Base template for classes whose resources are owned by the user. */ +template +class SR_API UserOwned : public enable_shared_from_this +{ +public: + shared_ptr shared_from_this() + { + auto shared = enable_shared_from_this::shared_from_this(); + if (!shared) + throw Error(SR_ERR_BUG); + return shared; + } +protected: + Struct *_structure; + + UserOwned(Struct *structure) : + _structure(structure) + { + } + + /* Deleter needed to allow shared_ptr use with protected destructor. */ + class Deleter + { + public: + void operator()(Class *object) { delete object; } + }; +}; + +/** Type of log callback */ +typedef function LogCallbackFunction; + +/** The global libsigrok context */ +class SR_API Context : public UserOwned +{ +public: + /** Create new context */ + static shared_ptr create(); + /** libsigrok package version. */ + string package_version(); + /** libsigrok library version. */ + string lib_version(); + /** Available hardware drivers, indexed by name. */ + map > drivers(); + /** Available input formats, indexed by name. */ + map > input_formats(); + /** Available output formats, indexed by name. */ + map > output_formats(); + /** Current log level. */ + const LogLevel *log_level(); + /** Set the log level. + * @param level LogLevel to use. */ + void set_log_level(const LogLevel *level); + /** Current log domain. */ + string log_domain(); + /** Set the log domain. + * @param value Log domain prefix string. */ + void set_log_domain(string value); + /** Set the log callback. + * @param callback Callback of the form callback(LogLevel, string). */ + void set_log_callback(LogCallbackFunction callback); + /** Set the log callback to the default handler. */ + void set_log_callback_default(); + /** Create a new session. */ + shared_ptr create_session(); + /** Create a new user device. */ + shared_ptr create_user_device( + string vendor, string model, string version); + /** Create a header packet. */ + shared_ptr create_header_packet(Glib::TimeVal start_time); + /** Create a meta packet. */ + shared_ptr create_meta_packet( + map config); + /** Create a logic packet. */ + shared_ptr create_logic_packet( + void *data_pointer, size_t data_length, unsigned int unit_size); + /** Create an analog packet. */ + shared_ptr create_analog_packet( + vector > channels, + float *data_pointer, unsigned int num_samples, const Quantity *mq, + const Unit *unit, vector mqflags); + /** Load a saved session. + * @param filename File name string. */ + shared_ptr load_session(string filename); + /** Create a new trigger. + * @param name Name string for new trigger. */ + shared_ptr create_trigger(string name); + /** Open an input file. + * @param filename File name string. */ + shared_ptr open_file(string filename); + /** Open an input stream based on header data. + * @param header Initial data from stream. */ + shared_ptr open_stream(string header); + map serials(shared_ptr driver); +protected: + map _drivers; + map _input_formats; + map _output_formats; + Session *_session; + LogCallbackFunction _log_callback; + Context(); + ~Context(); + friend class Deleter; + friend class Session; + friend class Driver; +}; + +enum Capability { + GET = SR_CONF_GET, + SET = SR_CONF_SET, + LIST = SR_CONF_LIST +}; + +/** An object that can be configured. */ +class SR_API Configurable +{ +public: + /** Read configuration for the given key. + * @param key ConfigKey to read. */ + Glib::VariantBase config_get(const ConfigKey *key); + /** Set configuration for the given key to a specified value. + * @param key ConfigKey to set. + * @param value Value to set. */ + void config_set(const ConfigKey *key, Glib::VariantBase value); + /** Enumerate available values for the given configuration key. + * @param key ConfigKey to enumerate values for. */ + Glib::VariantContainerBase config_list(const ConfigKey *key); + /** Enumerate available keys, according to a given index key. */ + map > config_keys(const ConfigKey *key); + /** Check for a key in the list from a given index key. */ + bool config_check(const ConfigKey *key, const ConfigKey *index_key); +protected: + Configurable( + struct sr_dev_driver *driver, + struct sr_dev_inst *sdi, + struct sr_channel_group *channel_group); + virtual ~Configurable(); + struct sr_dev_driver *config_driver; + struct sr_dev_inst *config_sdi; + struct sr_channel_group *config_channel_group; +}; + +/** A hardware driver provided by the library */ +class SR_API Driver : + public ParentOwned, + public Configurable +{ +public: + /** Name of this driver. */ + string name(); + /** Long name for this driver. */ + string long_name(); + /** Scan for devices and return a list of devices found. + * @param options Mapping of (ConfigKey, value) pairs. */ + vector > scan( + map options = + map()); +protected: + bool _initialized; + vector _devices; + Driver(struct sr_dev_driver *structure); + ~Driver(); + friend class Context; + friend class HardwareDevice; + friend class ChannelGroup; +}; + +/** A generic device, either hardware or virtual */ +class SR_API Device : public Configurable +{ +public: + /** Vendor name for this device. */ + string vendor(); + /** Model name for this device. */ + string model(); + /** Version string for this device. */ + string version(); + /** Serial number for this device. */ + string serial_number(); + /** Connection ID for this device. */ + string connection_id(); + /** List of the channels available on this device. */ + vector > channels(); + /** Channel groups available on this device, indexed by name. */ + map > channel_groups(); + /** Open device. */ + void open(); + /** Close device. */ + void close(); +protected: + Device(struct sr_dev_inst *structure); + ~Device(); + virtual shared_ptr get_shared_from_this() = 0; + shared_ptr get_channel(struct sr_channel *ptr); + struct sr_dev_inst *_structure; + map _channels; + map _channel_groups; + /** Deleter needed to allow shared_ptr use with protected destructor. */ + class Deleter + { + public: + void operator()(Device *device) { delete device; } + }; + friend class Deleter; + friend class Session; + friend class Channel; + friend class ChannelGroup; + friend class Output; + friend class Analog; +}; + +/** A real hardware device, connected via a driver */ +class SR_API HardwareDevice : + public UserOwned, + public Device +{ +public: + /** Driver providing this device. */ + shared_ptr driver(); +protected: + HardwareDevice(shared_ptr driver, struct sr_dev_inst *structure); + ~HardwareDevice(); + shared_ptr get_shared_from_this(); + shared_ptr _driver; + /** Deleter needed to allow shared_ptr use with protected destructor. */ + class Deleter + { + public: + void operator()(HardwareDevice *device) { delete device; } + }; + friend class Deleter; + friend class Driver; + friend class ChannelGroup; +}; + +/** A virtual device, created by the user */ +class SR_API UserDevice : + public UserOwned, + public Device +{ +public: + /** Add a new channel to this device. */ + shared_ptr add_channel(unsigned int index, const ChannelType *type, string name); +protected: + UserDevice(string vendor, string model, string version); + ~UserDevice(); + shared_ptr get_shared_from_this(); + /** Deleter needed to allow shared_ptr use with protected destructor. */ + class Deleter + { + public: + void operator()(UserDevice *device) { delete device; } + }; + friend class Context; + friend class Deleter; +}; + +/** A channel on a device */ +class SR_API Channel : + public ParentOwned +{ +public: + /** Current name of this channel. */ + string name(); + /** Set the name of this channel. * + * @param name Name string to set. */ + void set_name(string name); + /** Type of this channel. */ + const ChannelType *type(); + /** Enabled status of this channel. */ + bool enabled(); + /** Set the enabled status of this channel. + * @param value Boolean value to set. */ + void set_enabled(bool value); + /** Get the index number of this channel. */ + unsigned int index(); +protected: + Channel(struct sr_channel *structure); + ~Channel(); + const ChannelType * const _type; + friend class Device; + friend class UserDevice; + friend class ChannelGroup; + friend class Session; + friend class TriggerStage; + friend class Context; +}; + +/** A group of channels on a device, which share some configuration */ +class SR_API ChannelGroup : + public ParentOwned, + public Configurable +{ +public: + /** Name of this channel group. */ + string name(); + /** List of the channels in this group. */ + vector > channels(); +protected: + ChannelGroup(Device *device, struct sr_channel_group *structure); + ~ChannelGroup(); + vector _channels; + friend class Device; +}; + +/** A trigger configuration */ +class SR_API Trigger : public UserOwned +{ +public: + /** Name of this trigger configuration. */ + string name(); + /** List of the stages in this trigger. */ + vector > stages(); + /** Add a new stage to this trigger. */ + shared_ptr add_stage(); +protected: + Trigger(shared_ptr context, string name); + ~Trigger(); + shared_ptr _context; + vector _stages; + friend class Deleter; + friend class Context; + friend class Session; +}; + +/** A stage in a trigger configuration */ +class SR_API TriggerStage : + public ParentOwned +{ +public: + /** Index number of this stage. */ + int number(); + /** List of match conditions on this stage. */ + vector > matches(); + /** Add a new match condition to this stage. + * @param channel Channel to match on. + * @param type TriggerMatchType to apply. */ + void add_match(shared_ptr channel, const TriggerMatchType *type); + /** Add a new match condition to this stage. + * @param channel Channel to match on. + * @param type TriggerMatchType to apply. + * @param value Threshold value. */ + void add_match(shared_ptr channel, const TriggerMatchType *type, float value); +protected: + vector _matches; + TriggerStage(struct sr_trigger_stage *structure); + ~TriggerStage(); + friend class Trigger; +}; + +/** A match condition in a trigger configuration */ +class SR_API TriggerMatch : + public ParentOwned +{ +public: + /** Channel this condition matches on. */ + shared_ptr channel(); + /** Type of match. */ + const TriggerMatchType *type(); + /** Threshold value. */ + float value(); +protected: + TriggerMatch(struct sr_trigger_match *structure, shared_ptr channel); + ~TriggerMatch(); + shared_ptr _channel; + friend class TriggerStage; +}; + +/** Type of datafeed callback */ +typedef function, shared_ptr)> + DatafeedCallbackFunction; + +/* Data required for C callback function to call a C++ datafeed callback */ +class SR_PRIV DatafeedCallbackData +{ +public: + void run(const struct sr_dev_inst *sdi, + const struct sr_datafeed_packet *pkt); +protected: + DatafeedCallbackFunction _callback; + DatafeedCallbackData(Session *session, + DatafeedCallbackFunction callback); + Session *_session; + friend class Session; +}; + +/** Type of source callback */ +typedef function + SourceCallbackFunction; + +/* Data required for C callback function to call a C++ source callback */ +class SR_PRIV SourceCallbackData +{ +public: + bool run(int revents); +protected: + SourceCallbackData(shared_ptr source); + shared_ptr _source; + friend class Session; +}; + +/** An I/O event source */ +class SR_API EventSource +{ +public: + /** Create an event source from a file descriptor. + * @param fd File descriptor. + * @param events GLib IOCondition event mask. + * @param timeout Timeout in milliseconds. + * @param callback Callback of the form callback(events) */ + static shared_ptr create(int fd, Glib::IOCondition events, + int timeout, SourceCallbackFunction callback); + /** Create an event source from a GLib PollFD + * @param pollfd GLib PollFD + * @param timeout Timeout in milliseconds. + * @param callback Callback of the form callback(events) */ + static shared_ptr create(Glib::PollFD pollfd, int timeout, + SourceCallbackFunction callback); + /** Create an event source from a GLib IOChannel + * @param channel GLib IOChannel. + * @param events GLib IOCondition event mask. + * @param timeout Timeout in milliseconds. + * @param callback Callback of the form callback(events) */ + static shared_ptr create( + Glib::RefPtr channel, Glib::IOCondition events, + int timeout, SourceCallbackFunction callback); +protected: + EventSource(int timeout, SourceCallbackFunction callback); + ~EventSource(); + enum source_type { + SOURCE_FD, + SOURCE_POLLFD, + SOURCE_IOCHANNEL + } _type; + int _fd; + Glib::PollFD _pollfd; + Glib::RefPtr _channel; + Glib::IOCondition _events; + int _timeout; + SourceCallbackFunction _callback; + /** Deleter needed to allow shared_ptr use with protected destructor. */ + class Deleter + { + public: + void operator()(EventSource *source) { delete source; } + }; + friend class Deleter; + friend class Session; + friend class SourceCallbackData; +}; + +/** A virtual device associated with a stored session */ +class SR_API SessionDevice : + public ParentOwned, + public Device +{ +protected: + SessionDevice(struct sr_dev_inst *sdi); + ~SessionDevice(); + shared_ptr get_shared_from_this(); + /** Deleter needed to allow shared_ptr use with protected destructor. */ + class Deleter + { + public: + void operator()(SessionDevice *device) { delete device; } + }; + friend class Deleter; + friend class Session; +}; + +/** A sigrok session */ +class SR_API Session : public UserOwned +{ +public: + /** Add a device to this session. + * @param device Device to add. */ + void add_device(shared_ptr device); + /** List devices attached to this session. */ + vector > devices(); + /** Remove all devices from this session. */ + void remove_devices(); + /** Add a datafeed callback to this session. + * @param callback Callback of the form callback(Device, Packet). */ + void add_datafeed_callback(DatafeedCallbackFunction callback); + /** Remove all datafeed callbacks from this session. */ + void remove_datafeed_callbacks(); + /** Add an I/O event source. + * @param source EventSource to add. */ + void add_source(shared_ptr source); + /** Remove an event source. + * @param source EventSource to remove. */ + void remove_source(shared_ptr source); + /** Start the session. */ + void start(); + /** Run the session event loop. */ + void run(); + /** Stop the session. */ + void stop(); + /** Begin saving session to a file. + * @param filename File name string. */ + void begin_save(string filename); + /** Append a packet to the session file being saved. + * @param packet Packet to append. */ + void append(shared_ptr packet); + /** Append raw logic data to the session file being saved. */ + void append(void *data, size_t length, unsigned int unit_size); + /** Get current trigger setting. */ + shared_ptr trigger(); + /** Get the context. */ + shared_ptr context(); + /** Set trigger setting. + * @param trigger Trigger object to use. */ + void set_trigger(shared_ptr trigger); + /** Get filename this session was loaded from. */ + string filename(); +protected: + Session(shared_ptr context); + Session(shared_ptr context, string filename); + ~Session(); + shared_ptr get_device(const struct sr_dev_inst *sdi); + const shared_ptr _context; + map _owned_devices; + map > _other_devices; + vector _datafeed_callbacks; + map, SourceCallbackData *> _source_callbacks; + string _filename; + bool _saving; + bool _save_initialized; + string _save_filename; + uint64_t _save_samplerate; + shared_ptr _trigger; + friend class Deleter; + friend class Context; + friend class DatafeedCallbackData; + friend class SessionDevice; +}; + +/** A packet on the session datafeed */ +class SR_API Packet : public UserOwned +{ +public: + /** Type of this packet. */ + const PacketType *type(); + /** Payload of this packet. */ + shared_ptr payload(); +protected: + Packet(shared_ptr device, + const struct sr_datafeed_packet *structure); + ~Packet(); + shared_ptr _device; + PacketPayload *_payload; + friend class Deleter; + friend class Session; + friend class Output; + friend class DatafeedCallbackData; + friend class Header; + friend class Meta; + friend class Logic; + friend class Analog; + friend class Context; +}; + +/** Abstract base class for datafeed packet payloads */ +class SR_API PacketPayload +{ +protected: + PacketPayload(); + virtual ~PacketPayload() = 0; + virtual shared_ptr get_shared_pointer(Packet *parent) = 0; + /** Deleter needed to allow shared_ptr use with protected destructor. */ + class Deleter + { + public: + void operator()(PacketPayload *payload) { delete payload; } + }; + friend class Deleter; + friend class Packet; + friend class Output; +}; + +/** Payload of a datafeed header packet */ +class SR_API Header : + public ParentOwned, + public PacketPayload +{ +public: + /* Feed version number. */ + int feed_version(); + /* Start time of this session. */ + Glib::TimeVal start_time(); +protected: + Header(const struct sr_datafeed_header *structure); + ~Header(); + shared_ptr get_shared_pointer(Packet *parent); + friend class Packet; +}; + +/** Payload of a datafeed metadata packet */ +class SR_API Meta : + public ParentOwned, + public PacketPayload +{ +public: + /* Mapping of (ConfigKey, value) pairs. */ + map config(); +protected: + Meta(const struct sr_datafeed_meta *structure); + ~Meta(); + shared_ptr get_shared_pointer(Packet *parent); + map _config; + friend class Packet; +}; + +/** Payload of a datafeed packet with logic data */ +class SR_API Logic : + public ParentOwned, + public PacketPayload +{ +public: + /* Pointer to data. */ + void *data_pointer(); + /* Data length in bytes. */ + size_t data_length(); + /* Size of each sample in bytes. */ + unsigned int unit_size(); +protected: + Logic(const struct sr_datafeed_logic *structure); + ~Logic(); + shared_ptr get_shared_pointer(Packet *parent); + friend class Packet; +}; + +/** Payload of a datafeed packet with analog data */ +class SR_API Analog : + public ParentOwned, + public PacketPayload +{ +public: + /** Pointer to data. */ + float *data_pointer(); + /** Number of samples in this packet. */ + unsigned int num_samples(); + /** Channels for which this packet contains data. */ + vector > channels(); + /** Measured quantity of the samples in this packet. */ + const Quantity *mq(); + /** Unit of the samples in this packet. */ + const Unit *unit(); + /** Measurement flags associated with the samples in this packet. */ + vector mq_flags(); +protected: + Analog(const struct sr_datafeed_analog *structure); + ~Analog(); + shared_ptr get_shared_pointer(Packet *parent); + friend class Packet; +}; + +/** An input format supported by the library */ +class SR_API InputFormat : + public ParentOwned +{ +public: + /** Name of this input format. */ + string name(); + /** Description of this input format. */ + string description(); + /** Options supported by this input format. */ + map > options(); + /** Create an input using this input format. + * @param options Mapping of (option name, value) pairs. */ + shared_ptr create_input(map options = + map()); +protected: + InputFormat(const struct sr_input_module *structure); + ~InputFormat(); + friend class Context; + friend class InputDevice; +}; + +/** An input instance (an input format applied to a file or stream) */ +class SR_API Input : public UserOwned +{ +public: + /** Virtual device associated with this input. */ + shared_ptr device(); + /** Send next stream data. + * @param data Next stream data. */ + void send(string data); + /** Signal end of input data. */ + void end(); +protected: + Input(shared_ptr context, const struct sr_input *structure); + ~Input(); + shared_ptr _context; + InputDevice *_device; + friend class Deleter; + friend class Context; + friend class InputFormat; +}; + +/** A virtual device associated with an input */ +class SR_API InputDevice : + public ParentOwned, + public Device +{ +protected: + InputDevice(shared_ptr input, struct sr_dev_inst *sdi); + ~InputDevice(); + shared_ptr get_shared_from_this(); + shared_ptr _input; + friend class Input; +}; + +/** An option used by an output format */ +class SR_API Option : public UserOwned +{ +public: + /** Short name of this option suitable for command line usage. */ + string id(); + /** Short name of this option suitable for GUI usage. */ + string name(); + /** Description of this option in a sentence. */ + string description(); + /** Default value for this option. */ + Glib::VariantBase default_value(); + /** Possible values for this option, if a limited set. */ + vector values(); +protected: + Option(const struct sr_option *structure, + shared_ptr structure_array); + ~Option(); + shared_ptr _structure_array; + friend class Deleter; + friend class InputFormat; + friend class OutputFormat; +}; + +/** An output format supported by the library */ +class SR_API OutputFormat : + public ParentOwned +{ +public: + /** Name of this output format. */ + string name(); + /** Description of this output format. */ + string description(); + /** Options supported by this output format. */ + map > options(); + /** Create an output using this format. + * @param device Device to output for. + * @param options Mapping of (option name, value) pairs. */ + shared_ptr create_output(shared_ptr device, + map options = + map()); +protected: + OutputFormat(const struct sr_output_module *structure); + ~OutputFormat(); + friend class Context; + friend class Output; +}; + +/** An output instance (an output format applied to a device) */ +class SR_API Output : public UserOwned +{ +public: + /** Update output with data from the given packet. + * @param packet Packet to handle. */ + string receive(shared_ptr packet); +protected: + Output(shared_ptr format, shared_ptr device); + Output(shared_ptr format, + shared_ptr device, map options); + ~Output(); + const shared_ptr _format; + const shared_ptr _device; + const map _options; + friend class Deleter; + friend class OutputFormat; +}; + +/** Base class for objects which wrap an enumeration value from libsigrok */ +template class SR_API EnumValue +{ +public: + /** The integer constant associated with this value. */ + int id() const + { + return static_cast(_id); + } + /** The name associated with this value. */ + string name() const + { + return _name; + } + /** Get value associated with a given integer constant. */ + static const Class *get(int id) + { + auto key = static_cast(id); + if (_values.find(key) == _values.end()) + throw Error(SR_ERR_ARG); + return _values.at(key); + } + /** Get possible values. */ + static std::vector values() + { + std::vector result; + for (auto entry : _values) + result.push_back(entry.second); + return result; + } +protected: + EnumValue(Enum id, const char name[]) : _id(id), _name(name) + { + } + ~EnumValue() + { + } + static const std::map _values; + const Enum _id; + const string _name; +}; + +#include "enums.hpp" + +} + +#endif diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 0002c1d4..b22a6e9b 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -35,7 +35,7 @@ sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [ includes = ['../../include', '../cxx/include'] includes += [os.path.join(srcdir, path) for path in includes] -includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrok'] +includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrokcxx'] includes += [i[2:] for i in sr_includes] includes += [np.get_include(), ] libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs] diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i index 75f20ea5..12b01a52 100644 --- a/bindings/python/sigrok/core/classes.i +++ b/bindings/python/sigrok/core/classes.i @@ -353,7 +353,7 @@ typedef guint pyg_flags_type; %{ -#include "libsigrok/libsigrokcxx.hpp" +#include "libsigrokcxx/libsigrokcxx.hpp" /* Convert from a Python dict to a std::map */ std::map dict_to_map_string(PyObject *dict) diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i index 55482555..cdb9f0e7 100644 --- a/bindings/swig/classes.i +++ b/bindings/swig/classes.i @@ -20,7 +20,7 @@ #pragma SWIG nowarn=325,401 %{ -#include "libsigrok/libsigrokcxx.hpp" +#include "libsigrokcxx/libsigrokcxx.hpp" using namespace std; %} @@ -271,10 +271,10 @@ typedef std::map %attribute(sigrok::Analog, const sigrok::Unit *, unit, unit); %attributevector(Analog, std::vector, mq_flags, mq_flags); -%include "libsigrok/libsigrokcxx.hpp" +%include "libsigrokcxx/libsigrokcxx.hpp" %include "enums.i" namespace sigrok { -%include "libsigrok/enums.hpp" +%include "libsigrokcxx/enums.hpp" } diff --git a/configure.ac b/configure.ac index 5f9cf652..d2340bea 100644 --- a/configure.ac +++ b/configure.ac @@ -430,7 +430,7 @@ AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"]) AC_SUBST(SR_PKGLIBS) CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS" -CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrok -I${srcdir}/bindings/cxx/include $LIB_CFLAGS" +CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/bindings/cxx/include $LIB_CFLAGS" # Find Java compiler and JNI includes for Java bindings. AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])