X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bindings%2Fcxx%2Fclasses.cpp;h=5a977a86bf0fcf0d0856e615422f0e72c755c2af;hb=f17b45465500f1d1aad58479802018949004cce5;hp=a00f2967e45161e56b0d2df829cfa9c915ede926;hpb=d370545d6071690e7a8cc747db1134ced091e0de;p=libsigrok.git diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index a00f2967..5a977a86 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -39,20 +39,17 @@ 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(const map &input) { - auto output = g_hash_table_new_full( - g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); - for (auto entry : input) + auto *const output = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, + reinterpret_cast(&g_variant_unref)); + for (const auto &entry : input) g_hash_table_insert(output, g_strdup(entry.first.c_str()), entry.second.gobj_copy()); @@ -63,12 +60,12 @@ 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 { } @@ -77,7 +74,7 @@ ResourceReader::~ResourceReader() } SR_PRIV int ResourceReader::open_callback(struct sr_resource *res, - const char *name, void *cb_data) + const char *name, void *cb_data) noexcept { try { auto *const reader = static_cast(cb_data); @@ -90,7 +87,8 @@ SR_PRIV int ResourceReader::open_callback(struct sr_resource *res, return SR_OK; } -SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, void *cb_data) +SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, + void *cb_data) noexcept { try { auto *const reader = static_cast(cb_data); @@ -104,7 +102,7 @@ SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, void *cb_dat } SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res, - void *buf, size_t count, void *cb_data) + void *buf, size_t count, void *cb_data) noexcept { try { auto *const reader = static_cast(cb_data); @@ -122,26 +120,28 @@ shared_ptr Context::create() } Context::Context() : - UserOwned(_structure), - _session(NULL) + _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() @@ -157,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; } @@ -169,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; } @@ -181,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()); } @@ -211,22 +205,17 @@ void Context::set_log_level(const LogLevel *level) check(sr_log_loglevel_set(level->id())); } -static int call_log_callback(void *cb_data, int loglevel, const char *format, va_list args) +static int call_log_callback(void *cb_data, int loglevel, + const char *format, va_list args) noexcept { - 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) { @@ -290,14 +279,13 @@ 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); @@ -329,12 +317,12 @@ 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 = (sr_mq)mq->id(); - meaning->unit = (sr_unit)unit->id(); - meaning->mqflags = (sr_mqflag)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; @@ -375,23 +363,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), + _structure(structure), _initialized(false) { } @@ -400,12 +389,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); } @@ -421,14 +410,14 @@ vector> Driver::scan( } /* Translate scan options to GSList of struct sr_config pointers. */ - GSList *option_list = NULL; - for (auto entry : options) + GSList *option_list = nullptr; + 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); } @@ -443,7 +432,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())); @@ -469,7 +458,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( @@ -485,7 +474,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( @@ -505,8 +494,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++) { @@ -527,7 +516,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; @@ -537,12 +526,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; @@ -555,51 +544,48 @@ 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; - _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 group = (struct sr_channel_group *) 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)); } @@ -607,27 +593,27 @@ 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> 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; } @@ -644,7 +630,6 @@ void Device::close() HardwareDevice::HardwareDevice(shared_ptr driver, struct sr_dev_inst *structure) : - UserOwned(structure), Device(structure), _driver(move(driver)) { @@ -665,9 +650,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())) { } @@ -685,15 +669,15 @@ 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); + 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)) { } @@ -702,7 +686,7 @@ Channel::~Channel() { } -string Channel::name() +string Channel::name() const { return valid_string(_structure->name); } @@ -712,12 +696,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; } @@ -727,55 +711,57 @@ 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) - _channels.push_back(device->_channels[(struct sr_channel *)entry->data]); + for (GSList *entry = config_channel_group->channels; entry; entry = entry->next) { + auto *const ch = static_cast(entry->data); + /* 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()); + } } 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((struct sr_trigger_stage *) 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; } @@ -783,30 +769,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; } @@ -814,8 +798,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; } @@ -824,9 +808,11 @@ void TriggerStage::add_match(shared_ptr channel, { check(sr_trigger_match_add(_structure, channel->_structure, type->id(), value)); - _matches.push_back(new TriggerMatch( - (struct sr_trigger_match *) g_slist_last( - _structure->matches)->data, move(channel))); + GSList *const last = g_slist_last(_structure->matches); + unique_ptr match {new TriggerMatch{ + static_cast(last->data), + move(channel)}}; + _matches.push_back(move(match)); } void TriggerStage::add_match(shared_ptr channel, @@ -837,7 +823,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)) { } @@ -851,12 +837,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; } @@ -877,7 +863,6 @@ void DatafeedCallbackData::run(const struct sr_dev_inst *sdi, } SessionDevice::SessionDevice(struct sr_dev_inst *structure) : - ParentOwned(structure), Device(structure) { } @@ -892,7 +877,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)); @@ -900,17 +885,17 @@ Session::Session(shared_ptr context) : } Session::Session(shared_ptr context, string filename) : - UserOwned(_structure), + _structure(nullptr), _context(move(context)), _filename(move(filename)) { 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; - _owned_devices[sdi] = new SessionDevice(sdi); + for (GSList *dev = dev_list; dev; dev = dev->next) { + auto *const sdi = static_cast(dev->data); + unique_ptr device {new SessionDevice{sdi}}; + _owned_devices.emplace(sdi, move(device)); } _context->_session = this; } @@ -918,19 +903,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 @@ -949,9 +928,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; @@ -986,7 +964,7 @@ bool Session::is_running() const return (ret != 0); } -static void session_stopped_callback(void *data) +static void session_stopped_callback(void *data) noexcept { auto *const callback = static_cast(data); (*callback)(); @@ -1004,25 +982,24 @@ void Session::set_stopped_callback(SessionStoppedCallback callback) } 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, 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,13 +1012,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 = move(trigger); } -string Session::filename() +string Session::filename() const { return _filename; } @@ -1053,44 +1030,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); } @@ -1098,7 +1070,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); } @@ -1112,8 +1084,8 @@ PacketPayload::~PacketPayload() } Header::Header(const struct sr_datafeed_header *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1121,18 +1093,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, @@ -1140,8 +1112,8 @@ Glib::TimeVal Header::start_time() } Meta::Meta(const struct sr_datafeed_meta *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1149,26 +1121,25 @@ 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; } Logic::Logic(const struct sr_datafeed_logic *structure) : - ParentOwned(structure), - PacketPayload() + PacketPayload(), + _structure(structure) { } @@ -1176,10 +1147,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() @@ -1187,19 +1158,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) { } @@ -1207,10 +1178,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() @@ -1218,7 +1189,7 @@ void *Analog::data_pointer() return _structure->data; } -unsigned int Analog::num_samples() +unsigned int Analog::num_samples() const { return _structure->num_samples; } @@ -1226,29 +1197,30 @@ unsigned int Analog::num_samples() vector> Analog::channels() { vector> result; - for (auto l = _structure->meaning->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->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) { } @@ -1256,17 +1228,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); @@ -1296,14 +1268,12 @@ shared_ptr InputFormat::create_input( 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(move(context)), - _device(nullptr) + _structure(structure), + _context(move(context)) { } @@ -1314,15 +1284,15 @@ shared_ptr Input::device() auto sdi = sr_input_dev_inst_get(_structure); if (!sdi) throw Error(SR_ERR_NA); - _device = new InputDevice(shared_from_this(), sdi); + _device.reset(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); @@ -1335,14 +1305,11 @@ void Input::end() Input::~Input() { - if (_device) - delete _device; sr_input_free(_structure); } InputDevice::InputDevice(shared_ptr input, struct sr_dev_inst *structure) : - ParentOwned(structure), Device(structure), _input(move(input)) { @@ -1359,7 +1326,7 @@ shared_ptr InputDevice::get_shared_from_this() Option::Option(const struct sr_option *structure, shared_ptr structure_array) : - UserOwned(structure), + _structure(structure), _structure_array(move(structure_array)) { } @@ -1368,36 +1335,38 @@ 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; } OutputFormat::OutputFormat(const struct sr_output_module *structure) : - ParentOwned(structure) + _structure(structure) { } @@ -1405,17 +1374,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); @@ -1455,15 +1424,15 @@ shared_ptr OutputFormat::create_output(string filename, Output::Deleter()); } -bool OutputFormat::test_flag(const OutputFlag *flag) +bool OutputFormat::test_flag(const OutputFlag *flag) const { return sr_output_test_flag(_structure, flag->id()); } Output::Output(shared_ptr format, shared_ptr device, const map &options) : - UserOwned(sr_output_new(format->_structure, - map_to_hash_variant(options), device->_structure, NULL)), + _structure(sr_output_new(format->_structure, + map_to_hash_variant(options), device->_structure, nullptr)), _format(move(format)), _device(move(device)), _options(options) @@ -1472,7 +1441,7 @@ Output::Output(shared_ptr format, Output::Output(string filename, shared_ptr format, shared_ptr device, const map &options) : - UserOwned(sr_output_new(format->_structure, + _structure(sr_output_new(format->_structure, map_to_hash_variant(options), device->_structure, filename.c_str())), _format(move(format)), _device(move(device)),