hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added SharedPtr and MmgedSharedPtr

Browse Source
This commit is contained in:
hyung-hwan
2015-03-10 08:40:31 +00:00
parent 15d76c28a1
commit 49d57e3155
16 changed files with 427 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qse/include/qse/Makefile.am
View File

@ -9,7 +9,7 @@ pkginclude_HEADERS = \
if ENABLE_CXX
pkginclude_HEADERS += \
Types.hpp Hashable.hpp Uncopyable.hpp RefCounted.hpp \
ScopedPtr.hpp Exception.hpp
ScopedPtr.hpp SharedPtr.hpp Exception.hpp
endif
install-data-hook:

4
qse/include/qse/Makefile.in
View File

@ -52,7 +52,7 @@ build_triplet = @build@
host_triplet = @host@
@ENABLE_CXX_TRUE@am__append_1 = \
@ENABLE_CXX_TRUE@ Types.hpp Hashable.hpp Uncopyable.hpp RefCounted.hpp \
@ENABLE_CXX_TRUE@ ScopedPtr.hpp Exception.hpp
@ENABLE_CXX_TRUE@ ScopedPtr.hpp SharedPtr.hpp Exception.hpp
subdir = include/qse
DIST_COMMON = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \
@ -95,7 +95,7 @@ am__can_run_installinfo = \
am__pkginclude_HEADERS_DIST = conf-msw.h conf-os2.h conf-dos.h \
conf-vms.h conf-mac.h conf-inf.h types.h macros.h pack1.h \
unpack.h Types.hpp Hashable.hpp Uncopyable.hpp RefCounted.hpp \
ScopedPtr.hpp Exception.hpp
ScopedPtr.hpp SharedPtr.hpp Exception.hpp
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

2
qse/include/qse/RefCounted.hpp
View File

@ -57,7 +57,7 @@ public:
if (--this->ref_count == 0 && kill) delete this;
}
qse_size_t count () const
qse_size_t getRefCount () const
{
return this->ref_count;
}

6
qse/include/qse/ScopedPtr.hpp
View File

@ -97,12 +97,12 @@ template<typename T, typename DELETER = ScopedPtrDeleter<T> >
class QSE_EXPORT ScopedPtr: public Uncopyable
{
public:
typedef SharedPtr<T,DELETER> SelfType;
typedef ScopedPtrDeleter<T> DefaultDeleter;
ScopedPtr (T* ptr = (T*)QSE_NULL, void* darg = (void*)QSE_NULL)
ScopedPtr (T* ptr = (T*)QSE_NULL, void* darg = (void*)QSE_NULL): _ptr (ptr), _darg (darg)
{
this->_ptr = ptr;
this->_darg = darg;
}
~ScopedPtr ()

165
qse/include/qse/SharedPtr.hpp Normal file
View File

@ -0,0 +1,165 @@
/*
* $Id$
*
Copyright (c) 2006-2014 Chung, Hyung-Hwan. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _QSE_SHAREDPTR_HPP_
#define _QSE_SHAREDPTR_HPP_
#include <qse/types.h>
#include <qse/macros.h>
/////////////////////////////////
QSE_BEGIN_NAMESPACE(QSE)
/////////////////////////////////
template <typename T>
struct SharedPtrDeleter
{
void operator() (T* ptr, void* arg)
{
delete ptr;
}
};
template <typename T>
struct SharedPtrArrayDeleter
{
void operator() (T* ptr, void* arg)
{
delete[] ptr;
}
};
///
/// use QSE::MmgedSharedPtr if you want the instance of this class itself
/// to be memory managed.
///
template<typename T, typename DELETER = SharedPtrDeleter<T> >
class QSE_EXPORT SharedPtr
{
public:
typedef SharedPtr<T,DELETER> SelfType;
typedef SharedPtrDeleter<T> DefaultDeleter;
SharedPtr (T* ptr = (T*)QSE_NULL, void* darg = (void*)QSE_NULL): _ptr (ptr), _darg (darg)
{
this->_ref = new qse_size_t;
(*this->_ref) = 1;
}
SharedPtr (const SelfType& ptr): _ref(ptr._ref), _ptr (ptr._ptr), _darg (ptr._darg)
{
(*this->_ref)++;
}
~SharedPtr ()
{
(*this->_ref)--;
if (*this->_ref <= 0)
{
if (this->_ptr) this->deleter (this->_ptr, this->_darg);
delete this->_ref;
}
}
SelfType& operator= (const SelfType& ptr)
{
if (this != &ptr)
{
(*this->_ref)--;
if (*this->_ref <= 0)
{
if (this->_ptr) this->deleter (this->_ptr, this->_darg);
delete this->_ref;
}
this->_ptr = ptr._ptr;
this->_darg = ptr._darg;
this->_ref = ptr._ref;
(*this->_ref)++;
}
return *this;
}
T& operator* ()
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return *this->_ptr;
}
const T& operator* () const
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return *this->_ptr;
}
T* operator-> ()
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return this->_ptr;
}
const T* operator-> () const
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return this->_ptr;
}
bool operator! () const
{
return this->_ptr == (T*)QSE_NULL;
}
T& operator[] (qse_size_t idx)
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return this->_ptr[idx];
}
T* get ()
{
return this->_ptr;
}
const T* get () const
{
return this->_ptr;
}
protected:
qse_size_t* _ref;
T* _ptr;
void* _darg;
DELETER deleter;
};
/////////////////////////////////
QSE_END_NAMESPACE(QSE)
/////////////////////////////////
#endif

3
qse/include/qse/cmn/Array.hpp
View File

@ -110,6 +110,8 @@ public:
}
SelfType& operator= (const SelfType& array)
{
if (this != &array)
{
this->clear (true);
if (array.buffer)
@ -118,6 +120,7 @@ public:
this->count = array.count;
this->capacity = array.capacity;
}
}
return *this;
}

3
qse/include/qse/cmn/BinaryHeap.hpp
View File

@ -131,8 +131,11 @@ public:
}
SelfType& operator= (const SelfType& heap)
{
if (this != &heap)
{
ParentType::operator= (heap);
}
return *this;
}

3
qse/include/qse/cmn/HashList.hpp
View File

@ -219,6 +219,8 @@ public:
}
SelfType& operator= (const SelfType& list)
{
if (this != &list)
{
this->clear (false);
@ -240,6 +242,7 @@ public:
}
while (1);
}
}
return *this;
}

3
qse/include/qse/cmn/HashTable.hpp
View File

@ -130,8 +130,11 @@ public:
}
SelfType& operator= (const SelfType& table)
{
if (this != &table)
{
this->pair_list = table.pair_list;
}
return *this;
}

3
qse/include/qse/cmn/LinkedList.hpp
View File

@ -230,11 +230,14 @@ public:
}
SelfType& operator= (const SelfType& ll)
{
if (this != &ll)
{
this->clear ();
// note that the memory pool itself is not copied.
for (Node* p = ll.head_node; p != QSE_NULL; p = p->next)
this->append (p->value);
}
return *this;
}

2
qse/include/qse/cmn/Makefile.am
View File

@ -51,7 +51,7 @@ pkginclude_HEADERS = \
if ENABLE_CXX
pkginclude_HEADERS += \
Mmgr.hpp StdMmgr.hpp HeapMmgr.hpp Mmged.hpp \
Mmgr.hpp StdMmgr.hpp HeapMmgr.hpp Mmged.hpp MmgedSharedPtr.hpp \
Mpool.hpp Association.hpp LinkedList.hpp HashList.hpp HashTable.hpp \
RedBlackTree.hpp RedBlackTable.hpp \
Array.hpp BinaryHeap.hpp

8
qse/include/qse/cmn/Makefile.in
View File

@ -51,7 +51,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ENABLE_CXX_TRUE@am__append_1 = \
@ENABLE_CXX_TRUE@ Mmgr.hpp StdMmgr.hpp HeapMmgr.hpp Mmged.hpp \
@ENABLE_CXX_TRUE@ Mmgr.hpp StdMmgr.hpp HeapMmgr.hpp Mmged.hpp MmgedSharedPtr.hpp \
@ENABLE_CXX_TRUE@ Mpool.hpp Association.hpp LinkedList.hpp HashList.hpp HashTable.hpp \
@ENABLE_CXX_TRUE@ RedBlackTree.hpp RedBlackTable.hpp \
@ENABLE_CXX_TRUE@ Array.hpp BinaryHeap.hpp
@ -93,9 +93,9 @@ am__pkginclude_HEADERS_DIST = alg.h chr.h cp949.h cp950.h dir.h dll.h \
nwio.h oht.h opt.h path.h pio.h pma.h rbt.h rex.h sck.h sio.h \
sll.h slmb.h str.h task.h time.h tio.h tmr.h tre.h uni.h uri.h \
utf8.h xma.h Mmgr.hpp StdMmgr.hpp HeapMmgr.hpp Mmged.hpp \
Mpool.hpp Association.hpp LinkedList.hpp HashList.hpp \
HashTable.hpp RedBlackTree.hpp RedBlackTable.hpp Array.hpp \
BinaryHeap.hpp
MmgedSharedPtr.hpp Mpool.hpp Association.hpp LinkedList.hpp \
HashList.hpp HashTable.hpp RedBlackTree.hpp RedBlackTable.hpp \
Array.hpp BinaryHeap.hpp
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

173
qse/include/qse/cmn/MmgedSharedPtr.hpp Normal file
View File

@ -0,0 +1,173 @@
/*
* $Id$
*
Copyright (c) 2006-2014 Chung, Hyung-Hwan. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _QSE_CMN_MMGEDSHAREDPTR_HPP_
#define _QSE_CMN_MMGEDSHAREDPTR_HPP_
#include <qse/cmn/Mmged.hpp>
/////////////////////////////////
QSE_BEGIN_NAMESPACE(QSE)
/////////////////////////////////
template <typename T>
struct MmgedSharedPtrDeleter
{
void operator() (T* ptr, void* arg)
{
delete ptr;
}
};
template <typename T>
struct MmgedSharedPtrArrayDeleter
{
void operator() (T* ptr, void* arg)
{
delete[] ptr;
}
};
///
/// The MmgedSharedPtr class is similar to SharedPtr except that i
/// accepts a pointer to a memory manager to allocate the space for
/// shared reference count.
///
template<typename T, typename DELETER = MmgedSharedPtrDeleter<T> >
class QSE_EXPORT MmgedSharedPtr: public Mmged
{
public:
typedef MmgedSharedPtr<T,DELETER> SelfType;
typedef MmgedSharedPtrDeleter<T> DefaultDeleter;
MmgedSharedPtr (T* ptr = (T*)QSE_NULL, void* darg = (void*)QSE_NULL): Mmged(QSE_NULL), _ptr(ptr), _darg(darg)
{
this->_ref = new(this->getMmgr()) qse_size_t;
(*this->_ref) = 1;
}
MmgedSharedPtr (Mmgr* mmgr, T* ptr = (T*)QSE_NULL, void* darg = (void*)QSE_NULL): Mmged(mmgr), _ptr(ptr), _darg(darg)
{
this->_ref = new(this->getMmgr()) qse_size_t;
(*this->_ref) = 1;
}
MmgedSharedPtr (const SelfType& ptr): Mmged(ptr), _ref(ptr._ref), _ptr (ptr._ptr), _darg (ptr._darg)
{
(*this->_ref)++;
}
~MmgedSharedPtr ()
{
(*this->_ref)--;
if (*this->_ref <= 0)
{
if (this->_ptr) this->deleter (this->_ptr, this->_darg);
// no destructor as *this->_ref is a plain type.
::operator delete (this->_ref, this->getMmgr());
}
}
SelfType& operator= (const SelfType& ptr)
{
if (this != &ptr)
{
(*this->_ref)--;
if (*this->_ref <= 0)
{
if (this->_ptr) this->deleter (this->_ptr, this->_darg);
// no destructor as *this->_ref is a plain type.
::operator delete (this->_ref, this->getMmgr());
}
this->mmgr = ptr.getMmgr(); // memory manager must be copied
this->_ptr = ptr._ptr;
this->_darg = ptr._darg;
this->_ref = ptr._ref;
(*this->_ref)++;
}
return *this;
}
T& operator* ()
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return *this->_ptr;
}
const T& operator* () const
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return *this->_ptr;
}
T* operator-> ()
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return this->_ptr;
}
const T* operator-> () const
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return this->_ptr;
}
bool operator! () const
{
return this->_ptr == (T*)QSE_NULL;
}
T& operator[] (qse_size_t idx)
{
QSE_ASSERT (this->_ptr != (T*)QSE_NULL);
return this->_ptr[idx];
}
T* get ()
{
return this->_ptr;
}
const T* get () const
{
return this->_ptr;
}
protected:
qse_size_t* _ref;
T* _ptr;
void* _darg;
DELETER deleter;
};
/////////////////////////////////
QSE_END_NAMESPACE(QSE)
/////////////////////////////////
#endif

21
qse/include/qse/cmn/Mmgr.hpp
View File

@ -209,6 +209,27 @@ struct ScopedPtrMmgrDeleter
}
};
// Customized deleter for SharedPtr
template <typename T>
struct SharedPtrMmgrDeleter
{
void operator() (T* ptr, void* arg)
{
ptr->~T ();
::operator delete (ptr, (QSE::Mmgr*)arg);
}
};
template <typename T>
struct MmgedSharedPtrMmgrDeleter
{
void operator() (T* ptr, void* arg)
{
ptr->~T ();
::operator delete (ptr, (QSE::Mmgr*)arg);
}
};
/////////////////////////////////
QSE_END_NAMESPACE(QSE)
/////////////////////////////////

3
qse/include/qse/cmn/RedBlackTable.hpp
View File

@ -101,8 +101,11 @@ public:
}
SelfType& operator= (const SelfType& table)
{
if (this != &table)
{
this->pair_tree = table.pair_tree;
}
return *this;
}

3
qse/include/qse/cmn/RedBlackTree.hpp
View File

@ -379,6 +379,8 @@ public:
}
SelfType& operator= (const SelfType& rbt)
{
if (this != &rbt)
{
this->clear (false);
@ -389,6 +391,7 @@ public:
this->insert (*it);
++it;
}
}
return *this;
}