Skip to content
Permalink
Browse files

TileGenerator: free database resources (#38)

Destructor of DB* instance was never called.
Ensure it is, adding missing base class virtual destructor and calling delete when possible to free resources.
  • Loading branch information
Nestorfish authored and sfan5 committed Oct 13, 2016
1 parent d83f0d9 commit 26b62933eda625d35b0ba32f6e2e681d6e1db396
Showing with 15 additions and 4 deletions.
  1. +10 −1 TileGenerator.cpp
  2. +1 −0 TileGenerator.h
  3. +1 −1 db-leveldb.h
  4. +1 −1 db-redis.h
  5. +1 −1 db-sqlite3.h
  6. +1 −0 db.h
@@ -110,7 +110,8 @@ TileGenerator::TileGenerator():
m_shading(true),
m_backend(""),
m_border(0),
m_image(0),
m_db(NULL),
m_image(NULL),
m_xMin(INT_MAX),
m_xMax(INT_MIN),
m_zMin(INT_MAX),
@@ -127,6 +128,7 @@ TileGenerator::TileGenerator():

TileGenerator::~TileGenerator()
{
closeDatabase();
}

void TileGenerator::setBgColor(const std::string &bgColor)
@@ -246,6 +248,7 @@ void TileGenerator::generate(const std::string &input, const std::string &output
loadBlocks();
createImage();
renderMap();
closeDatabase();
if (m_drawScale) {
renderScale();
}
@@ -314,6 +317,12 @@ void TileGenerator::openDb(const std::string &input)
throw std::runtime_error(((std::string) "Unknown map backend: ") + backend);
}

void TileGenerator::closeDatabase()
{
delete m_db;
m_db = NULL;
}

void TileGenerator::loadBlocks()
{
std::vector<BlockPos> vec = m_db->getBlockPos();
@@ -76,6 +76,7 @@ class TileGenerator
private:
void parseColorsStream(std::istream &in);
void openDb(const std::string &input);
void closeDatabase();
void loadBlocks();
void createImage();
void renderMap();
@@ -9,7 +9,7 @@ class DBLevelDB : public DB {
DBLevelDB(const std::string &mapdir);
virtual std::vector<BlockPos> getBlockPos();
virtual void getBlocksOnZ(std::map<int16_t, BlockList> &blocks, int16_t zPos);
~DBLevelDB();
virtual ~DBLevelDB();
private:
void loadPosCache();

@@ -9,7 +9,7 @@ class DBRedis : public DB {
DBRedis(const std::string &mapdir);
virtual std::vector<BlockPos> getBlockPos();
virtual void getBlocksOnZ(std::map<int16_t, BlockList> &blocks, int16_t zPos);
~DBRedis();
virtual ~DBRedis();
private:
void loadPosCache();

@@ -9,7 +9,7 @@ class DBSQLite3 : public DB {
DBSQLite3(const std::string &mapdir);
virtual std::vector<BlockPos> getBlockPos();
virtual void getBlocksOnZ(std::map<int16_t, BlockList> &blocks, int16_t zPos);
~DBSQLite3();
virtual ~DBSQLite3();
private:
sqlite3 *db;

1 db.h
@@ -55,6 +55,7 @@ class DB {
public:
virtual std::vector<BlockPos> getBlockPos() = 0;
virtual void getBlocksOnZ(std::map<int16_t, BlockList> &blocks, int16_t zPos) = 0;
virtual ~DB() {};
};


0 comments on commit 26b6293

Please sign in to comment.
You can’t perform that action at this time.