isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Refactor internal calls to systemd service

Browse Source 
Add some parameters to make these calls useful beyond starting
and stopping units. We will need to query the existence of units
for starters.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2171>
This commit is contained in:
Carlos Garnacho 2022-02-10 14:05:41 +01:00 committed by Marge Bot
parent 4b56acb775
commit adc58ea743
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/shell-util.c
View File

@ -516,9 +516,15 @@ shell_util_get_uid (void)
} }
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
typedef enum {
SYSTEMD_CALL_FLAGS_NONE = 0,
SYSTEMD_CALL_FLAGS_WATCH_JOB = 1 << 0,
} SystemdFlags;
typedef struct { typedef struct {
GDBusConnection *connection; GDBusConnection *connection;
gchar *command; gchar *command;
SystemdFlags flags;
GCancellable *cancellable; GCancellable *cancellable;
gulong cancel_id; gulong cancel_id;
@ -593,7 +599,10 @@ on_systemd_call_cb (GObject *source,
g_assert (data->job == NULL); g_assert (data->job == NULL);
g_variant_get (reply, "(o)", &data->job); g_variant_get (reply, "(o)", &data->job);
/* And we wait for the JobRemoved notification. */ /* we should either wait for the JobRemoved notification, or
* notify here */
if ((data->flags & SYSTEMD_CALL_FLAGS_WATCH_JOB) == 0)
g_task_return_boolean (task, TRUE);
} }
static void static void
@ -642,8 +651,8 @@ on_systemd_job_removed_cb (GDBusConnection *connection,
static void static void
shell_util_systemd_call (const char *command, shell_util_systemd_call (const char *command,
const char *unit, GVariant *params,
const char *mode, SystemdFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
@ -690,16 +699,22 @@ shell_util_systemd_call (const char *command,
data = g_new0 (SystemdCall, 1); data = g_new0 (SystemdCall, 1);
data->command = g_strdup (command); data->command = g_strdup (command);
data->connection = g_object_ref (connection); data->connection = g_object_ref (connection);
data->job_watch = g_dbus_connection_signal_subscribe (connection, data->flags = flags;
"org.freedesktop.systemd1",
"org.freedesktop.systemd1.Manager", if ((data->flags & SYSTEMD_CALL_FLAGS_WATCH_JOB) != 0)
"JobRemoved", {
"/org/freedesktop/systemd1", data->job_watch = g_dbus_connection_signal_subscribe (connection,
NULL, "org.freedesktop.systemd1",
G_DBUS_SIGNAL_FLAGS_NONE, "org.freedesktop.systemd1.Manager",
on_systemd_job_removed_cb, "JobRemoved",
task, "/org/freedesktop/systemd1",
NULL); NULL,
G_DBUS_SIGNAL_FLAGS_NONE,
on_systemd_job_removed_cb,
task,
NULL);
}
g_task_set_task_data (task, g_task_set_task_data (task,
data, data,
(GDestroyNotify) shell_util_systemd_call_data_free); (GDestroyNotify) shell_util_systemd_call_data_free);
@ -718,8 +733,7 @@ shell_util_systemd_call (const char *command,
"/org/freedesktop/systemd1", "/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager", "org.freedesktop.systemd1.Manager",
command, command,
g_variant_new ("(ss)", params,
unit, mode),
G_VARIANT_TYPE ("(o)"), G_VARIANT_TYPE ("(o)"),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
-1, cancellable, -1, cancellable,
@ -740,7 +754,9 @@ shell_util_start_systemd_unit (const char *unit,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
shell_util_systemd_call ("StartUnit", unit, mode, shell_util_systemd_call ("StartUnit",
g_variant_new ("(ss)", unit, mode),
SYSTEMD_CALL_FLAGS_WATCH_JOB,
cancellable, callback, user_data); cancellable, callback, user_data);
} }
@ -758,7 +774,9 @@ shell_util_stop_systemd_unit (const char *unit,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
shell_util_systemd_call ("StopUnit", unit, mode, shell_util_systemd_call ("StopUnit",
g_variant_new ("(ss)", unit, mode),
SYSTEMD_CALL_FLAGS_WATCH_JOB,
cancellable, callback, user_data); cancellable, callback, user_data);
} }