endpoint: maintain a weak ref to the core since construction time

+ add a method to retrieve the core
+ change the register function to not require the core as a parameter

lib/wp/endpoint.c

@@ -96,11 +96,12 @@ struct _WpEndpointPrivate
   GPtrArray *streams;
   GPtrArray *controls;
   GPtrArray *links;
-  WpCore *core;
+  GWeakRef core;
 };
 
 enum {
   PROP_0,
+  PROP_CORE,
   PROP_NAME,
   PROP_MEDIA_CLASS,
 };
@@ -119,6 +120,8 @@ wp_endpoint_init (WpEndpoint * self)
 {
   WpEndpointPrivate *priv = wp_endpoint_get_instance_private (self);
 
+  g_weak_ref_init (&priv->core, NULL);
+
   priv->streams =
       g_ptr_array_new_with_free_func ((GDestroyNotify) g_variant_unref);
   priv->controls =
@@ -152,6 +155,7 @@ wp_endpoint_finalize (GObject * object)
   g_ptr_array_unref (priv->controls);
   g_ptr_array_unref (priv->links);
   g_free (priv->name);
+  g_weak_ref_clear (&priv->core);
 
   G_OBJECT_CLASS (wp_endpoint_parent_class)->finalize (object);
 }
@@ -164,6 +168,9 @@ wp_endpoint_set_property (GObject * object, guint property_id,
       wp_endpoint_get_instance_private (WP_ENDPOINT (object));
 
   switch (property_id) {
+  case PROP_CORE:
+    g_weak_ref_set (&priv->core, g_value_get_object (value));
+    break;
   case PROP_NAME:
     priv->name = g_value_dup_string (value);
     break;
@@ -185,6 +192,9 @@ wp_endpoint_get_property (GObject * object, guint property_id, GValue * value,
       wp_endpoint_get_instance_private (WP_ENDPOINT (object));
 
   switch (property_id) {
+  case PROP_CORE:
+    g_value_take_object (value, g_weak_ref_get (&priv->core));
+    break;
   case PROP_NAME:
     g_value_set_string (value, priv->name);
     break;
@@ -207,6 +217,11 @@ wp_endpoint_class_init (WpEndpointClass * klass)
   object_class->get_property = wp_endpoint_get_property;
   object_class->set_property = wp_endpoint_set_property;
 
+  g_object_class_install_property (object_class, PROP_CORE,
+      g_param_spec_object ("core", "core", "The wireplumber core",
+          WP_TYPE_CORE,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+
   /**
    * WpEndpoint::name:
    * The name of the endpoint.
@@ -238,24 +253,24 @@ wp_endpoint_class_init (WpEndpointClass * klass)
 /**
  * wp_endpoint_register:
  * @self: the endpoint
- * @core: the core
  *
- * Registers the endpoint on the @core.
+ * Registers the endpoint on the #WpCore.
  */
 void
-wp_endpoint_register (WpEndpoint * self, WpCore * core)
+wp_endpoint_register (WpEndpoint * self)
 {
   WpEndpointPrivate *priv;
+  g_autoptr (WpCore) core = NULL;
 
   g_return_if_fail (WP_IS_ENDPOINT (self));
-  g_return_if_fail (WP_IS_CORE (core));
 
   priv = wp_endpoint_get_instance_private (self);
+  core = g_weak_ref_get (&priv->core);
+  g_return_if_fail (core != NULL);
 
   g_info ("WpEndpoint:%p registering '%s' (%s)", self, priv->name,
       priv->media_class);
 
-  priv->core = core;
   wp_core_register_global (core, WP_GLOBAL_ENDPOINT, g_object_ref (self),
       g_object_unref);
 }
@@ -271,17 +286,18 @@ void
 wp_endpoint_unregister (WpEndpoint * self)
 {
   WpEndpointPrivate *priv;
+  g_autoptr (WpCore) core = NULL;
 
   g_return_if_fail (WP_IS_ENDPOINT (self));
 
   priv = wp_endpoint_get_instance_private (self);
-  if (priv->core) {
+  core = g_weak_ref_get (&priv->core);
+  if (core) {
     g_info ("WpEndpoint:%p unregistering '%s' (%s)", self, priv->name,
         priv->media_class);
 
     g_object_ref (self);
-    wp_core_remove_global (priv->core, WP_GLOBAL_ENDPOINT, self);
-    priv->core = NULL;
+    wp_core_remove_global (core, WP_GLOBAL_ENDPOINT, self);
     g_object_unref (self);
   }
 }
@@ -350,6 +366,23 @@ wp_endpoint_find (WpCore * core, const gchar * media_class_lookup)
   return data.result;
 }
 
+/**
+ * wp_endpoint_get_core:
+ * @self: the endpoint
+ *
+ * Returns: (transfer full): the core on which this endpoint is registered
+ */
+WpCore *
+wp_endpoint_get_core (WpEndpoint * self)
+{
+  WpEndpointPrivate *priv;
+
+  g_return_val_if_fail (WP_IS_ENDPOINT (self), NULL);
+
+  priv = wp_endpoint_get_instance_private (self);
+  return g_weak_ref_get (&priv->core);
+}
+
 const gchar *
 wp_endpoint_get_name (WpEndpoint * self)
 {

lib/wp/endpoint.h

@@ -34,10 +34,11 @@ struct _WpEndpointClass
   const gchar * (*get_endpoint_link_factory) (WpEndpoint * self);
 };
 
-void wp_endpoint_register (WpEndpoint * self, WpCore * core);
+void wp_endpoint_register (WpEndpoint * self);
 void wp_endpoint_unregister (WpEndpoint * self);
 GPtrArray * wp_endpoint_find (WpCore * core, const gchar * media_class_lookup);
 
+WpCore *wp_endpoint_get_core (WpEndpoint * self);
 const gchar * wp_endpoint_get_name (WpEndpoint * self);
 const gchar * wp_endpoint_get_media_class (WpEndpoint * self);
 

modules/module-pipewire.c

@@ -131,7 +131,7 @@ proxy_node_created(GObject *initable, GAsyncResult *res, gpointer d)
       WP_TYPE_ENDPOINT, endpoint_props);
 
   /* Register the endpoint */
-  wp_endpoint_register (endpoint, core);
+  wp_endpoint_register (endpoint);
 
   /* Clean up */
   proxy_info_destroy (pi);

modules/module-pipewire/simple-endpoint.c

@@ -326,6 +326,7 @@ gpointer
 simple_endpoint_factory (WpFactory * factory, GType type,
     GVariant * properties)
 {
+  g_autoptr (WpCore) core = NULL;
   guint64 proxy_node;
   guint64 proxy_port;
   const gchar *name;
@@ -336,6 +337,9 @@ simple_endpoint_factory (WpFactory * factory, GType type,
   g_return_val_if_fail (g_variant_is_of_type (properties,
           G_VARIANT_TYPE_VARDICT), NULL);
 
+  core = wp_factory_get_core (factory);
+  g_return_val_if_fail (core != NULL, NULL);
+
   if (!g_variant_lookup (properties, "name", "&s", &name))
       return NULL;
   if (!g_variant_lookup (properties, "media-class", "&s", &media_class))
@@ -346,6 +350,7 @@ simple_endpoint_factory (WpFactory * factory, GType type,
       return NULL;
 
   return g_object_new (simple_endpoint_get_type (),
+      "core", core,
       "name", name,
       "media-class", media_class,
       "node-proxy", (gpointer) proxy_node,

modules/module-pw-alsa-udev.c

@@ -122,7 +122,7 @@ proxy_node_created(GObject *initable, GAsyncResult *res, gpointer data)
       WP_TYPE_ENDPOINT, endpoint_props);
 
   /* Register the endpoint */
-  wp_endpoint_register (endpoint, impl->core);
+  wp_endpoint_register (endpoint);
 
   /* Clean up */
   proxy_info_destroy (pi);

modules/module-pw-audio-softdsp-endpoint.c

@@ -609,6 +609,7 @@ endpoint_factory (WpFactory * factory, GType type, GVariant * properties)
 
   /* Create the softdsp endpoint object */
   WpPwAudioSoftdspEndpoint *ep = g_object_new (endpoint_get_type (),
+      "core", wp_core,
       "name", name,
       "media-class", media_class,
       "node-proxy", (gpointer) proxy_node,