X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=8316b9bd1944c7a3c37ab77f111f50f6a154fcf3;hp=960ac39bc0524a5f0ae7f59604f1fa24eeefcee6;hb=ea7a83a437e60168d396fac20ff1eda04a06d100;hpb=15bebf575da5fe1f587a052c3dc254eea1bf7659 diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index 960ac39b..8316b9bd 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -18,8 +18,9 @@ */ /* Needed for isascii(), as used in the GNU libstdc++ headers */ +/* Needed in strutil.c for POSIX.1-2008 locale functions */ #ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 600 +#define _XOPEN_SOURCE 700 #endif #include @@ -47,9 +48,9 @@ static inline const char *valid_string(const char *input) /** Helper function to convert between map and GHashTable */ static GHashTable *map_to_hash_variant(const map &input) { - auto output = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, + auto *const output = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, reinterpret_cast(&g_variant_unref)); - for (auto entry : input) + for (const auto &entry : input) g_hash_table_insert(output, g_strdup(entry.first.c_str()), entry.second.gobj_copy()); @@ -101,7 +102,7 @@ SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, return SR_OK; } -SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res, +SR_PRIV gssize ResourceReader::read_callback(const struct sr_resource *res, void *buf, size_t count, void *cb_data) noexcept { try { @@ -116,30 +117,32 @@ SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res, shared_ptr Context::create() { - return shared_ptr(new Context(), Context::Deleter()); + return shared_ptr{new Context{}, default_delete{}}; } Context::Context() : - UserOwned(_structure), + _structure(nullptr), _session(nullptr) { check(sr_init(&_structure)); - 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] = - new Driver(driver_list[i]); - const struct sr_input_module **input_list = sr_input_list(); - if (input_list) - for (int i = 0; input_list[i]; i++) - _input_formats[sr_input_id_get(input_list[i])] = - new InputFormat(input_list[i]); - const struct sr_output_module **output_list = sr_output_list(); - if (output_list) - for (int i = 0; output_list[i]; i++) - _output_formats[sr_output_id_get(output_list[i])] = - new OutputFormat(output_list[i]); + if (struct sr_dev_driver **driver_list = sr_driver_list(_structure)) + for (int i = 0; driver_list[i]; i++) { + unique_ptr driver {new Driver{driver_list[i]}}; + _drivers.emplace(driver->name(), move(driver)); + } + + if (const struct sr_input_module **input_list = sr_input_list()) + for (int i = 0; input_list[i]; i++) { + unique_ptr input {new InputFormat{input_list[i]}}; + _input_formats.emplace(input->name(), move(input)); + } + + if (const struct sr_output_module **output_list = sr_output_list()) + for (int i = 0; output_list[i]; i++) { + unique_ptr output {new OutputFormat{output_list[i]}}; + _output_formats.emplace(output->name(), move(output)); + } } string Context::package_version() @@ -155,11 +158,10 @@ string Context::lib_version() map> Context::drivers() { map> result; - for (auto entry: _drivers) - { - auto name = entry.first; - auto driver = entry.second; - result[name] = driver->get_shared_pointer(this); + for (const auto &entry: _drivers) { + const auto &name = entry.first; + const auto &driver = entry.second; + result.emplace(name, driver->share_owned_by(shared_from_this())); } return result; } @@ -167,35 +169,53 @@ map> Context::drivers() map> Context::input_formats() { map> result; - for (auto entry: _input_formats) - { - auto name = entry.first; - auto input_format = entry.second; - result[name] = input_format->get_shared_pointer(this); + for (const auto &entry: _input_formats) { + const auto &name = entry.first; + const auto &input_format = entry.second; + result.emplace(name, input_format->share_owned_by(shared_from_this())); } return result; } +shared_ptr Context::input_format_match(string filename) +{ + const struct sr_input *input; + const struct sr_input_module *imod; + int rc; + + /* + * Have the input module looked up for the specified file. + * Failed lookup (or "successful lookup" with an empty result) + * are non-fatal. Free the sr_input that was created by the + * lookup routine, but grab the input module kind and return an + * InputFormat instance to the application. This works because + * the application passes a filename, no input data got buffered + * in the sr_input that we release. + */ + input = NULL; + rc = sr_input_scan_file(filename.c_str(), &input); + if (rc != SR_OK) + return nullptr; + if (!input) + return nullptr; + imod = sr_input_module_get(input); + sr_input_free(input); + return shared_ptr{new InputFormat{imod}, default_delete{}}; +} + map> Context::output_formats() { map> result; - for (auto entry: _output_formats) - { - auto name = entry.first; - auto output_format = entry.second; - result[name] = output_format->get_shared_pointer(this); + for (const auto &entry: _output_formats) { + const auto &name = entry.first; + const auto &output_format = entry.second; + result.emplace(name, output_format->share_owned_by(shared_from_this())); } return result; } Context::~Context() { - for (auto entry : _drivers) - delete entry.second; - for (auto entry : _input_formats) - delete entry.second; - for (auto entry : _output_formats) - delete entry.second; check(sr_exit(_structure)); } @@ -217,12 +237,9 @@ static int call_log_callback(void *cb_data, int loglevel, auto *const callback = static_cast(cb_data); - try - { + try { (*callback)(LogLevel::get(loglevel), message.get()); - } - catch (Error e) - { + } catch (Error &e) { return e.result; } @@ -256,15 +273,16 @@ void Context::set_resource_reader(ResourceReader *reader) shared_ptr Context::create_session() { - return shared_ptr( - new Session(shared_from_this()), Session::Deleter()); + return shared_ptr{new Session{shared_from_this()}, + default_delete{}}; } shared_ptr Context::create_user_device( string vendor, string model, string version) { - return shared_ptr( - new UserDevice(vendor, model, version), UserDevice::Deleter()); + return shared_ptr{ + new UserDevice{move(vendor), move(model), move(version)}, + default_delete{}}; } shared_ptr Context::create_header_packet(Glib::TimeVal start_time) @@ -276,27 +294,27 @@ shared_ptr Context::create_header_packet(Glib::TimeVal start_time) 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()); + return shared_ptr{new Packet{nullptr, packet}, + default_delete{}}; } shared_ptr Context::create_meta_packet( - const map &config) + 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); + for (const auto &input : config) { + const auto &key = input.first; + const auto &value = input.second; + auto *const output = g_new(struct sr_config, 1); output->key = key->id(); - output->data = value.gobj(); - g_variant_ref(output->data); + output->data = value.gobj_copy(); 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()); + return shared_ptr{new Packet{nullptr, packet}, + default_delete{}}; } shared_ptr Context::create_logic_packet( @@ -309,42 +327,76 @@ shared_ptr Context::create_logic_packet( 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()); + return shared_ptr{new Packet{nullptr, packet}, default_delete{}}; } 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) + vector > channels, + const float *data_pointer, unsigned int num_samples, const Quantity *mq, + const Unit *unit, vector mqflags) { auto analog = g_new0(struct sr_datafeed_analog, 1); auto meaning = g_new0(struct sr_analog_meaning, 1); + auto encoding = g_new0(struct sr_analog_encoding, 1); + auto spec = g_new0(struct sr_analog_spec, 1); analog->meaning = meaning; - for (auto channel : channels) + for (const 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; + meaning->mqflags = static_cast(QuantityFlag::mask_from_flags(move(mqflags))); + + analog->encoding = encoding; + + encoding->unitsize = sizeof(float); + encoding->is_signed = TRUE; + encoding->is_float = TRUE; +#ifdef WORDS_BIGENDIAN + encoding->is_bigendian = TRUE; +#else + encoding->is_bigendian = FALSE; +#endif + encoding->digits = 0; + encoding->is_digits_decimal = FALSE; + encoding->scale.p = 1; + encoding->scale.q = 1; + encoding->offset.p = 0; + encoding->offset.q = 1; + + analog->spec = spec; + + spec->spec_digits = 0; + + analog->num_samples = num_samples; + analog->data = (float*)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()); + return shared_ptr{new Packet{nullptr, packet}, default_delete{}}; +} + +shared_ptr Context::create_end_packet() +{ + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_END; + return shared_ptr{new Packet{nullptr, packet}, + default_delete{}}; } shared_ptr Context::load_session(string filename) { - return shared_ptr( - new Session(shared_from_this(), move(filename)), Session::Deleter()); + return shared_ptr{ + new Session{shared_from_this(), move(filename)}, + default_delete{}}; } shared_ptr Context::create_trigger(string name) { - return shared_ptr( - new Trigger(shared_from_this(), move(name)), Trigger::Deleter()); + return shared_ptr{ + new Trigger{shared_from_this(), move(name)}, + default_delete{}}; } shared_ptr Context::open_file(string filename) @@ -352,8 +404,9 @@ shared_ptr Context::open_file(string filename) const struct sr_input *input; check(sr_input_scan_file(filename.c_str(), &input)); - return shared_ptr( - new Input(shared_from_this(), input), Input::Deleter()); + return shared_ptr{ + new Input{shared_from_this(), input}, + default_delete{}}; } shared_ptr Context::open_stream(string header) @@ -364,8 +417,9 @@ shared_ptr Context::open_stream(string header) auto ret = sr_input_scan_buffer(gstr, &input); g_string_free(gstr, true); check(ret); - return shared_ptr( - new Input(shared_from_this(), input), Input::Deleter()); + return shared_ptr{ + new Input{shared_from_this(), input}, + default_delete{}}; } map Context::serials(shared_ptr driver) const @@ -384,8 +438,8 @@ map Context::serials(shared_ptr driver) const } Driver::Driver(struct sr_dev_driver *structure) : - ParentOwned(structure), Configurable(structure, nullptr, nullptr), + _structure(structure), _initialized(false) { } @@ -404,25 +458,35 @@ string Driver::long_name() const return valid_string(_structure->longname); } +set Driver::scan_options() const +{ + GArray *opts = sr_driver_scan_options_list(_structure); + set result; + if (opts) { + for (guint i = 0; i < opts->len; i++) + result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i))); + g_array_free(opts, TRUE); + } + return result; +} + vector> Driver::scan( - const map &options) + map options) { /* Initialise the driver if not yet done. */ - if (!_initialized) - { + if (!_initialized) { check(sr_driver_init(_parent->_structure, _structure)); _initialized = true; } /* Translate scan options to GSList of struct sr_config pointers. */ GSList *option_list = nullptr; - for (auto entry : options) - { - auto key = entry.first; - auto value = entry.second; - auto config = g_new(struct sr_config, 1); + for (const auto &entry : options) { + const auto &key = entry.first; + const auto &value = entry.second; + auto *const config = g_new(struct sr_config, 1); config->key = key->id(); - config->data = value.gobj(); + config->data = const_cast(value.gobj()); option_list = g_slist_append(option_list, config); } @@ -435,12 +499,12 @@ vector> Driver::scan( /* Create device objects. */ vector> result; - for (GSList *device = device_list; device; device = device->next) - { + for (GSList *device = device_list; device; device = device->next) { auto *const sdi = static_cast(device->data); - result.push_back(shared_ptr( - new HardwareDevice(shared_from_this(), sdi), - HardwareDevice::Deleter())); + shared_ptr hwdev { + new HardwareDevice{shared_from_this(), sdi}, + default_delete{}}; + result.push_back(move(hwdev)); } /* Free GSList returned from scan. */ @@ -463,6 +527,22 @@ Configurable::~Configurable() { } +set Configurable::config_keys() const +{ + GArray *opts; + set result; + + opts = sr_dev_options(config_driver, config_sdi, config_channel_group); + + if (opts) { + for (guint i = 0; i < opts->len; i++) + result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i))); + g_array_free(opts, TRUE); + } + + return result; +} + Glib::VariantBase Configurable::config_get(const ConfigKey *key) const { GVariant *data; @@ -479,98 +559,57 @@ void Configurable::config_set(const ConfigKey *key, const Glib::VariantBase &val key->id(), const_cast(value.gobj()))); } -Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const +set Configurable::config_capabilities(const ConfigKey *key) const { - GVariant *data; - check(sr_config_list( - config_driver, config_sdi, config_channel_group, - key->id(), &data)); - return Glib::VariantContainerBase(data); -} - -map> Configurable::config_keys(const ConfigKey *key) -{ - GVariant *gvar_opts; - gsize num_opts; - const uint32_t *opts; - map> result; - - check(sr_config_list( - config_driver, config_sdi, config_channel_group, - key->id(), &gvar_opts)); - - opts = static_cast(g_variant_get_fixed_array( - gvar_opts, &num_opts, sizeof(uint32_t))); + int caps = sr_dev_config_capabilities_list(config_sdi, + config_channel_group, key->id()); - for (gsize i = 0; i < num_opts; i++) - { - auto key = ConfigKey::get(opts[i] & SR_CONF_MASK); - set capabilities; - if (opts[i] & SR_CONF_GET) - capabilities.insert(GET); - if (opts[i] & SR_CONF_SET) - capabilities.insert(SET); - if (opts[i] & SR_CONF_LIST) - capabilities.insert(LIST); - result[key] = capabilities; - } + set result; - g_variant_unref(gvar_opts); + for (auto cap: Capability::values()) + if (caps & cap->id()) + result.insert(cap); return result; } bool Configurable::config_check(const ConfigKey *key, - const ConfigKey *index_key) const + const Capability *capability) const { - GVariant *gvar_opts; - gsize num_opts; - const uint32_t *opts; - - if (sr_config_list(config_driver, config_sdi, config_channel_group, - index_key->id(), &gvar_opts) != SR_OK) - return false; - - 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) == unsigned(key->id())) - { - g_variant_unref(gvar_opts); - return true; - } - } + int caps = sr_dev_config_capabilities_list(config_sdi, + config_channel_group, key->id()); - g_variant_unref(gvar_opts); + return (caps & capability->id()); +} - return false; +Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const +{ + GVariant *data; + check(sr_config_list( + config_driver, config_sdi, config_channel_group, + key->id(), &data)); + return Glib::VariantContainerBase(data); } Device::Device(struct sr_dev_inst *structure) : 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 *const channel = static_cast(entry->data); - _channels[channel] = new Channel(channel); + for (GSList *entry = sr_dev_inst_channels_get(structure); entry; entry = entry->next) { + auto *const ch = static_cast(entry->data); + unique_ptr channel {new Channel{ch}}; + _channels.emplace(ch, move(channel)); } - for (GSList *entry = sr_dev_inst_channel_groups_get(structure); entry; entry = entry->next) - { - auto *const group = static_cast(entry->data); - _channel_groups[group->name] = new ChannelGroup(this, group); + for (GSList *entry = sr_dev_inst_channel_groups_get(structure); entry; entry = entry->next) { + auto *const cg = static_cast(entry->data); + unique_ptr group {new ChannelGroup{this, cg}}; + _channel_groups.emplace(group->name(), move(group)); } } Device::~Device() { - for (auto entry : _channels) - delete entry.second; - for (auto entry : _channel_groups) - delete entry.second; } string Device::vendor() const @@ -603,25 +642,24 @@ vector> Device::channels() vector> result; 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())); + 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> Device::channel_groups() { map> result; - for (auto entry: _channel_groups) - { - auto name = entry.first; - auto channel_group = entry.second; - result[name] = channel_group->get_shared_pointer(get_shared_from_this()); + for (const auto &entry: _channel_groups) { + const auto &name = entry.first; + const auto &channel_group = entry.second; + result.emplace(name, channel_group->share_owned_by(get_shared_from_this())); } return result; } @@ -638,7 +676,6 @@ void Device::close() HardwareDevice::HardwareDevice(shared_ptr driver, struct sr_dev_inst *structure) : - UserOwned(structure), Device(structure), _driver(move(driver)) { @@ -659,9 +696,8 @@ shared_ptr HardwareDevice::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) + Device(sr_dev_inst_user_new( + vendor.c_str(), model.c_str(), version.c_str())) { } @@ -681,12 +717,13 @@ shared_ptr UserDevice::add_channel(unsigned int index, 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); + unique_ptr channel {new Channel{ch}}; + _channels.emplace(ch, move(channel)); return get_channel(ch); } Channel::Channel(struct sr_channel *structure) : - ParentOwned(structure), + _structure(structure), _type(ChannelType::get(_structure->type)) { } @@ -725,14 +762,15 @@ unsigned int Channel::index() const return _structure->index; } -ChannelGroup::ChannelGroup(Device *device, +ChannelGroup::ChannelGroup(const Device *device, struct sr_channel_group *structure) : - ParentOwned(structure), Configurable(sr_dev_inst_driver_get(device->_structure), device->_structure, structure) { - for (GSList *entry = structure->channels; entry; entry = entry->next) { + for (GSList *entry = config_channel_group->channels; entry; entry = entry->next) { auto *const ch = static_cast(entry->data); - _channels.push_back(device->_channels[ch]); + /* Note: This relies on Device::_channels to keep the Channel + * objects around over the lifetime of the ChannelGroup. */ + _channels.push_back(device->_channels.find(ch)->second.get()); } } @@ -742,31 +780,30 @@ ChannelGroup::~ChannelGroup() string ChannelGroup::name() const { - return valid_string(_structure->name); + return valid_string(config_channel_group->name); } vector> ChannelGroup::channels() { vector> result; - for (auto channel : _channels) - result.push_back(channel->get_shared_pointer(_parent)); + for (const auto &channel : _channels) + result.push_back(channel->share_owned_by(_parent)); return result; } -Trigger::Trigger(shared_ptr context, string name) : - UserOwned(sr_trigger_new(name.c_str())), +Trigger::Trigger(shared_ptr context, string name) : + _structure(sr_trigger_new(name.c_str())), _context(move(context)) { - for (auto stage = _structure->stages; stage; stage = stage->next) - _stages.push_back( - new TriggerStage(static_cast(stage->data))); + for (auto *stage = _structure->stages; stage; stage = stage->next) { + unique_ptr ts {new TriggerStage{ + static_cast(stage->data)}}; + _stages.push_back(move(ts)); + } } Trigger::~Trigger() { - for (auto stage: _stages) - delete stage; - sr_trigger_free(_structure); } @@ -778,29 +815,27 @@ string Trigger::name() const vector> Trigger::stages() { vector> result; - for (auto stage : _stages) - result.push_back(stage->get_shared_pointer(this)); + for (const auto &stage : _stages) + result.push_back(stage->share_owned_by(shared_from_this())); return result; } shared_ptr Trigger::add_stage() { - auto stage = new TriggerStage(sr_trigger_stage_add(_structure)); - _stages.push_back(stage); - return stage->get_shared_pointer(this); + unique_ptr stage {new TriggerStage{sr_trigger_stage_add(_structure)}}; + _stages.push_back(move(stage)); + return _stages.back()->share_owned_by(shared_from_this()); } -TriggerStage::TriggerStage(struct sr_trigger_stage *structure) : - ParentOwned(structure) +TriggerStage::TriggerStage(struct sr_trigger_stage *structure) : + _structure(structure) { } TriggerStage::~TriggerStage() { - for (auto match : _matches) - delete match; } - + int TriggerStage::number() const { return _structure->stage; @@ -809,8 +844,8 @@ int TriggerStage::number() const vector> TriggerStage::matches() { vector> result; - for (auto match : _matches) - result.push_back(match->get_shared_pointer(this)); + for (const auto &match : _matches) + result.push_back(match->share_owned_by(shared_from_this())); return result; } @@ -820,9 +855,10 @@ 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( - static_cast(last->data), - move(channel))); + unique_ptr match {new TriggerMatch{ + static_cast(last->data), + move(channel)}}; + _matches.push_back(move(match)); } void TriggerStage::add_match(shared_ptr channel, @@ -833,7 +869,7 @@ void TriggerStage::add_match(shared_ptr channel, TriggerMatch::TriggerMatch(struct sr_trigger_match *structure, shared_ptr channel) : - ParentOwned(structure), + _structure(structure), _channel(move(channel)) { } @@ -868,12 +904,11 @@ void DatafeedCallbackData::run(const struct sr_dev_inst *sdi, const struct sr_datafeed_packet *pkt) { auto device = _session->get_device(sdi); - auto packet = shared_ptr(new Packet(device, pkt), Packet::Deleter()); + shared_ptr packet {new Packet{device, pkt}, default_delete{}}; _callback(move(device), move(packet)); } SessionDevice::SessionDevice(struct sr_dev_inst *structure) : - ParentOwned(structure), Device(structure) { } @@ -888,7 +923,7 @@ shared_ptr SessionDevice::get_shared_from_this() } Session::Session(shared_ptr context) : - UserOwned(_structure), + _structure(nullptr), _context(move(context)) { check(sr_session_new(_context->_structure, &_structure)); @@ -896,7 +931,7 @@ Session::Session(shared_ptr context) : } Session::Session(shared_ptr context, string filename) : - UserOwned(_structure), + _structure(nullptr), _context(move(context)), _filename(move(filename)) { @@ -905,27 +940,23 @@ Session::Session(shared_ptr context, string filename) : check(sr_session_dev_list(_structure, &dev_list)); for (GSList *dev = dev_list; dev; dev = dev->next) { auto *const sdi = static_cast(dev->data); - _owned_devices[sdi] = new SessionDevice(sdi); + unique_ptr device {new SessionDevice{sdi}}; + _owned_devices.emplace(sdi, move(device)); } _context->_session = this; + g_slist_free(dev_list); } Session::~Session() { check(sr_session_destroy(_structure)); - - for (auto callback : _datafeed_callbacks) - delete callback; - - 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)); + _owned_devices[sdi]->share_owned_by(shared_from_this())); else if (_other_devices.count(sdi)) return _other_devices[sdi]; else @@ -948,6 +979,7 @@ vector> Session::devices() auto *const sdi = static_cast(dev->data); result.push_back(get_device(sdi)); } + g_slist_free(dev_list); return result; } @@ -1006,17 +1038,16 @@ static void datafeed_callback(const struct sr_dev_inst *sdi, void Session::add_datafeed_callback(DatafeedCallbackFunction callback) { - auto cb_data = new DatafeedCallbackData(this, move(callback)); + unique_ptr cb_data + {new DatafeedCallbackData{this, move(callback)}}; check(sr_session_datafeed_callback_add(_structure, - datafeed_callback, cb_data)); - _datafeed_callbacks.push_back(cb_data); + &datafeed_callback, cb_data.get())); + _datafeed_callbacks.push_back(move(cb_data)); } void Session::remove_datafeed_callbacks() { check(sr_session_datafeed_callback_remove_all(_structure)); - for (auto callback : _datafeed_callbacks) - delete callback; _datafeed_callbacks.clear(); } @@ -1047,41 +1078,36 @@ shared_ptr Session::context() Packet::Packet(shared_ptr device, const struct sr_datafeed_packet *structure) : - UserOwned(structure), + _structure(structure), _device(move(device)) { switch (structure->type) { case SR_DF_HEADER: - _payload = new Header( + _payload.reset(new Header{ static_cast( - structure->payload)); + structure->payload)}); break; case SR_DF_META: - _payload = new Meta( + _payload.reset(new Meta{ static_cast( - structure->payload)); + structure->payload)}); break; case SR_DF_LOGIC: - _payload = new Logic( + _payload.reset(new Logic{ static_cast( - structure->payload)); + structure->payload)}); break; case SR_DF_ANALOG: - _payload = new Analog( + _payload.reset(new Analog{ static_cast( - structure->payload)); - break; - default: - _payload = nullptr; + structure->payload)}); break; } } Packet::~Packet() { - if (_payload) - delete _payload; } const PacketType *Packet::type() const @@ -1092,7 +1118,7 @@ const PacketType *Packet::type() const 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); } @@ -1106,8 +1132,8 @@ PacketPayload::~PacketPayload() } Header::Header(const struct sr_datafeed_header *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1115,10 +1141,10 @@ 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() const @@ -1134,8 +1160,8 @@ Glib::TimeVal Header::start_time() const } Meta::Meta(const struct sr_datafeed_meta *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1143,10 +1169,10 @@ 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() const @@ -1154,14 +1180,14 @@ map Meta::config() const map result; 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); + result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data, true); } return result; } Logic::Logic(const struct sr_datafeed_logic *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1169,10 +1195,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() @@ -1191,8 +1217,8 @@ unsigned int Logic::unit_size() const } Analog::Analog(const struct sr_datafeed_analog *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1200,10 +1226,10 @@ 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)); } void *Analog::data_pointer() @@ -1211,6 +1237,11 @@ void *Analog::data_pointer() return _structure->data; } +void Analog::get_data_as_float(float *dest) +{ + check(sr_analog_to_float(_structure, dest)); +} + unsigned int Analog::num_samples() const { return _structure->num_samples; @@ -1226,6 +1257,58 @@ vector> Analog::channels() return result; } +unsigned int Analog::unitsize() const +{ + return _structure->encoding->unitsize; +} + +bool Analog::is_signed() const +{ + return _structure->encoding->is_signed; +} + +bool Analog::is_float() const +{ + return _structure->encoding->is_float; +} + +bool Analog::is_bigendian() const +{ + return _structure->encoding->is_bigendian; +} + +int Analog::digits() const +{ + return _structure->encoding->digits; +} + +bool Analog::is_digits_decimal() const +{ + return _structure->encoding->is_digits_decimal; +} + +shared_ptr Analog::scale() +{ + unique_ptr scale; + scale.reset(new Rational(&(_structure->encoding->scale))); + + if (scale) + return scale->share_owned_by(shared_from_this()); + else + throw Error(SR_ERR_NA); +} + +shared_ptr Analog::offset() +{ + unique_ptr offset; + offset.reset(new Rational(&(_structure->encoding->offset))); + + if (offset) + return offset->share_owned_by(shared_from_this()); + else + throw Error(SR_ERR_NA); +} + const Quantity *Analog::mq() const { return Quantity::get(_structure->meaning->mq); @@ -1241,8 +1324,80 @@ vector Analog::mq_flags() const return QuantityFlag::flags_from_mask(_structure->meaning->mqflags); } +shared_ptr Analog::get_logic_via_threshold(float threshold, + uint8_t *data_ptr) const +{ + auto datafeed = g_new(struct sr_datafeed_logic, 1); + datafeed->length = num_samples(); + datafeed->unitsize = 1; + + if (data_ptr) + datafeed->data = data_ptr; + else + datafeed->data = g_malloc(datafeed->length); + + shared_ptr logic = + shared_ptr{new Logic{datafeed}, default_delete{}}; + + check(sr_a2l_threshold(_structure, threshold, + (uint8_t*)datafeed->data, datafeed->length)); + + return logic; +} + +shared_ptr Analog::get_logic_via_schmitt_trigger(float lo_thr, + float hi_thr, uint8_t *state, uint8_t *data_ptr) const +{ + auto datafeed = g_new(struct sr_datafeed_logic, 1); + datafeed->length = num_samples(); + datafeed->unitsize = 1; + + if (data_ptr) + datafeed->data = data_ptr; + else + datafeed->data = g_malloc(datafeed->length); + + shared_ptr logic = + shared_ptr{new Logic{datafeed}, default_delete{}}; + + check(sr_a2l_schmitt_trigger(_structure, lo_thr, hi_thr, state, + (uint8_t*)datafeed->data, datafeed->length)); + + return logic; +} + +Rational::Rational(const struct sr_rational *structure) : + _structure(structure) +{ +} + +Rational::~Rational() +{ +} + +shared_ptr Rational::share_owned_by(shared_ptr _parent) +{ + return static_pointer_cast( + ParentOwned::share_owned_by(_parent)); +} + +int64_t Rational::numerator() const +{ + return _structure->p; +} + +uint64_t Rational::denominator() const +{ + return _structure->q; +} + +float Rational::value() const +{ + return (float)(_structure->p) / (float)(_structure->q); +} + InputFormat::InputFormat(const struct sr_input_module *structure) : - ParentOwned(structure) + _structure(structure) { } @@ -1271,54 +1426,53 @@ vector InputFormat::extensions() const map> InputFormat::options() { - const struct sr_option **options = sr_input_options_get(_structure); map> result; - if (options) - { - auto option_array = shared_ptr( - options, sr_input_options_free); - for (int i = 0; options[i]; i++) - result[options[i]->id] = shared_ptr