Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-08-02 06:43:00 +00:00
Code Issues Projects Releases Wiki Activity

plugin: allow to use logging function in plugins

Browse source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin 2013-12-18 15:36:34 +04:00 • committed by Pavel Emelyanov
parent c79751171f
commit 2add5b87fa
4 changed files with 72 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

70
include/criu-log.h Normal file
View file

@ -0,0 +1,70 @@
/*
This file defines types and macros for CRIU plugins.
Copyright (C) 2013 Parallels, Inc
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __CRIU_LOG_H__
#define __CRIU_LOG_H__
#define LOG_MSG (0) /* Print message regardless of log level */
#define LOG_ERROR (1) /* Errors only, when we're in trouble */
#define LOG_WARN (2) /* Warnings, dazen and confused but trying to continue */
#define LOG_INFO (3) /* Informative, everything is fine */
#define LOG_DEBUG (4) /* Debug only */
extern void print_on_level(unsigned int loglevel, const char *format, ...)
__attribute__ ((__format__ (__printf__, 2, 3)));
#ifndef LOG_PREFIX
# define LOG_PREFIX
#endif
#define pr_msg(fmt, ...) \
print_on_level(LOG_MSG, \
fmt, ##__VA_ARGS__)
#define pr_info(fmt, ...) \
print_on_level(LOG_INFO, \
LOG_PREFIX fmt, ##__VA_ARGS__)
#define pr_err(fmt, ...) \
print_on_level(LOG_ERROR, \
"Error (%s:%d): " LOG_PREFIX fmt, \
__FILE__, __LINE__, ##__VA_ARGS__)
#define pr_err_once(fmt, ...) \
do { \
static bool __printed; \
if (!__printed) { \
pr_err(fmt, ##__VA_ARGS__); \
__printed = 1; \
} \
} while (0)
#define pr_warn(fmt, ...) \
print_on_level(LOG_WARN, \
"Warn (%s:%d): " LOG_PREFIX fmt, \
__FILE__, __LINE__, ##__VA_ARGS__)
#define pr_debug(fmt, ...) \
print_on_level(LOG_DEBUG, \
LOG_PREFIX fmt, ##__VA_ARGS__)
#define pr_perror(fmt, ...) \
pr_err(fmt ": %m\n", ##__VA_ARGS__)
#endif /* __CR_LOG_LEVELS_H__ */

12
include/log-levels.h
View file

@ -1,12 +0,0 @@
#ifndef __CR_LOG_LEVELS_H__
#define __CR_LOG_LEVELS_H__
#define LOG_MSG (0) /* Print message regardless of log level */
#define LOG_ERROR (1) /* Errors only, when we're in trouble */
#define LOG_WARN (2) /* Warnings, dazen and confused but trying to continue */
#define LOG_INFO (3) /* Informative, everything is fine */
#define LOG_DEBUG (4) /* Debug only */
#define DEFAULT_LOGLEVEL LOG_WARN
#endif /* __CR_LOG_LEVELS_H__ */

43
include/log.h
View file

@ -1,7 +1,7 @@
#ifndef __CR_LOG_H__
#define __CR_LOG_H__
#include "log-levels.h"
#include "criu-log.h"
extern int log_init(const char *output);
extern void log_fini(void);
@ -16,48 +16,9 @@ extern unsigned int log_get_loglevel(void);
extern int vprint_num(char *buf, int blen, int num, char **ps);
extern void print_on_level(unsigned int loglevel, const char *format, ...)
__attribute__ ((__format__ (__printf__, 2, 3)));
extern int write_pidfile(int pid);
#ifndef LOG_PREFIX
# define LOG_PREFIX
#endif
#define pr_msg(fmt, ...) \
print_on_level(LOG_MSG, \
fmt, ##__VA_ARGS__)
#define pr_info(fmt, ...) \
print_on_level(LOG_INFO, \
LOG_PREFIX fmt, ##__VA_ARGS__)
#define pr_err(fmt, ...) \
print_on_level(LOG_ERROR, \
"Error (%s:%d): " LOG_PREFIX fmt, \
__FILE__, __LINE__, ##__VA_ARGS__)
#define pr_err_once(fmt, ...) \
do { \
static bool __printed; \
if (!__printed) { \
pr_err(fmt, ##__VA_ARGS__); \
__printed = 1; \
} \
} while (0)
#define pr_warn(fmt, ...) \
print_on_level(LOG_WARN, \
"Warn (%s:%d): " LOG_PREFIX fmt, \
__FILE__, __LINE__, ##__VA_ARGS__)
#define pr_debug(fmt, ...) \
print_on_level(LOG_DEBUG, \
LOG_PREFIX fmt, ##__VA_ARGS__)
#define pr_perror(fmt, ...) \
pr_err(fmt ": %m\n", ##__VA_ARGS__)
#define DEFAULT_LOGLEVEL LOG_WARN
#define DEFAULT_LOG_FILENAME "criu.log"

1
pie/log-simple.c
View file

@ -4,7 +4,6 @@
#include "syscall.h"
#include "log.h"
#include "log-levels.h"
#define LOG_SIMPLE_CHUNK 72