gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure : add option --enable-rusage

Browse Source
This commit is contained in:
Katsukura
2017-04-27 14:00:59 +09:00
parent 3fe2257929
commit 8c9b207557
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/cpu.c
View File

@ -1820,11 +1820,11 @@ mod_nmi_ctx(void *nmi_ctx, void (*func)())
int i;
unsigned long flags;
struct x86_cpu_local_variables *v;
//struct x86_cpu_local_variables *v;
if(!ihk_mc_get_processor_id()) {
v = get_x86_this_cpu_local();
}
//if(!ihk_mc_get_processor_id()) {
//v = get_x86_this_cpu_local();
//}
asm volatile("pushf; pop %0" : "=r"(flags) : : "memory", "cc");
for (i = 0; i < 22; i++)
l[i] = l[i + 5];

22
configure vendored
View File

@ -629,6 +629,7 @@ DCFA_VERSION
MCKERNEL_VERSION
IHK_VERSION
ENABLE_MCOVERLAYFS
ENABLE_RUSAGE
MANDIR
KERNDIR
KMODDIR
@ -696,6 +697,7 @@ with_system_map
enable_dcfa
enable_memdump
enable_mcoverlayfs
enable_rusage
'
ac_precious_vars='build_alias
host_alias
@ -1318,6 +1320,7 @@ Optional Features:
--enable-dcfa Enable DCFA modules
--enable-memdump enable dumping memory and analyzing a dump
--enable-mcoverlayfs enable mcoverlayfs implementation
--enable-rusage enable rusage implementation
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -2111,6 +2114,12 @@ else
ENABLE_MCOVERLAYFS=yes
fi
# Check whether --enable-rusage was given.
if test "${enable_rusage+set}" = set; then :
enableval=$enable_rusage; ENABLE_RUSAGE=$enableval
else
ENABLE_RUSAGE=no
fi
case "X$WITH_KERNELSRC" in
Xyes | Xno | X)
@ -3895,6 +3904,16 @@ $as_echo "$as_me: mcoverlayfs is disabled" >&6;}
fi
if test "x$ENABLE_RUSAGE" = "xyes" ; then
$as_echo "#define ENABLE_RUSAGE 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: rusage is enabled" >&5
$as_echo "$as_me: rusage is enabled" >&6;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: rusage is disabled" >&5
$as_echo "$as_me: rusage is disabled" >&6;}
fi
@ -5118,6 +5137,9 @@ _ACEOF
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ENABLE_RUSAGE=$ENABLE_RUSAGE
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF

7
kernel/Makefile.build.in
View File

@ -1,3 +1,4 @@
ENABLE_RUSAGE=@ENABLE_RUSAGE@
VPATH=@abs_srcdir@
SRC=$(VPATH)
IHKDIR=$(IHKBASE)/$(TARGETDIR)
@ -5,8 +6,12 @@ OBJS = init.o mem.o debug.o mikc.o listeners.o ap.o syscall.o cls.o host.o
OBJS += process.o copy.o waitq.o futex.o timer.o plist.o fileobj.o shmobj.o
OBJS += zeroobj.o procfs.o devobj.o sysfs.o xpmem.o rusage.o freeze.o
DEPSRCS=$(wildcard $(SRC)/*.c)
DOPT=
ifeq ($(ENABLE_RUSAGE),yes)
DOPT=-DENABLE_RUSAGE
endif
CFLAGS += -I$(SRC)/include -D__KERNEL__ -g -fno-omit-frame-pointer -fno-inline -fno-inline-small-functions
CFLAGS += -I$(SRC)/include -D__KERNEL__ $(DOPT) -g -fno-omit-frame-pointer -fno-inline -fno-inline-small-functions
LDFLAGS += -e arch_start
IHKOBJ = ihk/ihk.o

2
kernel/freeze.c
View File

@ -5,7 +5,7 @@
#include <cls.h>
extern int nmi_mode;
extern mod_nmi_ctx(void *, void(*)());
extern void mod_nmi_ctx(void *, void(*)());
extern void lapic_ack();
extern void __freeze();

2
kernel/include/rusage.h
View File

@ -1,8 +1,6 @@
#ifndef __RUSAGE_H
#define __RUSAGE_H
#define ENABLE_RUSAGE
#define RUSAGE_DEFAULT_SIZE 10
enum RUSAGE_MEMBER {