mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mutex to guard the shared string pool content.

Browse Source 
Change-Id: I0eb97d0fbeaefd8a1c86d240ed8bd7f208fb662e
This commit is contained in:
Kohei Yoshida
2013-11-05 14:38:28 -05:00
parent 9611851a53
commit 7045802f27
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svl/sharedstringpool.hxx
View File

@@ -11,6 +11,7 @@
#define INCLUDED_SVL_SHAREDSTRINGPOOL_HXX #define INCLUDED_SVL_SHAREDSTRINGPOOL_HXX
#include "svl/sharedstring.hxx" #include "svl/sharedstring.hxx"
#include "osl/mutex.hxx"
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
@@ -30,6 +31,7 @@ class SVL_DLLPUBLIC SharedStringPool
typedef std::pair<StrHashType::iterator, bool> InsertResultType; typedef std::pair<StrHashType::iterator, bool> InsertResultType;
typedef boost::unordered_map<const rtl_uString*, OUString> StrStoreType; typedef boost::unordered_map<const rtl_uString*, OUString> StrStoreType;
mutable osl::Mutex maMutex;
StrHashType maStrPool; StrHashType maStrPool;
StrHashType maStrPoolUpper; StrHashType maStrPoolUpper;
StrStoreType maStrStore; StrStoreType maStrStore;

6
svl/source/misc/sharedstringpool.cxx
View File

@@ -17,6 +17,8 @@ SharedStringPool::SharedStringPool( const CharClass* pCharClass ) : mpCharClass(
SharedString SharedStringPool::intern( const OUString& rStr ) SharedString SharedStringPool::intern( const OUString& rStr )
{ {
osl::MutexGuard aGuard(&maMutex);
InsertResultType aRes = findOrInsert(maStrPool, rStr); InsertResultType aRes = findOrInsert(maStrPool, rStr);
if (aRes.first == maStrPool.end()) if (aRes.first == maStrPool.end())
// Insertion failed. // Insertion failed.
@@ -63,6 +65,8 @@ inline sal_Int32 getRefCount( const rtl_uString* p )
void SharedStringPool::purge() void SharedStringPool::purge()
{ {
osl::MutexGuard aGuard(&maMutex);
StrHashType aNewStrPool; StrHashType aNewStrPool;
StrHashType::iterator it = maStrPool.begin(), itEnd = maStrPool.end(); StrHashType::iterator it = maStrPool.begin(), itEnd = maStrPool.end();
for (; it != itEnd; ++it) for (; it != itEnd; ++it)
@@ -98,11 +102,13 @@ void SharedStringPool::purge()
size_t SharedStringPool::getCount() const size_t SharedStringPool::getCount() const
{ {
osl::MutexGuard aGuard(&maMutex);
return maStrPool.size(); return maStrPool.size();
} }
size_t SharedStringPool::getCountIgnoreCase() const size_t SharedStringPool::getCountIgnoreCase() const
{ {
osl::MutexGuard aGuard(&maMutex);
return maStrPoolUpper.size(); return maStrPoolUpper.size();
} }