ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / simplethread.h

diff --git a/icuSources/test/intltest/simplethread.h b/icuSources/test/intltest/simplethread.h
old mode 100644 (file)
new mode 100755 (executable)
index 9cd0fc2..fae418d
--- a/icuSources/test/intltest/simplethread.h
+++ b/icuSources/test/intltest/simplethread.h
@@ -1,31 +1,87 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /********************************************************************
  * COPYRIGHT: 
 /********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2009, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and

  * others. All Rights Reserved.
  ********************************************************************/
 
 #ifndef SIMPLETHREAD_H
 #define SIMPLETHREAD_H
 
  * others. All Rights Reserved.
  ********************************************************************/
 
 #ifndef SIMPLETHREAD_H
 #define SIMPLETHREAD_H
 

-#include "mutex.h"
+#include <thread>
+#include "unicode/utypes.h"

 
 

-class U_EXPORT SimpleThread
+/*
+ * Simple class for creating threads in ICU tests.
+ * Originally created to provide a portable abstraction over platform
+ * (POSIX or Win32) threading interfaces.
+ *
+ * New threaded tests should consider skipping this class and directly using C++ std library
+ * threading functions. SimpleThread is retained primarily to support existing use.
+ */
+class SimpleThread

 {
 {

-public:
+  public:

     SimpleThread();
     virtual  ~SimpleThread();
     SimpleThread();
     virtual  ~SimpleThread();

-    int32_t   start(void);        // start the thread
-    UBool     isRunning();        // return true if a started thread has exited.
+    int32_t   start();            // start the thread. Return 0 if successfull.
+    void      join();             // A thread must be joined before deleting its SimpleThread.

 
 

-    virtual void run(void) = 0;   // Override this to provide the code to run
+    virtual void run() = 0;       // Override this to provide the code to run

                                   //   in the thread.
                                   //   in the thread.

-    void *fImplementation;
+  private:
+    std::thread fThread = {};
+};
+
+
+class IntlTest;
+
+// ThreadPool - utililty class to simplify the spawning a group of threads by
+//              a multi-threaded test.
+//
+//   Usage: from within an intltest test function,
+//       ThreadPool<TestClass> pool(
+//               this,              // The current intltest test object,
+//                                  //     of type "TestClass *"
+//               numberOfThreads,   // How many threads to spawn.
+//               &TestClass::func); // The function to be run by each thread.
+//                                  //     It takes one int32_t parameter which
+//                                  //     is set to the thread number, 0 to numberOfThreads-1.
+//
+//       pool.start();              // Start all threads running.
+//       pool.join();               // Wait until all threads have terminated.
+
+class ThreadPoolBase {
+  public:
+    ThreadPoolBase(IntlTest *test, int32_t numThreads);
+    virtual ~ThreadPoolBase();
+    
+    void start();
+    void join();

 
 

-public:
-    static void sleep(int32_t millis); // probably shouldn't go here but oh well.
-    static void errorFunc();      // Empty function, provides a single convenient place
-                                  //   to break on errors.
+  protected:
+    virtual void callFn(int32_t param) = 0;
+    friend class ThreadPoolThread;
+
+    IntlTest  *fIntlTest;
+    int32_t  fNumThreads;
+    SimpleThread **fThreads;

 };
 
 };
 

-#endif

 
 

+template<class TestClass>
+class ThreadPool : public ThreadPoolBase {
+  private:
+    void (TestClass::*fRunFnPtr)(int32_t);
+  public:
+    ThreadPool(TestClass *test, int howMany, void (TestClass::*runFnPtr)(int32_t threadNumber)) :
+        ThreadPoolBase(test, howMany), fRunFnPtr(runFnPtr) {};
+    virtual ~ThreadPool() {};
+  private:
+    virtual void callFn(int32_t param) {
+        TestClass *test = dynamic_cast<TestClass *>(fIntlTest);
+        (test->*fRunFnPtr)(param);
+    }
+};
+#endif