X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=1b53d0a795968aa79c5a64ed0f9be90b38af3f5b;hb=15914cdb0fc6c4c4e0acd410dd58177d0aa17fd2;hp=549e07b0843d92be6a4cc4de2ae156b370821182;hpb=4c7c4194cbd1d172a8ea37206d6aff9a09c1fb91;p=libsigrok.git diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index 549e07b0..1b53d0a7 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -17,7 +17,13 @@ * along with this program. If not, see . */ -#include "libsigrok/libsigrok.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,78 @@ 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) +{ + 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) +{ + 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) { + 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,11 +120,11 @@ shared_ptr Context::create() Context::Context() : UserOwned(_structure), - _session(NULL) + _session(nullptr) { check(sr_init(&_structure)); - struct sr_dev_driver **driver_list = sr_driver_list(); + struct sr_dev_driver **driver_list = sr_driver_list(_structure); if (driver_list) for (int i = 0; driver_list[i]; i++) _drivers[driver_list[i]->name] = @@ -161,32 +208,16 @@ 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) -{ - check(sr_log_logdomain_set(value.c_str())); -} - 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); + const unique_ptr + message {g_strdup_vprintf(format, args), &g_free}; - 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 +229,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() { @@ -214,16 +258,91 @@ shared_ptr Context::create_session() new Session(shared_from_this()), Session::Deleter()); } +shared_ptr Context::create_user_device( + string vendor, string model, string version) +{ + return shared_ptr( + new UserDevice(vendor, model, version), UserDevice::Deleter()); +} + +shared_ptr Context::create_header_packet(Glib::TimeVal start_time) +{ + auto header = g_new(struct sr_datafeed_header, 1); + header->feed_version = 1; + header->starttime.tv_sec = start_time.tv_sec; + header->starttime.tv_usec = start_time.tv_usec; + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_HEADER; + packet->payload = header; + return shared_ptr(new Packet(nullptr, packet), Packet::Deleter()); +} + +shared_ptr Context::create_meta_packet( + const map &config) +{ + auto meta = g_new0(struct sr_datafeed_meta, 1); + for (auto input : config) + { + auto key = input.first; + auto value = input.second; + auto output = g_new(struct sr_config, 1); + output->key = key->id(); + output->data = value.gobj(); + g_variant_ref(output->data); + meta->config = g_slist_append(meta->config, output); + } + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_META; + packet->payload = meta; + return shared_ptr(new Packet(nullptr, packet), Packet::Deleter()); +} + +shared_ptr Context::create_logic_packet( + void *data_pointer, size_t data_length, unsigned int unit_size) +{ + auto logic = g_new(struct sr_datafeed_logic, 1); + logic->length = data_length; + logic->unitsize = unit_size; + logic->data = data_pointer; + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_LOGIC; + packet->payload = logic; + return shared_ptr(new Packet(nullptr, packet), Packet::Deleter()); +} + +shared_ptr Context::create_analog_packet( + const vector > &channels, + float *data_pointer, unsigned int num_samples, const Quantity *mq, + 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) + meaning->channels = g_slist_append(meaning->channels, channel->_structure); + analog->num_samples = num_samples; + 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; + packet->payload = analog; + return shared_ptr(new Packet(nullptr, packet), Packet::Deleter()); +} + 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) @@ -247,9 +366,24 @@ shared_ptr Context::open_stream(string header) new Input(shared_from_this(), input), Input::Deleter()); } +map Context::serials(shared_ptr driver) +{ + GSList *serial_list = sr_serial_list(driver ? driver->_structure : nullptr); + map serials; + + for (GSList *serial = serial_list; serial; serial = serial->next) { + auto *const port = static_cast(serial->data); + serials[string(port->name)] = string(port->description); + } + + 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) { } @@ -269,7 +403,7 @@ string Driver::long_name() } vector> Driver::scan( - map options) + const map &options) { /* Initialise the driver if not yet done. */ if (!_initialized) @@ -279,7 +413,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; @@ -301,7 +435,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())); @@ -336,11 +470,11 @@ 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) @@ -363,8 +497,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++) { @@ -395,12 +529,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) == key->id()) + if ((opts[i] & SR_CONF_MASK) == unsigned(key->id())) { g_variant_unref(gvar_opts); return true; @@ -413,18 +547,18 @@ bool Configurable::config_check(const ConfigKey *key, } Device::Device(struct sr_dev_inst *structure) : - Configurable(structure->driver, structure, NULL), + Configurable(sr_dev_inst_driver_get(structure), structure, nullptr), _structure(structure) { - for (GSList *entry = structure->channels; entry; entry = entry->next) + 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 = structure->channel_groups; entry; entry = entry->next) + 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); } } @@ -437,42 +571,38 @@ Device::~Device() delete entry.second; } -string Device::description() +string Device::vendor() { - ostringstream s; - - vector parts = - {vendor(), model(), version()}; - - for (string part : parts) - if (part.length() > 0) - s << part; + return valid_string(sr_dev_inst_vendor_get(_structure)); +} - return s.str(); +string Device::model() +{ + return valid_string(sr_dev_inst_model_get(_structure)); } -string Device::vendor() +string Device::version() { - return valid_string(_structure->vendor); + return valid_string(sr_dev_inst_version_get(_structure)); } -string Device::model() +string Device::serial_number() { - return valid_string(_structure->model); + return valid_string(sr_dev_inst_sernum_get(_structure)); } -string Device::version() +string Device::connection_id() { - return valid_string(_structure->version); + return valid_string(sr_dev_inst_connid_get(_structure)); } vector> Device::channels() { vector> result; - for (auto channel = _structure->channels; 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]->get_shared_pointer(get_shared_from_this())); + } return result; } @@ -508,7 +638,7 @@ HardwareDevice::HardwareDevice(shared_ptr driver, struct sr_dev_inst *structure) : UserOwned(structure), Device(structure), - _driver(driver) + _driver(move(driver)) { } @@ -526,6 +656,33 @@ shared_ptr HardwareDevice::driver() return _driver; } +UserDevice::UserDevice(string vendor, string model, string version) : + UserOwned(sr_dev_inst_user_new( + vendor.c_str(), model.c_str(), version.c_str())), + Device(UserOwned::_structure) +{ +} + +UserDevice::~UserDevice() +{ +} + +shared_ptr UserDevice::get_shared_from_this() +{ + return static_pointer_cast(shared_from_this()); +} + +shared_ptr UserDevice::add_channel(unsigned int index, + const ChannelType *type, string name) +{ + check(sr_dev_inst_channel_add(Device::_structure, + index, type->id(), name.c_str())); + 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) : ParentOwned(structure), _type(ChannelType::get(_structure->type)) @@ -543,8 +700,7 @@ string Channel::name() void Channel::set_name(string name) { - check(sr_dev_channel_name_set(_parent->_structure, - _structure->index, name.c_str())); + check(sr_dev_channel_name_set(_structure, name.c_str())); } const ChannelType *Channel::type() @@ -559,7 +715,7 @@ bool Channel::enabled() void Channel::set_enabled(bool value) { - check(sr_dev_channel_enable(_parent->_structure, _structure->index, value)); + check(sr_dev_channel_enable(_structure, value)); } unsigned int Channel::index() @@ -570,10 +726,12 @@ unsigned int Channel::index() ChannelGroup::ChannelGroup(Device *device, struct sr_channel_group *structure) : ParentOwned(structure), - Configurable(device->_structure->driver, device->_structure, 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() @@ -595,11 +753,11 @@ vector> ChannelGroup::channels() 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() @@ -659,21 +817,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)) { } @@ -698,7 +857,7 @@ float TriggerMatch::value() DatafeedCallbackData::DatafeedCallbackData(Session *session, DatafeedCallbackFunction callback) : - _callback(callback), + _callback(move(callback)), _session(session) { } @@ -706,58 +865,9 @@ DatafeedCallbackData::DatafeedCallbackData(Session *session, void DatafeedCallbackData::run(const struct sr_dev_inst *sdi, const struct sr_datafeed_packet *pkt) { - auto device = _session->_devices[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) : @@ -777,27 +887,23 @@ 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(&_structure)); + check(sr_session_new(_context->_structure, &_structure)); _context->_session = this; } Session::Session(shared_ptr context, string filename) : UserOwned(_structure), - _context(context), - _saving(false) + _context(move(context)), + _filename(move(filename)) { - check(sr_session_load(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; - auto device = new SessionDevice(sdi); - _devices[sdi] = shared_ptr(device, - SessionDevice::Deleter()); + 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; } @@ -809,14 +915,26 @@ Session::~Session() for (auto callback : _datafeed_callbacks) delete callback; - for (auto entry : _source_callbacks) + for (auto entry : _owned_devices) delete entry.second; } +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)); + else if (_other_devices.count(sdi)) + return _other_devices[sdi]; + else + throw Error(SR_ERR_BUG); +} + void Session::add_device(shared_ptr device) { - check(sr_session_dev_add(_structure, device->_structure)); - _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() @@ -824,17 +942,16 @@ 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; - result.push_back(_devices[sdi]); + for (GSList *dev = dev_list; dev; dev = dev->next) { + auto *const sdi = static_cast(dev->data); + result.push_back(get_device(sdi)); } return result; } void Session::remove_devices() { - _devices.clear(); + _other_devices.clear(); check(sr_session_dev_remove_all(_structure)); } @@ -853,91 +970,29 @@ 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) { - 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(packet->_device->_structure->driver, - 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, @@ -946,16 +1001,16 @@ static void datafeed_callback(const struct sr_dev_inst *sdi, 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) @@ -963,81 +1018,35 @@ 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) +shared_ptr Session::trigger() { - 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; + return _trigger; } -void Session::remove_source(shared_ptr source) +void Session::set_trigger(shared_ptr trigger) { - 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); + if (!trigger) + // Set NULL trigger, i.e. remove any trigger from the session. + check(sr_session_trigger_set(_structure, nullptr)); + else + check(sr_session_trigger_set(_structure, trigger->_structure)); + _trigger = move(trigger); } -shared_ptr Session::trigger() +string Session::filename() { - return _trigger; + return _filename; } -void Session::set_trigger(shared_ptr trigger) +shared_ptr Session::context() { - check(sr_session_trigger_set(_structure, trigger->_structure)); - _trigger = trigger; + return _context; } Packet::Packet(shared_ptr device, const struct sr_datafeed_packet *structure) : UserOwned(structure), - _device(device) + _device(move(device)) { switch (structure->type) { @@ -1141,9 +1150,8 @@ shared_ptr Meta::get_shared_pointer(Packet *_parent) map Meta::config() { 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; @@ -1196,7 +1204,7 @@ shared_ptr Analog::get_shared_pointer(Packet *_parent) ParentOwned::get_shared_pointer(_parent)); } -float *Analog::data_pointer() +void *Analog::data_pointer() { return _structure->data; } @@ -1209,25 +1217,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() { - return Quantity::get(_structure->mq); + return Quantity::get(_structure->meaning->mq); } const Unit *Analog::unit() { - return Unit::get(_structure->unit); + return Unit::get(_structure->meaning->unit); } vector Analog::mq_flags() { - return QuantityFlag::flags_from_mask(_structure->mqflags); + return QuantityFlag::flags_from_mask(_structure->meaning->mqflags); } InputFormat::InputFormat(const struct sr_input_module *structure) : @@ -1249,20 +1258,32 @@ string InputFormat::description() return valid_string(sr_input_description_get(_structure)); } +vector InputFormat::extensions() +{ + vector exts; + for (const char *const *e = sr_input_extensions_get(_structure); + e && *e; e++) + exts.push_back(*e); + return exts; +} + map> InputFormat::options() { const struct sr_option **options = sr_input_options_get(_structure); - auto option_array = shared_ptr( - options, sr_input_options_free); map> result; - for (int i = 0; options[i]; i++) - result[options[i]->id] = shared_ptr