}
/** 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<string, VariantBase> and GHashTable */
-static GHashTable *map_to_hash_variant(map<string, Glib::VariantBase> input)
+static GHashTable *map_to_hash_variant(const map<string, Glib::VariantBase> &input)
{
- auto output = g_hash_table_new_full(
- g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
+ auto output = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ reinterpret_cast<GDestroyNotify>(&g_variant_unref));
for (auto entry : input)
g_hash_table_insert(output,
g_strdup(entry.first.c_str()),
entry.second.gobj_copy());
- return output;
+ return output;
}
Error::Error(int result) : result(result)
{
}
-const char *Error::what() const throw()
+const char *Error::what() const noexcept
{
return sr_strerror(result);
}
-Error::~Error() throw()
+Error::~Error() noexcept
{
}
Context::Context() :
UserOwned(_structure),
- _session(NULL)
+ _session(nullptr)
{
check(sr_init(&_structure));
static int call_log_callback(void *cb_data, int loglevel, const char *format, va_list args)
{
- va_list args_copy;
- va_copy(args_copy, args);
- int length = vsnprintf(NULL, 0, format, args_copy);
- va_end(args_copy);
- char *buf = (char *) g_malloc(length + 1);
- vsprintf(buf, format, args);
- string message(buf, length);
- g_free(buf);
+ const unique_ptr<char, decltype(&g_free)>
+ message {g_strdup_vprintf(format, args), &g_free};
- LogCallbackFunction callback = *((LogCallbackFunction *) cb_data);
+ auto *const callback = static_cast<LogCallbackFunction *>(cb_data);
try
{
- callback(LogLevel::get(loglevel), message);
+ (*callback)(LogLevel::get(loglevel), message.get());
}
catch (Error e)
{
void Context::set_log_callback(LogCallbackFunction callback)
{
- _log_callback = callback;
+ _log_callback = move(callback);
check(sr_log_callback_set(call_log_callback, &_log_callback));
}
}
shared_ptr<Packet> Context::create_meta_packet(
- map<const ConfigKey *, Glib::VariantBase> config)
+ const map<const ConfigKey *, Glib::VariantBase> &config)
{
auto meta = g_new0(struct sr_datafeed_meta, 1);
for (auto input : config)
}
shared_ptr<Packet> Context::create_analog_packet(
- vector<shared_ptr<Channel> > channels,
+ const vector<shared_ptr<Channel> > &channels,
float *data_pointer, unsigned int num_samples, const Quantity *mq,
- const Unit *unit, vector<const QuantityFlag *> mqflags)
+ const Unit *unit, const vector<const QuantityFlag *> &mqflags)
{
auto analog = g_new0(struct sr_datafeed_analog, 1);
+ auto meaning = g_new0(struct sr_analog_meaning, 1);
+
+ analog->meaning = meaning;
+
for (auto channel : channels)
- analog->channels = g_slist_append(analog->channels, channel->_structure);
+ meaning->channels = g_slist_append(meaning->channels, channel->_structure);
analog->num_samples = num_samples;
- analog->mq = mq->id();
- analog->unit = unit->id();
- analog->mqflags = QuantityFlag::mask_from_flags(mqflags);
+ meaning->mq = static_cast<sr_mq>(mq->id());
+ meaning->unit = static_cast<sr_unit>(unit->id());
+ meaning->mqflags = static_cast<sr_mqflag>(QuantityFlag::mask_from_flags(mqflags));
analog->data = data_pointer;
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_ANALOG;
shared_ptr<Session> Context::load_session(string filename)
{
return shared_ptr<Session>(
- new Session(shared_from_this(), filename), Session::Deleter());
+ new Session(shared_from_this(), move(filename)), Session::Deleter());
}
shared_ptr<Trigger> Context::create_trigger(string name)
{
return shared_ptr<Trigger>(
- new Trigger(shared_from_this(), name), Trigger::Deleter());
+ new Trigger(shared_from_this(), move(name)), Trigger::Deleter());
}
shared_ptr<Input> Context::open_file(string filename)
map<string, string> Context::serials(shared_ptr<Driver> driver)
{
- GSList *serial_list = sr_serial_list(driver ? driver->_structure : NULL);
+ GSList *serial_list = sr_serial_list(driver ? driver->_structure : nullptr);
map<string, string> 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<sr_serial_port *>(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<GDestroyNotify>(&sr_serial_free));
return serials;
}
Driver::Driver(struct sr_dev_driver *structure) :
ParentOwned(structure),
- Configurable(structure, NULL, NULL),
+ Configurable(structure, nullptr, nullptr),
_initialized(false)
{
}
}
vector<shared_ptr<HardwareDevice>> Driver::scan(
- map<const ConfigKey *, Glib::VariantBase> options)
+ const map<const ConfigKey *, Glib::VariantBase> &options)
{
/* Initialise the driver if not yet done. */
if (!_initialized)
}
/* Translate scan options to GSList of struct sr_config pointers. */
- GSList *option_list = NULL;
+ GSList *option_list = nullptr;
for (auto entry : options)
{
auto key = entry.first;
vector<shared_ptr<HardwareDevice>> result;
for (GSList *device = device_list; device; device = device->next)
{
- auto sdi = (struct sr_dev_inst *) device->data;
+ auto *const sdi = static_cast<struct sr_dev_inst *>(device->data);
result.push_back(shared_ptr<HardwareDevice>(
new HardwareDevice(shared_from_this(), sdi),
HardwareDevice::Deleter()));
return Glib::VariantBase(data);
}
-void Configurable::config_set(const ConfigKey *key, Glib::VariantBase value)
+void Configurable::config_set(const ConfigKey *key, const Glib::VariantBase &value)
{
check(sr_config_set(
config_sdi, config_channel_group,
- key->id(), value.gobj()));
+ key->id(), const_cast<GVariant*>(value.gobj())));
}
Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
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<const uint32_t *>(g_variant_get_fixed_array(
+ gvar_opts, &num_opts, sizeof(uint32_t)));
for (gsize i = 0; i < num_opts; i++)
{
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<const uint32_t *>(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;
}
Device::Device(struct sr_dev_inst *structure) :
- Configurable(sr_dev_inst_driver_get(structure), structure, NULL),
+ Configurable(sr_dev_inst_driver_get(structure), structure, nullptr),
_structure(structure)
{
for (GSList *entry = sr_dev_inst_channels_get(structure); entry; entry = entry->next)
{
- auto channel = (struct sr_channel *) entry->data;
+ auto *const channel = static_cast<struct sr_channel *>(entry->data);
_channels[channel] = new Channel(channel);
}
for (GSList *entry = sr_dev_inst_channel_groups_get(structure); entry; entry = entry->next)
{
- auto group = (struct sr_channel_group *) entry->data;
+ auto *const group = static_cast<struct sr_channel_group *>(entry->data);
_channel_groups[group->name] = new ChannelGroup(this, group);
}
}
vector<shared_ptr<Channel>> Device::channels()
{
vector<shared_ptr<Channel>> 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<struct sr_channel *>(channel->data);
+ result.push_back(_channels[ch]->get_shared_pointer(get_shared_from_this()));
+ }
return result;
}
struct sr_dev_inst *structure) :
UserOwned(structure),
Device(structure),
- _driver(driver)
+ _driver(move(driver))
{
}
{
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<struct sr_channel *>(last->data);
+ _channels[ch] = new Channel(ch);
+ return get_channel(ch);
}
Channel::Channel(struct sr_channel *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 = structure->channels; entry; entry = entry->next) {
+ auto *const ch = static_cast<struct sr_channel *>(entry->data);
+ _channels.push_back(device->_channels[ch]);
+ }
}
ChannelGroup::~ChannelGroup()
Trigger::Trigger(shared_ptr<Context> context, string name) :
UserOwned(sr_trigger_new(name.c_str())),
- _context(context)
+ _context(move(context))
{
for (auto stage = _structure->stages; stage; stage = stage->next)
_stages.push_back(
- new TriggerStage((struct sr_trigger_stage *) stage->data));
+ new TriggerStage(static_cast<struct sr_trigger_stage *>(stage->data)));
}
Trigger::~Trigger()
{
check(sr_trigger_match_add(_structure,
channel->_structure, type->id(), value));
+ GSList *const last = g_slist_last(_structure->matches);
_matches.push_back(new TriggerMatch(
- (struct sr_trigger_match *) g_slist_last(
- _structure->matches)->data, channel));
+ static_cast<struct sr_trigger_match *>(last->data),
+ move(channel)));
}
void TriggerStage::add_match(shared_ptr<Channel> channel,
const TriggerMatchType *type)
{
- add_match(channel, type, NAN);
+ add_match(move(channel), type, NAN);
}
TriggerMatch::TriggerMatch(struct sr_trigger_match *structure,
shared_ptr<Channel> channel) :
ParentOwned(structure),
- _channel(channel)
+ _channel(move(channel))
{
}
DatafeedCallbackData::DatafeedCallbackData(Session *session,
DatafeedCallbackFunction callback) :
- _callback(callback),
+ _callback(move(callback)),
_session(session)
{
}
{
auto device = _session->get_device(sdi);
auto packet = shared_ptr<Packet>(new Packet(device, pkt), Packet::Deleter());
- _callback(device, packet);
+ _callback(move(device), move(packet));
}
SessionDevice::SessionDevice(struct sr_dev_inst *structure) :
Session::Session(shared_ptr<Context> context) :
UserOwned(_structure),
- _context(context)
+ _context(move(context))
{
- check(sr_session_new(context->_structure, &_structure));
+ check(sr_session_new(_context->_structure, &_structure));
_context->_session = this;
}
Session::Session(shared_ptr<Context> context, string filename) :
UserOwned(_structure),
- _context(context),
- _filename(filename)
+ _context(move(context)),
+ _filename(move(filename))
{
- check(sr_session_load(context->_structure, filename.c_str(), &_structure));
+ check(sr_session_load(_context->_structure, _filename.c_str(), &_structure));
GSList *dev_list;
check(sr_session_dev_list(_structure, &dev_list));
- for (GSList *dev = dev_list; dev; dev = dev->next)
- {
- auto sdi = (struct sr_dev_inst *) dev->data;
+ for (GSList *dev = dev_list; dev; dev = dev->next) {
+ auto *const sdi = static_cast<struct sr_dev_inst *>(dev->data);
_owned_devices[sdi] = new SessionDevice(sdi);
}
_context->_session = this;
void Session::add_device(shared_ptr<Device> device)
{
- check(sr_session_dev_add(_structure, device->_structure));
- _other_devices[device->_structure] = device;
+ const auto dev_struct = device->_structure;
+ check(sr_session_dev_add(_structure, dev_struct));
+ _other_devices[dev_struct] = move(device);
}
vector<shared_ptr<Device>> Session::devices()
GSList *dev_list;
check(sr_session_dev_list(_structure, &dev_list));
vector<shared_ptr<Device>> 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<struct sr_dev_inst *>(dev->data);
result.push_back(get_device(sdi));
}
return result;
auto callback = static_cast<DatafeedCallbackData *>(cb_data);
callback->run(sdi, pkt);
}
-
+
void Session::add_datafeed_callback(DatafeedCallbackFunction callback)
{
- auto cb_data = new DatafeedCallbackData(this, callback);
+ auto cb_data = new DatafeedCallbackData(this, move(callback));
check(sr_session_datafeed_callback_add(_structure,
datafeed_callback, cb_data));
_datafeed_callbacks.push_back(cb_data);
}
-void Session::remove_datafeed_callbacks(void)
+void Session::remove_datafeed_callbacks()
{
check(sr_session_datafeed_callback_remove_all(_structure));
for (auto callback : _datafeed_callbacks)
{
if (!trigger)
// Set NULL trigger, i.e. remove any trigger from the session.
- check(sr_session_trigger_set(_structure, NULL));
+ check(sr_session_trigger_set(_structure, nullptr));
else
check(sr_session_trigger_set(_structure, trigger->_structure));
- _trigger = trigger;
+ _trigger = move(trigger);
}
string Session::filename()
Packet::Packet(shared_ptr<Device> device,
const struct sr_datafeed_packet *structure) :
UserOwned(structure),
- _device(device)
+ _device(move(device))
{
switch (structure->type)
{
map<const ConfigKey *, Glib::VariantBase> Meta::config()
{
map<const ConfigKey *, Glib::VariantBase> 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<struct sr_config *>(l->data);
result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data);
}
return result;
ParentOwned::get_shared_pointer(_parent));
}
-float *Analog::data_pointer()
+void *Analog::data_pointer()
{
return _structure->data;
}
vector<shared_ptr<Channel>> Analog::channels()
{
vector<shared_ptr<Channel>> result;
- for (auto l = _structure->channels; l; l = l->next)
- result.push_back(_parent->_device->get_channel(
- (struct sr_channel *)l->data));
+ for (auto l = _structure->meaning->channels; l; l = l->next) {
+ auto *const ch = static_cast<struct sr_channel *>(l->data);
+ result.push_back(_parent->_device->get_channel(ch));
+ }
return result;
}
const Quantity *Analog::mq()
{
- return Quantity::get(_structure->mq);
+ return Quantity::get(_structure->meaning->mq);
}
const Unit *Analog::unit()
{
- return Unit::get(_structure->unit);
+ return Unit::get(_structure->meaning->unit);
}
vector<const QuantityFlag *> Analog::mq_flags()
{
- return QuantityFlag::flags_from_mask(_structure->mqflags);
+ return QuantityFlag::flags_from_mask(_structure->meaning->mqflags);
}
InputFormat::InputFormat(const struct sr_input_module *structure) :
}
shared_ptr<Input> InputFormat::create_input(
- map<string, Glib::VariantBase> options)
+ const map<string, Glib::VariantBase> &options)
{
auto input = sr_input_new(_structure, map_to_hash_variant(options));
if (!input)
Input::Input(shared_ptr<Context> context, const struct sr_input *structure) :
UserOwned(structure),
- _context(context),
+ _context(move(context)),
_device(nullptr)
{
}
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<char *>(data), length);
auto ret = sr_input_send(_structure, gstr);
g_string_free(gstr, false);
check(ret);
struct sr_dev_inst *structure) :
ParentOwned(structure),
Device(structure),
- _input(input)
+ _input(move(input))
{
}
Option::Option(const struct sr_option *structure,
shared_ptr<const struct sr_option *> structure_array) :
UserOwned(structure),
- _structure_array(structure_array)
+ _structure_array(move(structure_array))
{
}
vector<Glib::VariantBase> Option::values()
{
vector<Glib::VariantBase> 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<GVariant *>(l->data);
+ result.push_back(Glib::VariantBase(var, true));
+ }
return result;
}
}
shared_ptr<Output> OutputFormat::create_output(
- shared_ptr<Device> device, map<string, Glib::VariantBase> options)
+ shared_ptr<Device> device, const map<string, Glib::VariantBase> &options)
{
return shared_ptr<Output>(
- new Output(shared_from_this(), device, options),
+ new Output(shared_from_this(), move(device), options),
Output::Deleter());
}
shared_ptr<Output> OutputFormat::create_output(string filename,
- shared_ptr<Device> device, map<string, Glib::VariantBase> options)
+ shared_ptr<Device> device, const map<string, Glib::VariantBase> &options)
{
return shared_ptr<Output>(
- new Output(filename, shared_from_this(), device, options),
+ new Output(move(filename), shared_from_this(), move(device), options),
Output::Deleter());
}
}
Output::Output(shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
+ shared_ptr<Device> device, const map<string, Glib::VariantBase> &options) :
UserOwned(sr_output_new(format->_structure,
- map_to_hash_variant(options), device->_structure, NULL)),
- _format(format),
- _device(device),
+ map_to_hash_variant(options), device->_structure, nullptr)),
+ _format(move(format)),
+ _device(move(device)),
_options(options)
{
}
Output::Output(string filename, shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
+ shared_ptr<Device> device, const map<string, Glib::VariantBase> &options) :
UserOwned(sr_output_new(format->_structure,
map_to_hash_variant(options), device->_structure, filename.c_str())),
- _format(format),
- _device(device),
+ _format(move(format)),
+ _device(move(device)),
_options(options)
{
}
projects / libsigrok.git / blobdiff