Some forkexec stuff.

3e89a345 · Silas Boyd-Wickizer · d9f0899f · 3e89a345 · 3e89a345 · 3e89a345
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,8 @@ ULIB = ulib.o usys.o printf.o umalloc.o uthread.o
 UPROGS= \
 	_cat \
 	_init \
+	_forkexectree \
+	_forkexecbench \
 	_forktree \
 	_ls \
 	_mapbench \

--- a/forkexecbench.c
+++ b/forkexecbench.c
+#include "types.h"
+#include "stat.h"
+#include "user.h"
+#include "mtrace.h"
+#include "amd64.h"
+#define NITERS 64
+static void
+execbench(void)
+{
+  u64 s = rdtsc();
+  for (int i = 0; i < NITERS; i++) {
+    int pid = fork(0);
+    if (pid < 0) {
+      printf(1, "fork error\n");
+      exit();
+    }
+    if (pid == 0) {
+      char *av[] = { "forkexecbench", "x", 0 };
+      exec("forkexecbench", av);
+      printf(1, "exec failed\n");
+      exit();
+    } else {
+      wait();
+    }
+  }
+  u64 e = rdtsc();
+  printf(1, "%lu\n", (e-s) / NITERS);
+}
+int
+main(int ac, char **av)
+{
+  if (ac == 2)
+      exit();
+  execbench();
+  exit();
+}
--- a/forkexectree.c
+++ b/forkexectree.c
@@ -7,17 +7,17 @@
 #define NDEPTH 7
 void
-forktree(uint depth)
+forktree(int depth)
 {
  if (depth == 0) {
    printf(1, "%d: forkexectree\n", getpid());
-    mtrace_enable_set(1, "xv6-forktree");
+    mtenable("xv6-forkexectree");
  }
  if (depth >= NDEPTH)
    exit();
-  for (uint i = 0; i < NCHILD; i++) {
+  for (int i = 0; i < NCHILD; i++) {
    int pid = fork(0);
    if (pid < 0) {
      printf(1, "fork error\n");
@@ -33,7 +33,7 @@ forktree(uint depth)
    }
  }
-  for (uint i = 0; i < NCHILD; i++) {
+  for (int i = 0; i < NCHILD; i++) {
    if (wait() < 0) {
      printf(1, "wait stopped early\n");
      exit();
@@ -48,10 +48,8 @@ forktree(uint depth)
  if (depth > 0)
    exit();
-  struct mtrace_appdata_entry entry;
+  mtops(0);
-  entry.u64 = 0;
+  mtdisable("xv6-forkexectree");
-  mtrace_appdata_register(&entry);
-  mtrace_enable_set(0, "xv6-forktree");
  printf(1, "%d: forkexectree OK\n", getpid());
  halt();