Merge remote-tracking branch 'origin/bench'

adonishong · Jul 10, 2017 · 5745695 · 5745695
2 parents 0241ce1 + 2bfd3bb
commit 5745695
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/lib/vmm.c b/lib/vmm.c
@@ -323,8 +323,16 @@ vmm_reentry(struct vmm_snapshot *snapshot)
   hv_return_t ret;
 
   printk("vmm_restore\n");
+  bool retried = false;
+retry:
   ret = hv_vm_create(HV_VM_DEFAULT);
   if (ret != HV_SUCCESS) {
+    if (!retried && ret == HV_NO_DEVICE) {
+      sleep(0);
+      retried = true;
+      printk("retried\n");
+      goto retry;
+    }
     panic("could not create the vm: error code %x", ret);
     return;
   }

diff --git a/src/debug.c b/src/debug.c
@@ -102,8 +102,8 @@ warnk(const char *fmt, ...)
   print_to_sink(warnk_sink, &printk_sync, mes);
 
 #ifndef NDEBUG
-  const char *magenda = "\x1b[35m", *reset = "\x1b[0m";
-  fprintf(stderr, "%sNoah WARNING: %s%s", magenda, mes, reset);
+  //const char *magenda = "\x1b[35m", *reset = "\x1b[0m";
+  //fprintf(stderr, "%sNoah WARNING: %s%s", magenda, mes, reset);
 #endif
 
   free(mes);
@@ -153,7 +153,7 @@ panic(const char *fmt, ...)
   vasprintf(&given, fmt, ap);
   asprintf(&mes, "!!PANIC!!\nperror is \"%s\" if it is valid\n%s\n", strerror(err), given);
 
-  printk("%s", mes);
+  printk("!!PANIC!!%s", mes);
   printbt_to_sink(printk_sink, &printk_sync);
 
   print_to_sink(warnk_sink, &warnk_sync, mes);

diff --git a/src/ipc/signal.c b/src/ipc/signal.c
@@ -267,7 +267,7 @@ wake_sighandler()
     meta_strace_sigdeliver(sig);
     switch (proc.sigaction[sig - 1].lsa_handler) {
       case LINUX_SIG_DFL:
-        warnk("Handling default signal in Noah is not implemented yet\n");
+        //warnk("Handling default signal in Noah is not implemented yet\n");
         /* fall through */
       case LINUX_SIG_IGN:
         continue;
@@ -414,6 +414,11 @@ DEFINE_SYSCALL(rt_sigsuspend, gaddr_t, nset, size_t, size)
   }
   LINUX_SIGDELSET(&lnset, LINUX_SIGKILL);
   LINUX_SIGDELSET(&lnset, LINUX_SIGSTOP);
+
+  sigset_t dwset, doset;
+  linux_to_darwin_sigset(&lnset, &dwset);
+  pthread_sigmask(SIG_SETMASK, &dwset, &doset);
+
   task.sigmask = lnset;
 
   while (1) {
@@ -426,6 +431,7 @@ DEFINE_SYSCALL(rt_sigsuspend, gaddr_t, nset, size_t, size)
   }
   handle_signal();
   warnk("signal handled\n");
+  pthread_sigmask(SIG_SETMASK, &doset, NULL);
   task.sigmask = loset;
   return -LINUX_EINTR;          /* returns -EINTR when its execution ends NORMALLY */
 }

diff --git a/src/proc/exec.c b/src/proc/exec.c
@@ -422,10 +422,10 @@ do_exec(const char *elf_path, int argc, char *argv[], char **envp)
     if ((err = load_script(data, st.st_size, elf_path, argc, argv, envp)) < 0)
       return err;
   }
-  else if (4 <= st.st_size && memcmp(data, "\xcf\xfa\xed\xfe", 4) == 0) {
-    /* Mach-O */
+  /*else if (4 <= st.st_size && memcmp(data, "\xcf\xfa\xed\xfe", 4) == 0) {
+    // Mach-O
     return syswrap(execve(elf_path, argv, envp));
-  }
+  }*/
   else {
     return -LINUX_ENOEXEC;                  /* unsupported file type */
   }

diff --git a/src/proc/process.c b/src/proc/process.c
@@ -23,6 +23,9 @@
 
 #include <sys/sysctl.h>
 
+#define _GNU_SOURCE
+#include <sys/syscall.h>
+
 struct proc proc;
 _Thread_local struct task task;
 
@@ -34,7 +37,7 @@ DEFINE_SYSCALL(sched_yield)
 
 DEFINE_SYSCALL(getpid)
 {
-  return syswrap(getpid());
+  return syswrap(syscall(SYS_getpid));
 }
 
 DEFINE_SYSCALL(getuid)
@@ -255,7 +258,7 @@ DEFINE_SYSCALL(getsid, l_pid_t, pid)
 DEFINE_SYSCALL(getgroups, int, gidsetsize, gaddr_t, grouplist_ptr)
 {
   gid_t *gl = malloc(gidsetsize * sizeof(gid_t));
-  int r = syswrap(getgroups(gidsetsize, gl));
+  int r = syswrap(getgroups(gidsetsize, gidsetsize == 0 ? NULL : gl));
   if (r < 0) {
     goto out;
   }