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

Added mcexec hack.

Browse Source
This commit is contained in:
Naoki Hamada
2014-09-04 16:44:30 +09:00
parent 12ef361436
commit c939a372b0
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
executer/user/mcexec.c
View File

@@ -111,7 +111,7 @@ struct kernel_termios {
cc_t c_cc[NCCS]; /* control characters */ cc_t c_cc[NCCS]; /* control characters */
}; };
int main_loop(int fd, int cpu, pthread_mutex_t *lock); int main_loop(int fd, int cpu, pthread_mutex_t *lock, int mcosid);
static int fd; static int fd;
static char *altroot; static char *altroot;
@@ -569,6 +569,7 @@ struct thread_data_s {
pthread_t thread_id; pthread_t thread_id;
int fd; int fd;
int cpu; int cpu;
int mcosid;
int ret; int ret;
pid_t tid; pid_t tid;
int terminate; int terminate;
@@ -589,7 +590,7 @@ static void *main_loop_thread_func(void *arg)
td->tid = gettid(); td->tid = gettid();
td->remote_tid = (int)td->tid; td->remote_tid = (int)td->tid;
pthread_barrier_wait(&init_ready); pthread_barrier_wait(&init_ready);
td->ret = main_loop(td->fd, td->cpu, td->lock); td->ret = main_loop(td->fd, td->cpu, td->lock, td->mcosid);
return NULL; return NULL;
} }
@@ -713,7 +714,7 @@ void init_sigaction(void)
} }
} }
void init_worker_threads(int fd) void init_worker_threads(int fd, int mcosid)
{ {
int i; int i;
@@ -725,6 +726,7 @@ void init_worker_threads(int fd)
thread_data[i].fd = fd; thread_data[i].fd = fd;
thread_data[i].cpu = i; thread_data[i].cpu = i;
thread_data[i].mcosid = mcosid;
thread_data[i].lock = &lock; thread_data[i].lock = &lock;
thread_data[i].init_ready = &init_ready; thread_data[i].init_ready = &init_ready;
thread_data[i].terminate = 0; thread_data[i].terminate = 0;
@@ -955,7 +957,7 @@ int main(int argc, char **argv)
init_sigaction(); init_sigaction();
init_worker_threads(fd); init_worker_threads(fd, mcosid);
if (ioctl(fd, MCEXEC_UP_START_IMAGE, (unsigned long)desc) != 0) { if (ioctl(fd, MCEXEC_UP_START_IMAGE, (unsigned long)desc) != 0) {
perror("exec"); perror("exec");
@@ -1058,7 +1060,7 @@ static long do_strncpy_from_user(int fd, void *dest, void *src, unsigned long n)
#define SET_ERR(ret) if (ret == -1) ret = -errno #define SET_ERR(ret) if (ret == -1) ret = -errno
int main_loop(int fd, int cpu, pthread_mutex_t *lock) int main_loop(int fd, int cpu, pthread_mutex_t *lock, int mcosid)
{ {
struct syscall_wait_desc w; struct syscall_wait_desc w;
long ret; long ret;
@@ -1067,6 +1069,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
int term; int term;
struct timeval tv; struct timeval tv;
char pathbuf[PATH_MAX]; char pathbuf[PATH_MAX];
char tmpbuf[PATH_MAX];
w.cpu = cpu; w.cpu = cpu;
w.pid = getpid(); w.pid = getpid();
@@ -1096,11 +1099,9 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
__dprintf("open: %s\n", pathbuf); __dprintf("open: %s\n", pathbuf);
fn = pathbuf; fn = pathbuf;
if(!strcmp(fn, "/proc/meminfo")){ if(!strncmp(fn, "/proc/", 6)){
fn = "/admin/fs/attached/files/proc/meminfo"; sprintf(tmpbuf, "/proc/mcos%d/%s", mcosid, fn + 6);
} fn = tmpbuf;
else if(!strcmp(fn, "/proc/cpuinfo")){
fn = "/admin/fs/attached/files/proc/cpuinfo";
} }
else if(!strcmp(fn, "/sys/devices/system/cpu/online")){ else if(!strcmp(fn, "/sys/devices/system/cpu/online")){
fn = "/admin/fs/attached/files/sys/devices/system/cpu/online"; fn = "/admin/fs/attached/files/sys/devices/system/cpu/online";
@@ -1228,7 +1229,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
/* Reinit signals and syscall threads */ /* Reinit signals and syscall threads */
init_sigaction(); init_sigaction();
init_worker_threads(fd); init_worker_threads(fd, mcosid);
__dprintf("pid(%d): signals and syscall threads OK\n", __dprintf("pid(%d): signals and syscall threads OK\n",
getpid()); getpid());