* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libsigrok/libsigrok.hpp"
+/* 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 700
+#endif
+
+#include <config.h>
+#include <libsigrokcxx/libsigrokcxx.hpp>
#include <sstream>
+#include <cmath>
namespace sigrok
{
}
/** 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);
- for (auto entry : input)
+ auto *const output = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ reinterpret_cast<GDestroyNotify>(&g_variant_unref));
+ for (const auto &entry : input)
g_hash_table_insert(output,
g_strdup(entry.first.c_str()),
entry.second.gobj_copy());
- return output;
+ return output;
}
Error::Error(int result) : result(result)
{
}
-const char *Error::what() const throw()
+const char *Error::what() const noexcept
{
return sr_strerror(result);
}
-Error::~Error() throw()
+Error::~Error() noexcept
+{
+}
+
+ResourceReader::~ResourceReader()
{
}
+SR_PRIV int ResourceReader::open_callback(struct sr_resource *res,
+ const char *name, void *cb_data) noexcept
+{
+ try {
+ auto *const reader = static_cast<ResourceReader*>(cb_data);
+ reader->open(res, name);
+ } catch (const Error &err) {
+ return err.result;
+ } catch (...) {
+ return SR_ERR;
+ }
+ return SR_OK;
+}
+
+SR_PRIV int ResourceReader::close_callback(struct sr_resource *res,
+ void *cb_data) noexcept
+{
+ try {
+ auto *const reader = static_cast<ResourceReader*>(cb_data);
+ reader->close(res);
+ } catch (const Error &err) {
+ return err.result;
+ } catch (...) {
+ return SR_ERR;
+ }
+ return SR_OK;
+}
+
+SR_PRIV gssize ResourceReader::read_callback(const struct sr_resource *res,
+ void *buf, size_t count, void *cb_data) noexcept
+{
+ try {
+ auto *const reader = static_cast<ResourceReader*>(cb_data);
+ return reader->read(res, buf, count);
+ } catch (const Error &err) {
+ return err.result;
+ } catch (...) {
+ return SR_ERR;
+ }
+}
+
shared_ptr<Context> Context::create()
{
- return shared_ptr<Context>(new Context(), Context::Deleter());
+ return shared_ptr<Context>{new Context{}, default_delete<Context>{}};
}
Context::Context() :
- UserOwned(structure),
- session(NULL)
-{
- check(sr_init(&structure));
-
- struct sr_dev_driver **driver_list = sr_driver_list();
- 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]);
-}
-
-string Context::get_package_version()
+ _structure(nullptr),
+ _session(nullptr)
+{
+ check(sr_init(&_structure));
+
+ if (struct sr_dev_driver **driver_list = sr_driver_list(_structure))
+ for (int i = 0; driver_list[i]; i++) {
+ unique_ptr<Driver> 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<InputFormat> 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<OutputFormat> output {new OutputFormat{output_list[i]}};
+ _output_formats.emplace(output->name(), move(output));
+ }
+}
+
+string Context::package_version()
{
return sr_package_version_string_get();
}
-string Context::get_lib_version()
+string Context::lib_version()
{
return sr_lib_version_string_get();
}
-map<string, shared_ptr<Driver>> Context::get_drivers()
+map<string, shared_ptr<Driver>> Context::drivers()
{
map<string, shared_ptr<Driver>> 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;
}
-map<string, shared_ptr<InputFormat>> Context::get_input_formats()
+map<string, shared_ptr<InputFormat>> Context::input_formats()
{
map<string, shared_ptr<InputFormat>> 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;
}
-map<string, shared_ptr<OutputFormat>> Context::get_output_formats()
+shared_ptr<InputFormat> 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<InputFormat>{new InputFormat{imod}, default_delete<InputFormat>{}};
+}
+
+map<string, shared_ptr<OutputFormat>> Context::output_formats()
{
map<string, shared_ptr<OutputFormat>> 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));
+ check(sr_exit(_structure));
}
-const LogLevel *Context::get_log_level()
+const LogLevel *Context::log_level() const
{
return LogLevel::get(sr_log_loglevel_get());
}
void Context::set_log_level(const LogLevel *level)
{
- check(sr_log_loglevel_set(level->get_id()));
-}
-
-string Context::get_log_domain()
-{
- return valid_string(sr_log_logdomain_get());
-}
-
-void Context::set_log_domain(string value)
-{
- check(sr_log_logdomain_set(value.c_str()));
+ 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<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);
- }
- catch (Error e)
- {
+ try {
+ (*callback)(LogLevel::get(loglevel), message.get());
+ } catch (Error &e) {
return e.result;
}
void Context::set_log_callback(LogCallbackFunction callback)
{
- log_callback = callback;
- check(sr_log_callback_set(call_log_callback, &log_callback));
-}
+ _log_callback = move(callback);
+ check(sr_log_callback_set(call_log_callback, &_log_callback));
+}
void Context::set_log_callback_default()
{
check(sr_log_callback_set_default());
- log_callback = nullptr;
-}
+ _log_callback = nullptr;
+}
+
+void Context::set_resource_reader(ResourceReader *reader)
+{
+ if (reader) {
+ check(sr_resource_set_hooks(_structure,
+ &ResourceReader::open_callback,
+ &ResourceReader::close_callback,
+ &ResourceReader::read_callback, reader));
+ } else {
+ check(sr_resource_set_hooks(_structure,
+ nullptr, nullptr, nullptr, nullptr));
+ }
+}
shared_ptr<Session> Context::create_session()
{
- return shared_ptr<Session>(
- new Session(shared_from_this()), Session::Deleter());
+ return shared_ptr<Session>{new Session{shared_from_this()},
+ default_delete<Session>{}};
+}
+
+shared_ptr<UserDevice> Context::create_user_device(
+ string vendor, string model, string version)
+{
+ return shared_ptr<UserDevice>{
+ new UserDevice{move(vendor), move(model), move(version)},
+ default_delete<UserDevice>{}};
+}
+
+shared_ptr<Packet> Context::create_header_packet(Glib::TimeVal start_time)
+{
+ auto header = g_new(struct sr_datafeed_header, 1);
+ header->feed_version = 1;
+ header->starttime.tv_sec = start_time.tv_sec;
+ header->starttime.tv_usec = start_time.tv_usec;
+ auto packet = g_new(struct sr_datafeed_packet, 1);
+ packet->type = SR_DF_HEADER;
+ packet->payload = header;
+ return shared_ptr<Packet>{new Packet{nullptr, packet},
+ default_delete<Packet>{}};
+}
+
+shared_ptr<Packet> Context::create_meta_packet(
+ map<const ConfigKey *, Glib::VariantBase> config)
+{
+ auto meta = g_new0(struct sr_datafeed_meta, 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_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<Packet>{new Packet{nullptr, packet},
+ default_delete<Packet>{}};
+}
+
+shared_ptr<Packet> Context::create_logic_packet(
+ void *data_pointer, size_t data_length, unsigned int unit_size)
+{
+ auto logic = g_new(struct sr_datafeed_logic, 1);
+ logic->length = data_length;
+ logic->unitsize = unit_size;
+ logic->data = data_pointer;
+ auto packet = g_new(struct sr_datafeed_packet, 1);
+ packet->type = SR_DF_LOGIC;
+ packet->payload = logic;
+ return shared_ptr<Packet>{new Packet{nullptr, packet}, default_delete<Packet>{}};
+}
+
+shared_ptr<Packet> Context::create_analog_packet(
+ vector<shared_ptr<Channel> > channels,
+ const float *data_pointer, unsigned int num_samples, const Quantity *mq,
+ const Unit *unit, vector<const QuantityFlag *> 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 (const auto &channel : channels)
+ meaning->channels = g_slist_append(meaning->channels, channel->_structure);
+ 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(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<Packet>{new Packet{nullptr, packet}, default_delete<Packet>{}};
+}
+
+shared_ptr<Packet> Context::create_end_packet()
+{
+ auto packet = g_new(struct sr_datafeed_packet, 1);
+ packet->type = SR_DF_END;
+ return shared_ptr<Packet>{new Packet{nullptr, packet},
+ default_delete<Packet>{}};
}
shared_ptr<Session> Context::load_session(string filename)
{
- return shared_ptr<Session>(
- new Session(shared_from_this(), filename), Session::Deleter());
+ return shared_ptr<Session>{
+ new Session{shared_from_this(), move(filename)},
+ default_delete<Session>{}};
}
shared_ptr<Trigger> Context::create_trigger(string name)
{
- return shared_ptr<Trigger>(
- new Trigger(shared_from_this(), name), Trigger::Deleter());
+ return shared_ptr<Trigger>{
+ new Trigger{shared_from_this(), move(name)},
+ default_delete<Trigger>{}};
}
shared_ptr<Input> Context::open_file(string filename)
{
const struct sr_input *input;
- check( sr_input_scan_file(filename.c_str(), &input));
- return shared_ptr<Input>(
- new Input(shared_from_this(), input), Input::Deleter());
+ check(sr_input_scan_file(filename.c_str(), &input));
+ return shared_ptr<Input>{
+ new Input{shared_from_this(), input},
+ default_delete<Input>{}};
}
shared_ptr<Input> Context::open_stream(string header)
auto ret = sr_input_scan_buffer(gstr, &input);
g_string_free(gstr, true);
check(ret);
- return shared_ptr<Input>(
- new Input(shared_from_this(), input), Input::Deleter());
+ return shared_ptr<Input>{
+ new Input{shared_from_this(), input},
+ default_delete<Input>{}};
+}
+
+map<string, string> Context::serials(shared_ptr<Driver> driver) const
+{
+ GSList *serial_list = sr_serial_list(driver ? driver->_structure : nullptr);
+ map<string, string> serials;
+
+ for (GSList *serial = serial_list; serial; serial = serial->next) {
+ auto *const port = static_cast<sr_serial_port *>(serial->data);
+ serials[string(port->name)] = string(port->description);
+ }
+
+ 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),
- initialized(false)
+ Configurable(structure, nullptr, nullptr),
+ _structure(structure),
+ _initialized(false)
{
}
Driver::~Driver()
{
- for (auto device : devices)
- delete device;
}
-string Driver::get_name()
+string Driver::name() const
{
- return valid_string(structure->name);
+ return valid_string(_structure->name);
}
-string Driver::get_long_name()
+string Driver::long_name() const
{
- return valid_string(structure->longname);
+ return valid_string(_structure->longname);
+}
+
+set<const ConfigKey *> Driver::scan_options() const
+{
+ GArray *opts = sr_driver_scan_options_list(_structure);
+ set<const ConfigKey *> 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<shared_ptr<HardwareDevice>> Driver::scan(
map<const ConfigKey *, Glib::VariantBase> options)
{
/* Initialise the driver if not yet done. */
- if (!initialized)
- {
- check(sr_driver_init(parent->structure, structure));
- initialized = true;
+ if (!_initialized) {
+ check(sr_driver_init(_parent->_structure, _structure));
+ _initialized = true;
}
- /* Clear all existing instances. */
- for (auto device : devices)
- delete device;
- devices.clear();
-
/* Translate scan options to GSList of struct sr_config pointers. */
- GSList *option_list = NULL;
- for (auto entry : options)
- {
- auto key = entry.first;
- auto value = entry.second;
- auto config = g_new(struct sr_config, 1);
- config->key = key->get_id();
- config->data = value.gobj();
+ GSList *option_list = nullptr;
+ 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 = const_cast<GVariant*>(value.gobj());
option_list = g_slist_append(option_list, config);
}
/* Run scan. */
- GSList *device_list = sr_driver_scan(structure, option_list);
+ GSList *device_list = sr_driver_scan(_structure, option_list);
/* Free option list. */
g_slist_free_full(option_list, g_free);
+
/* Create device objects. */
- for (GSList *device = device_list; device; device = device->next)
- {
- auto sdi = (struct sr_dev_inst *) device->data;
- devices.push_back(new HardwareDevice(this, sdi));
+ vector<shared_ptr<HardwareDevice>> result;
+ for (GSList *device = device_list; device; device = device->next) {
+ auto *const sdi = static_cast<struct sr_dev_inst *>(device->data);
+ shared_ptr<HardwareDevice> hwdev {
+ new HardwareDevice{shared_from_this(), sdi},
+ default_delete<HardwareDevice>{}};
+ result.push_back(move(hwdev));
}
/* Free GSList returned from scan. */
g_slist_free(device_list);
- /* Create list of shared pointers to device instances for return. */
- vector<shared_ptr<HardwareDevice>> result;
- for (auto device : devices)
- result.push_back(device->get_shared_pointer(parent));
return result;
}
{
}
-Glib::VariantBase Configurable::config_get(const ConfigKey *key)
+set<const ConfigKey *> Configurable::config_keys() const
+{
+ GArray *opts;
+ set<const ConfigKey *> 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;
check(sr_config_get(
config_driver, config_sdi, config_channel_group,
- key->get_id(), &data));
+ key->id(), &data));
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->get_id(), value.gobj()));
-}
-
-Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
-{
- GVariant *data;
- check(sr_config_list(
- config_driver, config_sdi, config_channel_group,
- key->get_id(), &data));
- return Glib::VariantContainerBase(data);
+ key->id(), const_cast<GVariant*>(value.gobj())));
}
-vector<const ConfigKey *> Configurable::config_keys(const ConfigKey *key)
+set<const Capability *> Configurable::config_capabilities(const ConfigKey *key) const
{
- GVariant *gvar_opts;
- gsize num_opts;
- const int32_t *opts;
- vector<const ConfigKey *> result;
+ int caps = sr_dev_config_capabilities_list(config_sdi,
+ config_channel_group, key->id());
- check(sr_config_list(
- config_driver, config_sdi, config_channel_group,
- key->get_id(), &gvar_opts));
-
- opts = (const int32_t *) g_variant_get_fixed_array(
- gvar_opts, &num_opts, sizeof(int32_t));
-
- for (gsize i = 0; i < num_opts; i++)
- result.push_back(ConfigKey::get(opts[i]));
+ set<const Capability *> 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 Capability *capability) const
{
- GVariant *gvar_opts;
- gsize num_opts;
- const int32_t *opts;
-
- if (sr_config_list(config_driver, config_sdi, config_channel_group,
- index_key->get_id(), &gvar_opts) != SR_OK)
- return false;
-
- opts = (const int32_t *) g_variant_get_fixed_array(
- gvar_opts, &num_opts, sizeof(int32_t));
+ int caps = sr_dev_config_capabilities_list(config_sdi,
+ config_channel_group, key->id());
- for (gsize i = 0; i < num_opts; i++)
- {
- if (opts[i] == key->get_id())
- {
- g_variant_unref(gvar_opts);
- return true;
- }
- }
-
- 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(structure->driver, structure, NULL),
- structure(structure)
+ Configurable(sr_dev_inst_driver_get(structure), structure, nullptr),
+ _structure(structure)
{
- for (GSList *entry = structure->channels; entry; entry = entry->next)
- {
- auto channel = (struct sr_channel *) 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<struct sr_channel *>(entry->data);
+ unique_ptr<Channel> channel {new Channel{ch}};
+ _channels.emplace(ch, move(channel));
}
- for (GSList *entry = structure->channel_groups; entry; entry = entry->next)
- {
- auto group = (struct sr_channel_group *) 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<struct sr_channel_group *>(entry->data);
+ unique_ptr<ChannelGroup> 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::get_description()
+string Device::vendor() const
{
- ostringstream s;
-
- vector<string> parts =
- {get_vendor(), get_model(), get_version()};
-
- for (string part : parts)
- if (part.length() > 0)
- s << part;
+ return valid_string(sr_dev_inst_vendor_get(_structure));
+}
- return s.str();
+string Device::model() const
+{
+ return valid_string(sr_dev_inst_model_get(_structure));
}
-string Device::get_vendor()
+string Device::version() const
{
- return valid_string(structure->vendor);
+ return valid_string(sr_dev_inst_version_get(_structure));
}
-string Device::get_model()
+string Device::serial_number() const
{
- return valid_string(structure->model);
+ return valid_string(sr_dev_inst_sernum_get(_structure));
}
-string Device::get_version()
+string Device::connection_id() const
{
- return valid_string(structure->version);
+ return valid_string(sr_dev_inst_connid_get(_structure));
}
-vector<shared_ptr<Channel>> Device::get_channels()
+vector<shared_ptr<Channel>> Device::channels()
{
vector<shared_ptr<Channel>> result;
- for (auto entry : channels)
- result.push_back(entry.second->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]->share_owned_by(get_shared_from_this()));
+ }
return result;
}
shared_ptr<Channel> 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<string, shared_ptr<ChannelGroup>>
-Device::get_channel_groups()
+Device::channel_groups()
{
map<string, shared_ptr<ChannelGroup>> 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;
}
void Device::open()
{
- check(sr_dev_open(structure));
+ check(sr_dev_open(_structure));
}
void Device::close()
{
- check(sr_dev_close(structure));
+ check(sr_dev_close(_structure));
}
-HardwareDevice::HardwareDevice(Driver *driver, struct sr_dev_inst *structure) :
- ParentOwned(structure),
+HardwareDevice::HardwareDevice(shared_ptr<Driver> driver,
+ struct sr_dev_inst *structure) :
Device(structure),
- driver(driver)
+ _driver(move(driver))
{
}
return static_pointer_cast<Device>(shared_from_this());
}
-shared_ptr<Driver> HardwareDevice::get_driver()
+shared_ptr<Driver> HardwareDevice::driver()
{
- return driver->get_shared_pointer(parent);
+ return _driver;
+}
+
+UserDevice::UserDevice(string vendor, string model, string version) :
+ Device(sr_dev_inst_user_new(
+ vendor.c_str(), model.c_str(), version.c_str()))
+{
+}
+
+UserDevice::~UserDevice()
+{
+}
+
+shared_ptr<Device> UserDevice::get_shared_from_this()
+{
+ return static_pointer_cast<Device>(shared_from_this());
+}
+
+shared_ptr<Channel> UserDevice::add_channel(unsigned int index,
+ const ChannelType *type, string name)
+{
+ check(sr_dev_inst_channel_add(Device::_structure,
+ index, type->id(), name.c_str()));
+ GSList *const last = g_slist_last(sr_dev_inst_channels_get(Device::_structure));
+ auto *const ch = static_cast<struct sr_channel *>(last->data);
+ unique_ptr<Channel> channel {new Channel{ch}};
+ _channels.emplace(ch, move(channel));
+ return get_channel(ch);
}
Channel::Channel(struct sr_channel *structure) :
- ParentOwned(structure),
- type(ChannelType::get(structure->type))
+ _structure(structure),
+ _type(ChannelType::get(_structure->type))
{
}
{
}
-string Channel::get_name()
+string Channel::name() const
{
- return valid_string(structure->name);
+ return valid_string(_structure->name);
}
void Channel::set_name(string name)
{
- check(sr_dev_channel_name_set(parent->structure, structure->index, name.c_str()));
+ check(sr_dev_channel_name_set(_structure, name.c_str()));
}
-const ChannelType *Channel::get_type()
+const ChannelType *Channel::type() const
{
- return ChannelType::get(structure->type);
+ return ChannelType::get(_structure->type);
}
-bool Channel::get_enabled()
+bool Channel::enabled() const
{
- return structure->enabled;
+ return _structure->enabled;
}
void Channel::set_enabled(bool value)
{
- check(sr_dev_channel_enable(parent->structure, structure->index, value));
+ check(sr_dev_channel_enable(_structure, value));
}
-unsigned int Channel::get_index()
+unsigned int Channel::index() const
{
- return structure->index;
+ return _structure->index;
}
-ChannelGroup::ChannelGroup(Device *device,
+ChannelGroup::ChannelGroup(const Device *device,
struct sr_channel_group *structure) :
- ParentOwned(structure),
- Configurable(device->structure->driver, device->structure, structure)
+ Configurable(sr_dev_inst_driver_get(device->_structure), device->_structure, structure)
{
- for (GSList *entry = structure->channels; entry; entry = entry->next)
- channels.push_back(device->channels[(struct sr_channel *)entry->data]);
+ for (GSList *entry = config_channel_group->channels; entry; entry = entry->next) {
+ auto *const ch = static_cast<struct sr_channel *>(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::get_name()
+string ChannelGroup::name() const
{
- return valid_string(structure->name);
+ return valid_string(config_channel_group->name);
}
-vector<shared_ptr<Channel>> ChannelGroup::get_channels()
+vector<shared_ptr<Channel>> ChannelGroup::channels()
{
vector<shared_ptr<Channel>> 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> context, string name) :
- UserOwned(sr_trigger_new(name.c_str())),
- context(context)
+Trigger::Trigger(shared_ptr<Context> 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((struct sr_trigger_stage *) stage->data));
+ for (auto *stage = _structure->stages; stage; stage = stage->next) {
+ unique_ptr<TriggerStage> ts {new TriggerStage{
+ static_cast<struct sr_trigger_stage *>(stage->data)}};
+ _stages.push_back(move(ts));
+ }
}
Trigger::~Trigger()
{
- for (auto stage: stages)
- delete stage;
-
- sr_trigger_free(structure);
+ sr_trigger_free(_structure);
}
-string Trigger::get_name()
+string Trigger::name() const
{
- return structure->name;
+ return _structure->name;
}
-vector<shared_ptr<TriggerStage>> Trigger::get_stages()
+vector<shared_ptr<TriggerStage>> Trigger::stages()
{
vector<shared_ptr<TriggerStage>> 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<TriggerStage> Trigger::add_stage()
{
- auto stage = new TriggerStage(sr_trigger_stage_add(structure));
- stages.push_back(stage);
- return stage->get_shared_pointer(this);
+ unique_ptr<TriggerStage> 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::get_number()
+
+int TriggerStage::number() const
{
- return structure->stage;
+ return _structure->stage;
}
-vector<shared_ptr<TriggerMatch>> TriggerStage::get_matches()
+vector<shared_ptr<TriggerMatch>> TriggerStage::matches()
{
vector<shared_ptr<TriggerMatch>> 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;
}
-void TriggerStage::add_match(shared_ptr<Channel> channel, const TriggerMatchType *type, float value)
+void TriggerStage::add_match(shared_ptr<Channel> channel,
+ const TriggerMatchType *type, float value)
{
- check(sr_trigger_match_add(structure, channel->structure, type->get_id(), value));
- matches.push_back(new TriggerMatch(
- (struct sr_trigger_match *) g_slist_last(structure->matches)->data, channel));
+ check(sr_trigger_match_add(_structure,
+ channel->_structure, type->id(), value));
+ GSList *const last = g_slist_last(_structure->matches);
+ unique_ptr<TriggerMatch> match {new TriggerMatch{
+ static_cast<struct sr_trigger_match *>(last->data),
+ move(channel)}};
+ _matches.push_back(move(match));
}
-void TriggerStage::add_match(shared_ptr<Channel> channel, const TriggerMatchType *type)
+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)
+TriggerMatch::TriggerMatch(struct sr_trigger_match *structure,
+ shared_ptr<Channel> channel) :
+ _structure(structure),
+ _channel(move(channel))
{
}
{
}
-shared_ptr<Channel> TriggerMatch::get_channel()
+shared_ptr<Channel> TriggerMatch::channel()
{
- return channel;
+ return _channel;
}
-const TriggerMatchType *TriggerMatch::get_type()
+const TriggerMatchType *TriggerMatch::type() const
{
- return TriggerMatchType::get(structure->match);
+ return TriggerMatchType::get(_structure->match);
}
-float TriggerMatch::get_value()
+float TriggerMatch::value() const
{
- return structure->value;
+ return _structure->value;
}
DatafeedCallbackData::DatafeedCallbackData(Session *session,
DatafeedCallbackFunction callback) :
- callback(callback), session(session)
+ _callback(move(callback)),
+ _session(session)
{
}
void DatafeedCallbackData::run(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *pkt)
{
- auto device = session->devices[sdi];
- auto packet = shared_ptr<Packet>(new Packet(device, pkt), Packet::Deleter());
- callback(device, packet);
-}
-
-SourceCallbackData::SourceCallbackData(shared_ptr<EventSource> source) :
- source(source)
-{
-}
-
-bool SourceCallbackData::run(int revents)
-{
- return source->callback((Glib::IOCondition) revents);
-}
-
-shared_ptr<EventSource> EventSource::create(int fd, Glib::IOCondition events,
- int timeout, SourceCallbackFunction callback)
-{
- auto result = new EventSource(timeout, callback);
- result->type = EventSource::SOURCE_FD;
- result->fd = fd;
- result->events = events;
- return shared_ptr<EventSource>(result, EventSource::Deleter());
-}
-
-shared_ptr<EventSource> EventSource::create(Glib::PollFD pollfd, int timeout,
- SourceCallbackFunction callback)
-{
- auto result = new EventSource(timeout, callback);
- result->type = EventSource::SOURCE_POLLFD;
- result->pollfd = pollfd;
- return shared_ptr<EventSource>(result, EventSource::Deleter());
+ auto device = _session->get_device(sdi);
+ shared_ptr<Packet> packet {new Packet{device, pkt}, default_delete<Packet>{}};
+ _callback(move(device), move(packet));
}
-shared_ptr<EventSource> EventSource::create(Glib::RefPtr<Glib::IOChannel> channel,
- Glib::IOCondition events, int timeout, SourceCallbackFunction callback)
+SessionDevice::SessionDevice(struct sr_dev_inst *structure) :
+ Device(structure)
{
- auto result = new EventSource(timeout, callback);
- result->type = EventSource::SOURCE_IOCHANNEL;
- result->channel = channel;
- result->events = events;
- return shared_ptr<EventSource>(result, EventSource::Deleter());
}
-EventSource::EventSource(int timeout, SourceCallbackFunction callback) :
- timeout(timeout), callback(callback)
+SessionDevice::~SessionDevice()
{
}
-EventSource::~EventSource()
+shared_ptr<Device> SessionDevice::get_shared_from_this()
{
+ return static_pointer_cast<Device>(shared_from_this());
}
Session::Session(shared_ptr<Context> context) :
- UserOwned(structure),
- context(context), saving(false)
+ _structure(nullptr),
+ _context(move(context))
{
- check(sr_session_new(&structure));
- context->session = this;
+ check(sr_session_new(_context->_structure, &_structure));
+ _context->_session = this;
}
Session::Session(shared_ptr<Context> context, string filename) :
- UserOwned(structure),
- context(context), saving(false)
+ _structure(nullptr),
+ _context(move(context)),
+ _filename(move(filename))
{
- check(sr_session_load(filename.c_str(), &structure));
- context->session = this;
+ 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 *const sdi = static_cast<struct sr_dev_inst *>(dev->data);
+ unique_ptr<SessionDevice> 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;
+ check(sr_session_destroy(_structure));
+}
- for (auto entry : source_callbacks)
- delete entry.second;
+shared_ptr<Device> Session::get_device(const struct sr_dev_inst *sdi)
+{
+ if (_owned_devices.count(sdi))
+ return static_pointer_cast<Device>(
+ _owned_devices[sdi]->share_owned_by(shared_from_this()));
+ else if (_other_devices.count(sdi))
+ return _other_devices[sdi];
+ else
+ throw Error(SR_ERR_BUG);
}
void Session::add_device(shared_ptr<Device> device)
{
- check(sr_session_dev_add(structure, device->structure));
- devices[device->structure] = device;
+ const auto dev_struct = device->_structure;
+ check(sr_session_dev_add(_structure, dev_struct));
+ _other_devices[dev_struct] = move(device);
}
-vector<shared_ptr<Device>> Session::get_devices()
+vector<shared_ptr<Device>> Session::devices()
{
GSList *dev_list;
- check(sr_session_dev_list(structure, &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;
- result.push_back(devices[sdi]);
+ 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));
}
+ g_slist_free(dev_list);
return result;
}
void Session::remove_devices()
{
- devices.clear();
- check(sr_session_dev_remove_all(structure));
+ _other_devices.clear();
+ check(sr_session_dev_remove_all(_structure));
}
void Session::start()
{
- check(sr_session_start(structure));
+ check(sr_session_start(_structure));
}
void Session::run()
{
- check(sr_session_run(structure));
+ check(sr_session_run(_structure));
}
void Session::stop()
{
- check(sr_session_stop(structure));
+ check(sr_session_stop(_structure));
}
-void Session::begin_save(string filename)
+bool Session::is_running() const
{
- saving = true;
- save_initialized = false;
- save_filename = filename;
- save_samplerate = 0;
+ const int ret = sr_session_is_running(_structure);
+ if (ret < 0)
+ throw Error{ret};
+ return (ret != 0);
}
-void Session::append(shared_ptr<Packet> packet)
+static void session_stopped_callback(void *data) noexcept
{
- if (!saving)
- throw Error(SR_ERR);
-
- switch (packet->structure->type)
- {
- case SR_DF_META:
- {
- auto meta = (const struct sr_datafeed_meta *)
- packet->structure->payload;
-
- for (auto l = meta->config; l; l = l->next)
- {
- auto config = (struct sr_config *) l->data;
- if (config->key == SR_CONF_SAMPLERATE)
- save_samplerate = g_variant_get_uint64(config->data);
- }
-
- break;
- }
- case SR_DF_LOGIC:
- {
- if (save_samplerate == 0)
- {
- GVariant *samplerate;
-
- check(sr_config_get(packet->device->structure->driver,
- packet->device->structure, NULL, SR_CONF_SAMPLERATE,
- &samplerate));
-
- save_samplerate = g_variant_get_uint64(samplerate);
-
- g_variant_unref(samplerate);
- }
-
- if (!save_initialized)
- {
- vector<shared_ptr<Channel>> save_channels;
-
- for (auto channel : packet->device->get_channels())
- if (channel->structure->enabled &&
- channel->structure->type == SR_CHANNEL_LOGIC)
- save_channels.push_back(channel);
-
- auto channels = g_new(char *, save_channels.size());
-
- int i = 0;
- for (auto channel : save_channels)
- channels[i++] = channel->structure->name;
- channels[i] = NULL;
-
- int ret = sr_session_save_init(structure, save_filename.c_str(),
- save_samplerate, channels);
-
- g_free(channels);
-
- if (ret != SR_OK)
- throw Error(ret);
-
- save_initialized = true;
- }
-
- auto logic = (const struct sr_datafeed_logic *)
- packet->structure->payload;
-
- check(sr_session_append(structure, save_filename.c_str(),
- (uint8_t *) logic->data, logic->unitsize,
- logic->length / logic->unitsize));
- }
- }
+ auto *const callback = static_cast<SessionStoppedCallback*>(data);
+ (*callback)();
}
-void Session::append(void *data, size_t length, unsigned int unit_size)
+void Session::set_stopped_callback(SessionStoppedCallback callback)
{
- check(sr_session_append(structure, save_filename.c_str(),
- (uint8_t *) data, unit_size, length));
+ _stopped_callback = move(callback);
+ if (_stopped_callback)
+ check(sr_session_stopped_callback_set(_structure,
+ &session_stopped_callback, &_stopped_callback));
+ else
+ check(sr_session_stopped_callback_set(_structure,
+ nullptr, nullptr));
}
static void datafeed_callback(const struct sr_dev_inst *sdi,
- const struct sr_datafeed_packet *pkt, void *cb_data)
+ const struct sr_datafeed_packet *pkt, void *cb_data) noexcept
{
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);
- 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::add_datafeed_callback(DatafeedCallbackFunction callback)
{
- check(sr_session_datafeed_callback_remove_all(structure));
- for (auto callback : datafeed_callbacks)
- delete callback;
- datafeed_callbacks.clear();
+ unique_ptr<DatafeedCallbackData> cb_data
+ {new DatafeedCallbackData{this, move(callback)}};
+ check(sr_session_datafeed_callback_add(_structure,
+ &datafeed_callback, cb_data.get()));
+ _datafeed_callbacks.push_back(move(cb_data));
}
-static int source_callback(int fd, int revents, void *cb_data)
+void Session::remove_datafeed_callbacks()
{
- (void) fd;
- auto callback = (SourceCallbackData *) cb_data;
- return callback->run(revents);
+ check(sr_session_datafeed_callback_remove_all(_structure));
+ _datafeed_callbacks.clear();
}
-void Session::add_source(shared_ptr<EventSource> source)
+shared_ptr<Trigger> Session::trigger()
{
- if (source_callbacks.count(source) == 1)
- throw Error(SR_ERR_ARG);
-
- auto cb_data = new SourceCallbackData(source);
-
- switch (source->type)
- {
- case EventSource::SOURCE_FD:
- check(sr_session_source_add(structure, source->fd, source->events,
- source->timeout, source_callback, cb_data));
- break;
- case EventSource::SOURCE_POLLFD:
- check(sr_session_source_add_pollfd(structure,
- source->pollfd.gobj(), source->timeout, source_callback,
- cb_data));
- break;
- case EventSource::SOURCE_IOCHANNEL:
- check(sr_session_source_add_channel(structure,
- source->channel->gobj(), source->events, source->timeout,
- source_callback, cb_data));
- break;
- }
-
- source_callbacks[source] = cb_data;
+ return _trigger;
}
-void Session::remove_source(shared_ptr<EventSource> source)
+void Session::set_trigger(shared_ptr<Trigger> trigger)
{
- if (source_callbacks.count(source) == 0)
- throw Error(SR_ERR_ARG);
-
- switch (source->type)
- {
- case EventSource::SOURCE_FD:
- check(sr_session_source_remove(structure, source->fd));
- break;
- case EventSource::SOURCE_POLLFD:
- check(sr_session_source_remove_pollfd(structure,
- source->pollfd.gobj()));
- break;
- case EventSource::SOURCE_IOCHANNEL:
- check(sr_session_source_remove_channel(structure,
- source->channel->gobj()));
- break;
- }
-
- delete source_callbacks[source];
-
- source_callbacks.erase(source);
+ if (!trigger)
+ // Set NULL trigger, i.e. remove any trigger from the session.
+ check(sr_session_trigger_set(_structure, nullptr));
+ else
+ check(sr_session_trigger_set(_structure, trigger->_structure));
+ _trigger = move(trigger);
}
-shared_ptr<Trigger> Session::get_trigger()
+string Session::filename() const
{
- return trigger;
+ return _filename;
}
-void Session::set_trigger(shared_ptr<Trigger> trigger)
+shared_ptr<Context> Session::context()
{
- check(sr_session_trigger_set(structure, trigger->structure));
- this->trigger = trigger;
+ return _context;
}
Packet::Packet(shared_ptr<Device> device,
const struct sr_datafeed_packet *structure) :
- UserOwned(structure),
- device(device)
+ _structure(structure),
+ _device(move(device))
{
switch (structure->type)
{
case SR_DF_HEADER:
- payload = new Header(
+ _payload.reset(new Header{
static_cast<const struct sr_datafeed_header *>(
- structure->payload));
+ structure->payload)});
break;
case SR_DF_META:
- payload = new Meta(
+ _payload.reset(new Meta{
static_cast<const struct sr_datafeed_meta *>(
- structure->payload));
+ structure->payload)});
break;
case SR_DF_LOGIC:
- payload = new Logic(
+ _payload.reset(new Logic{
static_cast<const struct sr_datafeed_logic *>(
- structure->payload));
+ structure->payload)});
break;
case SR_DF_ANALOG:
- payload = new Analog(
+ _payload.reset(new Analog{
static_cast<const struct sr_datafeed_analog *>(
- structure->payload));
- break;
- default:
- payload = nullptr;
+ structure->payload)});
break;
}
}
Packet::~Packet()
{
- if (payload)
- delete payload;
}
-const PacketType *Packet::get_type()
+const PacketType *Packet::type() const
{
- return PacketType::get(structure->type);
+ return PacketType::get(_structure->type);
}
-shared_ptr<PacketPayload> Packet::get_payload()
+shared_ptr<PacketPayload> Packet::payload()
{
- if (payload)
- return payload->get_shared_pointer(this);
+ if (_payload)
+ return _payload->share_owned_by(shared_from_this());
else
throw Error(SR_ERR_NA);
}
}
Header::Header(const struct sr_datafeed_header *structure) :
- ParentOwned(structure),
- PacketPayload()
+ PacketPayload(),
+ _structure(structure)
{
}
{
}
-shared_ptr<PacketPayload> Header::get_shared_pointer(Packet *parent)
+shared_ptr<PacketPayload> Header::share_owned_by(shared_ptr<Packet> _parent)
{
return static_pointer_cast<PacketPayload>(
- ParentOwned::get_shared_pointer(parent));
+ ParentOwned::share_owned_by(_parent));
}
-int Header::get_feed_version()
+int Header::feed_version() const
{
- return structure->feed_version;
+ return _structure->feed_version;
}
-Glib::TimeVal Header::get_start_time()
+Glib::TimeVal Header::start_time() const
{
return Glib::TimeVal(
- structure->starttime.tv_sec,
- structure->starttime.tv_usec);
+ _structure->starttime.tv_sec,
+ _structure->starttime.tv_usec);
}
Meta::Meta(const struct sr_datafeed_meta *structure) :
- ParentOwned(structure),
- PacketPayload()
+ PacketPayload(),
+ _structure(structure)
{
}
{
}
-shared_ptr<PacketPayload> Meta::get_shared_pointer(Packet *parent)
+shared_ptr<PacketPayload> Meta::share_owned_by(shared_ptr<Packet> _parent)
{
return static_pointer_cast<PacketPayload>(
- ParentOwned::get_shared_pointer(parent));
+ ParentOwned::share_owned_by(_parent));
}
-map<const ConfigKey *, Glib::VariantBase> Meta::get_config()
+map<const ConfigKey *, Glib::VariantBase> Meta::config() const
{
map<const ConfigKey *, Glib::VariantBase> result;
- for (auto l = structure->config; l; l = l->next)
- {
- auto config = (struct sr_config *) l->data;
- result[ConfigKey::get(config->key)] = Glib::VariantBase(config->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, true);
}
return result;
}
Logic::Logic(const struct sr_datafeed_logic *structure) :
- ParentOwned(structure),
- PacketPayload()
+ PacketPayload(),
+ _structure(structure)
{
}
{
}
-shared_ptr<PacketPayload> Logic::get_shared_pointer(Packet *parent)
+shared_ptr<PacketPayload> Logic::share_owned_by(shared_ptr<Packet> _parent)
{
return static_pointer_cast<PacketPayload>(
- ParentOwned::get_shared_pointer(parent));
+ ParentOwned::share_owned_by(_parent));
}
-void *Logic::get_data_pointer()
+void *Logic::data_pointer()
{
- return structure->data;
+ return _structure->data;
}
-size_t Logic::get_data_length()
+size_t Logic::data_length() const
{
- return structure->length;
+ return _structure->length;
}
-unsigned int Logic::get_unit_size()
+unsigned int Logic::unit_size() const
{
- return structure->unitsize;
+ return _structure->unitsize;
}
Analog::Analog(const struct sr_datafeed_analog *structure) :
- ParentOwned(structure),
- PacketPayload()
+ PacketPayload(),
+ _structure(structure)
{
}
{
}
-shared_ptr<PacketPayload> Analog::get_shared_pointer(Packet *parent)
+shared_ptr<PacketPayload> Analog::share_owned_by(shared_ptr<Packet> _parent)
{
return static_pointer_cast<PacketPayload>(
- ParentOwned::get_shared_pointer(parent));
+ ParentOwned::share_owned_by(_parent));
+}
+
+void *Analog::data_pointer()
+{
+ return _structure->data;
}
-float *Analog::get_data_pointer()
+void Analog::get_data_as_float(float *dest)
{
- return structure->data;
+ check(sr_analog_to_float(_structure, dest));
}
-unsigned int Analog::get_num_samples()
+unsigned int Analog::num_samples() const
{
- return structure->num_samples;
+ return _structure->num_samples;
}
-vector<shared_ptr<Channel>> Analog::get_channels()
+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::get_mq()
+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<Rational> Analog::scale()
+{
+ unique_ptr<Rational> 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<Rational> Analog::offset()
+{
+ unique_ptr<Rational> 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);
+}
+
+const Unit *Analog::unit() const
+{
+ return Unit::get(_structure->meaning->unit);
+}
+
+vector<const QuantityFlag *> Analog::mq_flags() const
+{
+ return QuantityFlag::flags_from_mask(_structure->meaning->mqflags);
+}
+
+shared_ptr<Logic> 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> logic =
+ shared_ptr<Logic>{new Logic{datafeed}, default_delete<Logic>{}};
+
+ check(sr_a2l_threshold(_structure, threshold,
+ (uint8_t*)datafeed->data, datafeed->length));
+
+ return logic;
+}
+
+shared_ptr<Logic> 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> logic =
+ shared_ptr<Logic>{new Logic{datafeed}, default_delete<Logic>{}};
+
+ 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)
{
- return Quantity::get(structure->mq);
}
-const Unit *Analog::get_unit()
+Rational::~Rational()
{
- return Unit::get(structure->unit);
}
-vector<const QuantityFlag *> Analog::get_mq_flags()
+shared_ptr<Rational> Rational::share_owned_by(shared_ptr<Analog> _parent)
{
- return QuantityFlag::flags_from_mask(structure->mqflags);
+ return static_pointer_cast<Rational>(
+ 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)
{
}
{
}
-string InputFormat::get_name()
+string InputFormat::name() const
{
- return valid_string(sr_input_id_get(structure));
+ return valid_string(sr_input_id_get(_structure));
}
-string InputFormat::get_description()
+string InputFormat::description() const
{
- return valid_string(sr_input_description_get(structure));
+ return valid_string(sr_input_description_get(_structure));
}
-map<string, shared_ptr<Option>> InputFormat::get_options()
+vector<string> InputFormat::extensions() const
+{
+ vector<string> exts;
+ for (const char *const *e = sr_input_extensions_get(_structure);
+ e && *e; e++)
+ exts.push_back(*e);
+ return exts;
+}
+
+map<string, shared_ptr<Option>> InputFormat::options()
{
- const struct sr_option **options = sr_input_options_get(structure);
- auto option_array = shared_ptr<const struct sr_option *>(
- options, sr_input_options_free);
map<string, shared_ptr<Option>> result;
- for (int i = 0; options[i]; i++)
- result[options[i]->id] = shared_ptr<Option>(
- new Option(options[i], option_array), Option::Deleter());
+
+ if (const struct sr_option **options = sr_input_options_get(_structure)) {
+ shared_ptr<const struct sr_option *> option_array
+ {options, &sr_input_options_free};
+ for (int i = 0; options[i]; i++) {
+ shared_ptr<Option> opt {
+ new Option{options[i], option_array},
+ default_delete<Option>{}};
+ result.emplace(opt->id(), move(opt));
+ }
+ }
return result;
}
shared_ptr<Input> InputFormat::create_input(
map<string, Glib::VariantBase> options)
{
- auto input = sr_input_new(structure, map_to_hash_variant(options));
+ auto input = sr_input_new(_structure, map_to_hash_variant(options));
if (!input)
throw Error(SR_ERR_ARG);
- return shared_ptr<Input>(
- new Input(parent->shared_from_this(), input), Input::Deleter());
+ return shared_ptr<Input>{new Input{_parent, input}, default_delete<Input>{}};
}
Input::Input(shared_ptr<Context> context, const struct sr_input *structure) :
- UserOwned(structure),
- context(context),
- device(nullptr)
+ _structure(structure),
+ _context(move(context))
{
}
-shared_ptr<InputDevice> Input::get_device()
+shared_ptr<InputDevice> Input::device()
{
- if (!device)
- {
- auto sdi = sr_input_dev_inst_get(structure);
+ if (!_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(string data)
+void Input::send(void *data, size_t length)
{
- auto gstr = g_string_new(data.c_str());
- auto ret = sr_input_send(structure, gstr);
- g_string_free(gstr, false);
+ auto gstr = g_string_new_len(static_cast<char *>(data), length);
+ auto ret = sr_input_send(_structure, gstr);
+ g_string_free(gstr, true);
check(ret);
}
+void Input::end()
+{
+ check(sr_input_end(_structure));
+}
+
+void Input::reset()
+{
+ check(sr_input_reset(_structure));
+}
+
Input::~Input()
{
- if (device)
- delete device;
- check(sr_input_free(structure));
+ sr_input_free(_structure);
}
InputDevice::InputDevice(shared_ptr<Input> input,
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(structure),
+ _structure_array(move(structure_array))
{
}
{
}
-string Option::get_id()
+string Option::id() const
{
- return valid_string(structure->id);
+ return valid_string(_structure->id);
}
-string Option::get_name()
+string Option::name() const
{
- return valid_string(structure->name);
+ return valid_string(_structure->name);
}
-string Option::get_description()
+string Option::description() const
{
- return valid_string(structure->desc);
+ return valid_string(_structure->desc);
}
-Glib::VariantBase Option::get_default_value()
+Glib::VariantBase Option::default_value() const
{
- return Glib::VariantBase(structure->def, true);
+ return Glib::VariantBase(_structure->def, true);
}
-vector<Glib::VariantBase> Option::get_values()
+vector<Glib::VariantBase> Option::values() const
{
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;
}
+Glib::VariantBase Option::parse_string(string value)
+{
+ enum sr_datatype dt;
+ Glib::VariantBase dflt = default_value();
+ GVariant *tmpl = dflt.gobj();
+
+ if (g_variant_is_of_type(tmpl, G_VARIANT_TYPE_UINT64)) {
+ dt = SR_T_UINT64;
+ } else if (g_variant_is_of_type(tmpl, G_VARIANT_TYPE_STRING)) {
+ dt = SR_T_STRING;
+ } else if (g_variant_is_of_type(tmpl, G_VARIANT_TYPE_BOOLEAN)) {
+ dt = SR_T_BOOL;
+ } else if (g_variant_is_of_type(tmpl, G_VARIANT_TYPE_DOUBLE)) {
+ dt = SR_T_FLOAT;
+ } else if (g_variant_is_of_type(tmpl, G_VARIANT_TYPE_INT32)) {
+ dt = SR_T_INT32;
+ } else {
+ throw Error(SR_ERR_BUG);
+ }
+ return ConfigKey::parse_string(value, dt);
+}
+
OutputFormat::OutputFormat(const struct sr_output_module *structure) :
- ParentOwned(structure)
+ _structure(structure)
{
}
{
}
-string OutputFormat::get_name()
+string OutputFormat::name() const
{
- return valid_string(sr_output_id_get(structure));
+ return valid_string(sr_output_id_get(_structure));
}
-string OutputFormat::get_description()
+string OutputFormat::description() const
{
- return valid_string(sr_output_description_get(structure));
+ return valid_string(sr_output_description_get(_structure));
}
-map<string, shared_ptr<Option>> OutputFormat::get_options()
+vector<string> OutputFormat::extensions() const
+{
+ vector<string> exts;
+ for (const char *const *e = sr_output_extensions_get(_structure);
+ e && *e; e++)
+ exts.push_back(*e);
+ return exts;
+}
+
+map<string, shared_ptr<Option>> OutputFormat::options()
{
- const struct sr_option **options = sr_output_options_get(structure);
- auto option_array = shared_ptr<const struct sr_option *>(
- options, sr_output_options_free);
map<string, shared_ptr<Option>> result;
- for (int i = 0; options[i]; i++)
- result[options[i]->id] = shared_ptr<Option>(
- new Option(options[i], option_array), Option::Deleter());
+
+ if (const struct sr_option **options = sr_output_options_get(_structure)) {
+ shared_ptr<const struct sr_option *> option_array
+ {options, &sr_output_options_free};
+ for (int i = 0; options[i]; i++) {
+ shared_ptr<Option> opt {
+ new Option{options[i], option_array},
+ default_delete<Option>{}};
+ result.emplace(opt->id(), move(opt));
+ }
+ }
return result;
}
shared_ptr<Output> OutputFormat::create_output(
shared_ptr<Device> device, map<string, Glib::VariantBase> options)
{
- return shared_ptr<Output>(
- new Output(shared_from_this(), device, options),
- Output::Deleter());
+ return shared_ptr<Output>{
+ new Output{shared_from_this(), move(device), move(options)},
+ default_delete<Output>{}};
+}
+
+shared_ptr<Output> OutputFormat::create_output(string filename,
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options)
+{
+ return shared_ptr<Output>{
+ new Output{move(filename), shared_from_this(), move(device), move(options)},
+ default_delete<Output>{}};
+}
+
+bool OutputFormat::test_flag(const OutputFlag *flag) const
+{
+ return sr_output_test_flag(_structure, flag->id());
}
Output::Output(shared_ptr<OutputFormat> format,
shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
- UserOwned(sr_output_new(format->structure,
- map_to_hash_variant(options), device->structure)),
- format(format), device(device), options(options)
+ _structure(sr_output_new(format->_structure,
+ map_to_hash_variant(options), device->_structure, nullptr)),
+ _format(move(format)),
+ _device(move(device)),
+ _options(move(options))
+{
+}
+
+Output::Output(string filename, shared_ptr<OutputFormat> format,
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
+ _structure(sr_output_new(format->_structure,
+ map_to_hash_variant(options), device->_structure, filename.c_str())),
+ _format(move(format)),
+ _device(move(device)),
+ _options(move(options))
{
}
Output::~Output()
{
- check(sr_output_free(structure));
+ check(sr_output_free(_structure));
+}
+
+shared_ptr<OutputFormat> Output::format()
+{
+ return _format;
}
string Output::receive(shared_ptr<Packet> packet)
{
GString *out;
- check(sr_output_send(structure, packet->structure, &out));
- if (out)
- {
+ check(sr_output_send(_structure, packet->_structure, &out));
+ if (out) {
auto result = string(out->str, out->str + out->len);
g_string_free(out, true);
return result;
- }
- else
- {
+ } else {
return string();
}
}
-#include "enums.cpp"
+#include <enums.cpp>
}
projects / libsigrok.git / blobdiff