Update ICU to 54.1 step 1

source/common/umutex.h

 /*
 **********************************************************************
-*   Copyright (C) 1997-2013, International Business Machines
+*   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
 * File UMUTEX.H
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   04/02/97  aliu        Creation.
 *   04/07/99  srl         rewrite - C interface, multiple mutices
 *   05/13/99  stephen     Changed to umutex (from cmutex)
 ******************************************************************************
 */
 
 #ifndef UMUTEX_H
 #define UMUTEX_H
 
 #include "unicode/utypes.h"
 #include "unicode/uclean.h"
 #include "putilimp.h"
 
 
 
 // Forward Declarations. UMutex is not in the ICU namespace (yet) because
 //                       there are some remaining references from plain C.
 struct UMutex;
+struct UConditionVar;
 
 U_NAMESPACE_BEGIN
 struct UInitOnce;
 U_NAMESPACE_END
 
 // Stringify macros, to allow #include of user supplied atomic & mutex files.
 #define U_MUTEX_STR(s) #s
 #define U_MUTEX_XSTR(s) U_MUTEX_STR(s)
 
 /****************************************************************************
@@ skipping 273 matching lines @@
 # define NOSERVICE
 # define NOIME
 # define NOMCX
 # ifndef NOMINMAX
 # define NOMINMAX
 # endif
 # include <windows.h>
 
 
 typedef struct UMutex {
-    icu::UInitOnce         fInitOnce;
+    icu::UInitOnce    fInitOnce;
     CRITICAL_SECTION  fCS;
 } UMutex;
 
 /* Initializer for a static UMUTEX. Deliberately contains no value for the
  *  CRITICAL_SECTION.
  */
 #define U_MUTEX_INITIALIZER {U_INITONCE_INITIALIZER}
 
+struct UConditionVar {
+    HANDLE           fEntryGate;
+    HANDLE           fExitGate;
+    int32_t          fWaitCount;
+};
+
+#define U_CONDITION_INITIALIZER {NULL, NULL, 0}
+    
 
 
 #elif U_PLATFORM_IMPLEMENTS_POSIX
 
 /*
  *  POSIX platform
  */
 
 #include <pthread.h>
 
 struct UMutex {
     pthread_mutex_t  fMutex;
 };
 typedef struct UMutex UMutex;
 #define U_MUTEX_INITIALIZER  {PTHREAD_MUTEX_INITIALIZER}
 
+struct UConditionVar {
+    pthread_cond_t   fCondition;
+};
+#define U_CONDITION_INITIALIZER {PTHREAD_COND_INITIALIZER}
+
 #else
 
 /*
  *  Unknow platform type.
  *      This is an error condition. ICU requires mutexes.
  */
 
 #error Unknown Platform.
 
 #endif
@@ skipping 14 matching lines @@
  *              and may cause a deadlock on some platforms.
  */
 U_INTERNAL void U_EXPORT2 umtx_lock(UMutex* mutex);
 
 /* Unlock a mutex.
  * @param mutex The given mutex to be unlocked.  Pass NULL to specify
  *              the global ICU mutex.
  */
 U_INTERNAL void U_EXPORT2 umtx_unlock (UMutex* mutex);
 
+/*
+ * Wait on a condition variable.
+ * The calling thread will unlock the mutex and wait on the condition variable.
+ * The mutex must be locked by the calling thread when invoking this function.
+ *
+ * @param cond the condition variable to wait on.
+ * @param mutex the associated mutex.
+ */
+
+U_INTERNAL void U_EXPORT2 umtx_condWait(UConditionVar *cond, UMutex *mutex);
+
+
+/*
+ * Broadcast wakeup of all threads waiting on a Condition.
+ * The associated mutex must be locked by the calling thread when calling
+ * this function; this is a temporary ICU restriction.
+ * 
+ * @param cond the condition variable.
+ */
+U_INTERNAL void U_EXPORT2 umtx_condBroadcast(UConditionVar *cond);
+
+/*
+ * Signal a condition variable, waking up one waiting thread.
+ * CAUTION: Do not use. Place holder only. Not implemented for Windows.
+ */
+U_INTERNAL void U_EXPORT2 umtx_condSignal(UConditionVar *cond);
+
 #endif /* UMUTEX_H */
 /*eof*/