mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 15:55:53 +00:00
Code Issues Releases Wiki Activity

compel: plugins,std -- Move in log engine from criu pie

Browse Source 
travis-ci: success for compel: The final infect move and install target
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov
2016-11-16 18:06:49 +03:00
committed by Andrei Vagin
parent 387361946e
commit a51068664b
5 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compel/plugins/Makefile
View File

@@ -48,6 +48,7 @@ shmem-obj-y += shmem/shmem.o
# STD plugin
target += std
std-obj-y += std/std.o
std-obj-y += std/log.o
std-obj-y += std/string.o
include ./$(PLUGIN_ARCH_DIR)/std/syscalls/Makefile.syscalls

1
compel/plugins/include/uapi/std/log.h
View File

@@ -5,6 +5,7 @@
extern void std_log_set_fd(int fd);
extern void std_log_set_loglevel(unsigned int level);
extern void std_log_set_start(struct timeval *tv);
extern int std_vprint_num(char *buf, int blen, int num, char **ps);
extern void std_sprintf(char output[STD_LOG_SIMPLE_CHUNK], const char *format, ...)
__attribute__ ((__format__ (__printf__, 2, 3)));

2
criu/pie/log-simple.c → compel/plugins/std/log.c
View File

@@ -124,7 +124,7 @@ void std_log_set_loglevel(unsigned int level)
cur_loglevel = level;
}
void log_set_start(struct timeval *s)
void std_log_set_start(struct timeval *s)
{
start = *s;
}

1
criu/include/criu-log.h
View File

@@ -35,7 +35,6 @@ extern int log_get_fd(void);
extern void log_set_loglevel(unsigned int loglevel);
extern unsigned int log_get_loglevel(void);
extern void log_get_logstart(struct timeval *);
extern void log_set_start(struct timeval *s);
extern int write_pidfile(int pid);

2
criu/pie/Makefile.library
View File

@@ -17,7 +17,7 @@ ifeq ($(ARCH),x86)
OBJS += ./$(ARCH_DIR)/memcpy.o
endif
OBJS += log-simple.o util-fd.o util.o string.o
OBJS += util-fd.o util.o string.o
ifeq ($(VDSO),y)
OBJS += util-vdso.o parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o