Skip to content

Commit 718bcaf

Browse files
nerzhulnerzhul
committedFeb 17, 2015
Replace std::list by std::vector into ServerMap::listAllLoadableBlocks ServerMap::listAllLoadedBlocks and their database backends.
This adds a speedup on database migration and /clearobjects command
·
5.11.00.4.13
1 parent c58d499 commit 718bcaf

13 files changed

+43
-51
lines changed
 

Diff for: ‎src/database-dummy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ bool Database_Dummy::deleteBlock(v3s16 blockpos)
6565
return true;
6666
}
6767

68-
void Database_Dummy::listAllLoadableBlocks(std::list<v3s16> &dst)
68+
void Database_Dummy::listAllLoadableBlocks(std::vector<v3s16> &dst)
6969
{
7070
for(std::map<u64, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)
7171
{

Diff for: ‎src/database-dummy.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Database_Dummy : public Database
3636
virtual bool saveBlock(v3s16 blockpos, std::string &data);
3737
virtual std::string loadBlock(v3s16 blockpos);
3838
virtual bool deleteBlock(v3s16 blockpos);
39-
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
39+
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
4040
virtual int Initialized(void);
4141
~Database_Dummy();
4242
private:

Diff for: ‎src/database-leveldb.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ bool Database_LevelDB::deleteBlock(v3s16 blockpos)
9393
return true;
9494
}
9595

96-
void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst)
96+
void Database_LevelDB::listAllLoadableBlocks(std::vector<v3s16> &dst)
9797
{
9898
leveldb::Iterator* it = m_database->NewIterator(leveldb::ReadOptions());
9999
for (it->SeekToFirst(); it->Valid(); it->Next()) {

Diff for: ‎src/database-leveldb.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Database_LevelDB : public Database
3939
virtual bool saveBlock(v3s16 blockpos, std::string &data);
4040
virtual std::string loadBlock(v3s16 blockpos);
4141
virtual bool deleteBlock(v3s16 blockpos);
42-
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
42+
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
4343
virtual int Initialized(void);
4444
~Database_LevelDB();
4545
private:

Diff for: ‎src/database-redis.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,15 @@ bool Database_Redis::deleteBlock(v3s16 blockpos)
147147
return true;
148148
}
149149

150-
void Database_Redis::listAllLoadableBlocks(std::list<v3s16> &dst)
150+
void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
151151
{
152152
redisReply *reply;
153153
reply = (redisReply*) redisCommand(ctx, "HKEYS %s", hash.c_str());
154154
if(!reply)
155155
throw FileNotGoodException(std::string("redis command 'HKEYS %s' failed: ") + ctx->errstr);
156156
if(reply->type != REDIS_REPLY_ARRAY)
157157
throw FileNotGoodException("Failed to get keys from database");
158-
for(size_t i = 0; i < reply->elements; i++)
159-
{
158+
for(size_t i = 0; i < reply->elements; i++) {
Has conversations. Original line has conversations.
160159
assert(reply->element[i]->type == REDIS_REPLY_STRING);
161160
dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str)));
162161
}

Diff for: ‎src/database-redis.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Database_Redis : public Database
3939
virtual bool saveBlock(v3s16 blockpos, std::string &data);
4040
virtual std::string loadBlock(v3s16 blockpos);
4141
virtual bool deleteBlock(v3s16 blockpos);
42-
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
42+
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
4343
virtual int Initialized(void);
4444
~Database_Redis();
4545
private:

Diff for: ‎src/database-sqlite3.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -274,12 +274,11 @@ void Database_SQLite3::createDatabase()
274274

275275
}
276276

277-
void Database_SQLite3::listAllLoadableBlocks(std::list<v3s16> &dst)
277+
void Database_SQLite3::listAllLoadableBlocks(std::vector<v3s16> &dst)
278278
{
279279
verifyDatabase();
280280

281-
while(sqlite3_step(m_database_list) == SQLITE_ROW)
282-
{
281+
while(sqlite3_step(m_database_list) == SQLITE_ROW) {
283282
sqlite3_int64 block_i = sqlite3_column_int64(m_database_list, 0);
284283
v3s16 p = getIntegerAsBlock(block_i);
285284
//dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;

Diff for: ‎src/database-sqlite3.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Database_SQLite3 : public Database
3939
virtual bool saveBlock(v3s16 blockpos, std::string &data);
4040
virtual std::string loadBlock(v3s16 blockpos);
4141
virtual bool deleteBlock(v3s16 blockpos);
42-
virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
42+
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
4343
virtual int Initialized(void);
4444
~Database_SQLite3();
4545
private:

Diff for: ‎src/database.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2020
#ifndef DATABASE_HEADER
2121
#define DATABASE_HEADER
2222

23-
#include <list>
23+
#include <vector>
2424
#include <string>
2525
#include "irr_v3d.h"
2626
#include "irrlichttypes.h"
@@ -40,7 +40,7 @@ class Database
4040
virtual bool deleteBlock(v3s16 blockpos) = 0;
4141
s64 getBlockAsInteger(const v3s16 pos) const;
4242
v3s16 getIntegerAsBlock(s64 i) const;
43-
virtual void listAllLoadableBlocks(std::list<v3s16> &dst) = 0;
43+
virtual void listAllLoadableBlocks(std::vector<v3s16> &dst) = 0;
4444
virtual int Initialized(void)=0;
4545
virtual ~Database() {};
4646
};

Diff for: ‎src/environment.cpp

+23-30
Original file line numberDiff line numberDiff line change
@@ -851,11 +851,10 @@ void ServerEnvironment::clearAllObjects()
851851
{
852852
infostream<<"ServerEnvironment::clearAllObjects(): "
853853
<<"Removing all active objects"<<std::endl;
854-
std::list<u16> objects_to_remove;
854+
std::vector<u16> objects_to_remove;
855855
for(std::map<u16, ServerActiveObject*>::iterator
856856
i = m_active_objects.begin();
857-
i != m_active_objects.end(); ++i)
858-
{
857+
i != m_active_objects.end(); ++i) {
859858
ServerActiveObject* obj = i->second;
860859
if(obj->getType() == ACTIVEOBJECT_TYPE_PLAYER)
861860
continue;
@@ -888,15 +887,15 @@ void ServerEnvironment::clearAllObjects()
888887
// Id to be removed from m_active_objects
889888
objects_to_remove.push_back(id);
890889
}
890+
891891
// Remove references from m_active_objects
892-
for(std::list<u16>::iterator i = objects_to_remove.begin();
893-
i != objects_to_remove.end(); ++i)
894-
{
892+
for(std::vector<u16>::iterator i = objects_to_remove.begin();
893+
i != objects_to_remove.end(); ++i) {
895894
m_active_objects.erase(*i);
896895
}
897896

898897
// Get list of loaded blocks
899-
std::list<v3s16> loaded_blocks;
898+
std::vector<v3s16> loaded_blocks;
900899
infostream<<"ServerEnvironment::clearAllObjects(): "
901900
<<"Listing all loaded blocks"<<std::endl;
902901
m_map->listAllLoadedBlocks(loaded_blocks);
@@ -905,7 +904,7 @@ void ServerEnvironment::clearAllObjects()
905904
<<loaded_blocks.size()<<std::endl;
906905

907906
// Get list of loadable blocks
908-
std::list<v3s16> loadable_blocks;
907+
std::vector<v3s16> loadable_blocks;
909908
infostream<<"ServerEnvironment::clearAllObjects(): "
910909
<<"Listing all loadable blocks"<<std::endl;
911910
m_map->listAllLoadableBlocks(loadable_blocks);
@@ -915,9 +914,8 @@ void ServerEnvironment::clearAllObjects()
915914
<<", now clearing"<<std::endl;
916915

917916
// Grab a reference on each loaded block to avoid unloading it
918-
for(std::list<v3s16>::iterator i = loaded_blocks.begin();
919-
i != loaded_blocks.end(); ++i)
920-
{
917+
for(std::vector<v3s16>::iterator i = loaded_blocks.begin();
918+
i != loaded_blocks.end(); ++i) {
921919
v3s16 p = *i;
922920
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
923921
assert(block);
@@ -931,9 +929,8 @@ void ServerEnvironment::clearAllObjects()
931929
u32 num_blocks_checked = 0;
932930
u32 num_blocks_cleared = 0;
933931
u32 num_objs_cleared = 0;
934-
for(std::list<v3s16>::iterator i = loadable_blocks.begin();
935-
i != loadable_blocks.end(); ++i)
936-
{
932+
for(std::vector<v3s16>::iterator i = loadable_blocks.begin();
933+
i != loadable_blocks.end(); ++i) {
937934
v3s16 p = *i;
938935
MapBlock *block = m_map->emergeBlock(p, false);
939936
if(!block){
@@ -969,9 +966,8 @@ void ServerEnvironment::clearAllObjects()
969966
m_map->unloadUnreferencedBlocks();
970967

971968
// Drop references that were added above
972-
for(std::list<v3s16>::iterator i = loaded_blocks.begin();
973-
i != loaded_blocks.end(); ++i)
974-
{
969+
for(std::vector<v3s16>::iterator i = loaded_blocks.begin();
970+
i != loaded_blocks.end(); ++i) {
975971
v3s16 p = *i;
976972
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
977973
assert(block);
@@ -1542,11 +1538,10 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
15421538
*/
15431539
void ServerEnvironment::removeRemovedObjects()
15441540
{
1545-
std::list<u16> objects_to_remove;
1541+
std::vector<u16> objects_to_remove;
15461542
for(std::map<u16, ServerActiveObject*>::iterator
15471543
i = m_active_objects.begin();
1548-
i != m_active_objects.end(); ++i)
1549-
{
1544+
i != m_active_objects.end(); ++i) {
15501545
u16 id = i->first;
15511546
ServerActiveObject* obj = i->second;
15521547
// This shouldn't happen but check it
@@ -1616,13 +1611,13 @@ void ServerEnvironment::removeRemovedObjects()
16161611
// Delete
16171612
if(obj->environmentDeletes())
16181613
delete obj;
1614+
16191615
// Id to be removed from m_active_objects
16201616
objects_to_remove.push_back(id);
16211617
}
16221618
// Remove references from m_active_objects
1623-
for(std::list<u16>::iterator i = objects_to_remove.begin();
1624-
i != objects_to_remove.end(); ++i)
1625-
{
1619+
for(std::vector<u16>::iterator i = objects_to_remove.begin();
1620+
i != objects_to_remove.end(); ++i) {
16261621
m_active_objects.erase(*i);
16271622
}
16281623
}
@@ -1666,8 +1661,9 @@ static void print_hexdump(std::ostream &o, const std::string &data)
16661661
*/
16671662
void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
16681663
{
1669-
if(block==NULL)
1664+
if(block == NULL)
16701665
return;
1666+
16711667
// Ignore if no stored objects (to not set changed flag)
16721668
if(block->m_static_objects.m_stored.empty())
16731669
return;
@@ -1693,17 +1689,14 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
16931689
std::list<StaticObject> new_stored;
16941690
for(std::list<StaticObject>::iterator
16951691
i = block->m_static_objects.m_stored.begin();
1696-
i != block->m_static_objects.m_stored.end(); ++i)
1697-
{
1698-
/*infostream<<"Server: Creating an active object from "
1699-
<<"static data"<<std::endl;*/
1692+
i != block->m_static_objects.m_stored.end(); ++i) {
17001693
StaticObject &s_obj = *i;
1694+
17011695
// Create an active object from the data
17021696
ServerActiveObject *obj = ServerActiveObject::create
17031697
((ActiveObjectType) s_obj.type, this, 0, s_obj.pos, s_obj.data);
17041698
// If couldn't create object, store static data back.
1705-
if(obj==NULL)
1706-
{
1699+
if(obj == NULL) {
17071700
errorstream<<"ServerEnvironment::activateObjects(): "
17081701
<<"failed to create active object from static object "
17091702
<<"in block "<<PP(s_obj.pos/BS)

Diff for: ‎src/main.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -973,16 +973,17 @@ static bool migrate_database(const GameParams &game_params, const Settings &cmd_
973973
return false;
974974
}
975975

976-
std::list<v3s16> blocks;
976+
std::vector<v3s16> blocks;
977977
ServerMap &old_map = ((ServerMap&)server->getMap());
978978
old_map.listAllLoadableBlocks(blocks);
979979
int count = 0;
980980
new_db->beginSave();
981-
for (std::list<v3s16>::iterator i = blocks.begin(); i != blocks.end(); i++) {
981+
for (std::vector<v3s16>::iterator i = blocks.begin(); i != blocks.end(); i++) {
982982
MapBlock *block = old_map.loadBlock(*i);
983983
if (!block) {
984984
errorstream << "Failed to load block " << PP(*i) << ", skipping it.";
985-
} else {
985+
}
986+
else {
986987
old_map.saveBlock(block, new_db);
987988
MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z));
988989
sector->deleteBlock(block);

Diff for: ‎src/map.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3070,7 +3070,7 @@ void ServerMap::save(ModifiedState save_level)
30703070
}
30713071
}
30723072

3073-
void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
3073+
void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
30743074
{
30753075
if(loadFromFolders()){
30763076
errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
@@ -3079,7 +3079,7 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
30793079
dbase->listAllLoadableBlocks(dst);
30803080
}
30813081

3082-
void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)
3082+
void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
30833083
{
30843084
for(std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
30853085
si != m_sectors.end(); ++si)

Diff for: ‎src/map.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ class ServerMap : public Map
466466
void endSave();
467467

468468
void save(ModifiedState save_level);
469-
void listAllLoadableBlocks(std::list<v3s16> &dst);
470-
void listAllLoadedBlocks(std::list<v3s16> &dst);
469+
void listAllLoadableBlocks(std::vector<v3s16> &dst);
470+
void listAllLoadedBlocks(std::vector<v3s16> &dst);
471471
// Saves map seed and possibly other stuff
472472
void saveMapMeta();
473473
void loadMapMeta();

0 commit comments

Comments
 (0)
Please sign in to comment.