From b2f6d15b5171dcc4f583fcdc9fd225bab909b1ee Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Fri, 4 Sep 2020 17:23:24 +0100 Subject: [PATCH] all: Include process ID in output When we have more than one layer of adverbs, this provides a way to tell which one we are. Signed-off-by: Simon McVittie <smcv@collabora.com> --- src/adverb.c | 6 +++++- src/launch.c | 6 +++++- src/launcher.c | 6 +++++- src/wrap.c | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/adverb.c b/src/adverb.c index 33acaa64d..8093c9fbb 100644 --- a/src/adverb.c +++ b/src/adverb.c @@ -451,13 +451,15 @@ static GOptionEntry options[] = { NULL } }; +static int my_pid = -1; + static void cli_log_func (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) { - g_printerr ("%s: %s\n", (const char *) user_data, message); + g_printerr ("%s[%d]: %s\n", (const char *) user_data, my_pid, message); } int @@ -478,6 +480,8 @@ main (int argc, sigset_t mask; struct sigaction terminate_child_action = {}; + my_pid = getpid (); + sigemptyset (&mask); sigaddset (&mask, SIGCHLD); diff --git a/src/launch.c b/src/launch.c index 54f2e5045..41413a077 100644 --- a/src/launch.c +++ b/src/launch.c @@ -440,13 +440,15 @@ static const GOptionEntry options[] = { NULL } }; +static int my_pid = -1; + static void cli_log_func (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) { - g_printerr ("%s: %s\n", (const char *) user_data, message); + g_printerr ("%s[%d]: %s\n", (const char *) user_data, my_pid, message); } int @@ -476,6 +478,8 @@ main (int argc, GHashTableIter iter; gpointer key, value; + my_pid = getpid (); + setlocale (LC_ALL, ""); g_set_prgname ("pressure-vessel-launch"); diff --git a/src/launcher.c b/src/launcher.c index 7f9c5e644..e26df69e5 100644 --- a/src/launcher.c +++ b/src/launcher.c @@ -1005,13 +1005,15 @@ static GOptionEntry options[] = { NULL } }; +static int my_pid = -1; + static void cli_log_func (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) { - g_printerr ("%s: %s\n", (const char *) user_data, message); + g_printerr ("%s[%d]: %s\n", (const char *) user_data, my_pid, message); } int @@ -1027,6 +1029,8 @@ main (int argc, gsize i; int ret = EX_USAGE; + my_pid = getpid (); + setlocale (LC_ALL, ""); g_set_prgname ("pressure-vessel-launcher"); diff --git a/src/wrap.c b/src/wrap.c index a8da29920..b4733ff27 100644 --- a/src/wrap.c +++ b/src/wrap.c @@ -842,13 +842,15 @@ tristate_environment (const gchar *name) return TRISTATE_MAYBE; } +static int my_pid = -1; + static void cli_log_func (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) { - g_printerr ("%s: %s\n", (const char *) user_data, message); + g_printerr ("%s[%d]: %s\n", (const char *) user_data, my_pid, message); } int @@ -886,6 +888,8 @@ main (int argc, "STEAM_COMPAT_TOOL_PATH", }; + my_pid = getpid (); + setlocale (LC_ALL, ""); g_set_prgname ("pressure-vessel-wrap"); -- GitLab