Commit a5106866 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Andrei Vagin

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

travis-ci: success for compel: The final infect move and install target
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 38736194
...@@ -48,6 +48,7 @@ shmem-obj-y += shmem/shmem.o ...@@ -48,6 +48,7 @@ shmem-obj-y += shmem/shmem.o
# STD plugin # STD plugin
target += std target += std
std-obj-y += std/std.o std-obj-y += std/std.o
std-obj-y += std/log.o
std-obj-y += std/string.o std-obj-y += std/string.o
include ./$(PLUGIN_ARCH_DIR)/std/syscalls/Makefile.syscalls include ./$(PLUGIN_ARCH_DIR)/std/syscalls/Makefile.syscalls
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
extern void std_log_set_fd(int fd); extern void std_log_set_fd(int fd);
extern void std_log_set_loglevel(unsigned int level); 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 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, ...) extern void std_sprintf(char output[STD_LOG_SIMPLE_CHUNK], const char *format, ...)
__attribute__ ((__format__ (__printf__, 2, 3))); __attribute__ ((__format__ (__printf__, 2, 3)));
......
...@@ -124,7 +124,7 @@ void std_log_set_loglevel(unsigned int level) ...@@ -124,7 +124,7 @@ void std_log_set_loglevel(unsigned int level)
cur_loglevel = level; cur_loglevel = level;
} }
void log_set_start(struct timeval *s) void std_log_set_start(struct timeval *s)
{ {
start = *s; start = *s;
} }
......
...@@ -35,7 +35,6 @@ extern int log_get_fd(void); ...@@ -35,7 +35,6 @@ extern int log_get_fd(void);
extern void log_set_loglevel(unsigned int loglevel); extern void log_set_loglevel(unsigned int loglevel);
extern unsigned int log_get_loglevel(void); extern unsigned int log_get_loglevel(void);
extern void log_get_logstart(struct timeval *); extern void log_get_logstart(struct timeval *);
extern void log_set_start(struct timeval *s);
extern int write_pidfile(int pid); extern int write_pidfile(int pid);
......
...@@ -17,7 +17,7 @@ ifeq ($(ARCH),x86) ...@@ -17,7 +17,7 @@ ifeq ($(ARCH),x86)
OBJS += ./$(ARCH_DIR)/memcpy.o OBJS += ./$(ARCH_DIR)/memcpy.o
endif endif
OBJS += log-simple.o util-fd.o util.o string.o OBJS += util-fd.o util.o string.o
ifeq ($(VDSO),y) ifeq ($(VDSO),y)
OBJS += util-vdso.o parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o OBJS += util-vdso.o parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment