[lxc-devel] [lxc/master] lxc: Distinguish pthread_mutex_unlock error messages

[marcosps on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 675 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171208/c5a209fb/attachment.bin>
-------------- next part --------------
From 81a14ca9443ea6934f6cb393b8dae206084ec43f Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Fri, 8 Dec 2017 00:02:18 -0200
Subject: [PATCH] lxc: Distinguish pthread_mutex_unlock error messages

The same message exists in lxclock.c and cgmanager.c, so print the
filename along with the message.

Before this patch:
lxc-destroy -n u1
pthread_mutex_unlock returned:1 Operation not permitted

After this patch:
xc-destroy -n u1
lxclock.c: pthread_mutex_unlock returned:1 Operation not permitted

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
---
 src/lxc/cgroups/cgmanager.c | 3 ++-
 src/lxc/lxclock.c           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lxc/cgroups/cgmanager.c b/src/lxc/cgroups/cgmanager.c
index 054eb1715..e8ef8c66c 100644
--- a/src/lxc/cgroups/cgmanager.c
+++ b/src/lxc/cgroups/cgmanager.c
@@ -88,7 +88,8 @@ static void unlock_mutex(pthread_mutex_t *l)
 	int ret;
 
 	if ((ret = pthread_mutex_unlock(l)) != 0) {
-		fprintf(stderr, "pthread_mutex_unlock returned:%d %s\n", ret, strerror(ret));
+		fprintf(stderr, "%s: pthread_mutex_unlock returned:%d %s\n",
+				__FILE__, ret, strerror(ret));
 		exit(1);
 	}
 }
diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index c85a8461c..dee5aa5f0 100644
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -84,7 +84,8 @@ static void unlock_mutex(pthread_mutex_t *l)
 	int ret;
 
 	if ((ret = pthread_mutex_unlock(l)) != 0) {
-		fprintf(stderr, "pthread_mutex_unlock returned:%d %s\n", ret, strerror(ret));
+		fprintf(stderr, "%s: pthread_mutex_unlock returned:%d %s\n",
+				__FILE__, ret, strerror(ret));
 		dump_stacktrace();
 		exit(EXIT_FAILURE);
 	}