[gnome-builder] flatpak: add some tracing macros



commit 4aa3bf4af7d35679b42d21dfd94aaa52a4d78690
Author: Christian Hergert <chergert redhat com>
Date:   Thu Apr 22 12:08:42 2021 -0700

    flatpak: add some tracing macros

 src/plugins/flatpak/gbp-flatpak-application-addin.c | 13 +++++++++----
 src/plugins/flatpak/gbp-flatpak-runtime-provider.c  | 11 ++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c 
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index f2196f17b..73618e084 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -1535,6 +1535,8 @@ gbp_flatpak_application_addin_resolve_extension (GbpFlatpakApplicationAddin *sel
   g_autoptr(GArray) runtime_extensions = NULL;
   g_autoptr(GStringChunk) strings = NULL;
 
+  IDE_ENTRY;
+
   /* XXX: This method is a monstrocity to all main loops. Please make something
    *      in libflatpak that we can use instead of this.
    */
@@ -1544,14 +1546,14 @@ gbp_flatpak_application_addin_resolve_extension (GbpFlatpakApplicationAddin *sel
   g_return_val_if_fail (extension != NULL, NULL);
 
   if (self->installations == NULL)
-    return NULL;
+    IDE_RETURN (NULL);
 
   /* It would be very nice to do this asynchronously someday, but we try to
    * only use cached contents so it's not quite as bad as it could be.
    */
 
   if (!gbp_flatpak_split_id (sdk, &sdk_id, &sdk_arch, &sdk_branch))
-    return NULL;
+    IDE_RETURN (NULL);
 
   strings = g_string_chunk_new (4096);
   installations = g_ptr_array_ref (self->installations);
@@ -1687,10 +1689,13 @@ gbp_flatpak_application_addin_resolve_extension (GbpFlatpakApplicationAddin *sel
                 continue;
 
               if (ide_str_equal0 (target->ref, sdk))
-                return g_strdup (maybe->ref);
+                {
+                  char *ret = g_strdup (maybe->ref);
+                  IDE_RETURN (ret);
+                }
             }
         }
     }
 
-  return NULL;
+  IDE_RETURN (NULL);
 }
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c 
b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
index 5987766ef..5012f7962 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -654,19 +654,24 @@ resolve_extension_branch (GbpFlatpakRuntimeProvider *self,
   g_autofree gchar *resolved = NULL;
   g_autofree gchar *branch = NULL;
 
+  IDE_ENTRY;
+
   g_assert (GBP_IS_FLATPAK_RUNTIME_PROVIDER (self));
   g_assert (extension != NULL);
 
+  IDE_TRACE_MSG ("Resolving extension %s for SDK %s",
+                 extension, sdk);
+
   if (extension == NULL)
-    return NULL;
+    IDE_RETURN (NULL);
 
   addin = gbp_flatpak_application_addin_get_default ();
   resolved = gbp_flatpak_application_addin_resolve_extension (addin, sdk, extension);
 
   if (resolved == NULL || !gbp_flatpak_split_id (resolved, NULL, NULL, &branch))
-    return NULL;
+    IDE_RETURN (NULL);
 
-  return g_steal_pointer (&branch);
+  IDE_RETURN (g_steal_pointer (&branch));
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]