[libdazzle] counters: avoid warning when envvar is set
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdazzle] counters: avoid warning when envvar is set
- Date: Sun, 3 Jun 2018 02:23:41 +0000 (UTC)
commit bef80e87378e3477e7a95f709e8ee8a01ce1956f
Author: Christian Hergert <chergert redhat com>
Date: Sat Jun 2 19:23:12 2018 -0700
counters: avoid warning when envvar is set
src/util/dzl-counter.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/src/util/dzl-counter.c b/src/util/dzl-counter.c
index 9f707b9..ad1e121 100644
--- a/src/util/dzl-counter.c
+++ b/src/util/dzl-counter.c
@@ -160,6 +160,7 @@ _dzl_counter_arena_init_local (DzlCounterArena *arena)
gsize size;
gint page_size;
ShmHeader *header;
+ gboolean needs_warning = TRUE;
#ifndef G_OS_WIN32
gpointer mem;
unsigned pid;
@@ -192,7 +193,10 @@ _dzl_counter_arena_init_local (DzlCounterArena *arena)
arena->is_local_arena = TRUE;
if (getenv ("DZL_COUNTER_DISABLE_SHM"))
- goto use_malloc;
+ {
+ needs_warning = FALSE;
+ goto use_malloc;
+ }
pid = getpid ();
g_snprintf (name, sizeof name, NAME_FORMAT, pid);
@@ -241,8 +245,9 @@ failure:
#endif
use_malloc:
- g_warning ("Failed to allocate shared memory for counters. "
- "Counters will not be available to external processes.");
+ if (needs_warning)
+ g_warning ("Failed to allocate shared memory for counters. "
+ "Counters will not be available to external processes.");
/*
* Ask for double memory than required so that we can be certain
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]