add DCFA configure option

configure.ac

@@ -13,6 +13,10 @@ AC_ARG_WITH([target],
     [--with-target={attached-mic | builtin-mic | builtin-x86}],[target, default is attached-mic]),
   [WITH_TARGET=$withval],[WITH_TARGET=yes])
 
+AC_ARG_ENABLE([dcfa],
+  [AS_HELP_STRING(
+  	[--enable-dcfa],[Enable DCFA modules])],[],[enable_dcfa=no])
+
 case "X$WITH_KERNELSRC" in
     Xyes | Xno | X)
 	WITH_KERNELSRC='/lib/modules/`uname -r`/build'
@@ -110,4 +114,7 @@ AC_CONFIG_FILES([
 	boot-attached-mic.sh
 ])
 
+AS_IF([test "x$enable_dcfa" = xyes], [
+        AC_CONFIG_FILES([kernel/Makefile.dcfa])])
+    
 AC_OUTPUT

kernel/Makefile.build.dcfa

@@ -1,12 +1,12 @@
 IHKDIR=$(IHKBASE)/$(TARGETDIR)
 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
+OBJS += process.o copy.o waitq.o futex.o timer.o plist.o
 DEPSRCS=$(wildcard $(SRC)/*.c)
 
 CFLAGS += -I$(SRC)/include -mcmodel=kernel -D__KERNEL__
-CFLAGS += -DKNC_MAP_MICPA -DCONFIG_$(CONFIG_V) $(EXTRA_CFLAGS)
+CFLAGS += -DKNC_MAP_MICPA $(EXTRA_CFLAGS)
 
-ifeq ("$(DCFA_V)", "k")
+ifeq ("$(DCFA_MODE)", "kmod")
 CFLAGS += -DDCFA_RUN
 else
 CFLAGS += -DDCFA_KMOD
@@ -19,7 +19,6 @@ include $(SRC)/config/config.$(TARGET)
 include $(IHKBASE)/Makefile.common
 
 SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) SRC=$(SRC)
-SUBCMD_OPTS += CONFIG_V=$(CONFIG_V)
 
 OBJDUMP ?= objdump
 OBJCOPY ?= objcopy

kernel/Makefile.dcfa.in

@@ -1,16 +1,14 @@
-BUILD_TARGET ?= attached-mic
+BUILD_TARGET ?= @TARGET@
+INSTALL_KL_DIR ?= @KERNDIR@
 SRC = $(CURDIR)
-IHKBASE ?= $(SRC)/../../ihk/cokernel
-INSTALL_KL_DIR ?= ./
 
-O ?= $(KBUILD_OUTPUT)
+DCFA_MODE ?= umod
-N ?= kernel_obj.o
+IHKBASE ?= $(SRC)/../../ihk/cokernel
+O ?= $(CURDIR)/build
 V ?= $(VERBOSE)
 
-CONFIG_V ?= KNF
+N ?= kernel_obj.o
-DCFA_V ?= u
+EXTRA_OBJS ?= 
-
-EXTRA_OBJS ?=
 
 ## compile items
 
@@ -22,7 +20,7 @@ KERNEL_MAKEFILE = $(addsuffix /Makefile,$(addprefix $(O)/,$(BUILD_TARGET)))
 
 ## install items
 
-ifeq ("$(DCFA_V)", "k")
+ifeq ("$(DCFA_MODE)", "kmod")
 KERNEL_OBJ_PUB = $(INSTALL_KL_DIR)/$(N)
 KERNEL_MAKEFILE_PUB = $(INSTALL_KL_DIR)/Makefile
 else
@@ -37,9 +35,16 @@ $(if $(O),,$(error Specify the compilation target directory))
 #	$(error IHK is not found in $(IHKBASE)))
 
 
-.PHONY: kmod umod clean depend
+.PHONY: all kmod umod clean depend
 .SECONDARY:	$(KERNEL_MAKEFILE) $(KERNEL_MAKEFILE_PUB)
 
+all: $(DCFA_MODE)
+
+install: $(DCFA_MODE)_install
+
+clean:
+	rm -rf $(O)
+	
 kmod: $(KERNEL_OBJ)
 
 umod: $(KERNELS)
@@ -70,8 +75,7 @@ $(KERNEL_MAKEFILE): Makefile.build.dcfa
 	@echo 'IHKBASE = $(IHKBASE)' >> $@
 	@echo 'TARGET = $(notdir $(patsubst %/,%,$(dir $@)))' >> $@
 	@echo 'TARGETDIR = $$(shell echo $$(TARGET) | sed "s/-/\//")' >> $@	
-	@echo 'CONFIG_V = $(CONFIG_V)' >> $@
+	@echo 'DCFA_MODE = $(DCFA_MODE)' >> $@
-	@echo 'DCFA_V = $(DCFA_V)' >> $@
 	@echo 'KERNEL_OBJ = $(KERNEL_OBJ)' >> $@
 	@echo 'EXTRA_OBJS = $(EXTRA_OBJS)' >> $@
 	@echo 'EXTRA_CFLAGS = $(EXTRA_CFLAGS)' >> $@
@@ -88,15 +92,5 @@ $(KERNEL_MAKEFILE_PUB): Makefile.build.dcfa.public
 	@echo 'TARGETDIR = $$(shell echo $$(TARGET) | sed "s/-/\//")' >> $@	
 	@echo 'KERNEL_OBJ = $(KERNEL_OBJ_PUB)' >> $@
 	@cat $^ >> $@
-		
-umod_clean: $(addsuffix .umod_clean,$(BUILD_TARGET))
-
-kmod_clean: $(addsuffix .kmod_clean,$(BUILD_TARGET))
-
-%.umod_clean: $(O)/%/Makefile
-	@make --no-print-directory -C $(O)/$(basename $@) $(SUBCMD_OPTS) umod_clean
-	
-%.kmod_clean: $(O)/%/Makefile
-	@make --no-print-directory -C $(O)/$(basename $@) $(SUBCMD_OPTS) kmod_clean
 	
 FORCE: