From 120fa8f855c5eed10852950c7b37f3878acdbfd9 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza 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 --- src/lxc/cgmanager.c | 3 ++- src/lxc/lxclock.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c index 6464ae524..de9c5f129 100644 --- a/src/lxc/cgmanager.c +++ b/src/lxc/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 9e52324dd..e319d7c6e 100644 --- a/src/lxc/lxclock.c +++ b/src/lxc/lxclock.c @@ -89,7 +89,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); } -- 2.47.2