X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bindings%2Fcxx%2Fclasses.cpp;h=2ae0f29839b9256c19572f8fbece25cdf23a8550;hb=2928f47d6404e51c2dda1842c43db578cb1d6cdd;hp=f8065fd7a6f79de667b42f1f7e849c52ea29e7d4;hpb=90ba83f21dae08fdafa26f9db513b25c1aeea92d;p=libsigrok.git diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index f8065fd7..2ae0f298 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -22,12 +22,6 @@ namespace sigrok { -/** Custom shared_ptr deleter for children owned by their parent object. */ -template void reset_parent(T *child) -{ - child->parent.reset(); -} - /** Helper function to translate C errors to C++ exceptions. */ static void check(int result) { @@ -113,8 +107,8 @@ map> Context::get_drivers() { auto name = entry.first; auto driver = entry.second; - driver->parent = static_pointer_cast(shared_from_this()); - result[name] = shared_ptr(driver, reset_parent); + result[name] = static_pointer_cast( + driver->get_shared_pointer(this)); } return result; } @@ -126,9 +120,8 @@ map> Context::get_input_formats() { auto name = entry.first; auto input_format = entry.second; - input_format->parent = static_pointer_cast(shared_from_this()); - result[name] = shared_ptr(input_format, - reset_parent); + result[name] = static_pointer_cast( + input_format->get_shared_pointer(this)); } return result; } @@ -140,9 +133,8 @@ map> Context::get_output_formats() { auto name = entry.first; auto output_format = entry.second; - output_format->parent = static_pointer_cast(shared_from_this()); - result[name] = shared_ptr(output_format, - reset_parent); + result[name] = static_pointer_cast( + output_format->get_shared_pointer(this)); } return result; } @@ -301,11 +293,8 @@ vector> Driver::scan( /* Create list of shared pointers to device instances for return. */ vector> result; for (auto device : devices) - { - device->parent = parent->shared_from_this(); - result.push_back(shared_ptr(device, - reset_parent)); - } + result.push_back(static_pointer_cast( + device->get_shared_pointer(parent))); return result; } @@ -355,14 +344,14 @@ Device::Device(struct sr_dev_inst *structure) : for (GSList *entry = structure->channels; entry; entry = entry->next) { auto channel = (struct sr_channel *) entry->data; - channels.push_back(new Channel(channel)); + channels[channel] = new Channel(channel); } } Device::~Device() { - for (auto channel : channels) - delete channel; + for (auto entry : channels) + delete entry.second; } string Device::get_vendor() @@ -383,14 +372,18 @@ string Device::get_version() vector> Device::get_channels() { vector> result; - for (auto channel : channels) - { - channel->parent = static_pointer_cast(shared_from_this()); - result.push_back(shared_ptr(channel, reset_parent)); - } + for (auto entry : channels) + result.push_back(static_pointer_cast( + entry.second->get_shared_pointer(this))); return result; } +shared_ptr Device::get_channel(struct sr_channel *ptr) +{ + return static_pointer_cast( + channels[ptr]->get_shared_pointer(this)); +} + void Device::open() { check(sr_dev_open(structure)); @@ -420,7 +413,7 @@ HardwareDevice::~HardwareDevice() shared_ptr HardwareDevice::get_driver() { - return static_pointer_cast(driver->shared_from_this()); + return static_pointer_cast(driver->get_shared_pointer(parent)); } map> @@ -431,10 +424,8 @@ HardwareDevice::get_channel_groups() { auto name = entry.first; auto channel_group = entry.second; - channel_group->parent = - static_pointer_cast(shared_from_this()); - result[name] = shared_ptr(channel_group, - reset_parent); + result[name] = static_pointer_cast( + channel_group->get_shared_pointer(this)); } return result; } @@ -480,12 +471,7 @@ ChannelGroup::ChannelGroup(HardwareDevice *device, Configurable(device->structure->driver, device->structure, structure) { for (GSList *entry = structure->channels; entry; entry = entry->next) - { - auto channel = (struct sr_channel *) entry->data; - for (auto device_channel : device->channels) - if (channel == device_channel->structure) - channels.push_back(device_channel); - } + channels.push_back(device->channels[(struct sr_channel *)entry->data]); } ChannelGroup::~ChannelGroup() @@ -501,10 +487,8 @@ vector> ChannelGroup::get_channels() { vector> result; for (auto channel : channels) - { - channel->parent = static_pointer_cast(parent->shared_from_this()); - result.push_back(shared_ptr(channel, reset_parent)); - } + result.push_back(static_pointer_cast( + channel->get_shared_pointer(parent))); return result; } @@ -532,10 +516,8 @@ vector> Trigger::get_stages() { vector> result; for (auto stage : stages) - { - stage->parent = static_pointer_cast(shared_from_this()); - result.push_back(shared_ptr(stage, reset_parent)); - } + result.push_back(static_pointer_cast( + stage->get_shared_pointer(this))); return result; } @@ -543,8 +525,8 @@ shared_ptr Trigger::add_stage() { auto stage = new TriggerStage(sr_trigger_stage_add(structure)); stages.push_back(stage); - stage->parent = static_pointer_cast(shared_from_this()); - return shared_ptr(stage, reset_parent); + return static_pointer_cast( + stage->get_shared_pointer(this)); } TriggerStage::TriggerStage(struct sr_trigger_stage *structure) : @@ -567,10 +549,8 @@ vector> TriggerStage::get_matches() { vector> result; for (auto match : matches) - { - match->parent = static_pointer_cast(shared_from_this()); - result.push_back(shared_ptr(match, reset_parent)); - } + result.push_back(static_pointer_cast( + match->get_shared_pointer(this))); return result; } @@ -620,7 +600,7 @@ void DatafeedCallbackData::run(const struct sr_dev_inst *sdi, const struct sr_datafeed_packet *pkt) { auto device = session->devices[sdi]; - auto packet = shared_ptr(new Packet(pkt), Packet::Deleter()); + auto packet = shared_ptr(new Packet(device, pkt), Packet::Deleter()); callback(device, packet); } @@ -913,11 +893,23 @@ void Session::set_trigger(shared_ptr trigger) this->trigger = trigger; } -Packet::Packet(const struct sr_datafeed_packet *structure) : - structure(structure) +Packet::Packet(shared_ptr device, + const struct sr_datafeed_packet *structure) : + structure(structure), + device(device) { switch (structure->type) { + case SR_DF_HEADER: + payload = new Header( + static_cast( + structure->payload)); + break; + case SR_DF_META: + payload = new Meta( + static_cast( + structure->payload)); + break; case SR_DF_LOGIC: payload = new Logic( static_cast( @@ -928,15 +920,13 @@ Packet::Packet(const struct sr_datafeed_packet *structure) : static_cast( structure->payload)); break; - default: - payload = NULL; - break; } } Packet::~Packet() { - delete payload; + if (payload) + delete payload; } const PacketType *Packet::get_type() @@ -944,9 +934,9 @@ const PacketType *Packet::get_type() return PacketType::get(structure->type); } -PacketPayload *Packet::get_payload() +shared_ptr Packet::get_payload() { - return payload; + return payload->get_shared_pointer(this); } PacketPayload::PacketPayload() @@ -957,28 +947,77 @@ PacketPayload::~PacketPayload() { } -Logic::Logic(const struct sr_datafeed_logic *structure) : PacketPayload(), - structure(structure), - data(static_cast(structure->data), - static_cast(structure->data) + structure->length) {} +Header::Header(const struct sr_datafeed_header *structure) : + PacketPayload(), + StructureWrapper(structure) +{ +} + +Header::~Header() +{ +} + +int Header::get_feed_version() +{ + return structure->feed_version; +} + +Glib::TimeVal Header::get_start_time() +{ + return Glib::TimeVal( + structure->starttime.tv_sec, + structure->starttime.tv_usec); +} + +Meta::Meta(const struct sr_datafeed_meta *structure) : + PacketPayload(), + StructureWrapper(structure) +{ +} + +Meta::~Meta() +{ +} + +map Meta::get_config() +{ + map 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); + } + return result; +} + +Logic::Logic(const struct sr_datafeed_logic *structure) : + PacketPayload(), + StructureWrapper(structure) +{ +} Logic::~Logic() { } -void *Logic::get_data() +void *Logic::get_data_pointer() { return structure->data; } -size_t Logic::get_data_size() +size_t Logic::get_data_length() { return structure->length; } +unsigned int Logic::get_unit_size() +{ + return structure->unitsize; +} + Analog::Analog(const struct sr_datafeed_analog *structure) : PacketPayload(), - structure(structure) + StructureWrapper(structure) { } @@ -986,19 +1025,23 @@ Analog::~Analog() { } -void *Analog::get_data() +float *Analog::get_data_pointer() { return structure->data; } -size_t Analog::get_data_size() +unsigned int Analog::get_num_samples() { - return structure->num_samples * sizeof(float); + return structure->num_samples; } -unsigned int Analog::get_num_samples() +vector> Analog::get_channels() { - return structure->num_samples; + vector> result; + for (auto l = structure->channels; l; l = l->next) + result.push_back(parent->device->get_channel( + (struct sr_channel *)l->data)); + return result; } const Quantity *Analog::get_mq()