MCL/sf/mw/qt: comparison src/corelib/codecs/qtextcodec.cpp

equal deleted inserted replaced

-:dee5afe5301f
+:3f74d0d4af4c
 #include "qsimplecodec_p.h"
 #include "qlatincodec_p.h"
 #ifndef QT_NO_CODECS
 #  include "qtsciicodec_p.h"
 #  include "qisciicodec_p.h"
+#ifndef Q_OS_SYMBIAN
 #  if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)
 // no iconv(3) support, must build all codecs into the library
 #    include "../../plugins/codecs/cn/qgb18030codec.h"
 #    include "../../plugins/codecs/jp/qeucjpcodec.h"
 #    include "../../plugins/codecs/jp/qjiscodec.h"
 #  endif // QT_NO_ICONV
 #  if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED)
 #    include "qfontlaocodec_p.h"
 #    include "../../plugins/codecs/jp/qfontjpcodec.h"
 #  endif
+#endif // QT_NO_SYMBIAN
 #endif // QT_NO_CODECS
 #include "qlocale.h"
-#include "private/qmutexpool_p.h"
+#include "qmutex.h"
+#include "qhash.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <locale.h>
 #if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
 #endif
 #if defined(Q_OS_WINCE)
 #  define QT_NO_SETLOCALE
 #endif
+#ifdef Q_OS_SYMBIAN
+#include "qtextcodec_symbian.cpp"
+#endif
 // enabling this is not exception safe!
 // #define Q_DEBUG_TEXTCODEC
 QT_BEGIN_NAMESPACE
 #endif
 return 0;
 }
 static QList<QTextCodec*> *all = 0;
+static int clearCaches = 0;  // flags specifying if caches should be invalided: 0x1 codecForName, 0x2 codecForMib
 #ifdef Q_DEBUG_TEXTCODEC
 static bool destroying_is_ok = false;
 #endif
 static QTextCodec *localeMapper = 0;
 /* the next two functions are implicitely thread safe,
 as they are only called by setup() which uses a mutex.
 */
 static void setupLocaleMapper()
 {
+#ifdef Q_OS_SYMBIAN
+localeMapper = QSymbianTextCodec::localeMapper;
+if (localeMapper)
+return;
+#endif
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
 localeMapper = QTextCodec::codecForName("System");
 #else
 #ifndef QT_NO_ICONV
 if (!localeMapper)
 localeMapper = QTextCodec::codecForName("ISO 8859-1");
 #endif
 }
+#ifndef QT_NO_THREAD
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, textCodecsMutex, (QMutex::Recursive));
+#endif
+// textCodecsMutex need to be locked to enter this function
 static void setup()
 {
-#ifndef QT_NO_THREAD
-QMutexLocker locker(QMutexPool::globalInstanceGet(&all));
-#endif
 if (all)
 return;
 #ifdef Q_DEBUG_TEXTCODEC
 if (destroying_is_ok)
 all = new QList<QTextCodec*>;
 // create the cleanup object to cleanup all codecs on exit
 (void) createQTextCodecCleanup();
 #ifndef QT_NO_CODECS
+(void)new QTsciiCodec;
+for (int i = 0; i < 9; ++i)
+(void)new QIsciiCodec(i);
+for (int i = 0; i < QSimpleTextCodec::numSimpleCodecs; ++i)
+(void)new QSimpleTextCodec(i);
+#ifdef Q_OS_SYMBIAN
+localeMapper = QSymbianTextCodec::init();
+#endif
 #  if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED)
 // no font codecs when bootstrapping
 (void)new QFontLaoCodec;
 #    if defined(QT_NO_ICONV)
 // no iconv(3) support, must build all codecs into the library
 (void)new QFontBig5hkscsCodec;
 (void)new QFontBig5Codec;
 #    endif // QT_NO_ICONV && !QT_BOOTSTRAPPED
 #  endif // Q_WS_X11
-(void)new QTsciiCodec;
+#ifndef Q_OS_SYMBIAN
-for (int i = 0; i < 9; ++i)
-(void)new QIsciiCodec(i);
 #  if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)
 // no asian codecs when bootstrapping, sorry
 (void)new QGb18030Codec;
 (void)new QGbkCodec;
 (void)new QGb2312Codec;
 (void)new QEucKrCodec;
 (void)new QCP949Codec;
 (void)new QBig5Codec;
 (void)new QBig5hkscsCodec;
 #  endif // QT_NO_ICONV && !QT_BOOTSTRAPPED
+#endif //Q_OS_SYMBIAN
 #endif // QT_NO_CODECS
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
 (void) new QWindowsLocalCodec;
 #endif // Q_OS_WIN32
 (void)new QUtf16BECodec;
 (void)new QUtf16LECodec;
 (void)new QUtf32Codec;
 (void)new QUtf32BECodec;
 (void)new QUtf32LECodec;
+#ifndef Q_OS_SYMBIAN
 (void)new QLatin15Codec;
+#endif
 (void)new QLatin1Codec;
 (void)new QUtf8Codec;
-for (int i = 0; i < QSimpleTextCodec::numSimpleCodecs; ++i)
+#ifndef Q_OS_SYMBIAN
-(void)new QSimpleTextCodec(i);
 #if defined(Q_OS_UNIX) && !defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)
 // QIconvCodec depends on the UTF-16 codec, so it needs to be created last
 (void) new QIconvCodec();
+#endif
 #endif
 if (!localeMapper)
 setupLocaleMapper();
 }
 \sa QTextStream, QTextDecoder, QTextEncoder, {Codecs Example}
 */
 /*!
-\nonreentrant
 Constructs a QTextCodec, and gives it the highest precedence. The
 QTextCodec should always be constructed on the heap (i.e. with \c
 new). Qt takes ownership and will delete it when the application
 terminates.
 */
 QTextCodec::QTextCodec()
 {
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 setup();
 all->prepend(this);
 }
 {
 #ifdef Q_DEBUG_TEXTCODEC
 if (!destroying_is_ok)
 qWarning("QTextCodec::~QTextCodec: Called by application");
 #endif
-if (all)
+if (all) {
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 all->removeAll(this);
+clearCaches = 0x1 | 0x2;
+}
 }
 /*!
 \fn QTextCodec *QTextCodec::codecForName(const char *name)
 QTextCodec *QTextCodec::codecForName(const QByteArray &name)
 {
 if (name.isEmpty())
 return 0;
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 setup();
+static QHash <QByteArray, QTextCodec *> cache;
+if (clearCaches & 0x1) {
+cache.clear();
+clearCaches &= ~0x1;
+}
+QTextCodec *codec = cache.value(name);
+if (codec)
+return codec;
 for (int i = 0; i < all->size(); ++i) {
 QTextCodec *cursor = all->at(i);
-if (nameMatch(cursor->name(), name))
+if (nameMatch(cursor->name(), name)) {
+cache.insert(name, cursor);
 return cursor;
+}
 QList<QByteArray> aliases = cursor->aliases();
-for (int i = 0; i < aliases.size(); ++i)
+for (int y = 0; y < aliases.size(); ++y)
-if (nameMatch(aliases.at(i), name))
+if (nameMatch(aliases.at(y), name)) {
+cache.insert(name, cursor);
 return cursor;
 }
+}
-return createForName(name);
+codec = createForName(name);
+if (codec)
+cache.insert(name, codec);
+return codec;
 }
 /*!
 Returns the QTextCodec which matches the \link
 QTextCodec::mibEnum() MIBenum\endlink \a mib.
 */
 QTextCodec* QTextCodec::codecForMib(int mib)
 {
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 setup();
-// Qt 3 used 1000 (mib for UCS2) as its identifier for the utf16 codec. Map
+static QHash <int, QTextCodec *> cache;
-// this correctly for compatibility.
+if (clearCaches & 0x2) {
-if (mib == 1000)
+cache.clear();
-mib = 1015;
+clearCaches &= ~0x2;
+}
+QTextCodec *codec = cache.value(mib);
+if (codec)
+return codec;
 QList<QTextCodec*>::ConstIterator i;
 for (int i = 0; i < all->size(); ++i) {
 QTextCodec *cursor = all->at(i);
-if (cursor->mibEnum() == mib)
+if (cursor->mibEnum() == mib) {
+cache.insert(mib, cursor);
 return cursor;
 }
+}
-return createForMib(mib);
+codec = createForMib(mib);
+// Qt 3 used 1000 (mib for UCS2) as its identifier for the utf16 codec. Map
+// this correctly for compatibility.
+if (!codec && mib == 1000)
+return codecForMib(1015);
+if (codec)
+cache.insert(mib, codec);
+return codec;
 }
 /*!
 Returns the list of all available codecs, by name. Call
 QTextCodec::codecForName() to obtain the QTextCodec for the name.
 \sa availableMibs(), name(), aliases()
 */
 QList<QByteArray> QTextCodec::availableCodecs()
 {
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 setup();
 QList<QByteArray> codecs;
 for (int i = 0; i < all->size(); ++i) {
 codecs += all->at(i)->name();
 codecs += all->at(i)->aliases();
 }
+#ifndef QT_NO_THREAD
+locker.unlock();
+#endif
 #ifndef QT_NO_TEXTCODECPLUGIN
 QFactoryLoader *l = loader();
 QStringList keys = l->keys();
 for (int i = 0; i < keys.size(); ++i) {
 if (!keys.at(i).startsWith(QLatin1String("MIB: "))) {
 \sa availableCodecs(), mibEnum()
 */
 QList<int> QTextCodec::availableMibs()
 {
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 setup();
 QList<int> codecs;
 for (int i = 0; i < all->size(); ++i)
 codecs += all->at(i)->mibEnum();
+#ifndef QT_NO_THREAD
+locker.unlock();
+#endif
 #ifndef QT_NO_TEXTCODECPLUGIN
 QFactoryLoader *l = loader();
 QStringList keys = l->keys();
 for (int i = 0; i < keys.size(); ++i) {
 if (keys.at(i).startsWith(QLatin1String("MIB: "))) {
 \sa codecForLocale()
 */
 void QTextCodec::setCodecForLocale(QTextCodec *c)
 {
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 localeMapper = c;
 if (!localeMapper)
 setupLocaleMapper();
 }
 QTextCodec* QTextCodec::codecForLocale()
 {
 if (localeMapper)
 return localeMapper;
+#ifndef QT_NO_THREAD
+QMutexLocker locker(textCodecsMutex());
+#endif
 setup();
 return localeMapper;
 }

branch	RCL_3
changeset 7	3f74d0d4af4c
parent 4	3b1da2848fc7
child 8	740e5562c97f