Merge branch 'scale-amd64' of git+ssh://pdos.csail.mit.edu/home/am0/6.828/xv6 into scale-amd64

207c8bac · Nickolai Zeldovich · 1d27eebf · 38865066 · 207c8bac
--- a/bin/mapbench.cc
+++ b/bin/mapbench.cc
@@ -3,12 +3,16 @@
 #include "user.h"
 #include "amd64.h"
 #include "uspinlock.h"
+#include "mtrace.h"
 #include "pthread.h"

-enum { readaccess = 0 };
+enum { readaccess = 1 };
 enum { verbose = 0 };
 enum { npg = 1 };

+static pthread_barrier_t bar;
+#define NITER 10  // 1000000
+
 void*
 thr(void *arg)
 {
@@ -16,7 +20,12 @@ thr(void *arg)
  if (setaffinity(tid) < 0)
    fprintf(1, "setaffinity err\n");

-  for (int i = 0; i < 1000000; i++) {
+  pthread_barrier_wait(&bar);
+
+  if (tid == 0)
+    mtenable_type(mtrace_record_ascope, "xv6-asharing");
+
+  for (int i = 0; i < NITER; i++) {
    if (verbose && ((i % 100) == 0))
      fprintf(1, "%d: %d ops\n", tid, i);

@@ -50,6 +59,7 @@ main(int ac, char **av)
  int nthread = atoi(av[1]);

  // fprintf(1, "mapbench[%d]: start esp %x, nthread=%d\n", getpid(), rrsp(), nthread);
+  pthread_barrier_init(&bar, 0, nthread);

  for(u64 i = 0; i < nthread; i++) {
    pthread_t tid;
@@ -60,6 +70,8 @@ main(int ac, char **av)
  for(int i = 0; i < nthread; i++)
    wait();

+  mtdisable("xv6-asharing");
+
  // fprintf(1, "mapbench[%d]: done\n", getpid());
  // halt();
  exit();