Skip to content

Commit

Permalink
Replace std::list by std::vector into ServerMap::listAllLoadableBlock…
Browse files Browse the repository at this point in the history 
…s ServerMap::listAllLoadedBlocks and their database backends.

This adds a speedup on database migration and /clearobjects command
  • Loading branch information
@nerzhul
nerzhul committed Feb 17, 2015
1 parent c58d499 commit 718bcaf
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 51 deletions.
2 changes: 1 addition & 1 deletion src/database-dummy.cpp
View file
Expand Up @@ -65,7 +65,7 @@ bool Database_Dummy::deleteBlock(v3s16 blockpos)
return true;
}

void Database_Dummy::listAllLoadableBlocks(std::list<v3s16> &dst)
void Database_Dummy::listAllLoadableBlocks(std::vector<v3s16> &dst)
{
for(std::map<u64, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)
{
Expand Down
2 changes: 1 addition & 1 deletion src/database-dummy.h
View file
Expand Up @@ -36,7 +36,7 @@ class Database_Dummy : public Database
virtual bool saveBlock(v3s16 blockpos, std::string &data);
virtual std::string loadBlock(v3s16 blockpos);
virtual bool deleteBlock(v3s16 blockpos);
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
virtual int Initialized(void);
~Database_Dummy();
private:
Expand Down
2 changes: 1 addition & 1 deletion src/database-leveldb.cpp
View file
Expand Up @@ -93,7 +93,7 @@ bool Database_LevelDB::deleteBlock(v3s16 blockpos)
return true;
}

void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst)
void Database_LevelDB::listAllLoadableBlocks(std::vector<v3s16> &dst)
{
leveldb::Iterator* it = m_database->NewIterator(leveldb::ReadOptions());
for (it->SeekToFirst(); it->Valid(); it->Next()) {
Expand Down
2 changes: 1 addition & 1 deletion src/database-leveldb.h
View file
Expand Up @@ -39,7 +39,7 @@ class Database_LevelDB : public Database
virtual bool saveBlock(v3s16 blockpos, std::string &data);
virtual std::string loadBlock(v3s16 blockpos);
virtual bool deleteBlock(v3s16 blockpos);
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
virtual int Initialized(void);
~Database_LevelDB();
private:
Expand Down
5 changes: 2 additions & 3 deletions src/database-redis.cpp
View file
Expand Up @@ -147,16 +147,15 @@ bool Database_Redis::deleteBlock(v3s16 blockpos)
return true;
}

void Database_Redis::listAllLoadableBlocks(std::list<v3s16> &dst)
void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
{
redisReply *reply;
reply = (redisReply*) redisCommand(ctx, "HKEYS %s", hash.c_str());
if(!reply)
throw FileNotGoodException(std::string("redis command 'HKEYS %s' failed: ") + ctx->errstr);
if(reply->type != REDIS_REPLY_ARRAY)
throw FileNotGoodException("Failed to get keys from database");
for(size_t i = 0; i < reply->elements; i++)
{
for(size_t i = 0; i < reply->elements; i++) {

This comment has been minimized.

Sign in to view

Copy link
@ShadowNinja

ShadowNinja Feb 18, 2015

Member

You can optimize some places like here by adding dst.reserve(reply->elements); to prevent reallocations.

This comment has been minimized.

Sign in to view

Copy link
@nerzhul

nerzhul Feb 18, 2015

Author Member

You are right, i'll look at this, this will improve performance, right :) there are many places where we can do that
assert(reply->element[i]->type == REDIS_REPLY_STRING);
dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str)));
}
Expand Down
2 changes: 1 addition & 1 deletion src/database-redis.h
View file
Expand Up @@ -39,7 +39,7 @@ class Database_Redis : public Database
virtual bool saveBlock(v3s16 blockpos, std::string &data);
virtual std::string loadBlock(v3s16 blockpos);
virtual bool deleteBlock(v3s16 blockpos);
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
virtual int Initialized(void);
~Database_Redis();
private:
Expand Down
5 changes: 2 additions & 3 deletions src/database-sqlite3.cpp
View file
Expand Up @@ -274,12 +274,11 @@ void Database_SQLite3::createDatabase()

}

void Database_SQLite3::listAllLoadableBlocks(std::list<v3s16> &dst)
void Database_SQLite3::listAllLoadableBlocks(std::vector<v3s16> &dst)
{
verifyDatabase();

while(sqlite3_step(m_database_list) == SQLITE_ROW)
{
while(sqlite3_step(m_database_list) == SQLITE_ROW) {
sqlite3_int64 block_i = sqlite3_column_int64(m_database_list, 0);
v3s16 p = getIntegerAsBlock(block_i);
//dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;
Expand Down
2 changes: 1 addition & 1 deletion src/database-sqlite3.h
View file
Expand Up @@ -39,7 +39,7 @@ class Database_SQLite3 : public Database
virtual bool saveBlock(v3s16 blockpos, std::string &data);
virtual std::string loadBlock(v3s16 blockpos);
virtual bool deleteBlock(v3s16 blockpos);
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
virtual int Initialized(void);
~Database_SQLite3();
private:
Expand Down
4 changes: 2 additions & 2 deletions src/database.h
View file
Expand Up @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef DATABASE_HEADER
#define DATABASE_HEADER

#include <list>
#include <vector>
#include <string>
#include "irr_v3d.h"
#include "irrlichttypes.h"
Expand All @@ -40,7 +40,7 @@ class Database
virtual bool deleteBlock(v3s16 blockpos) = 0;
s64 getBlockAsInteger(const v3s16 pos) const;
v3s16 getIntegerAsBlock(s64 i) const;
virtual void listAllLoadableBlocks(std::list<v3s16> &dst) = 0;
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst) = 0;
virtual int Initialized(void)=0;
virtual ~Database() {};
};
Expand Down
53 changes: 23 additions & 30 deletions src/environment.cpp
View file
Expand Up @@ -851,11 +851,10 @@ void ServerEnvironment::clearAllObjects()
{
infostream<<"ServerEnvironment::clearAllObjects(): "
<<"Removing all active objects"<<std::endl;
std::list<u16> objects_to_remove;
std::vector<u16> objects_to_remove;
for(std::map<u16, ServerActiveObject*>::iterator
i = m_active_objects.begin();
i != m_active_objects.end(); ++i)
{
i != m_active_objects.end(); ++i) {
ServerActiveObject* obj = i->second;
if(obj->getType() == ACTIVEOBJECT_TYPE_PLAYER)
continue;
Expand Down Expand Up @@ -888,15 +887,15 @@ void ServerEnvironment::clearAllObjects()
// Id to be removed from m_active_objects
objects_to_remove.push_back(id);
}

// Remove references from m_active_objects
for(std::list<u16>::iterator i = objects_to_remove.begin();
i != objects_to_remove.end(); ++i)
{
for(std::vector<u16>::iterator i = objects_to_remove.begin();
i != objects_to_remove.end(); ++i) {
m_active_objects.erase(*i);
}

// Get list of loaded blocks
std::list<v3s16> loaded_blocks;
std::vector<v3s16> loaded_blocks;
infostream<<"ServerEnvironment::clearAllObjects(): "
<<"Listing all loaded blocks"<<std::endl;
m_map->listAllLoadedBlocks(loaded_blocks);
Expand All @@ -905,7 +904,7 @@ void ServerEnvironment::clearAllObjects()
<<loaded_blocks.size()<<std::endl;

// Get list of loadable blocks
std::list<v3s16> loadable_blocks;
std::vector<v3s16> loadable_blocks;
infostream<<"ServerEnvironment::clearAllObjects(): "
<<"Listing all loadable blocks"<<std::endl;
m_map->listAllLoadableBlocks(loadable_blocks);
Expand All @@ -915,9 +914,8 @@ void ServerEnvironment::clearAllObjects()
<<", now clearing"<<std::endl;

// Grab a reference on each loaded block to avoid unloading it
for(std::list<v3s16>::iterator i = loaded_blocks.begin();
i != loaded_blocks.end(); ++i)
{
for(std::vector<v3s16>::iterator i = loaded_blocks.begin();
i != loaded_blocks.end(); ++i) {
v3s16 p = *i;
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
assert(block);
Expand All @@ -931,9 +929,8 @@ void ServerEnvironment::clearAllObjects()
u32 num_blocks_checked = 0;
u32 num_blocks_cleared = 0;
u32 num_objs_cleared = 0;
for(std::list<v3s16>::iterator i = loadable_blocks.begin();
i != loadable_blocks.end(); ++i)
{
for(std::vector<v3s16>::iterator i = loadable_blocks.begin();
i != loadable_blocks.end(); ++i) {
v3s16 p = *i;
MapBlock *block = m_map->emergeBlock(p, false);
if(!block){
Expand Down Expand Up @@ -969,9 +966,8 @@ void ServerEnvironment::clearAllObjects()
m_map->unloadUnreferencedBlocks();

// Drop references that were added above
for(std::list<v3s16>::iterator i = loaded_blocks.begin();
i != loaded_blocks.end(); ++i)
{
for(std::vector<v3s16>::iterator i = loaded_blocks.begin();
i != loaded_blocks.end(); ++i) {
v3s16 p = *i;
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
assert(block);
Expand Down Expand Up @@ -1542,11 +1538,10 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
*/
void ServerEnvironment::removeRemovedObjects()
{
std::list<u16> objects_to_remove;
std::vector<u16> objects_to_remove;
for(std::map<u16, ServerActiveObject*>::iterator
i = m_active_objects.begin();
i != m_active_objects.end(); ++i)
{
i != m_active_objects.end(); ++i) {
u16 id = i->first;
ServerActiveObject* obj = i->second;
// This shouldn't happen but check it
Expand Down Expand Up @@ -1616,13 +1611,13 @@ void ServerEnvironment::removeRemovedObjects()
// Delete
if(obj->environmentDeletes())
delete obj;

// Id to be removed from m_active_objects
objects_to_remove.push_back(id);
}
// Remove references from m_active_objects
for(std::list<u16>::iterator i = objects_to_remove.begin();
i != objects_to_remove.end(); ++i)
{
for(std::vector<u16>::iterator i = objects_to_remove.begin();
i != objects_to_remove.end(); ++i) {
m_active_objects.erase(*i);
}
}
Expand Down Expand Up @@ -1666,8 +1661,9 @@ static void print_hexdump(std::ostream &o, const std::string &data)
*/
void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
{
if(block==NULL)
if(block == NULL)
return;

// Ignore if no stored objects (to not set changed flag)
if(block->m_static_objects.m_stored.empty())
return;
Expand All @@ -1693,17 +1689,14 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
std::list<StaticObject> new_stored;
for(std::list<StaticObject>::iterator
i = block->m_static_objects.m_stored.begin();
i != block->m_static_objects.m_stored.end(); ++i)
{
/*infostream<<"Server: Creating an active object from "
<<"static data"<<std::endl;*/
i != block->m_static_objects.m_stored.end(); ++i) {
StaticObject &s_obj = *i;

// Create an active object from the data
ServerActiveObject *obj = ServerActiveObject::create
((ActiveObjectType) s_obj.type, this, 0, s_obj.pos, s_obj.data);
// If couldn't create object, store static data back.
if(obj==NULL)
{
if(obj == NULL) {
errorstream<<"ServerEnvironment::activateObjects(): "
<<"failed to create active object from static object "
<<"in block "<<PP(s_obj.pos/BS)
Expand Down
7 changes: 4 additions & 3 deletions src/main.cpp
View file
Expand Up @@ -973,16 +973,17 @@ static bool migrate_database(const GameParams &game_params, const Settings &cmd_
return false;
}

std::list<v3s16> blocks;
std::vector<v3s16> blocks;
ServerMap &old_map = ((ServerMap&)server->getMap());
old_map.listAllLoadableBlocks(blocks);
int count = 0;
new_db->beginSave();
for (std::list<v3s16>::iterator i = blocks.begin(); i != blocks.end(); i++) {
for (std::vector<v3s16>::iterator i = blocks.begin(); i != blocks.end(); i++) {
MapBlock *block = old_map.loadBlock(*i);
if (!block) {
errorstream << "Failed to load block " << PP(*i) << ", skipping it.";
} else {
}
else {
old_map.saveBlock(block, new_db);
MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z));
sector->deleteBlock(block);
Expand Down
4 changes: 2 additions & 2 deletions src/map.cpp
View file
Expand Up @@ -3070,7 +3070,7 @@ void ServerMap::save(ModifiedState save_level)
}
}

void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
{
if(loadFromFolders()){
errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
Expand All @@ -3079,7 +3079,7 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
dbase->listAllLoadableBlocks(dst);
}

void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)
void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
{
for(std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
si != m_sectors.end(); ++si)
Expand Down
4 changes: 2 additions & 2 deletions src/map.h
View file
Expand Up @@ -466,8 +466,8 @@ class ServerMap : public Map
void endSave();

void save(ModifiedState save_level);
void listAllLoadableBlocks(std::list<v3s16> &dst);
void listAllLoadedBlocks(std::list<v3s16> &dst);
void listAllLoadableBlocks(std::vector<v3s16> &dst);
void listAllLoadedBlocks(std::vector<v3s16> &dst);
// Saves map seed and possibly other stuff
void saveMapMeta();
void loadMapMeta();
Expand Down

0 comments on commit 718bcaf

Please sign in to comment.