summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-14 17:55:12 (UTC)
committer simon <simon>2002-12-14 17:55:12 (UTC)
commit309c34a61e7cf6a199275c32c00ec1eaaa511d9b (patch) (side-by-side diff)
tree5aa46eaefc040373397fcb3157ae6b5dd46a9c49
parent03c4518324c328c530eb795705b6a4281d65055a (diff)
downloadopie-309c34a61e7cf6a199275c32c00ec1eaaa511d9b.zip
opie-309c34a61e7cf6a199275c32c00ec1eaaa511d9b.tar.gz
opie-309c34a61e7cf6a199275c32c00ec1eaaa511d9b.tar.bz2
- make it thread-safe
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/singleton.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/singleton.h b/noncore/multimedia/opieplayer2/singleton.h
index 83e228f..825344e 100644
--- a/noncore/multimedia/opieplayer2/singleton.h
+++ b/noncore/multimedia/opieplayer2/singleton.h
@@ -11,58 +11,67 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef SINGLETON_H
#define SINGLETON_H
+#include "threadutil.h"
+
template <class Product>
struct DefaultSingletonCreator
{
static Product *create() { return new Product; }
};
template <class Product>
struct NullSingletonCreator
{
static Product *create() { return 0; }
};
template
<
class T,
template <class> class Creator = DefaultSingletonCreator
>
class Singleton
{
public:
static T &self()
{
- if ( !s_self )
- s_self = Creator<T>::create();
+ if ( !s_self ) {
+ ThreadUtil::AutoLock lock( s_guard );
+ if ( !s_self )
+ s_self = Creator<T>::create();
+ }
return *s_self;
}
protected:
Singleton()
{ s_self = static_cast<T *>( this ); }
~Singleton()
{ s_self = 0; }
private:
Singleton( const Singleton<T, Creator> &rhs );
Singleton<T, Creator> &operator=( const Singleton<T, Creator> &rhs );
static T *s_self;
+ static ThreadUtil::Mutex s_guard;
};
template <class T, template <class> class Creator>
T *Singleton<T, Creator>::s_self = 0;
+template <class T, template <class> class Creator>
+ThreadUtil::Mutex Singleton<T, Creator>::s_guard;
+
#endif // SINGLETON_H
/* vim: et sw=4 ts=4
*/