From c8e7957c63d1ec1694a72be35150341fa6ccbbb0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 18 Jan 2016 14:04:56 +0100
Subject: [PATCH] core: add NMLOG macros to nm-manager.c

---
 src/nm-manager.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 455691d50c..f825913643 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -194,6 +194,25 @@ enum {
 	LAST_PROP
 };
 
+NM_DEFINE_SINGLETON_INSTANCE (NMManager);
+
+/************************************************************************/
+
+#define _NMLOG_DOMAIN           LOGD_CORE
+#define _NMLOG_PREFIX_NAME      "manager"
+#define _NMLOG(level, ...) \
+    G_STMT_START { \
+        char __sbuf[32]; \
+        const void *const __self = (self); \
+        \
+        nm_log ((level), _NMLOG_DOMAIN, \
+                "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
+                _NMLOG_PREFIX_NAME, \
+                (__self && __self != singleton_instance \
+                    ? (__self ? nm_sprintf_buf (__sbuf, "[%p]", __self) : "[]") \
+                    : "") \
+                _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
+    } G_STMT_END
 
 /************************************************************************/