diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/utils/sdlcheckutils.cpp | 30 | ||||
| -rw-r--r-- | src/utils/sdlmemoryobject.h | 50 |
4 files changed, 59 insertions, 23 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 06f21b243..0788568a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -666,6 +666,7 @@ SET(SRCS utils/sdlcheckutils.h utils/sdlhelper.cpp utils/sdlhelper.h + utils/sdlmemoryobject.h utils/stringutils.cpp utils/stringutils.h utils/stringvector.h diff --git a/src/Makefile.am b/src/Makefile.am index f32d0fabb..de9610b4f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -123,6 +123,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \ utils/sdl2helper.h \ utils/sdlhelper.cpp \ utils/sdlhelper.h \ + utils/sdlmemoryobject.h \ utils/stringutils.cpp \ utils/stringutils.h \ utils/timer.cpp \ diff --git a/src/utils/sdlcheckutils.cpp b/src/utils/sdlcheckutils.cpp index 028c2968f..dbc27f10e 100644 --- a/src/utils/sdlcheckutils.cpp +++ b/src/utils/sdlcheckutils.cpp @@ -24,6 +24,7 @@ #include "logger.h" +#include "utils/sdlmemoryobject.h" #include "utils/stringutils.h" #include <map> @@ -35,24 +36,7 @@ #define DEBUG_SURFACE_ALLOCATION 1 -struct MemoryObject -{ - MemoryObject(const std::string &name, const char *const file, - const unsigned int line) : - mName(name), - mAddFile(strprintf("%s:%u", file, line)), - mRemoveFile(), - mCnt(1) - { - } - - std::string mName; - std::string mAddFile; - std::string mRemoveFile; - int mCnt; -}; - -std::map<void*, MemoryObject*> mSurfaces; +std::map<void*, SDLMemoryObject*> mSurfaces; static SDL_Surface *addSurface(const char *restrict const name, SDL_Surface *restrict const surface, @@ -63,11 +47,11 @@ static SDL_Surface *addSurface(const char *restrict const name, logger->log("add surface: %s %s:%u %p", name, file, line, static_cast<void*>(surface)); #endif - std::map<void*, MemoryObject*>::iterator + std::map<void*, SDLMemoryObject*>::iterator it = mSurfaces.find(surface); if (it != mSurfaces.end()) { - MemoryObject *const obj = (*it).second; + SDLMemoryObject *const obj = (*it).second; if (obj) { // found some time ago created surface #ifdef DEBUG_SURFACE_ALLOCATION @@ -80,7 +64,7 @@ static SDL_Surface *addSurface(const char *restrict const name, } else { // creating surface object - mSurfaces[surface] = new MemoryObject(name, file, line); + mSurfaces[surface] = new SDLMemoryObject(name, file, line); } return surface; } @@ -93,7 +77,7 @@ static void deleteSurface(const char *restrict const name A_UNUSED, #ifdef DEBUG_SURFACE_ALLOCATION logger->log("delete surface: %s %s:%u %p", name, file, line, surface); #endif - std::map<void*, MemoryObject*>::iterator + std::map<void*, SDLMemoryObject*>::iterator it = mSurfaces.find(surface); if (it == mSurfaces.end()) { @@ -102,7 +86,7 @@ static void deleteSurface(const char *restrict const name A_UNUSED, } else { - MemoryObject *const obj = (*it).second; + SDLMemoryObject *const obj = (*it).second; if (obj) { const int cnt = obj->mCnt; diff --git a/src/utils/sdlmemoryobject.h b/src/utils/sdlmemoryobject.h new file mode 100644 index 000000000..cc96f60c1 --- /dev/null +++ b/src/utils/sdlmemoryobject.h @@ -0,0 +1,50 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef UTILS_SDLMEMORYOBJECT_H +#define UTILS_SDLMEMORYOBJECT_H + +#ifdef DEBUG_SDL_SURFACES + +#include "logger.h" + +#include <string> + +#include "localconsts.h" + +struct SDLMemoryObject final +{ + SDLMemoryObject(const std::string &name, const char *const file, + const unsigned int line) : + mName(name), + mAddFile(strprintf("%s:%u", file, line)), + mRemoveFile(), + mCnt(1) + { + } + + std::string mName; + std::string mAddFile; + std::string mRemoveFile; + int mCnt; +}; + +#endif // DEBUG_SDL_SURFACES +#endif // UTILS_SDLMEMORYOBJECT_H |