Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复GC清理资源时的问题

This commit is contained in:
Nomango 2018-07-13 01:12:22 +08:00
parent f718a197a8
commit 6d9f1686a7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/Base/GC.cpp
View File

@ -42,6 +42,7 @@ GC GC::_instance;
e2d::GC::GC() e2d::GC::GC()
: _notifyed(false) : _notifyed(false)
, _cleanup(false)
, _pool() , _pool()
{ {
} }
@ -91,11 +92,20 @@ void e2d::GC::flush()
void e2d::GC::clear() void e2d::GC::clear()
{ {
_instance._cleanup = true;
for (auto pair : _instance._pool) for (auto pair : _instance._pool)
{ {
delete pair.first; if (pair.second)
{
delete[] pair.first;
}
else
{
delete pair.first;
}
} }
_instance._pool.clear(); _instance._pool.clear();
_instance._cleanup = false;
} }
void e2d::GC::autorelease(Ref * ref) void e2d::GC::autorelease(Ref * ref)
@ -124,7 +134,7 @@ void e2d::GC::autoreleaseArray(Ref * ref)
void e2d::GC::retain(Ref * ref) void e2d::GC::retain(Ref * ref)
{ {
if (ref) if (ref && !_instance._cleanup)
{ {
auto iter = _instance._pool.find(ref); auto iter = _instance._pool.find(ref);
if (iter != _instance._pool.end()) if (iter != _instance._pool.end())
@ -136,7 +146,7 @@ void e2d::GC::retain(Ref * ref)
void e2d::GC::release(Ref * ref) void e2d::GC::release(Ref * ref)
{ {
if (ref) if (ref && !_instance._cleanup)
{ {
auto iter = _instance._pool.find(ref); auto iter = _instance._pool.find(ref);
if (iter != _instance._pool.end()) if (iter != _instance._pool.end())

1
core/e2dbase.h
View File

@ -512,6 +512,7 @@ private:
private: private:
bool _notifyed; bool _notifyed;
bool _cleanup;
std::map<Ref*, bool> _pool; std::map<Ref*, bool> _pool;
static GC _instance; static GC _instance;