Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chanegd wxTlsValue to be pointer-like instead of value-like which doesn't work for UDTs; use __thread keyword with mingw32 >= 4.3 too; use library-based thread-specific variables support in wxString cache now that it is fixed to work there; finally added a unit test for TLS stuff

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-29 23:28:42 +00:00
parent b18f47d002
commit 8b73c5318c
17 changed files with 320 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/wx/string.h
View File

@@ -75,12 +75,6 @@
#define wxUSE_STRING_POS_CACHE 0
#endif
#ifndef wxHAS_COMPILER_TLS
// FIXME: currently the code only works with compiler TLS support
#undef wxUSE_STRING_POS_CACHE
#define wxUSE_STRING_POS_CACHE 0
#endif
#if wxUSE_STRING_POS_CACHE
#include "wx/tls.h"
@@ -600,7 +594,26 @@ private:
unsigned lastUsed;
};
static wxTLS_TYPE(Cache) ms_cache;
// notice that we must use an accessor function and not a static variable
// because when the TLS variables support is implemented in the library (and
// not by the compiler), the global s_cache variable could be not yet
// initialized when a ctor of another global object is executed and if that
// ctor uses any wxString methods, bad things happen
//
// also note that for the same reason this function _is_ MT-safe: we know
// it's going to be called during the program startup (currently during
// globals initialization but even if they ever stop using wxString, it would
// still be called by wxInitialize()), i.e. before any threads are created
static Cache& GetCache()
{
static wxTLS_TYPE(Cache) s_cache;
return wxTLS_VALUE(s_cache);
}
static Cache::Element *GetCacheBegin() { return GetCache().cached; }
static Cache::Element *GetCacheEnd() { return GetCacheBegin() + Cache::SIZE; }
static unsigned& LastUsedCacheElement() { return GetCache().lastUsed; }
friend struct wxStrCacheDumper;
@@ -644,9 +657,7 @@ private:
// profiling seems to show a small but consistent gain if we use this
// simple loop instead of starting from the last used element (there are
// a lot of misses in this function...)
for ( Cache::Element *c = ms_cache.cached;
c != ms_cache.cached + Cache::SIZE;
c++ )
for ( Cache::Element *c = GetCacheBegin(); c != GetCacheEnd(); c++ )
{
if ( c->str == this )
return c;
@@ -660,9 +671,9 @@ private:
// its corresponding index in the byte string or not
Cache::Element *GetCacheElement() const
{
Cache::Element * const cacheBegin = ms_cache.cached;
Cache::Element * const cacheEnd = ms_cache.cached + Cache::SIZE;
Cache::Element * const cacheStart = cacheBegin + ms_cache.lastUsed;
Cache::Element * const cacheBegin = GetCacheBegin();
Cache::Element * const cacheEnd = GetCacheEnd();
Cache::Element * const cacheStart = cacheBegin + LastUsedCacheElement();
// check the last used first, this does no (measurable) harm for a miss
// but does help for simple loops addressing the same string all the time
@@ -685,7 +696,7 @@ private:
c->Reset();
// and remember the last used element
ms_cache.lastUsed = c - cacheBegin;
LastUsedCacheElement() = c - cacheBegin;
}
return c;