C++: Add internal lookup to find Channel object from sr_channel *.

[libsigrok.git] / bindings / cxx / classes.cpp

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index c75f09a00037d847b98559a630c5ee460520b8c3..7b8d8531f899a74ca3fa30822933d5d3f3386adf 100644 (file)
--- 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 <class T> 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<string, shared_ptr<Driver>> Context::get_drivers()
        {
                auto name = entry.first;
                auto driver = entry.second;
-               driver->parent = static_pointer_cast<Context>(shared_from_this());
-               result[name] = shared_ptr<Driver>(driver, reset_parent<Driver>);
+               result[name] = static_pointer_cast<Driver>(
+                       driver->get_shared_pointer(this));
        }
        return result;
 }
@@ -126,9 +120,8 @@ map<string, shared_ptr<InputFormat>> Context::get_input_formats()
        {
                auto name = entry.first;
                auto input_format = entry.second;
-               input_format->parent = static_pointer_cast<Context>(shared_from_this());
-               result[name] = shared_ptr<InputFormat>(input_format,
-                       reset_parent<InputFormat>);
+               result[name] = static_pointer_cast<InputFormat>(
+                       input_format->get_shared_pointer(this));
        }
        return result;
 }
@@ -140,9 +133,8 @@ map<string, shared_ptr<OutputFormat>> Context::get_output_formats()
        {
                auto name = entry.first;
                auto output_format = entry.second;
-               output_format->parent = static_pointer_cast<Context>(shared_from_this());
-               result[name] = shared_ptr<OutputFormat>(output_format,
-                       reset_parent<OutputFormat>);
+               result[name] = static_pointer_cast<OutputFormat>(
+                       output_format->get_shared_pointer(this));
        }
        return result;
 }
@@ -301,11 +293,8 @@ vector<shared_ptr<HardwareDevice>> Driver::scan(
        /* Create list of shared pointers to device instances for return. */
        vector<shared_ptr<HardwareDevice>> result;
        for (auto device : devices)
-       {
-               device->parent = parent->shared_from_this();
-               result.push_back(shared_ptr<HardwareDevice>(device,
-                       reset_parent<HardwareDevice>));
-       }
+               result.push_back(static_pointer_cast<HardwareDevice>(
+                       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<shared_ptr<Channel>> Device::get_channels()
 {
        vector<shared_ptr<Channel>> result;
-       for (auto channel : channels)
-       {
-               channel->parent = static_pointer_cast<Device>(shared_from_this());
-               result.push_back(shared_ptr<Channel>(channel, reset_parent<Channel>));
-       }
+       for (auto entry : channels)
+               result.push_back(static_pointer_cast<Channel>(
+                       entry.second->get_shared_pointer(this)));
        return result;
 }
 
+shared_ptr<Channel> Device::get_channel(struct sr_channel *ptr)
+{
+       return static_pointer_cast<Channel>(
+               channels[ptr]->get_shared_pointer(this));
+}
+
 void Device::open()
 {
        check(sr_dev_open(structure));
@@ -420,7 +413,7 @@ HardwareDevice::~HardwareDevice()
 
 shared_ptr<Driver> HardwareDevice::get_driver()
 {
-       return static_pointer_cast<Driver>(driver->shared_from_this());
+       return static_pointer_cast<Driver>(driver->get_shared_pointer(parent));
 }
 
 map<string, shared_ptr<ChannelGroup>>
@@ -431,10 +424,8 @@ HardwareDevice::get_channel_groups()
        {
                auto name = entry.first;
                auto channel_group = entry.second;
-               channel_group->parent =
-                       static_pointer_cast<HardwareDevice>(shared_from_this());
-               result[name] = shared_ptr<ChannelGroup>(channel_group,
-                       reset_parent<ChannelGroup>);
+               result[name] = static_pointer_cast<ChannelGroup>(
+                       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<shared_ptr<Channel>> ChannelGroup::get_channels()
 {
        vector<shared_ptr<Channel>> result;
        for (auto channel : channels)
-       {
-               channel->parent = static_pointer_cast<Device>(parent->shared_from_this());
-               result.push_back(shared_ptr<Channel>(channel, reset_parent<Channel>));
-       }
+               result.push_back(static_pointer_cast<Channel>(
+                       channel->get_shared_pointer(parent)));
        return result;
 }
 
@@ -532,10 +516,8 @@ vector<shared_ptr<TriggerStage>> Trigger::get_stages()
 {
        vector<shared_ptr<TriggerStage>> result;
        for (auto stage : stages)
-       {
-               stage->parent = static_pointer_cast<Trigger>(shared_from_this());
-               result.push_back(shared_ptr<TriggerStage>(stage, reset_parent<TriggerStage>));
-       }
+               result.push_back(static_pointer_cast<TriggerStage>(
+                       stage->get_shared_pointer(this)));
        return result;
 }
 
@@ -543,8 +525,8 @@ shared_ptr<TriggerStage> Trigger::add_stage()
 {
        auto stage = new TriggerStage(sr_trigger_stage_add(structure));
        stages.push_back(stage);
-       stage->parent = static_pointer_cast<Trigger>(shared_from_this());
-       return shared_ptr<TriggerStage>(stage, reset_parent<TriggerStage>);
+       return static_pointer_cast<TriggerStage>(
+               stage->get_shared_pointer(this));
 }
 
 TriggerStage::TriggerStage(struct sr_trigger_stage *structure) : 
@@ -567,10 +549,8 @@ vector<shared_ptr<TriggerMatch>> TriggerStage::get_matches()
 {
        vector<shared_ptr<TriggerMatch>> result;
        for (auto match : matches)
-       {
-               match->parent = static_pointer_cast<TriggerStage>(shared_from_this());
-               result.push_back(shared_ptr<TriggerMatch>(match, reset_parent<TriggerMatch>));
-       }
+               result.push_back(static_pointer_cast<TriggerMatch>(
+                       match->get_shared_pointer(this)));
        return result;
 }
 
@@ -939,6 +919,11 @@ Packet::~Packet()
        delete payload;
 }
 
+const PacketType *Packet::get_type()
+{
+       return PacketType::get(structure->type);
+}
+
 PacketPayload *Packet::get_payload()
 {
        return payload;