mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 23:35:21 +00:00
Code Issues Releases Wiki Activity

Move pr_ helpers to log.[ch]

Browse Source 
This is a place where they should belong to.
util.c is too big already.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Cyrill Gorcunov
2012-02-17 12:17:00 +04:00
parent 6a0b94e7d5
commit fe99f501ef
4 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/log.h
View File

@@ -1,8 +1,40 @@
#ifndef LOG_H__ #ifndef LOG_H__
#define LOG_H__ #define LOG_H__
extern void printk(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
extern int init_log(const char *name); extern int init_log(const char *name);
extern void fini_log(void); extern void fini_log(void);
extern int get_logfd(void); extern int get_logfd(void);
#define pr_info(fmt, ...) printk(fmt, ##__VA_ARGS__)
#define pr_err(fmt, ...) printk("Error (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define pr_panic(fmt, ...) printk("PANIC (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define pr_warning(fmt, ...) printk("Warning (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#ifdef CR_DEBUG
#define pr_debug(fmt, ...) \
do { \
printk("%s:%d:%s: " fmt, \
__FILE__, __LINE__,__func__, \
##__VA_ARGS__); \
} while (0)
#define dprintk(fmt, ...) printk(fmt, ##__VA_ARGS__)
#else
#define pr_debug(fmt, ...)
#define dprintk(fmt, ...)
#endif
#define die(fmt, ...) \
do { \
printk("die (%s:%d): " fmt, __FILE__, \
__LINE__, ##__VA_ARGS__); \
exit(1); \
} while (0)
#define pr_perror(fmt, ...) \
do { \
pr_err(fmt ": %m\n", ##__VA_ARGS__); \
} while (0)
#endif /* LOG_H__ */ #endif /* LOG_H__ */

34
include/util.h
View File

@@ -15,9 +15,7 @@
#include "compiler.h" #include "compiler.h"
#include "types.h" #include "types.h"
#include "log.h"
extern void printk(const char *format, ...)
__attribute__ ((__format__ (__printf__, 1, 2)));
#define PREF_SHIFT_OP(pref, op, size) ((size) op (pref ##BYTES_SHIFT)) #define PREF_SHIFT_OP(pref, op, size) ((size) op (pref ##BYTES_SHIFT))
#define KBYTES_SHIFT 10 #define KBYTES_SHIFT 10
@@ -32,36 +30,6 @@ extern void printk(const char *format, ...)
#define MEGA(size) PREF_SHIFT_OP(K, <<, size) #define MEGA(size) PREF_SHIFT_OP(K, <<, size)
#define GIGA(size) PREF_SHIFT_OP(K, <<, size) #define GIGA(size) PREF_SHIFT_OP(K, <<, size)
#define pr_info(fmt, ...) printk(fmt, ##__VA_ARGS__)
#define pr_err(fmt, ...) printk("Error (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define pr_panic(fmt, ...) printk("PANIC (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define pr_warning(fmt, ...) printk("Warning (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#ifdef CR_DEBUG
#define pr_debug(fmt, ...) \
do { \
printk("%s:%d:%s: " fmt, \
__FILE__, __LINE__,__func__, \
##__VA_ARGS__); \
} while (0)
#define dprintk(fmt, ...) printk(fmt, ##__VA_ARGS__)
#else
#define pr_debug(fmt, ...)
#define dprintk(fmt, ...)
#endif
#define die(fmt, ...) \
do { \
printk("die (%s:%d): " fmt, __FILE__, \
__LINE__, ##__VA_ARGS__); \
exit(1); \
} while (0)
#define pr_perror(fmt, ...) \
do { \
pr_err(fmt ": %m\n", ##__VA_ARGS__); \
} while (0)
#ifndef BUG_ON_HANDLER #ifndef BUG_ON_HANDLER
#ifdef CR_NOGLIBC #ifdef CR_NOGLIBC

14
log.c
View File

@@ -16,10 +16,7 @@
#include "types.h" #include "types.h"
#include "util.h" #include "util.h"
/* /* Note pr_ helpers rely on this descriptor! */
* Note pr_ helpers rely on this
* descriptor!
*/
static int logfd = STDERR_FILENO; static int logfd = STDERR_FILENO;
int get_logfd(void) int get_logfd(void)
@@ -69,3 +66,12 @@ void fini_log(void)
logfd = STDERR_FILENO; logfd = STDERR_FILENO;
} }
void printk(const char *format, ...)
{
va_list params;
va_start(params, format);
vdprintf(get_logfd(), format, params);
va_end(params);
}

10
util.c
View File

@@ -34,19 +34,9 @@
#include "types.h" #include "types.h"
#include "list.h" #include "list.h"
#include "util.h" #include "util.h"
#include "log.h"
#include "crtools.h" #include "crtools.h"
void printk(const char *format, ...)
{
va_list params;
va_start(params, format);
vdprintf(get_logfd(), format, params);
va_end(params);
}
void hex_dump(void *addr, unsigned long len) void hex_dump(void *addr, unsigned long len)
{ {
unsigned char *p = addr; unsigned char *p = addr;