Merge branch 'master' of postpeta.pccluster.org:mckernel

executer/kernel/Makefile

@@ -1,19 +0,0 @@
-KDIR ?= /lib/modules/`uname -r `/build
-
-obj-m += mcctrl.o
-
-mcctrl-objs := driver.o control.o ikc.o syscall.o
-
-IHK_BASE=$(src)/../../../ihk
-EXTRA_CFLAGS = -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/include -I$(src)/../include
-KBUILD_EXTRA_SYMBOLS = $(IHK_BASE)/linux/core/Module.symvers
-
-.PHONY: clean install
-
-modules:
-	$(MAKE) -C $(KDIR) M=$(PWD) modules
-
-clean:
-	$(RM) .*.cmd *.mod.c *.o *.ko* Module.symvers modules.order -r .tmp*
-
-install:

executer/user/Makefile

@@ -1,16 +0,0 @@
-#CC=/usr/linux-k1om-4.7/bin/x86_64-k1om-linux-gcc
-CC=gcc
-CFLAGS=-Wall -O
-TARGET=mcexec
-
-all: $(TARGET)
-
-mcexec: mcexec.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -pthread -o $@ $^ $(EXTRA_OBJS)
-
-clean:
-	$(RM) $(TARGET) *.o
-
-.PHONY: all clean
-
-

executer/user/Makefile.in

@@ -6,7 +6,7 @@ TARGET=mcexec
 all: $(TARGET)
 
 mcexec: mcexec.c
-	$(CC) $(CFLAGS) -pthread -o $@ $^
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -pthread -o $@ $^ $(EXTRA_OBJS)
 
 clean:
 	$(RM) $(TARGET) *.o

executer/user/mcexec.c

@@ -549,6 +549,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
 {
 	struct syscall_wait_desc w;
 	long ret;
+	char *fn;
 	
 	w.cpu = cpu;
 
@@ -573,7 +574,17 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
 			
 			__dprintf("open: %s\n", dma_buf);
 
-			ret = open((char *)dma_buf, w.sr.args[1], w.sr.args[2]);
+			fn = (char *)dma_buf;
+			if(!strcmp(fn, "/proc/meminfo")){
+				fn = "/admin/fs/attached/files/proc/meminfo";
+			}
+			else if(!strcmp(fn, "/proc/cpuinfo")){
+				fn = "/admin/fs/attached/files/proc/cpuinfo";
+			}
+			else if(!strcmp(fn, "/sys/devices/system/cpu/online")){
+				fn = "/admin/fs/attached/files/sys/devices/system/cpu/online";
+			}
+			ret = open(fn, w.sr.args[1], w.sr.args[2]);
 			SET_ERR(ret);
 			do_syscall_return(fd, cpu, ret, 0, 0, 0, 0);
 			break;