#include <sys/syscall.h>
#include <errno.h>
#include <stdarg.h>
+#include <stdio.h>
#include "share.h"
#define UST_STR_COMPONENT XSTR(UST_COMPONENT)
-#define ERRMSG(fmt, args...) do { sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (" __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args); fflush(stderr); } while(0)
+#define ERRMSG(fmt, args...) do { sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args, __func__); fflush(stderr); } while(0)
-#define DEBUG
-#ifdef DEBUG
+#ifdef UST_DEBUG
# define DBG(fmt, args...) ERRMSG(fmt, ## args)
#else
# define DBG(fmt, args...) do {} while(0)