sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/String: Replace manual memory management/COW by smart pointers 

Former-commit-id: 27cab7f0642619ab47d53ed59c737992534f2979
This commit is contained in:
Lynix 2015-09-13 12:07:31 +02:00
parent 44e99bce3d
commit 9f1c190985
3 changed files with 342 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
include/Nazara/Core/String.hpp
View File

@ -11,6 +11,7 @@
#include <Nazara/Core/Hashable.hpp> #include <Nazara/Core/Hashable.hpp>
#include <atomic> #include <atomic>
#include <iosfwd> #include <iosfwd>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
@ -29,8 +30,6 @@ class NAZARA_CORE_API NzString : public NzHashable
TrimOnlyRight = 0x08 // Trim(med), ne coupe que la partie droite de la chaîne TrimOnlyRight = 0x08 // Trim(med), ne coupe que la partie droite de la chaîne
}; };
struct SharedString;
NzString(); NzString();
explicit NzString(char character); explicit NzString(char character);
NzString(unsigned int rep, char character); NzString(unsigned int rep, char character);
@ -40,10 +39,9 @@ class NAZARA_CORE_API NzString : public NzHashable
NzString(const char* string); NzString(const char* string);
NzString(const char* string, unsigned int length); NzString(const char* string, unsigned int length);
NzString(const std::string& string); NzString(const std::string& string);
NzString(const NzString& string); NzString(const NzString& string) = default;
NzString(NzString&& string) noexcept; NzString(NzString&& string) noexcept = default;
NzString(SharedString* sharedString); ~NzString() = default;
~NzString();
NzString& Append(char character); NzString& Append(char character);
NzString& Append(const char* string); NzString& Append(const char* string);
@ -137,7 +135,6 @@ class NAZARA_CORE_API NzString : public NzHashable
NzString& Set(const std::string& string); NzString& Set(const std::string& string);
NzString& Set(const NzString& string); NzString& Set(const NzString& string);
NzString& Set(NzString&& string) noexcept; NzString& Set(NzString&& string) noexcept;
NzString& Set(SharedString* sharedString);
NzString Simplified(nzUInt32 flags = None) const; NzString Simplified(nzUInt32 flags = None) const;
NzString& Simplify(nzUInt32 flags = None); NzString& Simplify(nzUInt32 flags = None);
@ -299,37 +296,30 @@ class NAZARA_CORE_API NzString : public NzHashable
NAZARA_CORE_API friend bool operator>=(const char* string, const NzString& nstring); NAZARA_CORE_API friend bool operator>=(const char* string, const NzString& nstring);
NAZARA_CORE_API friend bool operator>=(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend bool operator>=(const std::string& string, const NzString& nstring);
struct NAZARA_CORE_API SharedString
{
SharedString() :
refCount(1)
{
}
SharedString(unsigned short referenceCount, unsigned int bufferSize, unsigned int stringSize, char* str) :
capacity(bufferSize),
size(stringSize),
string(str),
refCount(referenceCount)
{
}
unsigned int capacity;
unsigned int size;
char* string;
std::atomic_ushort refCount;
};
static SharedString emptyString;
static const unsigned int npos; static const unsigned int npos;
private: private:
struct SharedString;
NzString(std::shared_ptr<SharedString>&& sharedString);
void EnsureOwnership(bool discardContent = false); void EnsureOwnership(bool discardContent = false);
bool FillHash(NzAbstractHash* hash) const; bool FillHash(NzAbstractHash* hash) const;
void ReleaseString(); inline void ReleaseString();
SharedString* m_sharedString; static std::shared_ptr<SharedString> GetEmptyString();
std::shared_ptr<SharedString> m_sharedString;
struct SharedString
{
inline SharedString();
inline SharedString(unsigned int strSize);
unsigned int capacity;
unsigned int size;
std::unique_ptr<char[]> string;
};
}; };
namespace std namespace std

25
include/Nazara/Core/String.inl
View File

@ -4,6 +4,31 @@
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>
inline NzString::NzString(std::shared_ptr<SharedString>&& sharedString) :
m_sharedString(std::move(sharedString))
{
}
inline void NzString::ReleaseString()
{
m_sharedString = std::move(GetEmptyString());
}
inline NzString::SharedString::SharedString() : // Special case: empty string
capacity(0),
size(0)
{
}
inline NzString::SharedString::SharedString(unsigned int strSize) :
capacity(strSize),
size(strSize),
string(new char[strSize + 1])
{
string[strSize] = '\0';
}
namespace std namespace std
{ {
template<> template<>

710
src/Nazara/Core/String.cpp
View File

File diff suppressed because it is too large Load Diff