X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=c5ce63864359eeb08fe6a956debbc001dd2f3a21;hb=a98729a742ebbb9df9dbb9ce8aae1cc4c3f1e00d;hp=f165128754ec0357b2ce1788caf58238bd0cd142;hpb=0ab8e5d22bbb82674a825125c4cb23b8f3b78858;p=libsigrok.git diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index f1651287..c5ce6386 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -47,9 +47,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()); @@ -116,30 +116,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 +157,11 @@ string Context::lib_version() map> Context::drivers() { map> result; - for (auto entry: _drivers) + for (const auto &entry: _drivers) { - auto name = entry.first; - auto driver = entry.second; - result[name] = driver->get_shared_pointer(this); + const auto &name = entry.first; + const auto &driver = entry.second; + result.emplace(name, driver->share_owned_by(shared_from_this())); } return result; } @@ -167,11 +169,11 @@ map> Context::drivers() map> Context::input_formats() { map> result; - for (auto entry: _input_formats) + for (const auto &entry: _input_formats) { - auto name = entry.first; - auto input_format = entry.second; - result[name] = input_format->get_shared_pointer(this); + const auto &name = entry.first; + const auto &input_format = entry.second; + result.emplace(name, input_format->share_owned_by(shared_from_this())); } return result; } @@ -179,27 +181,21 @@ map> Context::input_formats() map> Context::output_formats() { map> result; - for (auto entry: _output_formats) + for (const auto &entry: _output_formats) { - auto name = entry.first; - auto output_format = entry.second; - result[name] = output_format->get_shared_pointer(this); + 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)); } -const LogLevel *Context::log_level() +const LogLevel *Context::log_level() const { return LogLevel::get(sr_log_loglevel_get()); } @@ -256,15 +252,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 +273,28 @@ 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) { auto meta = g_new0(struct sr_datafeed_meta, 1); - for (auto input : config) + for (const auto &input : config) { - auto key = input.first; - auto value = input.second; - auto output = g_new(struct sr_config, 1); + 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,7 +307,7 @@ 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( @@ -322,7 +320,7 @@ shared_ptr Context::create_analog_packet( 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()); @@ -332,19 +330,21 @@ shared_ptr Context::create_analog_packet( 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::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 +352,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,11 +365,12 @@ 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) +map Context::serials(shared_ptr driver) const { GSList *serial_list = sr_serial_list(driver ? driver->_structure : nullptr); map serials; @@ -384,8 +386,8 @@ map Context::serials(shared_ptr driver) } Driver::Driver(struct sr_dev_driver *structure) : - ParentOwned(structure), Configurable(structure, nullptr, nullptr), + _structure(structure), _initialized(false) { } @@ -394,12 +396,12 @@ 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); } @@ -416,13 +418,13 @@ vector> Driver::scan( /* Translate scan options to GSList of struct sr_config pointers. */ GSList *option_list = nullptr; - for (auto entry : options) + for (const auto &entry : options) { - auto key = entry.first; - auto value = entry.second; - auto config = g_new(struct sr_config, 1); + 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); } @@ -438,9 +440,10 @@ vector> Driver::scan( 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,7 +466,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( @@ -479,7 +482,7 @@ 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) +Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const { GVariant *data; check(sr_config_list( @@ -521,7 +524,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; @@ -554,46 +557,43 @@ Device::Device(struct sr_dev_inst *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); + 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); + 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() +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)); } @@ -603,25 +603,25 @@ 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) + for (const auto &entry: _channel_groups) { - auto name = entry.first; - auto channel_group = entry.second; - result[name] = channel_group->get_shared_pointer(get_shared_from_this()); + 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 +638,6 @@ void Device::close() HardwareDevice::HardwareDevice(shared_ptr driver, struct sr_dev_inst *structure) : - UserOwned(structure), Device(structure), _driver(move(driver)) { @@ -659,9 +658,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 +679,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)) { } @@ -695,7 +694,7 @@ Channel::~Channel() { } -string Channel::name() +string Channel::name() const { return valid_string(_structure->name); } @@ -705,12 +704,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; } @@ -720,19 +719,20 @@ 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; } -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()); } } @@ -740,37 +740,36 @@ ChannelGroup::~ChannelGroup() { } -string ChannelGroup::name() +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())), + _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); } -string Trigger::name() +string Trigger::name() const { return _structure->name; } @@ -778,30 +777,28 @@ string Trigger::name() 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() +int TriggerStage::number() const { return _structure->stage; } @@ -809,8 +806,8 @@ int TriggerStage::number() 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 +817,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 +831,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)) { } @@ -847,12 +845,12 @@ 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; } @@ -868,12 +866,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 +885,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 +893,7 @@ Session::Session(shared_ptr context) : } Session::Session(shared_ptr context, string filename) : - UserOwned(_structure), + _structure(nullptr), _context(move(context)), _filename(move(filename)) { @@ -905,7 +902,8 @@ 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; } @@ -913,19 +911,13 @@ Session::Session(shared_ptr context, string filename) : 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 @@ -1006,17 +998,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(); } @@ -1035,7 +1026,7 @@ void Session::set_trigger(shared_ptr trigger) _trigger = move(trigger); } -string Session::filename() +string Session::filename() const { return _filename; } @@ -1047,44 +1038,39 @@ 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 PacketType *Packet::type() const { return PacketType::get(_structure->type); } @@ -1092,7 +1078,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); } @@ -1106,8 +1092,8 @@ PacketPayload::~PacketPayload() } Header::Header(const struct sr_datafeed_header *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1115,18 +1101,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, @@ -1134,8 +1120,8 @@ Glib::TimeVal Header::start_time() } Meta::Meta(const struct sr_datafeed_meta *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1143,13 +1129,13 @@ 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) { @@ -1160,8 +1146,8 @@ map Meta::config() } Logic::Logic(const struct sr_datafeed_logic *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1169,10 +1155,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() @@ -1180,19 +1166,19 @@ 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; } Analog::Analog(const struct sr_datafeed_analog *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1200,10 +1186,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,7 +1197,7 @@ void *Analog::data_pointer() return _structure->data; } -unsigned int Analog::num_samples() +unsigned int Analog::num_samples() const { return _structure->num_samples; } @@ -1226,23 +1212,23 @@ vector> Analog::channels() return result; } -const Quantity *Analog::mq() +const Quantity *Analog::mq() const { return Quantity::get(_structure->meaning->mq); } -const Unit *Analog::unit() +const Unit *Analog::unit() const { return Unit::get(_structure->meaning->unit); } -vector Analog::mq_flags() +vector Analog::mq_flags() const { return QuantityFlag::flags_from_mask(_structure->meaning->mqflags); } InputFormat::InputFormat(const struct sr_input_module *structure) : - ParentOwned(structure) + _structure(structure) { } @@ -1250,17 +1236,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); @@ -1271,15 +1257,18 @@ vector InputFormat::extensions() map> InputFormat::options() { - const struct sr_option **options = sr_input_options_get(_structure); map> result; - if (options) + + if (const struct sr_option **options = sr_input_options_get(_structure)) { - auto option_array = shared_ptr( - options, sr_input_options_free); - for (int i = 0; options[i]; i++) - result[options[i]->id] = shared_ptr