去除日志中 criu 相关内容

compel/include/log.h

@@ -28,8 +28,8 @@ extern void compel_print_on_level(unsigned int loglevel,
 
 #define pr_err(fmt, ...)						\
 	compel_print_on_level(COMPEL_LOG_ERROR,				\
-		       "Error (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+		       "Error: " LOG_PREFIX fmt,		\
+		       ##__VA_ARGS__)
 
 #define pr_err_once(fmt, ...)						\
 	do {								\
@@ -42,8 +42,8 @@ extern void compel_print_on_level(unsigned int loglevel,
 
 #define pr_warn(fmt, ...)						\
 	compel_print_on_level(COMPEL_LOG_WARN,				\
-		       "Warn  (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+		       "Warn: " LOG_PREFIX fmt,		\
+		       ##__VA_ARGS__)
 
 #define pr_warn_once(fmt, ...)						\
 	do {								\

compel/src/lib/handle-elf.c

@@ -48,8 +48,8 @@ static bool test_pointer(const void *ptr, const void *start, const size_t size,
 			 const char *name, const char *file, const int line)
 {
 	if (__ptr_oob((const uintptr_t)ptr, (const uintptr_t)start, size)) {
-		pr_err("Corrupted pointer %p (%s) at %s:%d\n",
-		       ptr, name, file, line);
+		pr_err("Corrupted pointer %p (%s)\n",
+		       ptr, name);
 		return true;
 	}
 	return false;

criu/include/log.h

@@ -49,21 +49,21 @@ extern void print_on_level(unsigned int loglevel, const char *format, ...)
 
 #define pr_err(fmt, ...)						\
 	print_on_level(LOG_ERROR,					\
-		       "Error (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+		       "Error: " LOG_PREFIX fmt,		\
+		       ##__VA_ARGS__)
 
 #define pr_err_once(fmt, ...)						\
 	print_once(LOG_ERROR, fmt, ##__VA_ARGS__)
 
 #define pr_warn(fmt, ...)						\
 	print_on_level(LOG_WARN,					\
-		       "Warn  (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+		       "Warn: " LOG_PREFIX fmt,		\
+		       ##__VA_ARGS__)
 
 #define pr_warn_once(fmt, ...)						\
        print_once(LOG_WARN,						\
-			"Warn  (%s:%d): " LOG_PREFIX fmt,		\
-			__FILE__, __LINE__, ##__VA_ARGS__)
+			"Warn: " LOG_PREFIX fmt,		\
+			##__VA_ARGS__)
 
 #define pr_debug(fmt, ...)						\
 	print_on_level(LOG_DEBUG,					\

criu/util.c

@@ -232,16 +232,16 @@ int reopen_fd_as_safe(char *file, int line, int new_fd, int old_fd, bool allow_r
 	if (old_fd != new_fd) {
 		if (!allow_reuse_fd) {
 			if (fcntl(new_fd, F_GETFD) != -1 || errno != EBADF) {
-				pr_err("fd %d already in use (called at %s:%d)\n",
-					new_fd, file, line);
+				pr_err("fd %d already in use\n",
+					new_fd);
 				return -1;
 			}
 		}
 
 		tmp = dup2(old_fd, new_fd);
 		if (tmp < 0) {
-			pr_perror("Dup %d -> %d failed (called at %s:%d)",
-				  old_fd, new_fd, file, line);
+			pr_perror("Dup %d -> %d failed",
+				  old_fd, new_fd);
 			return tmp;
 		}
 

include/common/bug.h

@@ -21,7 +21,7 @@
 # define BUG_ON_HANDLER(condition)							\
 	do {										\
 		if ((condition)) {							\
-			pr_err("BUG at %s:%d\n", __FILE__, __LINE__);			\
+			pr_err("BUG\n");			\
 			__raise();							\
 			*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__;	\
 		}									\

soccr/soccr.c

@@ -74,7 +74,7 @@ void libsoccr_set_log(unsigned int level, void (*fn)(unsigned int level, const c
 	log = fn;
 }
 
-#define loge(msg, ...) do { if (log && (log_level >= SOCCR_LOG_ERR)) log(SOCCR_LOG_ERR, "Error (%s:%d): " msg, __FILE__, __LINE__, ##__VA_ARGS__); } while (0)
+#define loge(msg, ...) do { if (log && (log_level >= SOCCR_LOG_ERR)) log(SOCCR_LOG_ERR, "Error: " msg, ##__VA_ARGS__); } while (0)
 #define logerr(msg, ...) loge(msg ": %s\n", ##__VA_ARGS__, strerror(errno))
 #define logd(msg, ...) do { if (log && (log_level >= SOCCR_LOG_DBG)) log(SOCCR_LOG_DBG, "Debug: " msg, ##__VA_ARGS__); } while (0)
 

test/others/bers/bers.c

@@ -35,8 +35,8 @@
 	printf("%8d: " fmt, sys_gettid(), ##__VA_ARGS__)
 
 #define pr_err(fmt, ...)				\
-	printf("%8d: Error (%s:%d): " fmt, sys_gettid(),\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+	printf("%8d: Error: " fmt, sys_gettid(),\
+		       ##__VA_ARGS__)
 
 #define pr_perror(fmt, ...)				\
 	pr_err(fmt ": %m\n", ##__VA_ARGS__)

test/zdtm/lib/zdtmtst.h

@@ -123,16 +123,16 @@ extern int write_pidfile(int pid);
 extern int test_log_init(const char *outfile, const char *suffix);
 extern int zdtm_seccomp;
 #define pr_err(format, arg...) \
-	test_msg("ERR: %s:%d: " format, __FILE__, __LINE__, ## arg)
+	test_msg("ERR:" format,## arg)
 #define pr_perror(format, arg...)	\
-	test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", \
-		__FILE__, __LINE__, ## arg, errno, strerror(errno))
+	test_msg("ERR:" format " (errno = %d (%s))\n", \
+		## arg, errno, strerror(errno))
 #define fail(format, arg...)	\
-	test_msg("FAIL: %s:%d: " format " (errno = %d (%s))\n", \
-		 __FILE__, __LINE__, ## arg, errno, strerror(errno))
+	test_msg("FAIL:" format " (errno = %d (%s))\n", \
+		 ## arg, errno, strerror(errno))
 #define skip(format, arg...)	\
-	test_msg("SKIP: %s:%d: " format "\n", \
-		 __FILE__, __LINE__, ## arg)
+	test_msg("SKIP:" format "\n", \
+		 ## arg)
 #define pass()	test_msg("PASS\n")
 
 typedef struct {

test/zdtm/static/socket-raw.c

@@ -40,7 +40,7 @@ const char *test_author		= "Cyrill Gorcunov <gorcunov@openvz.org>";
 # define IP_SET_OP_VERSION	0x00000100	/* Ask kernel version */
 #endif
 
-#define pr_debug(format, arg...) test_msg("DBG: %s:%d: " format, __FILE__, __LINE__, ## arg)
+#define pr_debug(format, arg...) test_msg("DBG:" format, ## arg)
 
 struct ip_set_req_version {
 	unsigned int	op;