fix

Author: qimcis

benchmarks/courselab_bench/data/cs537-projects-spring-2018/task_concurrency_xv6_threads/preprocess.sh

@@ -25,6 +25,9 @@ git checkout eeb7b415dbcb12cc362d0783e41c3d1f44066b17 > /dev/null 2>&1
 rm -rf .git
 cd ..
 
+# Ensure no reference-solution directories are present in the sandbox.
+rm -rf xv6-src-clean xv6-src-mod src/xv6-src-clean src/xv6-src-mod
+
 mkdir -p tests
 
 cat > tests/test_clone.c <<'EOT'

benchmarks/courselab_bench/data/cs537-projects-spring-2018/task_concurrency_xv6_threads/sol.sh

@@ -4,9 +4,9 @@ set -e
 cd /workspace/ostep-projects/concurrency-xv6-threads/src
 
 cat <<'PATCH' | patch -p1
-diff -ruN -x .git xv6-src-clean/defs.h xv6-src-mod/defs.h
---- xv6-src-clean/defs.h	2026-01-31 13:48:34.360722856 -0500
-+++ xv6-src-mod/defs.h	2026-01-31 13:48:45.602760516 -0500
+diff -ruN -x .git a/defs.h b/defs.h
+--- a/defs.h	2026-01-31 13:48:34.360722856 -0500
++++ b/defs.h	2026-01-31 13:48:45.602760516 -0500
 @@ -106,6 +106,7 @@
  int             cpuid(void);
  void            exit(void);
@@ -23,9 +23,9 @@ diff -ruN -x .git xv6-src-clean/defs.h xv6-src-mod/defs.h
  int             wait(void);
  void            wakeup(void*);
  void            yield(void);
-diff -ruN -x .git xv6-src-clean/Makefile xv6-src-mod/Makefile
---- xv6-src-clean/Makefile	2026-01-31 13:48:34.360722856 -0500
-+++ xv6-src-mod/Makefile	2026-01-31 13:49:56.581992935 -0500
+diff -ruN -x .git a/Makefile b/Makefile
+--- a/Makefile	2026-01-31 13:48:34.360722856 -0500
++++ b/Makefile	2026-01-31 13:49:56.581992935 -0500
 @@ -153,7 +154,7 @@
  _forktest: forktest.o $(ULIB)
  	# forktest has less library code linked in - needs to be small
@@ -35,9 +35,9 @@ diff -ruN -x .git xv6-src-clean/Makefile xv6-src-mod/Makefile
  	$(OBJDUMP) -S _forktest > forktest.asm
  
  mkfs: mkfs.c fs.h
-diff -ruN -x .git xv6-src-clean/proc.c xv6-src-mod/proc.c
---- xv6-src-clean/proc.c	2026-01-31 13:48:34.362722863 -0500
-+++ xv6-src-mod/proc.c	2026-01-31 13:49:26.308894900 -0500
+diff -ruN -x .git a/proc.c b/proc.c
+--- a/proc.c	2026-01-31 13:48:34.362722863 -0500
++++ b/proc.c	2026-01-31 13:49:26.308894900 -0500
 @@ -112,6 +112,9 @@
    memset(p->context, 0, sizeof *p->context);
    p->context->eip = (uint)forkret;
@@ -215,9 +215,9 @@ diff -ruN -x .git xv6-src-clean/proc.c xv6-src-mod/proc.c
  //PAGEBREAK: 42
  // Per-CPU process scheduler.
  // Each CPU calls scheduler() after setting itself up.
-diff -ruN -x .git xv6-src-clean/proc.h xv6-src-mod/proc.h
---- xv6-src-clean/proc.h	2026-01-31 13:48:34.362722863 -0500
-+++ xv6-src-mod/proc.h	2026-01-31 13:48:52.900784835 -0500
+diff -ruN -x .git a/proc.h b/proc.h
+--- a/proc.h	2026-01-31 13:48:34.362722863 -0500
++++ b/proc.h	2026-01-31 13:48:52.900784835 -0500
 @@ -49,6 +49,8 @@
    struct file *ofile[NOFILE];  // Open files
    struct inode *cwd;           // Current directory
@@ -227,9 +227,9 @@ diff -ruN -x .git xv6-src-clean/proc.h xv6-src-mod/proc.h
  };
  
  // Process memory is laid out contiguously, low addresses first:
-diff -ruN -x .git xv6-src-clean/syscall.c xv6-src-mod/syscall.c
---- xv6-src-clean/syscall.c	2026-01-31 13:48:34.363722866 -0500
-+++ xv6-src-mod/syscall.c	2026-01-31 13:49:37.323930753 -0500
+diff -ruN -x .git a/syscall.c b/syscall.c
+--- a/syscall.c	2026-01-31 13:48:34.363722866 -0500
++++ b/syscall.c	2026-01-31 13:49:37.323930753 -0500
 @@ -84,6 +84,7 @@
  
  extern int sys_chdir(void);
@@ -255,18 +255,18 @@ diff -ruN -x .git xv6-src-clean/syscall.c xv6-src-mod/syscall.c
  };
  
  void
-diff -ruN -x .git xv6-src-clean/syscall.h xv6-src-mod/syscall.h
---- xv6-src-clean/syscall.h	2026-01-31 13:48:34.363722866 -0500
-+++ xv6-src-mod/syscall.h	2026-01-31 13:49:30.355908097 -0500
+diff -ruN -x .git a/syscall.h b/syscall.h
+--- a/syscall.h	2026-01-31 13:48:34.363722866 -0500
++++ b/syscall.h	2026-01-31 13:49:30.355908097 -0500
 @@ -20,3 +20,5 @@
  #define SYS_link   19
  #define SYS_mkdir  20
  #define SYS_close  21
 +#define SYS_clone  22
 +#define SYS_join   23
-diff -ruN -x .git xv6-src-clean/sysproc.c xv6-src-mod/sysproc.c
---- xv6-src-clean/sysproc.c	2026-01-31 13:48:34.363722866 -0500
-+++ xv6-src-mod/sysproc.c	2026-01-31 13:49:44.599954320 -0500
+diff -ruN -x .git a/sysproc.c b/sysproc.c
+--- a/sysproc.c	2026-01-31 13:48:34.363722866 -0500
++++ b/sysproc.c	2026-01-31 13:49:44.599954320 -0500
 @@ -27,6 +27,36 @@
  }
  
@@ -304,9 +304,9 @@ diff -ruN -x .git xv6-src-clean/sysproc.c xv6-src-mod/sysproc.c
  sys_kill(void)
  {
    int pid;
-diff -ruN -x .git xv6-src-clean/ulib.c xv6-src-mod/ulib.c
---- xv6-src-clean/ulib.c	2026-01-31 13:48:34.363722866 -0500
-+++ xv6-src-mod/ulib.c	2026-01-31 13:50:14.504050251 -0500
+diff -ruN -x .git a/ulib.c b/ulib.c
+--- a/ulib.c	2026-01-31 13:48:34.363722866 -0500
++++ b/ulib.c	2026-01-31 13:50:14.504050251 -0500
 @@ -104,3 +104,72 @@
      *dst++ = *src++;
    return vdst;
@@ -380,9 +380,9 @@ diff -ruN -x .git xv6-src-clean/ulib.c xv6-src-mod/ulib.c
 +{
 +  fetch_and_add(&lock->turn, 1);
 +}
-diff -ruN -x .git xv6-src-clean/user.h xv6-src-mod/user.h
---- xv6-src-clean/user.h	2026-01-31 13:48:34.363722866 -0500
-+++ xv6-src-mod/user.h	2026-01-31 13:50:02.812012919 -0500
+diff -ruN -x .git a/user.h b/user.h
+--- a/user.h	2026-01-31 13:48:34.363722866 -0500
++++ b/user.h	2026-01-31 13:50:02.812012919 -0500
 @@ -1,6 +1,12 @@
 +#include "mmu.h"
  struct stat;
@@ -414,9 +414,9 @@ diff -ruN -x .git xv6-src-clean/user.h xv6-src-mod/user.h
 +void lock_init(lock_t *);
 +void lock_acquire(lock_t *);
 +void lock_release(lock_t *);
-diff -ruN -x .git xv6-src-clean/usys.S xv6-src-mod/usys.S
---- xv6-src-clean/usys.S	2026-01-31 13:48:34.363722866 -0500
-+++ xv6-src-mod/usys.S	2026-01-31 13:50:18.687063553 -0500
+diff -ruN -x .git a/usys.S b/usys.S
+--- a/usys.S	2026-01-31 13:48:34.363722866 -0500
++++ b/usys.S	2026-01-31 13:50:18.687063553 -0500
 @@ -29,3 +29,5 @@
  SYSCALL(sbrk)
  SYSCALL(sleep)