X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5a5c578e2e358a121cdb9234a6cb11c4ecfbf323..5bb7eb131773abd9e642f83629528b4c4e706b2e:/lock_tester.cc diff --git a/lock_tester.cc b/lock_tester.cc index c192128..f8e2196 100644 --- a/lock_tester.cc +++ b/lock_tester.cc @@ -11,7 +11,7 @@ char log_thread_prefix = 'c'; // must be >= 2 const int nt = 6; //XXX: lab1's rpc handlers are blocking. Since rpcs uses a thread pool of 10 threads, we cannot test more than 10 blocking rpc. -std::string dst; +string dst; lock_client **lc = new lock_client * [nt]; lock_protocol::lockid_t a = "1"; lock_protocol::lockid_t b = "2"; @@ -21,7 +21,7 @@ lock_protocol::lockid_t c = "3"; // doesn't grant the same lock to both clients. // it assumes that lock names are distinct in the first byte. int ct[256]; -std::mutex count_mutex; +mutex count_mutex; void check_grant(lock_protocol::lockid_t lid) { lock ml(count_mutex); @@ -116,7 +116,7 @@ void test5(int i) { int main(int argc, char *argv[]) { - std::thread th[nt]; + thread th[nt]; int test = 0; setvbuf(stdout, NULL, _IONBF, 0); @@ -148,7 +148,7 @@ main(int argc, char *argv[]) if (!test || test == 2) { // test2 for (int i = 0; i < nt; i++) - th[i] = std::thread(test2, i); + th[i] = thread(test2, i); for (int i = 0; i < nt; i++) th[i].join(); } @@ -157,7 +157,7 @@ main(int argc, char *argv[]) LOG_NONMEMBER("test 3"); for (int i = 0; i < nt; i++) - th[i] = std::thread(test3, i); + th[i] = thread(test3, i); for (int i = 0; i < nt; i++) th[i].join(); } @@ -166,7 +166,7 @@ main(int argc, char *argv[]) LOG_NONMEMBER("test 4"); for (int i = 0; i < 2; i++) - th[i] = std::thread(test4, i); + th[i] = thread(test4, i); for (int i = 0; i < 2; i++) th[i].join(); } @@ -175,7 +175,7 @@ main(int argc, char *argv[]) LOG_NONMEMBER("test 5"); for (int i = 0; i < nt; i++) - th[i] = std::thread(test5, i); + th[i] = thread(test5, i); for (int i = 0; i < nt; i++) th[i].join(); }