X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=8efd103a7552e7e4e7d1240698677bbb2d5db52e;hb=b6ab954d67b584af662323ae79ae6da0fbd3a588;hp=357c9d6f3cbccac46f24a7d1c74025c525b40324;hpb=81b3ce374c3b6d48e5ed321ac7a871ce4248a0bb;p=libsigrok.git
diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 357c9d6f..8efd103a 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -17,7 +17,13 @@
* along with this program. If not, see .
*/
-#include "libsigrokcxx/libsigrokcxx.hpp"
+/* Needed for isascii(), as used in the GNU libstdc++ headers */
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif
+
+#include
+#include
#include
#include
@@ -33,37 +39,79 @@ static void check(int result)
}
/** Helper function to obtain valid strings from possibly null input. */
-static const char *valid_string(const char *input)
+static inline const char *valid_string(const char *input)
{
- if (input != NULL)
- return input;
- else
- return "";
+ return (input) ? input : "";
}
/** Helper function to convert between map and GHashTable */
-static GHashTable *map_to_hash_variant(map input)
+static GHashTable *map_to_hash_variant(const map &input)
{
- auto output = g_hash_table_new_full(
- g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
+ auto output = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ reinterpret_cast(&g_variant_unref));
for (auto entry : input)
g_hash_table_insert(output,
g_strdup(entry.first.c_str()),
entry.second.gobj_copy());
- return output;
+ return output;
}
Error::Error(int result) : result(result)
{
}
-const char *Error::what() const throw()
+const char *Error::what() const noexcept
{
return sr_strerror(result);
}
-Error::~Error() throw()
+Error::~Error() noexcept
+{
+}
+
+ResourceReader::~ResourceReader()
+{
+}
+
+SR_PRIV int ResourceReader::open_callback(struct sr_resource *res,
+ const char *name, void *cb_data) noexcept
{
+ try {
+ auto *const reader = static_cast(cb_data);
+ reader->open(res, name);
+ } catch (const Error &err) {
+ return err.result;
+ } catch (...) {
+ return SR_ERR;
+ }
+ return SR_OK;
+}
+
+SR_PRIV int ResourceReader::close_callback(struct sr_resource *res,
+ void *cb_data) noexcept
+{
+ try {
+ auto *const reader = static_cast(cb_data);
+ reader->close(res);
+ } catch (const Error &err) {
+ return err.result;
+ } catch (...) {
+ return SR_ERR;
+ }
+ return SR_OK;
+}
+
+SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res,
+ void *buf, size_t count, void *cb_data) noexcept
+{
+ try {
+ auto *const reader = static_cast(cb_data);
+ return reader->read(res, buf, count);
+ } catch (const Error &err) {
+ return err.result;
+ } catch (...) {
+ return SR_ERR;
+ }
}
shared_ptr Context::create()
@@ -73,7 +121,7 @@ shared_ptr Context::create()
Context::Context() :
UserOwned(_structure),
- _session(NULL)
+ _session(nullptr)
{
check(sr_init(&_structure));
@@ -111,7 +159,7 @@ map> Context::drivers()
{
auto name = entry.first;
auto driver = entry.second;
- result[name] = driver->get_shared_pointer(this);
+ result[name] = driver->share_owned_by(shared_from_this());
}
return result;
}
@@ -123,7 +171,7 @@ map> Context::input_formats()
{
auto name = entry.first;
auto input_format = entry.second;
- result[name] = input_format->get_shared_pointer(this);
+ result[name] = input_format->share_owned_by(shared_from_this());
}
return result;
}
@@ -135,7 +183,7 @@ map> Context::output_formats()
{
auto name = entry.first;
auto output_format = entry.second;
- result[name] = output_format->get_shared_pointer(this);
+ result[name] = output_format->share_owned_by(shared_from_this());
}
return result;
}
@@ -151,7 +199,7 @@ Context::~Context()
check(sr_exit(_structure));
}
-const LogLevel *Context::log_level()
+const LogLevel *Context::log_level() const
{
return LogLevel::get(sr_log_loglevel_get());
}
@@ -161,32 +209,17 @@ void Context::set_log_level(const LogLevel *level)
check(sr_log_loglevel_set(level->id()));
}
-string Context::log_domain()
-{
- return valid_string(sr_log_logdomain_get());
-}
-
-void Context::set_log_domain(string value)
+static int call_log_callback(void *cb_data, int loglevel,
+ const char *format, va_list args) noexcept
{
- check(sr_log_logdomain_set(value.c_str()));
-}
+ const unique_ptr
+ message {g_strdup_vprintf(format, args), &g_free};
-static int call_log_callback(void *cb_data, int loglevel, const char *format, va_list args)
-{
- va_list args_copy;
- va_copy(args_copy, args);
- int length = vsnprintf(NULL, 0, format, args_copy);
- va_end(args_copy);
- char *buf = (char *) g_malloc(length + 1);
- vsprintf(buf, format, args);
- string message(buf, length);
- g_free(buf);
-
- LogCallbackFunction callback = *((LogCallbackFunction *) cb_data);
+ auto *const callback = static_cast(cb_data);
try
{
- callback(LogLevel::get(loglevel), message);
+ (*callback)(LogLevel::get(loglevel), message.get());
}
catch (Error e)
{
@@ -198,15 +231,28 @@ static int call_log_callback(void *cb_data, int loglevel, const char *format, va
void Context::set_log_callback(LogCallbackFunction callback)
{
- _log_callback = callback;
+ _log_callback = move(callback);
check(sr_log_callback_set(call_log_callback, &_log_callback));
-}
+}
void Context::set_log_callback_default()
{
check(sr_log_callback_set_default());
_log_callback = nullptr;
-}
+}
+
+void Context::set_resource_reader(ResourceReader *reader)
+{
+ if (reader) {
+ check(sr_resource_set_hooks(_structure,
+ &ResourceReader::open_callback,
+ &ResourceReader::close_callback,
+ &ResourceReader::read_callback, reader));
+ } else {
+ check(sr_resource_set_hooks(_structure,
+ nullptr, nullptr, nullptr, nullptr));
+ }
+}
shared_ptr Context::create_session()
{
@@ -234,7 +280,7 @@ shared_ptr Context::create_header_packet(Glib::TimeVal start_time)
}
shared_ptr Context::create_meta_packet(
- map config)
+ const map &config)
{
auto meta = g_new0(struct sr_datafeed_meta, 1);
for (auto input : config)
@@ -267,17 +313,21 @@ shared_ptr Context::create_logic_packet(
}
shared_ptr Context::create_analog_packet(
- vector > channels,
+ const vector > &channels,
float *data_pointer, unsigned int num_samples, const Quantity *mq,
- const Unit *unit, vector mqflags)
+ const Unit *unit, const vector &mqflags)
{
auto analog = g_new0(struct sr_datafeed_analog, 1);
+ auto meaning = g_new0(struct sr_analog_meaning, 1);
+
+ analog->meaning = meaning;
+
for (auto channel : channels)
- analog->channels = g_slist_append(analog->channels, channel->_structure);
+ meaning->channels = g_slist_append(meaning->channels, channel->_structure);
analog->num_samples = num_samples;
- analog->mq = mq->id();
- analog->unit = unit->id();
- analog->mqflags = QuantityFlag::mask_from_flags(mqflags);
+ meaning->mq = static_cast(mq->id());
+ meaning->unit = static_cast(unit->id());
+ meaning->mqflags = static_cast(QuantityFlag::mask_from_flags(mqflags));
analog->data = data_pointer;
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_ANALOG;
@@ -288,13 +338,13 @@ shared_ptr Context::create_analog_packet(
shared_ptr Context::load_session(string filename)
{
return shared_ptr(
- new Session(shared_from_this(), filename), Session::Deleter());
+ new Session(shared_from_this(), move(filename)), Session::Deleter());
}
shared_ptr Context::create_trigger(string name)
{
return shared_ptr(
- new Trigger(shared_from_this(), name), Trigger::Deleter());
+ new Trigger(shared_from_this(), move(name)), Trigger::Deleter());
}
shared_ptr Context::open_file(string filename)
@@ -318,23 +368,24 @@ shared_ptr Context::open_stream(string header)
new Input(shared_from_this(), input), Input::Deleter());
}
-map Context::serials(shared_ptr driver)
+map Context::serials(shared_ptr driver) const
{
- GSList *serial_list = sr_serial_list(driver ? driver->_structure : NULL);
+ GSList *serial_list = sr_serial_list(driver ? driver->_structure : nullptr);
map serials;
for (GSList *serial = serial_list; serial; serial = serial->next) {
- struct sr_serial_port *port = (sr_serial_port *) serial->data;
+ auto *const port = static_cast(serial->data);
serials[string(port->name)] = string(port->description);
}
- g_slist_free_full(serial_list, (GDestroyNotify)sr_serial_free);
+ g_slist_free_full(serial_list,
+ reinterpret_cast(&sr_serial_free));
return serials;
}
Driver::Driver(struct sr_dev_driver *structure) :
ParentOwned(structure),
- Configurable(structure, NULL, NULL),
+ Configurable(structure, nullptr, nullptr),
_initialized(false)
{
}
@@ -343,18 +394,18 @@ Driver::~Driver()
{
}
-string Driver::name()
+string Driver::name() const
{
return valid_string(_structure->name);
}
-string Driver::long_name()
+string Driver::long_name() const
{
return valid_string(_structure->longname);
}
vector> Driver::scan(
- map options)
+ const map &options)
{
/* Initialise the driver if not yet done. */
if (!_initialized)
@@ -364,7 +415,7 @@ vector> Driver::scan(
}
/* Translate scan options to GSList of struct sr_config pointers. */
- GSList *option_list = NULL;
+ GSList *option_list = nullptr;
for (auto entry : options)
{
auto key = entry.first;
@@ -386,7 +437,7 @@ vector> Driver::scan(
vector> result;
for (GSList *device = device_list; device; device = device->next)
{
- auto sdi = (struct sr_dev_inst *) device->data;
+ auto *const sdi = static_cast(device->data);
result.push_back(shared_ptr(
new HardwareDevice(shared_from_this(), sdi),
HardwareDevice::Deleter()));
@@ -412,7 +463,7 @@ Configurable::~Configurable()
{
}
-Glib::VariantBase Configurable::config_get(const ConfigKey *key)
+Glib::VariantBase Configurable::config_get(const ConfigKey *key) const
{
GVariant *data;
check(sr_config_get(
@@ -421,14 +472,14 @@ Glib::VariantBase Configurable::config_get(const ConfigKey *key)
return Glib::VariantBase(data);
}
-void Configurable::config_set(const ConfigKey *key, Glib::VariantBase value)
+void Configurable::config_set(const ConfigKey *key, const Glib::VariantBase &value)
{
check(sr_config_set(
config_sdi, config_channel_group,
- key->id(), value.gobj()));
+ key->id(), const_cast(value.gobj())));
}
-Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
+Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const
{
GVariant *data;
check(sr_config_list(
@@ -448,8 +499,8 @@ map> Configurable::config_keys(const ConfigKe
config_driver, config_sdi, config_channel_group,
key->id(), &gvar_opts));
- opts = (const uint32_t *) g_variant_get_fixed_array(
- gvar_opts, &num_opts, sizeof(uint32_t));
+ opts = static_cast(g_variant_get_fixed_array(
+ gvar_opts, &num_opts, sizeof(uint32_t)));
for (gsize i = 0; i < num_opts; i++)
{
@@ -470,7 +521,7 @@ map> Configurable::config_keys(const ConfigKe
}
bool Configurable::config_check(const ConfigKey *key,
- const ConfigKey *index_key)
+ const ConfigKey *index_key) const
{
GVariant *gvar_opts;
gsize num_opts;
@@ -480,12 +531,12 @@ bool Configurable::config_check(const ConfigKey *key,
index_key->id(), &gvar_opts) != SR_OK)
return false;
- opts = (const uint32_t *) g_variant_get_fixed_array(
- gvar_opts, &num_opts, sizeof(uint32_t));
+ opts = static_cast(g_variant_get_fixed_array(
+ gvar_opts, &num_opts, sizeof(uint32_t)));
for (gsize i = 0; i < num_opts; i++)
{
- if ((opts[i] & SR_CONF_MASK) == (uint32_t) key->id())
+ if ((opts[i] & SR_CONF_MASK) == unsigned(key->id()))
{
g_variant_unref(gvar_opts);
return true;
@@ -498,18 +549,18 @@ bool Configurable::config_check(const ConfigKey *key,
}
Device::Device(struct sr_dev_inst *structure) :
- Configurable(sr_dev_inst_driver_get(structure), structure, NULL),
+ Configurable(sr_dev_inst_driver_get(structure), structure, nullptr),
_structure(structure)
{
for (GSList *entry = sr_dev_inst_channels_get(structure); entry; entry = entry->next)
{
- auto channel = (struct sr_channel *) entry->data;
+ auto *const channel = static_cast(entry->data);
_channels[channel] = new Channel(channel);
}
for (GSList *entry = sr_dev_inst_channel_groups_get(structure); entry; entry = entry->next)
{
- auto group = (struct sr_channel_group *) entry->data;
+ auto *const group = static_cast(entry->data);
_channel_groups[group->name] = new ChannelGroup(this, group);
}
}
@@ -522,27 +573,27 @@ Device::~Device()
delete entry.second;
}
-string Device::vendor()
+string Device::vendor() const
{
return valid_string(sr_dev_inst_vendor_get(_structure));
}
-string Device::model()
+string Device::model() const
{
return valid_string(sr_dev_inst_model_get(_structure));
}
-string Device::version()
+string Device::version() const
{
return valid_string(sr_dev_inst_version_get(_structure));
}
-string Device::serial_number()
+string Device::serial_number() const
{
return valid_string(sr_dev_inst_sernum_get(_structure));
}
-string Device::connection_id()
+string Device::connection_id() const
{
return valid_string(sr_dev_inst_connid_get(_structure));
}
@@ -550,16 +601,16 @@ string Device::connection_id()
vector> Device::channels()
{
vector> result;
- for (auto channel = sr_dev_inst_channels_get(_structure); channel; channel = channel->next)
- result.push_back(
- _channels[(struct sr_channel *) channel->data]->get_shared_pointer(
- get_shared_from_this()));
+ for (auto channel = sr_dev_inst_channels_get(_structure); channel; channel = channel->next) {
+ auto *const ch = static_cast(channel->data);
+ result.push_back(_channels[ch]->share_owned_by(get_shared_from_this()));
+ }
return result;
}
shared_ptr Device::get_channel(struct sr_channel *ptr)
{
- return _channels[ptr]->get_shared_pointer(get_shared_from_this());
+ return _channels[ptr]->share_owned_by(get_shared_from_this());
}
map>
@@ -570,7 +621,7 @@ Device::channel_groups()
{
auto name = entry.first;
auto channel_group = entry.second;
- result[name] = channel_group->get_shared_pointer(get_shared_from_this());
+ result[name] = channel_group->share_owned_by(get_shared_from_this());
}
return result;
}
@@ -589,7 +640,7 @@ HardwareDevice::HardwareDevice(shared_ptr driver,
struct sr_dev_inst *structure) :
UserOwned(structure),
Device(structure),
- _driver(driver)
+ _driver(move(driver))
{
}
@@ -628,11 +679,10 @@ shared_ptr UserDevice::add_channel(unsigned int index,
{
check(sr_dev_inst_channel_add(Device::_structure,
index, type->id(), name.c_str()));
- struct sr_channel *structure = (struct sr_channel *)
- g_slist_last(sr_dev_inst_channels_get(Device::_structure))->data;
- Channel *channel = new Channel(structure);
- _channels[structure] = channel;
- return get_channel(structure);
+ GSList *const last = g_slist_last(sr_dev_inst_channels_get(Device::_structure));
+ auto *const ch = static_cast(last->data);
+ _channels[ch] = new Channel(ch);
+ return get_channel(ch);
}
Channel::Channel(struct sr_channel *structure) :
@@ -645,7 +695,7 @@ Channel::~Channel()
{
}
-string Channel::name()
+string Channel::name() const
{
return valid_string(_structure->name);
}
@@ -655,12 +705,12 @@ void Channel::set_name(string name)
check(sr_dev_channel_name_set(_structure, name.c_str()));
}
-const ChannelType *Channel::type()
+const ChannelType *Channel::type() const
{
return ChannelType::get(_structure->type);
}
-bool Channel::enabled()
+bool Channel::enabled() const
{
return _structure->enabled;
}
@@ -670,7 +720,7 @@ void Channel::set_enabled(bool value)
check(sr_dev_channel_enable(_structure, value));
}
-unsigned int Channel::index()
+unsigned int Channel::index() const
{
return _structure->index;
}
@@ -680,15 +730,17 @@ ChannelGroup::ChannelGroup(Device *device,
ParentOwned(structure),
Configurable(sr_dev_inst_driver_get(device->_structure), device->_structure, structure)
{
- for (GSList *entry = structure->channels; entry; entry = entry->next)
- _channels.push_back(device->_channels[(struct sr_channel *)entry->data]);
+ for (GSList *entry = structure->channels; entry; entry = entry->next) {
+ auto *const ch = static_cast(entry->data);
+ _channels.push_back(device->_channels[ch]);
+ }
}
ChannelGroup::~ChannelGroup()
{
}
-string ChannelGroup::name()
+string ChannelGroup::name() const
{
return valid_string(_structure->name);
}
@@ -697,17 +749,17 @@ vector> ChannelGroup::channels()
{
vector> result;
for (auto channel : _channels)
- result.push_back(channel->get_shared_pointer(_parent));
+ result.push_back(channel->share_owned_by(_parent));
return result;
}
Trigger::Trigger(shared_ptr context, string name) :
UserOwned(sr_trigger_new(name.c_str())),
- _context(context)
+ _context(move(context))
{
for (auto stage = _structure->stages; stage; stage = stage->next)
_stages.push_back(
- new TriggerStage((struct sr_trigger_stage *) stage->data));
+ new TriggerStage(static_cast(stage->data)));
}
Trigger::~Trigger()
@@ -718,7 +770,7 @@ Trigger::~Trigger()
sr_trigger_free(_structure);
}
-string Trigger::name()
+string Trigger::name() const
{
return _structure->name;
}
@@ -727,7 +779,7 @@ vector> Trigger::stages()
{
vector> result;
for (auto stage : _stages)
- result.push_back(stage->get_shared_pointer(this));
+ result.push_back(stage->share_owned_by(shared_from_this()));
return result;
}
@@ -735,7 +787,7 @@ shared_ptr Trigger::add_stage()
{
auto stage = new TriggerStage(sr_trigger_stage_add(_structure));
_stages.push_back(stage);
- return stage->get_shared_pointer(this);
+ return stage->share_owned_by(shared_from_this());
}
TriggerStage::TriggerStage(struct sr_trigger_stage *structure) :
@@ -749,7 +801,7 @@ TriggerStage::~TriggerStage()
delete match;
}
-int TriggerStage::number()
+int TriggerStage::number() const
{
return _structure->stage;
}
@@ -758,7 +810,7 @@ vector> TriggerStage::matches()
{
vector> result;
for (auto match : _matches)
- result.push_back(match->get_shared_pointer(this));
+ result.push_back(match->share_owned_by(shared_from_this()));
return result;
}
@@ -767,21 +819,22 @@ void TriggerStage::add_match(shared_ptr channel,
{
check(sr_trigger_match_add(_structure,
channel->_structure, type->id(), value));
+ GSList *const last = g_slist_last(_structure->matches);
_matches.push_back(new TriggerMatch(
- (struct sr_trigger_match *) g_slist_last(
- _structure->matches)->data, channel));
+ static_cast(last->data),
+ move(channel)));
}
void TriggerStage::add_match(shared_ptr channel,
const TriggerMatchType *type)
{
- add_match(channel, type, NAN);
+ add_match(move(channel), type, NAN);
}
TriggerMatch::TriggerMatch(struct sr_trigger_match *structure,
shared_ptr channel) :
ParentOwned(structure),
- _channel(channel)
+ _channel(move(channel))
{
}
@@ -794,19 +847,19 @@ shared_ptr TriggerMatch::channel()
return _channel;
}
-const TriggerMatchType *TriggerMatch::type()
+const TriggerMatchType *TriggerMatch::type() const
{
return TriggerMatchType::get(_structure->match);
}
-float TriggerMatch::value()
+float TriggerMatch::value() const
{
return _structure->value;
}
DatafeedCallbackData::DatafeedCallbackData(Session *session,
DatafeedCallbackFunction callback) :
- _callback(callback),
+ _callback(move(callback)),
_session(session)
{
}
@@ -816,56 +869,7 @@ void DatafeedCallbackData::run(const struct sr_dev_inst *sdi,
{
auto device = _session->get_device(sdi);
auto packet = shared_ptr(new Packet(device, pkt), Packet::Deleter());
- _callback(device, packet);
-}
-
-SourceCallbackData::SourceCallbackData(shared_ptr source) :
- _source(source)
-{
-}
-
-bool SourceCallbackData::run(int revents)
-{
- return _source->_callback((Glib::IOCondition) revents);
-}
-
-shared_ptr EventSource::create(int fd, Glib::IOCondition events,
- int timeout, SourceCallbackFunction callback)
-{
- auto result = new EventSource(timeout, callback);
- result->_type = EventSource::SOURCE_FD;
- result->_fd = fd;
- result->_events = events;
- return shared_ptr(result, EventSource::Deleter());
-}
-
-shared_ptr EventSource::create(Glib::PollFD pollfd, int timeout,
- SourceCallbackFunction callback)
-{
- auto result = new EventSource(timeout, callback);
- result->_type = EventSource::SOURCE_POLLFD;
- result->_pollfd = pollfd;
- return shared_ptr(result, EventSource::Deleter());
-}
-
-shared_ptr EventSource::create(Glib::RefPtr channel,
- Glib::IOCondition events, int timeout, SourceCallbackFunction callback)
-{
- auto result = new EventSource(timeout, callback);
- result->_type = EventSource::SOURCE_IOCHANNEL;
- result->_channel = channel;
- result->_events = events;
- return shared_ptr(result, EventSource::Deleter());
-}
-
-EventSource::EventSource(int timeout, SourceCallbackFunction callback) :
- _timeout(timeout),
- _callback(callback)
-{
-}
-
-EventSource::~EventSource()
-{
+ _callback(move(device), move(packet));
}
SessionDevice::SessionDevice(struct sr_dev_inst *structure) :
@@ -885,25 +889,22 @@ shared_ptr SessionDevice::get_shared_from_this()
Session::Session(shared_ptr context) :
UserOwned(_structure),
- _context(context),
- _saving(false)
+ _context(move(context))
{
- check(sr_session_new(context->_structure, &_structure));
+ check(sr_session_new(_context->_structure, &_structure));
_context->_session = this;
}
Session::Session(shared_ptr context, string filename) :
UserOwned(_structure),
- _context(context),
- _filename(filename),
- _saving(false)
+ _context(move(context)),
+ _filename(move(filename))
{
- check(sr_session_load(context->_structure, filename.c_str(), &_structure));
+ check(sr_session_load(_context->_structure, _filename.c_str(), &_structure));
GSList *dev_list;
check(sr_session_dev_list(_structure, &dev_list));
- for (GSList *dev = dev_list; dev; dev = dev->next)
- {
- auto sdi = (struct sr_dev_inst *) dev->data;
+ for (GSList *dev = dev_list; dev; dev = dev->next) {
+ auto *const sdi = static_cast(dev->data);
_owned_devices[sdi] = new SessionDevice(sdi);
}
_context->_session = this;
@@ -916,9 +917,6 @@ Session::~Session()
for (auto callback : _datafeed_callbacks)
delete callback;
- for (auto entry : _source_callbacks)
- delete entry.second;
-
for (auto entry : _owned_devices)
delete entry.second;
}
@@ -927,7 +925,7 @@ shared_ptr Session::get_device(const struct sr_dev_inst *sdi)
{
if (_owned_devices.count(sdi))
return static_pointer_cast(
- _owned_devices[sdi]->get_shared_pointer(this));
+ _owned_devices[sdi]->share_owned_by(shared_from_this()));
else if (_other_devices.count(sdi))
return _other_devices[sdi];
else
@@ -936,8 +934,9 @@ shared_ptr Session::get_device(const struct sr_dev_inst *sdi)
void Session::add_device(shared_ptr device)
{
- check(sr_session_dev_add(_structure, device->_structure));
- _other_devices[device->_structure] = device;
+ const auto dev_struct = device->_structure;
+ check(sr_session_dev_add(_structure, dev_struct));
+ _other_devices[dev_struct] = move(device);
}
vector> Session::devices()
@@ -945,9 +944,8 @@ vector> Session::devices()
GSList *dev_list;
check(sr_session_dev_list(_structure, &dev_list));
vector> result;
- for (GSList *dev = dev_list; dev; dev = dev->next)
- {
- auto sdi = (struct sr_dev_inst *) dev->data;
+ for (GSList *dev = dev_list; dev; dev = dev->next) {
+ auto *const sdi = static_cast(dev->data);
result.push_back(get_device(sdi));
}
return result;
@@ -974,109 +972,47 @@ void Session::stop()
check(sr_session_stop(_structure));
}
-void Session::begin_save(string filename)
+bool Session::is_running() const
{
- _saving = true;
- _save_initialized = false;
- _save_filename = filename;
- _save_samplerate = 0;
+ const int ret = sr_session_is_running(_structure);
+ if (ret < 0)
+ throw Error{ret};
+ return (ret != 0);
}
-void Session::append(shared_ptr packet)
+static void session_stopped_callback(void *data) noexcept
{
- if (!_saving)
- throw Error(SR_ERR);
-
- switch (packet->_structure->type)
- {
- case SR_DF_META:
- {
- auto meta = (const struct sr_datafeed_meta *)
- packet->_structure->payload;
-
- for (auto l = meta->config; l; l = l->next)
- {
- auto config = (struct sr_config *) l->data;
- if (config->key == SR_CONF_SAMPLERATE)
- _save_samplerate = g_variant_get_uint64(config->data);
- }
-
- break;
- }
- case SR_DF_LOGIC:
- {
- if (_save_samplerate == 0)
- {
- GVariant *samplerate;
-
- check(sr_config_get(sr_dev_inst_driver_get(packet->_device->_structure),
- packet->_device->_structure, NULL, SR_CONF_SAMPLERATE,
- &samplerate));
-
- _save_samplerate = g_variant_get_uint64(samplerate);
-
- g_variant_unref(samplerate);
- }
-
- if (!_save_initialized)
- {
- vector> save_channels;
-
- for (auto channel : packet->_device->channels())
- if (channel->_structure->enabled &&
- channel->_structure->type == SR_CHANNEL_LOGIC)
- save_channels.push_back(channel);
-
- auto channels = g_new(char *, save_channels.size());
-
- int i = 0;
- for (auto channel : save_channels)
- channels[i++] = channel->_structure->name;
- channels[i] = NULL;
-
- int ret = sr_session_save_init(_structure, _save_filename.c_str(),
- _save_samplerate, channels);
-
- g_free(channels);
-
- if (ret != SR_OK)
- throw Error(ret);
-
- _save_initialized = true;
- }
-
- auto logic = (const struct sr_datafeed_logic *)
- packet->_structure->payload;
-
- check(sr_session_append(_structure, _save_filename.c_str(),
- (uint8_t *) logic->data, logic->unitsize,
- logic->length / logic->unitsize));
- }
- }
+ auto *const callback = static_cast(data);
+ (*callback)();
}
-void Session::append(void *data, size_t length, unsigned int unit_size)
+void Session::set_stopped_callback(SessionStoppedCallback callback)
{
- check(sr_session_append(_structure, _save_filename.c_str(),
- (uint8_t *) data, unit_size, length));
+ _stopped_callback = move(callback);
+ if (_stopped_callback)
+ check(sr_session_stopped_callback_set(_structure,
+ &session_stopped_callback, &_stopped_callback));
+ else
+ check(sr_session_stopped_callback_set(_structure,
+ nullptr, nullptr));
}
static void datafeed_callback(const struct sr_dev_inst *sdi,
- const struct sr_datafeed_packet *pkt, void *cb_data)
+ const struct sr_datafeed_packet *pkt, void *cb_data) noexcept
{
auto callback = static_cast(cb_data);
callback->run(sdi, pkt);
}
-
+
void Session::add_datafeed_callback(DatafeedCallbackFunction callback)
{
- auto cb_data = new DatafeedCallbackData(this, callback);
+ auto cb_data = new DatafeedCallbackData(this, move(callback));
check(sr_session_datafeed_callback_add(_structure,
datafeed_callback, cb_data));
_datafeed_callbacks.push_back(cb_data);
}
-void Session::remove_datafeed_callbacks(void)
+void Session::remove_datafeed_callbacks()
{
check(sr_session_datafeed_callback_remove_all(_structure));
for (auto callback : _datafeed_callbacks)
@@ -1084,66 +1020,6 @@ void Session::remove_datafeed_callbacks(void)
_datafeed_callbacks.clear();
}
-static int source_callback(int fd, int revents, void *cb_data)
-{
- (void) fd;
- auto callback = (SourceCallbackData *) cb_data;
- return callback->run(revents);
-}
-
-void Session::add_source(shared_ptr source)
-{
- if (_source_callbacks.count(source) == 1)
- throw Error(SR_ERR_ARG);
-
- auto cb_data = new SourceCallbackData(source);
-
- switch (source->_type)
- {
- case EventSource::SOURCE_FD:
- check(sr_session_source_add(_structure, source->_fd, source->_events,
- source->_timeout, source_callback, cb_data));
- break;
- case EventSource::SOURCE_POLLFD:
- check(sr_session_source_add_pollfd(_structure,
- source->_pollfd.gobj(), source->_timeout, source_callback,
- cb_data));
- break;
- case EventSource::SOURCE_IOCHANNEL:
- check(sr_session_source_add_channel(_structure,
- source->_channel->gobj(), source->_events, source->_timeout,
- source_callback, cb_data));
- break;
- }
-
- _source_callbacks[source] = cb_data;
-}
-
-void Session::remove_source(shared_ptr source)
-{
- if (_source_callbacks.count(source) == 0)
- throw Error(SR_ERR_ARG);
-
- switch (source->_type)
- {
- case EventSource::SOURCE_FD:
- check(sr_session_source_remove(_structure, source->_fd));
- break;
- case EventSource::SOURCE_POLLFD:
- check(sr_session_source_remove_pollfd(_structure,
- source->_pollfd.gobj()));
- break;
- case EventSource::SOURCE_IOCHANNEL:
- check(sr_session_source_remove_channel(_structure,
- source->_channel->gobj()));
- break;
- }
-
- delete _source_callbacks[source];
-
- _source_callbacks.erase(source);
-}
-
shared_ptr Session::trigger()
{
return _trigger;
@@ -1153,13 +1029,13 @@ void Session::set_trigger(shared_ptr trigger)
{
if (!trigger)
// Set NULL trigger, i.e. remove any trigger from the session.
- check(sr_session_trigger_set(_structure, NULL));
+ check(sr_session_trigger_set(_structure, nullptr));
else
check(sr_session_trigger_set(_structure, trigger->_structure));
- _trigger = trigger;
+ _trigger = move(trigger);
}
-string Session::filename()
+string Session::filename() const
{
return _filename;
}
@@ -1172,7 +1048,7 @@ shared_ptr Session::context()
Packet::Packet(shared_ptr device,
const struct sr_datafeed_packet *structure) :
UserOwned(structure),
- _device(device)
+ _device(move(device))
{
switch (structure->type)
{
@@ -1208,7 +1084,7 @@ Packet::~Packet()
delete _payload;
}
-const PacketType *Packet::type()
+const PacketType *Packet::type() const
{
return PacketType::get(_structure->type);
}
@@ -1216,7 +1092,7 @@ const PacketType *Packet::type()
shared_ptr Packet::payload()
{
if (_payload)
- return _payload->get_shared_pointer(this);
+ return _payload->share_owned_by(shared_from_this());
else
throw Error(SR_ERR_NA);
}
@@ -1239,18 +1115,18 @@ Header::~Header()
{
}
-shared_ptr Header::get_shared_pointer(Packet *_parent)
+shared_ptr Header::share_owned_by(shared_ptr _parent)
{
return static_pointer_cast(
- ParentOwned::get_shared_pointer(_parent));
+ ParentOwned::share_owned_by(_parent));
}
-int Header::feed_version()
+int Header::feed_version() const
{
return _structure->feed_version;
}
-Glib::TimeVal Header::start_time()
+Glib::TimeVal Header::start_time() const
{
return Glib::TimeVal(
_structure->starttime.tv_sec,
@@ -1267,18 +1143,17 @@ Meta::~Meta()
{
}
-shared_ptr Meta::get_shared_pointer(Packet *_parent)
+shared_ptr Meta::share_owned_by(shared_ptr _parent)
{
return static_pointer_cast(
- ParentOwned::get_shared_pointer(_parent));
+ ParentOwned::share_owned_by(_parent));
}
-map Meta::config()
+map Meta::config() const
{
map result;
- for (auto l = _structure->config; l; l = l->next)
- {
- auto config = (struct sr_config *) l->data;
+ for (auto l = _structure->config; l; l = l->next) {
+ auto *const config = static_cast(l->data);
result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data);
}
return result;
@@ -1294,10 +1169,10 @@ Logic::~Logic()
{
}
-shared_ptr Logic::get_shared_pointer(Packet *_parent)
+shared_ptr Logic::share_owned_by(shared_ptr _parent)
{
return static_pointer_cast(
- ParentOwned::get_shared_pointer(_parent));
+ ParentOwned::share_owned_by(_parent));
}
void *Logic::data_pointer()
@@ -1305,12 +1180,12 @@ void *Logic::data_pointer()
return _structure->data;
}
-size_t Logic::data_length()
+size_t Logic::data_length() const
{
return _structure->length;
}
-unsigned int Logic::unit_size()
+unsigned int Logic::unit_size() const
{
return _structure->unitsize;
}
@@ -1325,18 +1200,18 @@ Analog::~Analog()
{
}
-shared_ptr Analog::get_shared_pointer(Packet *_parent)
+shared_ptr Analog::share_owned_by(shared_ptr _parent)
{
return static_pointer_cast(
- ParentOwned::get_shared_pointer(_parent));
+ ParentOwned::share_owned_by(_parent));
}
-float *Analog::data_pointer()
+void *Analog::data_pointer()
{
return _structure->data;
}
-unsigned int Analog::num_samples()
+unsigned int Analog::num_samples() const
{
return _structure->num_samples;
}
@@ -1344,25 +1219,26 @@ unsigned int Analog::num_samples()
vector> Analog::channels()
{
vector> result;
- for (auto l = _structure->channels; l; l = l->next)
- result.push_back(_parent->_device->get_channel(
- (struct sr_channel *)l->data));
+ for (auto l = _structure->meaning->channels; l; l = l->next) {
+ auto *const ch = static_cast(l->data);
+ result.push_back(_parent->_device->get_channel(ch));
+ }
return result;
}
-const Quantity *Analog::mq()
+const Quantity *Analog::mq() const
{
- return Quantity::get(_structure->mq);
+ return Quantity::get(_structure->meaning->mq);
}
-const Unit *Analog::unit()
+const Unit *Analog::unit() const
{
- return Unit::get(_structure->unit);
+ return Unit::get(_structure->meaning->unit);
}
-vector Analog::mq_flags()
+vector Analog::mq_flags() const
{
- return QuantityFlag::flags_from_mask(_structure->mqflags);
+ return QuantityFlag::flags_from_mask(_structure->meaning->mqflags);
}
InputFormat::InputFormat(const struct sr_input_module *structure) :
@@ -1374,17 +1250,17 @@ InputFormat::~InputFormat()
{
}
-string InputFormat::name()
+string InputFormat::name() const
{
return valid_string(sr_input_id_get(_structure));
}
-string InputFormat::description()
+string InputFormat::description() const
{
return valid_string(sr_input_description_get(_structure));
}
-vector InputFormat::extensions()
+vector InputFormat::extensions() const
{
vector exts;
for (const char *const *e = sr_input_extensions_get(_structure);
@@ -1409,18 +1285,17 @@ map> InputFormat::options()
}
shared_ptr InputFormat::create_input(
- map options)
+ const map &options)
{
auto input = sr_input_new(_structure, map_to_hash_variant(options));
if (!input)
throw Error(SR_ERR_ARG);
- return shared_ptr(
- new Input(_parent->shared_from_this(), input), Input::Deleter());
+ return shared_ptr(new Input(_parent, input), Input::Deleter());
}
Input::Input(shared_ptr context, const struct sr_input *structure) :
UserOwned(structure),
- _context(context),
+ _context(move(context)),
_device(nullptr)
{
}
@@ -1435,12 +1310,12 @@ shared_ptr Input::device()
_device = new InputDevice(shared_from_this(), sdi);
}
- return _device->get_shared_pointer(shared_from_this());
+ return _device->share_owned_by(shared_from_this());
}
void Input::send(void *data, size_t length)
{
- auto gstr = g_string_new_len((gchar *)data, length);
+ auto gstr = g_string_new_len(static_cast(data), length);
auto ret = sr_input_send(_structure, gstr);
g_string_free(gstr, false);
check(ret);
@@ -1462,7 +1337,7 @@ InputDevice::InputDevice(shared_ptr input,
struct sr_dev_inst *structure) :
ParentOwned(structure),
Device(structure),
- _input(input)
+ _input(move(input))
{
}
@@ -1478,7 +1353,7 @@ shared_ptr InputDevice::get_shared_from_this()
Option::Option(const struct sr_option *structure,
shared_ptr structure_array) :
UserOwned(structure),
- _structure_array(structure_array)
+ _structure_array(move(structure_array))
{
}
@@ -1486,31 +1361,33 @@ Option::~Option()
{
}
-string Option::id()
+string Option::id() const
{
return valid_string(_structure->id);
}
-string Option::name()
+string Option::name() const
{
return valid_string(_structure->name);
}
-string Option::description()
+string Option::description() const
{
return valid_string(_structure->desc);
}
-Glib::VariantBase Option::default_value()
+Glib::VariantBase Option::default_value() const
{
return Glib::VariantBase(_structure->def, true);
}
-vector Option::values()
+vector Option::values() const
{
vector result;
- for (auto l = _structure->values; l; l = l->next)
- result.push_back(Glib::VariantBase((GVariant *) l->data, true));
+ for (auto l = _structure->values; l; l = l->next) {
+ auto *const var = static_cast(l->data);
+ result.push_back(Glib::VariantBase(var, true));
+ }
return result;
}
@@ -1523,17 +1400,17 @@ OutputFormat::~OutputFormat()
{
}
-string OutputFormat::name()
+string OutputFormat::name() const
{
return valid_string(sr_output_id_get(_structure));
}
-string OutputFormat::description()
+string OutputFormat::description() const
{
return valid_string(sr_output_description_get(_structure));
}
-vector OutputFormat::extensions()
+vector OutputFormat::extensions() const
{
vector exts;
for (const char *const *e = sr_output_extensions_get(_structure);
@@ -1558,37 +1435,42 @@ map> OutputFormat::options()
}
shared_ptr