CC-tea/cairo-dock-core
1
0
Fork 0
mirror of https://github.com/Cairo-Dock/cairo-dock-core.git synced 2026-04-21 10:55:50 +02:00
Code Issues Projects Releases Wiki Activity

systemd-integration: do not use static variables for GVariant types

Browse Source 
After looking into the GLib source code, I realized that this has no benefit since GVariantType is just a glorified typedef for the underlying type string. On the other hand, by using g_variant_builder_init_static () where supported, we can actually avoid an unnecessary copy.
This commit is contained in:
Kondor Dániel
2025-12-20 21:23:59 +01:00
parent c5f22d64bc
commit a11264434e
1 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/implementations/cairo-dock-systemd-integration.c
View File

@@ -26,6 +26,12 @@
#include "cairo-dock-systemd-integration.h"
#include <cairo-dock-log.h>
#if GLIB_CHECK_VERSION (2, 84, 0)
#define _init_variant_builder g_variant_builder_init_static
#else
#define _init_variant_builder g_variant_builder_init
#endif
static GDBusProxy *s_proxy = NULL;
static guint32 s_iLaunchID = 0; // unique counter to be used as a suffix for systemd unit names
@@ -43,40 +49,11 @@ static void _spawn_end (G_GNUC_UNUSED GObject* pObj, GAsyncResult *res, G_GNUC_U
}
}
static GVariantType *s_full_type = NULL;
static GVariantType *s_props_type = NULL;
static GVariantType *s_aux_type = NULL;
static GVariantType *s_args_one_type = NULL;
static GVariantType *s_string_array_type = NULL;
static void _init_variant_types (void)
{
/*
StartTransientUnit(in s name,
in s mode,
in a(sv) properties,
in a(sa(sv)) aux,
out o job);
*/
if (!s_full_type) s_full_type = g_variant_type_new ("(ssa(sv)a(sa(sv)))");
if (!s_props_type) s_props_type = g_variant_type_new ("a(sv)");
if (!s_aux_type) s_aux_type = g_variant_type_new ("a(sa(sv))");
// format of args
if (!s_args_one_type) s_args_one_type = g_variant_type_new ("(sasb)");
// args and env vectors
if (!s_string_array_type) s_string_array_type = g_variant_type_new ("as");
// note: all type variables are leaked -- could add a destructor that is called on exit
}
static void _spawn_app (const gchar * const *args, const gchar *id, const gchar *desc, const gchar * const *env, const gchar *working_dir)
{
if (!s_proxy) return;
if (!(args && *args)) return;
_init_variant_types ();
/* Note: systemd unit names must be unique. We ensure this by:
* -- using the "app-cairodock-" prefix to distinguish from other units
* -- adding the app-id to distinguish between apps started by us
@@ -102,16 +79,16 @@ static void _spawn_app (const gchar * const *args, const gchar *id, const gchar
else name = g_strdup_printf ("app-cairodock-%"G_GUINT32_FORMAT"-%s@%"G_GUINT32_FORMAT".service", s_iLaunchTS, id, s_iLaunchID);
GVariantBuilder var_builder;
g_variant_builder_init (&var_builder, s_full_type);
_init_variant_builder (&var_builder, G_VARIANT_TYPE ("(ssa(sv)a(sa(sv)))"));
g_variant_builder_add_value (&var_builder, g_variant_new_take_string (name));
g_variant_builder_add (&var_builder, "s", "fail");
g_variant_builder_open (&var_builder, s_props_type);
g_variant_builder_open (&var_builder, G_VARIANT_TYPE ("a(sv)"));
g_variant_builder_add (&var_builder, "(sv)", "Description", g_variant_new_string (desc));
{
GVariantBuilder args_builder;
g_variant_builder_init (&args_builder, s_args_one_type);
_init_variant_builder (&args_builder, G_VARIANT_TYPE ("(sasb)"));
g_variant_builder_add (&args_builder, "s", args[0]);
g_variant_builder_open (&args_builder, s_string_array_type);
g_variant_builder_open (&args_builder, G_VARIANT_TYPE ("as"));
for(; *args; ++args) g_variant_builder_add (&args_builder, "s", *args);
g_variant_builder_close (&args_builder);
g_variant_builder_add (&args_builder, "b", FALSE);
@@ -121,7 +98,7 @@ static void _spawn_app (const gchar * const *args, const gchar *id, const gchar
if (env && *env)
{
GVariantBuilder env_builder;
g_variant_builder_init (&env_builder, s_string_array_type);
_init_variant_builder (&env_builder, G_VARIANT_TYPE ("as"));
if (env) for (; *env; ++env) g_variant_builder_add (&env_builder, "s", *env);
g_variant_builder_add (&var_builder, "(sv)", "Environment", g_variant_builder_end (&env_builder));
}
@@ -134,7 +111,7 @@ static void _spawn_app (const gchar * const *args, const gchar *id, const gchar
// kill any child processes after the main process exited; this is a problem e.g. with cosmic-files)
g_variant_builder_add (&var_builder, "(sv)", "ExitType", g_variant_new_string ("cgroup"));
g_variant_builder_close (&var_builder);
g_variant_builder_open (&var_builder, s_aux_type);
g_variant_builder_open (&var_builder, G_VARIANT_TYPE ("a(sa(sv))"));
g_variant_builder_close (&var_builder);
g_dbus_proxy_call (s_proxy, "StartTransientUnit", g_variant_builder_end (&var_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _spawn_end, NULL);