X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Fstress%2Fmisc%2Frwlock_driver.cpp;h=548d16a9d95466978d3a8eea92abf0e628abc93b;hb=dfda714438c69e7c8e3642e45f4decb3c15eb3f8;hp=2c61d440e4a75c3e563db772e35d177f98aafb95;hpb=1621e9e488395f489590c3fc497c28382fb17fd1;p=libcds.git diff --git a/test/stress/misc/rwlock_driver.cpp b/test/stress/misc/rwlock_driver.cpp index 2c61d440..548d16a9 100644 --- a/test/stress/misc/rwlock_driver.cpp +++ b/test/stress/misc/rwlock_driver.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include using namespace std; @@ -17,8 +18,8 @@ static size_t s_nRWLockPassCount = 200000; typedef cds_others::RWLock RWLock; class RWLockTest : public cds_test::stress_fixture { protected: - static int sum; - static int x; + static size_t sum; + static size_t x; static RWLock *rwlock; static void SetUpTestCase() { @@ -58,20 +59,20 @@ protected: } }; -int RWLockTest::x; -int RWLockTest::sum; +size_t RWLockTest::x; +size_t RWLockTest::sum; RWLock *RWLockTest::rwlock; TEST_F(RWLockTest, BasicLockUnlock) { rwlock = new RWLock(); - int num_threads = s_nRWLockThreadCount; + size_t num_threads = s_nRWLockThreadCount; for (int write_percentage = 5; write_percentage < 40; write_percentage += 5) { - std::thread *threads = new std::thread[num_threads]; + std::unique_ptr threads(new std::thread[num_threads]); for (size_t i = 0; i < num_threads; i++) { threads[i] = std::thread(ReaderWriterThread, write_percentage); } - for (int i = 0; i < num_threads; i++) { + for (size_t i = 0; i < num_threads; i++) { threads[i].join(); } }