Port tests/timerfd.c
[akaros.git] / tests / lock_test.c
index 337d346..a92dab0 100644 (file)
 /* OS dependent #incs */
 #ifdef __ros__
 
-#include <parlib.h>
-#include <vcore.h>
-#include <timing.h>
-#include <spinlock.h>
-#include <mcs.h>
-#include <arch/arch.h>
-#include <event.h>
+#include <parlib/parlib.h>
+#include <parlib/vcore.h>
+#include <parlib/timing.h>
+#include <parlib/spinlock.h>
+#include <parlib/mcs.h>
+#include <parlib/arch/arch.h>
+#include <parlib/event.h>
 
-#include <tsc-compat.h>
-#include <measure.h>
+#include <parlib/tsc-compat.h>
+#include <benchutil/measure.h>
 
 #else
 
@@ -445,7 +445,7 @@ __thread int __vcore_context = 0;
  */
 
 const char *argp_program_version = "lock_test v0.1475263";
-const char *argp_program_bug_address = "<akaros@lists.eecs.berkeley.edu>";
+const char *argp_program_bug_address = "<akaros+subscribe@googlegroups.com>";
 
 static char doc[] = "lock_test -- spinlock benchmarking";
 static char args_doc[] = "-w NUM -l NUM -t LOCK";
@@ -734,7 +734,7 @@ static void os_prep_work(pthread_t *worker_threads, int nr_threads)
        atomic_init(&indir_cnt, 0);
        pthread_can_vcore_request(FALSE);       /* 2LS won't manage vcores */
        pthread_need_tls(FALSE);
-       pthread_lib_init();                                     /* gives us one vcore */
+       pthread_mcp_init();                                     /* gives us one vcore */
        register_ev_handler(EV_VCORE_PREEMPT, trace_preempt, 0);
        register_ev_handler(EV_CHECK_MSGS, trace_indir, 0);
        if (pargs.fake_vc_ctx) {