diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-12 14:05:24 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-12 14:42:01 (GMT) |
commit | b3b7796178f6a94fc46ef827b01a46420dae5a50 (patch) | |
tree | 134fece992d250fd39bdd0050e991c8d96c196aa /src/corelib/codecs/qtextcodec.cpp | |
parent | 164f375fad41bbe488f516915d960a022370382c (diff) | |
download | Qt-b3b7796178f6a94fc46ef827b01a46420dae5a50.zip Qt-b3b7796178f6a94fc46ef827b01a46420dae5a50.tar.gz Qt-b3b7796178f6a94fc46ef827b01a46420dae5a50.tar.bz2 |
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Theses function are relatively slow, and often called with the same
arguments
Task-number: QTBUG-7888
Reviewed-by: Thierry
Reviewed-by: Andreas
Diffstat (limited to 'src/corelib/codecs/qtextcodec.cpp')
-rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index ff40af5..2d332e9 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -80,6 +80,7 @@ #endif // QT_NO_CODECS #include "qlocale.h" #include "qmutex.h" +#include "qhash.h" #include <stdlib.h> #include <ctype.h> @@ -172,6 +173,7 @@ static QTextCodec *createForMib(int mib) } 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 @@ -935,6 +937,7 @@ QTextCodec::~QTextCodec() QMutexLocker locker(textCodecsMutex()); #endif all->removeAll(this); + clearCaches = 0x1 | 0x2; } } @@ -961,17 +964,31 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name) #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)) return cursor; QList<QByteArray> aliases = cursor->aliases(); for (int y = 0; y < aliases.size(); ++y) - if (nameMatch(aliases.at(y), 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; } @@ -986,6 +1003,15 @@ QTextCodec* QTextCodec::codecForMib(int mib) #endif setup(); + static QHash <int, QTextCodec *> cache; + if (clearCaches & 0x2) { + cache.clear(); + clearCaches &= ~0x2; + } + QTextCodec *codec = cache.value(mib); + if (codec) + return codec; + // Qt 3 used 1000 (mib for UCS2) as its identifier for the utf16 codec. Map // this correctly for compatibility. if (mib == 1000) @@ -994,11 +1020,16 @@ QTextCodec* QTextCodec::codecForMib(int mib) 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); + if (codec) + cache.insert(mib, codec); + return codec; } /*! |