ICU-66108.tar.gz

[apple/icu.git] / icuSources / common / ucln_cmn.h

diff --git a/icuSources/common/ucln_cmn.h b/icuSources/common/ucln_cmn.h
index 1903127a6e717508531b9e75767324a050067198..5ce2a4c2f312b8cccedcd8db107b12d8094ed2c3 100644 (file)
--- a/icuSources/common/ucln_cmn.h
+++ b/icuSources/common/ucln_cmn.h
@@ -1,12 +1,12 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 ******************************************************************************
 /*
 ******************************************************************************

-*                                                                            *
-* Copyright (C) 2001-2013, International Business Machines                   *
-*                Corporation and others. All Rights Reserved.                *
-*                                                                            *
+* Copyright (C) 2001-2016, International Business Machines
+*                Corporation and others. All Rights Reserved.

 ******************************************************************************
 *   file name:  ucln_cmn.h
 ******************************************************************************
 *   file name:  ucln_cmn.h

-*   encoding:   US-ASCII
+*   encoding:   UTF-8

 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   tab size:   8 (not used)
 *   indentation:4
 *


@@ -22,8 +22,6 @@
 
 /* These are the cleanup functions for various APIs. */
 /* @return true if cleanup complete successfully.*/
 
 /* These are the cleanup functions for various APIs. */
 /* @return true if cleanup complete successfully.*/

-U_CFUNC UBool umtx_cleanup(void);
-

 U_CFUNC UBool utrace_cleanup(void);
 
 U_CFUNC UBool ucln_lib_cleanup(void);
 U_CFUNC UBool utrace_cleanup(void);
 
 U_CFUNC UBool ucln_lib_cleanup(void);


@@ -33,15 +31,22 @@ Please keep the order of enums declared in same order
 as the cleanup functions are suppose to be called. */
 typedef enum ECleanupCommonType {
     UCLN_COMMON_START = -1,
 as the cleanup functions are suppose to be called. */
 typedef enum ECleanupCommonType {
     UCLN_COMMON_START = -1,

+    UCLN_COMMON_NUMPARSE_UNISETS,

     UCLN_COMMON_USPREP,
     UCLN_COMMON_BREAKITERATOR,
     UCLN_COMMON_USPREP,
     UCLN_COMMON_BREAKITERATOR,

-    UCLN_COMMON_BREAKITERATOR_DICT,
+    UCLN_COMMON_RBBI,
+    UCLN_COMMON_RBBI57,

     UCLN_COMMON_SERVICE,
     UCLN_COMMON_SERVICE,

-    UCLN_COMMON_URES,
+    UCLN_COMMON_LOCALE_KEY_TYPE,

     UCLN_COMMON_LOCALE,
     UCLN_COMMON_LOCALE_AVAILABLE,
     UCLN_COMMON_LOCALE,
     UCLN_COMMON_LOCALE_AVAILABLE,

+    UCLN_COMMON_LIKELY_SUBTAGS,
+    UCLN_COMMON_LOCALE_DISTANCE,

     UCLN_COMMON_ULOC,
     UCLN_COMMON_ULOC,

+    UCLN_COMMON_CURRENCY,
+    UCLN_COMMON_LOADED_NORMALIZER2,

     UCLN_COMMON_NORMALIZER2,
     UCLN_COMMON_NORMALIZER2,

+    UCLN_COMMON_CHARACTERPROPERTIES,

     UCLN_COMMON_USET,
     UCLN_COMMON_UNAMES,
     UCLN_COMMON_UPROPS,
     UCLN_COMMON_USET,
     UCLN_COMMON_UNAMES,
     UCLN_COMMON_UPROPS,


@@ -49,13 +54,22 @@ typedef enum ECleanupCommonType {
     UCLN_COMMON_UCNV_IO,
     UCLN_COMMON_UDATA,
     UCLN_COMMON_PUTIL,
     UCLN_COMMON_UCNV_IO,
     UCLN_COMMON_UDATA,
     UCLN_COMMON_PUTIL,

-    UCLN_COMMON_LIST_FORMATTER,

     UCLN_COMMON_UINIT,
     UCLN_COMMON_UINIT,

+
+    /*
+       Unified caches caches collation stuff. Collation data structures
+       contain resource bundles which means that unified cache cleanup
+       must happen before resource bundle clean up.
+    */
+    UCLN_COMMON_UNIFIED_CACHE,
+    UCLN_COMMON_URES,
+    UCLN_COMMON_MUTEX,    // Mutexes should be the last to be cleaned up.

     UCLN_COMMON_COUNT /* This must be last */
 } ECleanupCommonType;
 
 /* Main library cleanup registration function. */
 /* See common/ucln.h for details on adding a cleanup function. */
     UCLN_COMMON_COUNT /* This must be last */
 } ECleanupCommonType;
 
 /* Main library cleanup registration function. */
 /* See common/ucln.h for details on adding a cleanup function. */

+/* Note: the global mutex must not be held when calling this function. */

 U_CFUNC void U_EXPORT2 ucln_common_registerCleanup(ECleanupCommonType type,
                                                    cleanupFunc *func);
 
 U_CFUNC void U_EXPORT2 ucln_common_registerCleanup(ECleanupCommonType type,
                                                    cleanupFunc *func);