Ugh. Once again, unreviewed, roll out unintentional commit in r202790.

* benchmarks/LockFairnessTest.cpp:
(main):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202791 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 9721dfa963bb12f66548c3aa0e0d30b2024f88ee..dbe6648825af25e99c98596d481ad20835a6a59e 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,10 @@
+2016-07-03  Filip Pizlo  <fpizlo@apple.com>
+
+        Ugh. Once again, unreviewed, roll out unintentional commit in r202790.
+
+        * benchmarks/LockFairnessTest.cpp:
+        (main):
+
 2016-07-02  Dan Bernstein  <mitz@apple.com>
 
         Build fix.

diff --git a/Source/WTF/benchmarks/LockFairnessTest.cpp b/Source/WTF/benchmarks/LockFairnessTest.cpp
index f08321c0f68836535d83cb6bc7511848bb52d94f..e808908418cf150ad75eb35ab4a46b050875f1ab 100644 (file)
--- a/Source/WTF/benchmarks/LockFairnessTest.cpp
+++ b/Source/WTF/benchmarks/LockFairnessTest.cpp
@@ -48,13 +48,12 @@ namespace {
 
 NO_RETURN void usage()
 {
-    printf("Usage: LockFairnessTest yieldspinlock|pausespinlock|wordlock|lock|barginglock|bargingwordlock|thunderlock|thunderwordlock|cascadelock|cascadewordlockhandofflock|mutex|all <num threads> <seconds per test> <microseconds in critical section>\n");
+    printf("Usage: LockFairnessTest yieldspinlock|pausespinlock|wordlock|lock|barginglock|bargingwordlock|thunderlock|thunderwordlock|cascadelock|cascadewordlockhandofflock|mutex|all <num threads> <seconds per test>\n");
     exit(1);
 }
 
 unsigned numThreads;
 double secondsPerTest;
-unsigned microsecondsInCriticalSection;
 
 struct Benchmark {
     template<typename LockType>
@@ -73,19 +72,9 @@ struct Benchmark {
             threads[threadIndex] = createThread(
                 "Benchmark Thread",
                 [&, threadIndex] () {
-                    if (!microsecondsInCriticalSection) {
-                        while (keepGoing) {
-                            lock.lock();
-                            counts[threadIndex]++;
-                            lock.unlock();
-                        }
-                        return;
-                    }
-                    
                     while (keepGoing) {
                         lock.lock();
                         counts[threadIndex]++;
-                        usleep(microsecondsInCriticalSection);
                         lock.unlock();
                     }
                 });
@@ -96,8 +85,8 @@ struct Benchmark {
     
         sleep(secondsPerTest);
     
-        keepGoing = false;
         lock.lock();
+        keepGoing = false;
     
         dataLog(name, ": ");
         CommaPrinter comma;
@@ -117,10 +106,9 @@ int main(int argc, char** argv)
 {
     WTF::initializeThreading();
     
-    if (argc != 5
+    if (argc != 4
         || sscanf(argv[2], "%u", &numThreads) != 1
-        || sscanf(argv[3], "%lf", &secondsPerTest) != 1
-        || sscanf(argv[4], "%u", &microsecondsInCriticalSection) != 1)
+        || sscanf(argv[3], "%lf", &secondsPerTest) != 1)
         usage();
     
     runEverything<Benchmark>(argv[1]);