mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Use the logger; also, default to not showing much crap in console. Use --info-on-stderr to enable crap.
This commit is contained in:
Perttu Ahola
parent
4846846a2d
commit
b65a5aceb0
16 changed files with 844 additions and 646 deletions
191
src/map.cpp
191
src/map.cpp
|
|
@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#include <IMaterialRenderer.h>
|
||||
#endif
|
||||
#include "settings.h"
|
||||
#include "log.h"
|
||||
|
||||
/*
|
||||
SQLite format specification:
|
||||
|
|
@ -346,7 +347,7 @@ void Map::unspreadLight(enum LightBank bank,
|
|||
*/
|
||||
/*if(light_sources.find(n2pos))
|
||||
{
|
||||
std::cout<<"Removed from light_sources"<<std::endl;
|
||||
infostream<<"Removed from light_sources"<<std::endl;
|
||||
light_sources.remove(n2pos);
|
||||
}*/
|
||||
}
|
||||
|
|
@ -377,7 +378,7 @@ void Map::unspreadLight(enum LightBank bank,
|
|||
}
|
||||
}
|
||||
|
||||
/*dstream<<"unspreadLight(): Changed block "
|
||||
/*infostream<<"unspreadLight(): Changed block "
|
||||
<<blockchangecount<<" times"
|
||||
<<" for "<<from_nodes.size()<<" nodes"
|
||||
<<std::endl;*/
|
||||
|
|
@ -439,7 +440,7 @@ void Map::spreadLight(enum LightBank bank,
|
|||
{
|
||||
v3s16 pos = j.getNode()->getKey();
|
||||
//v3s16 pos = *j;
|
||||
//dstream<<"pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"<<std::endl;
|
||||
//infostream<<"pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"<<std::endl;
|
||||
v3s16 blockpos = getNodeBlockPos(pos);
|
||||
|
||||
// Only fetch a new block if the block position has changed
|
||||
|
|
@ -544,7 +545,7 @@ void Map::spreadLight(enum LightBank bank,
|
|||
}
|
||||
}
|
||||
|
||||
/*dstream<<"spreadLight(): Changed block "
|
||||
/*infostream<<"spreadLight(): Changed block "
|
||||
<<blockchangecount<<" times"
|
||||
<<" for "<<from_nodes.size()<<" nodes"
|
||||
<<std::endl;*/
|
||||
|
|
@ -728,7 +729,7 @@ void Map::updateLighting(enum LightBank bank,
|
|||
dummy block.
|
||||
*/
|
||||
//assert(0);
|
||||
dstream<<"updateLighting(): InvalidPositionException"
|
||||
infostream<<"updateLighting(): InvalidPositionException"
|
||||
<<std::endl;
|
||||
}
|
||||
}
|
||||
|
|
@ -752,7 +753,7 @@ void Map::updateLighting(enum LightBank bank,
|
|||
assert(0);
|
||||
}
|
||||
|
||||
/*dstream<<"Bottom for sunlight-propagated block ("
|
||||
/*infostream<<"Bottom for sunlight-propagated block ("
|
||||
<<pos.X<<","<<pos.Y<<","<<pos.Z<<") not valid"
|
||||
<<std::endl;*/
|
||||
|
||||
|
|
@ -799,7 +800,7 @@ void Map::updateLighting(enum LightBank bank,
|
|||
{
|
||||
u32 diff = modified_blocks.size() - count_was;
|
||||
count_was = modified_blocks.size();
|
||||
dstream<<"unspreadLight modified "<<diff<<std::endl;
|
||||
infostream<<"unspreadLight modified "<<diff<<std::endl;
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -811,7 +812,7 @@ void Map::updateLighting(enum LightBank bank,
|
|||
{
|
||||
u32 diff = modified_blocks.size() - count_was;
|
||||
count_was = modified_blocks.size();
|
||||
dstream<<"spreadLight modified "<<diff<<std::endl;
|
||||
infostream<<"spreadLight modified "<<diff<<std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -867,7 +868,7 @@ void Map::updateLighting(enum LightBank bank,
|
|||
//TimeTaker timer("blitBack");
|
||||
vmanip.blitBack(modified_blocks);
|
||||
}
|
||||
/*dstream<<"emerge_time="<<emerge_time<<std::endl;
|
||||
/*infostream<<"emerge_time="<<emerge_time<<std::endl;
|
||||
emerge_time = 0;*/
|
||||
}
|
||||
|
||||
|
|
@ -1471,12 +1472,12 @@ void Map::timerUpdate(float dtime, float unload_timeout,
|
|||
|
||||
if(deleted_blocks_count != 0)
|
||||
{
|
||||
PrintInfo(dstream); // ServerMap/ClientMap:
|
||||
dstream<<"Unloaded "<<deleted_blocks_count
|
||||
PrintInfo(infostream); // ServerMap/ClientMap:
|
||||
infostream<<"Unloaded "<<deleted_blocks_count
|
||||
<<" blocks from memory";
|
||||
if(save_before_unloading)
|
||||
dstream<<", of which "<<saved_blocks_count<<" were written";
|
||||
dstream<<"."<<std::endl;
|
||||
infostream<<", of which "<<saved_blocks_count<<" were written";
|
||||
infostream<<"."<<std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1543,7 +1544,7 @@ void Map::unloadUnusedData(float timeout,
|
|||
|
||||
deleteSectors(sector_deletion_queue);
|
||||
|
||||
dstream<<"Map: Unloaded "<<deleted_blocks_count<<" blocks from memory"
|
||||
infostream<<"Map: Unloaded "<<deleted_blocks_count<<" blocks from memory"
|
||||
<<", of which "<<saved_blocks_count<<" were wr."
|
||||
<<std::endl;
|
||||
|
||||
|
|
@ -1579,7 +1580,7 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
|
|||
u32 initial_size = m_transforming_liquid.size();
|
||||
|
||||
/*if(initial_size != 0)
|
||||
dstream<<"transformLiquids(): initial_size="<<initial_size<<std::endl;*/
|
||||
infostream<<"transformLiquids(): initial_size="<<initial_size<<std::endl;*/
|
||||
|
||||
// list of nodes that due to viscosity have not reached their max level height
|
||||
UniqueQueue<v3s16> must_reflow;
|
||||
|
|
@ -1807,7 +1808,7 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
|
|||
break;
|
||||
}
|
||||
}
|
||||
//dstream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
|
||||
//infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
|
||||
while (must_reflow.size() > 0)
|
||||
m_transforming_liquid.push_back(must_reflow.pop_front());
|
||||
updateLighting(lighting_modified_blocks, modified_blocks);
|
||||
|
|
@ -1820,7 +1821,7 @@ NodeMetadata* Map::getNodeMetadata(v3s16 p)
|
|||
MapBlock *block = getBlockNoCreateNoEx(blockpos);
|
||||
if(block == NULL)
|
||||
{
|
||||
dstream<<"WARNING: Map::setNodeMetadata(): Block not found"
|
||||
infostream<<"WARNING: Map::setNodeMetadata(): Block not found"
|
||||
<<std::endl;
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1835,7 +1836,7 @@ void Map::setNodeMetadata(v3s16 p, NodeMetadata *meta)
|
|||
MapBlock *block = getBlockNoCreateNoEx(blockpos);
|
||||
if(block == NULL)
|
||||
{
|
||||
dstream<<"WARNING: Map::setNodeMetadata(): Block not found"
|
||||
infostream<<"WARNING: Map::setNodeMetadata(): Block not found"
|
||||
<<std::endl;
|
||||
return;
|
||||
}
|
||||
|
|
@ -1849,7 +1850,7 @@ void Map::removeNodeMetadata(v3s16 p)
|
|||
MapBlock *block = getBlockNoCreateNoEx(blockpos);
|
||||
if(block == NULL)
|
||||
{
|
||||
dstream<<"WARNING: Map::removeNodeMetadata(): Block not found"
|
||||
infostream<<"WARNING: Map::removeNodeMetadata(): Block not found"
|
||||
<<std::endl;
|
||||
return;
|
||||
}
|
||||
|
|
@ -1897,7 +1898,7 @@ ServerMap::ServerMap(std::string savedir):
|
|||
m_database_read(NULL),
|
||||
m_database_write(NULL)
|
||||
{
|
||||
dstream<<__FUNCTION_NAME<<std::endl;
|
||||
infostream<<__FUNCTION_NAME<<std::endl;
|
||||
|
||||
//m_chunksize = 8; // Takes a few seconds
|
||||
|
||||
|
|
@ -1935,7 +1936,7 @@ ServerMap::ServerMap(std::string savedir):
|
|||
// If directory is empty, it is safe to save into it.
|
||||
if(fs::GetDirListing(m_savedir).size() == 0)
|
||||
{
|
||||
dstream<<DTIME<<"Server: Empty save directory is valid."
|
||||
infostream<<"Server: Empty save directory is valid."
|
||||
<<std::endl;
|
||||
m_map_saving_enabled = true;
|
||||
}
|
||||
|
|
@ -1946,7 +1947,7 @@ ServerMap::ServerMap(std::string savedir):
|
|||
loadMapMeta();
|
||||
}
|
||||
catch(FileNotGoodException &e){
|
||||
dstream<<DTIME<<"WARNING: Could not load map metadata"
|
||||
infostream<<"WARNING: Could not load map metadata"
|
||||
//<<" Disabling chunk-based generator."
|
||||
<<std::endl;
|
||||
//m_chunksize = 0;
|
||||
|
|
@ -1957,18 +1958,18 @@ ServerMap::ServerMap(std::string savedir):
|
|||
loadChunkMeta();
|
||||
}
|
||||
catch(FileNotGoodException &e){
|
||||
dstream<<DTIME<<"WARNING: Could not load chunk metadata."
|
||||
infostream<<"WARNING: Could not load chunk metadata."
|
||||
<<" Disabling chunk-based generator."
|
||||
<<std::endl;
|
||||
m_chunksize = 0;
|
||||
}*/
|
||||
|
||||
/*dstream<<DTIME<<"Server: Successfully loaded chunk "
|
||||
/*infostream<<"Server: Successfully loaded chunk "
|
||||
"metadata and sector (0,0) from "<<savedir<<
|
||||
", assuming valid save directory."
|
||||
<<std::endl;*/
|
||||
|
||||
dstream<<DTIME<<"INFO: Server: Successfully loaded map "
|
||||
infostream<<"Server: Successfully loaded map "
|
||||
<<"and chunk metadata from "<<savedir
|
||||
<<", assuming valid save directory."
|
||||
<<std::endl;
|
||||
|
|
@ -1985,13 +1986,13 @@ ServerMap::ServerMap(std::string savedir):
|
|||
}
|
||||
catch(std::exception &e)
|
||||
{
|
||||
dstream<<DTIME<<"WARNING: Server: Failed to load map from "<<savedir
|
||||
infostream<<"WARNING: Server: Failed to load map from "<<savedir
|
||||
<<", exception: "<<e.what()<<std::endl;
|
||||
dstream<<"Please remove the map or fix it."<<std::endl;
|
||||
dstream<<"WARNING: Map saving will be disabled."<<std::endl;
|
||||
infostream<<"Please remove the map or fix it."<<std::endl;
|
||||
infostream<<"WARNING: Map saving will be disabled."<<std::endl;
|
||||
}
|
||||
|
||||
dstream<<DTIME<<"INFO: Initializing new map."<<std::endl;
|
||||
infostream<<"Initializing new map."<<std::endl;
|
||||
|
||||
// Create zero sector
|
||||
emergeSector(v2s16(0,0));
|
||||
|
|
@ -2002,7 +2003,7 @@ ServerMap::ServerMap(std::string savedir):
|
|||
|
||||
ServerMap::~ServerMap()
|
||||
{
|
||||
dstream<<__FUNCTION_NAME<<std::endl;
|
||||
infostream<<__FUNCTION_NAME<<std::endl;
|
||||
|
||||
try
|
||||
{
|
||||
|
|
@ -2010,16 +2011,16 @@ ServerMap::~ServerMap()
|
|||
{
|
||||
// Save only changed parts
|
||||
save(true);
|
||||
dstream<<DTIME<<"Server: saved map to "<<m_savedir<<std::endl;
|
||||
infostream<<"Server: saved map to "<<m_savedir<<std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
dstream<<DTIME<<"Server: map not saved"<<std::endl;
|
||||
infostream<<"Server: map not saved"<<std::endl;
|
||||
}
|
||||
}
|
||||
catch(std::exception &e)
|
||||
{
|
||||
dstream<<DTIME<<"Server: Failed to save map to "<<m_savedir
|
||||
infostream<<"Server: Failed to save map to "<<m_savedir
|
||||
<<", exception: "<<e.what()<<std::endl;
|
||||
}
|
||||
|
||||
|
|
@ -2050,7 +2051,7 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
|
|||
{
|
||||
bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
|
||||
if(enable_mapgen_debug_info)
|
||||
dstream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
|
||||
infostream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
|
||||
<<blockpos.Z<<")"<<std::endl;
|
||||
|
||||
// Do nothing if not inside limits (+-1 because of neighbors)
|
||||
|
|
@ -2134,19 +2135,19 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
|
|||
core::map<v3s16, MapBlock*> &changed_blocks)
|
||||
{
|
||||
v3s16 blockpos = data->blockpos;
|
||||
/*dstream<<"finishBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
|
||||
/*infostream<<"finishBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
|
||||
<<blockpos.Z<<")"<<std::endl;*/
|
||||
|
||||
if(data->no_op)
|
||||
{
|
||||
//dstream<<"finishBlockMake(): no-op"<<std::endl;
|
||||
//infostream<<"finishBlockMake(): no-op"<<std::endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
|
||||
|
||||
/*dstream<<"Resulting vmanip:"<<std::endl;
|
||||
data->vmanip.print(dstream);*/
|
||||
/*infostream<<"Resulting vmanip:"<<std::endl;
|
||||
data->vmanip.print(infostream);*/
|
||||
|
||||
/*
|
||||
Blit generated stuff to map
|
||||
|
|
@ -2159,7 +2160,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
|
|||
}
|
||||
|
||||
if(enable_mapgen_debug_info)
|
||||
dstream<<"finishBlockMake: changed_blocks.size()="
|
||||
infostream<<"finishBlockMake: changed_blocks.size()="
|
||||
<<changed_blocks.size()<<std::endl;
|
||||
|
||||
/*
|
||||
|
|
@ -2300,7 +2301,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
|
|||
*/
|
||||
//save(true);
|
||||
|
||||
/*dstream<<"finishBlockMake() done for ("<<blockpos.X<<","<<blockpos.Y<<","
|
||||
/*infostream<<"finishBlockMake() done for ("<<blockpos.X<<","<<blockpos.Y<<","
|
||||
<<blockpos.Z<<")"<<std::endl;*/
|
||||
#if 0
|
||||
if(enable_mapgen_debug_info)
|
||||
|
|
@ -2316,7 +2317,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
|
|||
MapBlock *block = getBlockNoCreateNoEx(p);
|
||||
char spos[20];
|
||||
snprintf(spos, 20, "(%2d,%2d,%2d)", x, y, z);
|
||||
dstream<<"Generated "<<spos<<": "
|
||||
infostream<<"Generated "<<spos<<": "
|
||||
<<analyze_block(block)<<std::endl;
|
||||
}
|
||||
}
|
||||
|
|
@ -2352,7 +2353,7 @@ ServerMapSector * ServerMap::createSector(v2s16 p2d)
|
|||
ServerMapSector *sector = (ServerMapSector*)getSectorNoGenerateNoEx(p2d);
|
||||
if(sector == NULL)
|
||||
{
|
||||
dstream<<"ServerMap::createSector(): loadSectorFull didn't make a sector"<<std::endl;
|
||||
infostream<<"ServerMap::createSector(): loadSectorFull didn't make a sector"<<std::endl;
|
||||
throw InvalidPositionException("");
|
||||
}
|
||||
return sector;
|
||||
|
|
@ -2394,7 +2395,7 @@ MapBlock * ServerMap::generateBlock(
|
|||
{
|
||||
DSTACKF("%s: p=(%d,%d,%d)", __FUNCTION_NAME, p.X, p.Y, p.Z);
|
||||
|
||||
/*dstream<<"generateBlock(): "
|
||||
/*infostream<<"generateBlock(): "
|
||||
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
|
||||
<<std::endl;*/
|
||||
|
||||
|
|
@ -2412,7 +2413,7 @@ MapBlock * ServerMap::generateBlock(
|
|||
*/
|
||||
if(blockpos_over_limit(p))
|
||||
{
|
||||
dstream<<__FUNCTION_NAME<<": Block position over limit"<<std::endl;
|
||||
infostream<<__FUNCTION_NAME<<": Block position over limit"<<std::endl;
|
||||
throw InvalidPositionException("generateBlock(): pos. over limit");
|
||||
}
|
||||
|
||||
|
|
@ -2458,7 +2459,7 @@ MapBlock * ServerMap::generateBlock(
|
|||
MapNode n = block->getNode(p);
|
||||
if(n.getContent() == CONTENT_IGNORE)
|
||||
{
|
||||
dstream<<"CONTENT_IGNORE at "
|
||||
infostream<<"CONTENT_IGNORE at "
|
||||
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
|
||||
<<std::endl;
|
||||
erroneus_content = true;
|
||||
|
|
@ -2532,7 +2533,7 @@ MapBlock * ServerMap::createBlock(v3s16 p)
|
|||
}
|
||||
catch(InvalidPositionException &e)
|
||||
{
|
||||
dstream<<"createBlock: createSector() failed"<<std::endl;
|
||||
infostream<<"createBlock: createSector() failed"<<std::endl;
|
||||
throw e;
|
||||
}
|
||||
/*
|
||||
|
|
@ -2542,7 +2543,7 @@ MapBlock * ServerMap::createBlock(v3s16 p)
|
|||
*/
|
||||
/*catch(std::exception &e)
|
||||
{
|
||||
dstream<<"createBlock: createSector() failed: "
|
||||
infostream<<"createBlock: createSector() failed: "
|
||||
<<e.what()<<std::endl;
|
||||
throw e;
|
||||
}*/
|
||||
|
|
@ -2634,18 +2635,18 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
|
|||
}
|
||||
catch(InvalidPositionException &e)
|
||||
{
|
||||
dstream<<"emergeBlock: createSector() failed: "
|
||||
infostream<<"emergeBlock: createSector() failed: "
|
||||
<<e.what()<<std::endl;
|
||||
dstream<<"Path to failed sector: "<<getSectorDir(p2d)
|
||||
infostream<<"Path to failed sector: "<<getSectorDir(p2d)
|
||||
<<std::endl
|
||||
<<"You could try to delete it."<<std::endl;
|
||||
throw e;
|
||||
}
|
||||
catch(VersionMismatchException &e)
|
||||
{
|
||||
dstream<<"emergeBlock: createSector() failed: "
|
||||
infostream<<"emergeBlock: createSector() failed: "
|
||||
<<e.what()<<std::endl;
|
||||
dstream<<"Path to failed sector: "<<getSectorDir(p2d)
|
||||
infostream<<"Path to failed sector: "<<getSectorDir(p2d)
|
||||
<<std::endl
|
||||
<<"You could try to delete it."<<std::endl;
|
||||
throw e;
|
||||
|
|
@ -2681,7 +2682,7 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
|
|||
else
|
||||
{
|
||||
// Valid block
|
||||
//dstream<<"emergeBlock(): Returning already valid block"<<std::endl;
|
||||
//infostream<<"emergeBlock(): Returning already valid block"<<std::endl;
|
||||
return block;
|
||||
}
|
||||
|
||||
|
|
@ -2691,7 +2692,7 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
|
|||
*/
|
||||
if(only_from_disk && (does_not_exist || lighting_expired))
|
||||
{
|
||||
//dstream<<"emergeBlock(): Was not on disk but not generating"<<std::endl;
|
||||
//infostream<<"emergeBlock(): Was not on disk but not generating"<<std::endl;
|
||||
|
||||
if(block == NULL)
|
||||
{
|
||||
|
|
@ -2705,11 +2706,11 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
|
|||
return block;
|
||||
}
|
||||
|
||||
//dstream<<"Not found on disk, generating."<<std::endl;
|
||||
//infostream<<"Not found on disk, generating."<<std::endl;
|
||||
// 0ms
|
||||
//TimeTaker("emergeBlock() generate");
|
||||
|
||||
//dstream<<"emergeBlock(): Didn't find valid block -> making one"<<std::endl;
|
||||
//infostream<<"emergeBlock(): Didn't find valid block -> making one"<<std::endl;
|
||||
|
||||
/*
|
||||
If the block doesn't exist, generate the block.
|
||||
|
|
@ -2811,7 +2812,7 @@ void ServerMap::createDatabase() {
|
|||
if(e == SQLITE_ABORT)
|
||||
throw FileNotGoodException("Could not create database structure");
|
||||
else
|
||||
dstream<<"Server: Database structure was created";
|
||||
infostream<<"Server: Database structure was created";
|
||||
}
|
||||
|
||||
void ServerMap::verifyDatabase() {
|
||||
|
|
@ -2834,7 +2835,7 @@ void ServerMap::verifyDatabase() {
|
|||
|
||||
d = sqlite3_open_v2(dbp.c_str(), &m_database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
|
||||
if(d != SQLITE_OK) {
|
||||
dstream<<"WARNING: Database failed to open: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
infostream<<"WARNING: Database failed to open: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
throw FileNotGoodException("Cannot open database file");
|
||||
}
|
||||
|
||||
|
|
@ -2843,17 +2844,17 @@ void ServerMap::verifyDatabase() {
|
|||
|
||||
d = sqlite3_prepare(m_database, "SELECT `data` FROM `blocks` WHERE `pos`=? LIMIT 1", -1, &m_database_read, NULL);
|
||||
if(d != SQLITE_OK) {
|
||||
dstream<<"WARNING: Database read statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
infostream<<"WARNING: Database read statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
throw FileNotGoodException("Cannot prepare read statement");
|
||||
}
|
||||
|
||||
d = sqlite3_prepare(m_database, "REPLACE INTO `blocks` VALUES(?, ?)", -1, &m_database_write, NULL);
|
||||
if(d != SQLITE_OK) {
|
||||
dstream<<"WARNING: Database write statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
infostream<<"WARNING: Database write statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
throw FileNotGoodException("Cannot prepare write statement");
|
||||
}
|
||||
|
||||
dstream<<"Server: Database opened"<<std::endl;
|
||||
infostream<<"Server: Database opened"<<std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2954,12 +2955,12 @@ void ServerMap::save(bool only_changed)
|
|||
DSTACK(__FUNCTION_NAME);
|
||||
if(m_map_saving_enabled == false)
|
||||
{
|
||||
dstream<<DTIME<<"WARNING: Not saving map, saving disabled."<<std::endl;
|
||||
infostream<<"WARNING: Not saving map, saving disabled."<<std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
if(only_changed == false)
|
||||
dstream<<DTIME<<"ServerMap: Saving whole map, this can take time."
|
||||
infostream<<"ServerMap: Saving whole map, this can take time."
|
||||
<<std::endl;
|
||||
|
||||
if(only_changed == false || m_map_metadata_changed)
|
||||
|
|
@ -3000,7 +3001,7 @@ void ServerMap::save(bool only_changed)
|
|||
saveBlock(block);
|
||||
block_count++;
|
||||
|
||||
/*dstream<<"ServerMap: Written block ("
|
||||
/*infostream<<"ServerMap: Written block ("
|
||||
<<block->getPos().X<<","
|
||||
<<block->getPos().Y<<","
|
||||
<<block->getPos().Z<<")"
|
||||
|
|
@ -3017,7 +3018,7 @@ void ServerMap::save(bool only_changed)
|
|||
if(only_changed == false || sector_meta_count != 0
|
||||
|| block_count != 0)
|
||||
{
|
||||
dstream<<DTIME<<"ServerMap: Written: "
|
||||
infostream<<"ServerMap: Written: "
|
||||
<<sector_meta_count<<" sector metadata files, "
|
||||
<<block_count<<" block files"
|
||||
<<", "<<block_count_all<<" blocks in memory."
|
||||
|
|
@ -3029,7 +3030,7 @@ void ServerMap::saveMapMeta()
|
|||
{
|
||||
DSTACK(__FUNCTION_NAME);
|
||||
|
||||
dstream<<"INFO: ServerMap::saveMapMeta(): "
|
||||
infostream<<"ServerMap::saveMapMeta(): "
|
||||
<<"seed="<<m_seed
|
||||
<<std::endl;
|
||||
|
||||
|
|
@ -3039,7 +3040,7 @@ void ServerMap::saveMapMeta()
|
|||
std::ofstream os(fullpath.c_str(), std::ios_base::binary);
|
||||
if(os.good() == false)
|
||||
{
|
||||
dstream<<"ERROR: ServerMap::saveMapMeta(): "
|
||||
infostream<<"ERROR: ServerMap::saveMapMeta(): "
|
||||
<<"could not open"<<fullpath<<std::endl;
|
||||
throw FileNotGoodException("Cannot open chunk metadata");
|
||||
}
|
||||
|
|
@ -3058,14 +3059,14 @@ void ServerMap::loadMapMeta()
|
|||
{
|
||||
DSTACK(__FUNCTION_NAME);
|
||||
|
||||
dstream<<"INFO: ServerMap::loadMapMeta(): Loading map metadata"
|
||||
infostream<<"ServerMap::loadMapMeta(): Loading map metadata"
|
||||
<<std::endl;
|
||||
|
||||
std::string fullpath = m_savedir + "/map_meta.txt";
|
||||
std::ifstream is(fullpath.c_str(), std::ios_base::binary);
|
||||
if(is.good() == false)
|
||||
{
|
||||
dstream<<"ERROR: ServerMap::loadMapMeta(): "
|
||||
infostream<<"ERROR: ServerMap::loadMapMeta(): "
|
||||
<<"could not open"<<fullpath<<std::endl;
|
||||
throw FileNotGoodException("Cannot open map metadata");
|
||||
}
|
||||
|
|
@ -3087,9 +3088,7 @@ void ServerMap::loadMapMeta()
|
|||
|
||||
m_seed = params.getU64("seed");
|
||||
|
||||
dstream<<"INFO: ServerMap::loadMapMeta(): "
|
||||
<<"seed="<<m_seed
|
||||
<<std::endl;
|
||||
infostream<<"ServerMap::loadMapMeta(): "<<"seed="<<m_seed<<std::endl;
|
||||
}
|
||||
|
||||
void ServerMap::saveSectorMeta(ServerMapSector *sector)
|
||||
|
|
@ -3128,7 +3127,7 @@ MapSector* ServerMap::loadSectorMeta(std::string sectordir, bool save_after_load
|
|||
// format. Just go ahead and create the sector.
|
||||
if(fs::PathExists(sectordir))
|
||||
{
|
||||
/*dstream<<"ServerMap::loadSectorMeta(): Sector metafile "
|
||||
/*infostream<<"ServerMap::loadSectorMeta(): Sector metafile "
|
||||
<<fullpath<<" doesn't exist but directory does."
|
||||
<<" Continuing with a sector with no metadata."
|
||||
<<std::endl;*/
|
||||
|
|
@ -3259,7 +3258,7 @@ bool ServerMap::loadSectorFull(v2s16 p2d)
|
|||
|
||||
if(loadlayout != 2)
|
||||
{
|
||||
dstream<<"Sector converted to new layout - deleting "<<
|
||||
infostream<<"Sector converted to new layout - deleting "<<
|
||||
sectordir1<<std::endl;
|
||||
fs::RecursiveDelete(sectordir1);
|
||||
}
|
||||
|
|
@ -3271,13 +3270,13 @@ bool ServerMap::loadSectorFull(v2s16 p2d)
|
|||
void ServerMap::beginSave() {
|
||||
verifyDatabase();
|
||||
if(sqlite3_exec(m_database, "BEGIN;", NULL, NULL, NULL) != SQLITE_OK)
|
||||
dstream<<"WARNING: beginSave() failed, saving might be slow.";
|
||||
infostream<<"WARNING: beginSave() failed, saving might be slow.";
|
||||
}
|
||||
|
||||
void ServerMap::endSave() {
|
||||
verifyDatabase();
|
||||
if(sqlite3_exec(m_database, "COMMIT;", NULL, NULL, NULL) != SQLITE_OK)
|
||||
dstream<<"WARNING: endSave() failed, map might not have saved.";
|
||||
infostream<<"WARNING: endSave() failed, map might not have saved.";
|
||||
}
|
||||
|
||||
void ServerMap::saveBlock(MapBlock *block)
|
||||
|
|
@ -3289,7 +3288,7 @@ void ServerMap::saveBlock(MapBlock *block)
|
|||
if(block->isDummy())
|
||||
{
|
||||
/*v3s16 p = block->getPos();
|
||||
dstream<<"ServerMap::saveBlock(): WARNING: Not writing dummy block "
|
||||
infostream<<"ServerMap::saveBlock(): WARNING: Not writing dummy block "
|
||||
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
|
||||
return;
|
||||
}
|
||||
|
|
@ -3334,12 +3333,12 @@ void ServerMap::saveBlock(MapBlock *block)
|
|||
const char *bytes = tmp.c_str();
|
||||
|
||||
if(sqlite3_bind_int64(m_database_write, 1, getBlockAsInteger(p3d)) != SQLITE_OK)
|
||||
dstream<<"WARNING: Block position failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
infostream<<"WARNING: Block position failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
if(sqlite3_bind_blob(m_database_write, 2, (void *)bytes, o.tellp(), NULL) != SQLITE_OK) // TODO this mught not be the right length
|
||||
dstream<<"WARNING: Block data failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
infostream<<"WARNING: Block data failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
int written = sqlite3_step(m_database_write);
|
||||
if(written != SQLITE_DONE)
|
||||
dstream<<"WARNING: Block failed to save ("<<p3d.X<<", "<<p3d.Y<<", "<<p3d.Z<<") "
|
||||
infostream<<"WARNING: Block failed to save ("<<p3d.X<<", "<<p3d.Y<<", "<<p3d.Z<<") "
|
||||
<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
// Make ready for later reuse
|
||||
sqlite3_reset(m_database_write);
|
||||
|
|
@ -3415,7 +3414,7 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
|
|||
}
|
||||
catch(SerializationError &e)
|
||||
{
|
||||
dstream<<"WARNING: Invalid block data on disk "
|
||||
infostream<<"WARNING: Invalid block data on disk "
|
||||
<<"fullpath="<<fullpath
|
||||
<<" (SerializationError). "
|
||||
<<"what()="<<e.what()
|
||||
|
|
@ -3482,7 +3481,7 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
|
|||
}
|
||||
catch(SerializationError &e)
|
||||
{
|
||||
dstream<<"WARNING: Invalid block data in database "
|
||||
infostream<<"WARNING: Invalid block data in database "
|
||||
<<" (SerializationError). "
|
||||
<<"what()="<<e.what()
|
||||
<<std::endl;
|
||||
|
|
@ -3503,7 +3502,7 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
|
|||
verifyDatabase();
|
||||
|
||||
if(sqlite3_bind_int64(m_database_read, 1, getBlockAsInteger(blockpos)) != SQLITE_OK)
|
||||
dstream<<"WARNING: Could not bind block position for load: "
|
||||
infostream<<"WARNING: Could not bind block position for load: "
|
||||
<<sqlite3_errmsg(m_database)<<std::endl;
|
||||
if(sqlite3_step(m_database_read) == SQLITE_ROW) {
|
||||
/*
|
||||
|
|
@ -3769,7 +3768,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
|
|||
int time2 = time(0);
|
||||
if(time2 > time1 + 4)
|
||||
{
|
||||
dstream<<"ClientMap::renderMap(): "
|
||||
infostream<<"ClientMap::renderMap(): "
|
||||
"Rendering takes ages, returning."
|
||||
<<std::endl;
|
||||
return;
|
||||
|
|
@ -3931,7 +3930,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
|
|||
m_control.blocks_drawn = blocks_drawn;
|
||||
m_control.blocks_would_have_drawn = blocks_would_have_drawn;
|
||||
|
||||
/*dstream<<"renderMap(): is_transparent_pass="<<is_transparent_pass
|
||||
/*infostream<<"renderMap(): is_transparent_pass="<<is_transparent_pass
|
||||
<<", rendered "<<vertex_count<<" vertices."<<std::endl;*/
|
||||
}
|
||||
|
||||
|
|
@ -4181,7 +4180,7 @@ MapVoxelManipulator::MapVoxelManipulator(Map *map)
|
|||
|
||||
MapVoxelManipulator::~MapVoxelManipulator()
|
||||
{
|
||||
/*dstream<<"MapVoxelManipulator: blocks: "<<m_loaded_blocks.size()
|
||||
/*infostream<<"MapVoxelManipulator: blocks: "<<m_loaded_blocks.size()
|
||||
<<std::endl;*/
|
||||
}
|
||||
|
||||
|
|
@ -4213,11 +4212,11 @@ void MapVoxelManipulator::emerge(VoxelArea a, s32 caller_id)
|
|||
{
|
||||
TimeTaker timer1("emerge load", &emerge_load_time);
|
||||
|
||||
/*dstream<<"Loading block (caller_id="<<caller_id<<")"
|
||||
/*infostream<<"Loading block (caller_id="<<caller_id<<")"
|
||||
<<" ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
|
||||
<<" wanted area: ";
|
||||
a.print(dstream);
|
||||
dstream<<std::endl;*/
|
||||
a.print(infostream);
|
||||
infostream<<std::endl;*/
|
||||
|
||||
MapBlock *block = m_map->getBlockNoCreate(p);
|
||||
if(block->isDummy())
|
||||
|
|
@ -4245,7 +4244,7 @@ void MapVoxelManipulator::emerge(VoxelArea a, s32 caller_id)
|
|||
m_loaded_blocks.insert(p, !block_data_inexistent);
|
||||
}
|
||||
|
||||
//dstream<<"emerge done"<<std::endl;
|
||||
//infostream<<"emerge done"<<std::endl;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -4261,7 +4260,7 @@ void MapVoxelManipulator::blitBack
|
|||
|
||||
//TimeTaker timer1("blitBack");
|
||||
|
||||
/*dstream<<"blitBack(): m_loaded_blocks.size()="
|
||||
/*infostream<<"blitBack(): m_loaded_blocks.size()="
|
||||
<<m_loaded_blocks.size()<<std::endl;*/
|
||||
|
||||
/*
|
||||
|
|
@ -4350,10 +4349,10 @@ void ManualMapVoxelManipulator::initialEmerge(
|
|||
u32 size_MB = block_area_nodes.getVolume()*4/1000000;
|
||||
if(size_MB >= 1)
|
||||
{
|
||||
dstream<<"initialEmerge: area: ";
|
||||
block_area_nodes.print(dstream);
|
||||
dstream<<" ("<<size_MB<<"MB)";
|
||||
dstream<<std::endl;
|
||||
infostream<<"initialEmerge: area: ";
|
||||
block_area_nodes.print(infostream);
|
||||
infostream<<" ("<<size_MB<<"MB)";
|
||||
infostream<<std::endl;
|
||||
}
|
||||
|
||||
addArea(block_area_nodes);
|
||||
|
|
@ -4421,7 +4420,7 @@ void ManualMapVoxelManipulator::blitBackAll(
|
|||
if(existed == false)
|
||||
{
|
||||
// The Great Bug was found using this
|
||||
/*dstream<<"ManualMapVoxelManipulator::blitBackAll: "
|
||||
/*infostream<<"ManualMapVoxelManipulator::blitBackAll: "
|
||||
<<"Inexistent ("<<p.X<<","<<p.Y<<","<<p.Z<<")"
|
||||
<<std::endl;*/
|
||||
continue;
|
||||
|
|
@ -4429,7 +4428,7 @@ void ManualMapVoxelManipulator::blitBackAll(
|
|||
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
|
||||
if(block == NULL)
|
||||
{
|
||||
dstream<<"WARNING: "<<__FUNCTION_NAME
|
||||
infostream<<"WARNING: "<<__FUNCTION_NAME
|
||||
<<": got NULL block "
|
||||
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
|
||||
<<std::endl;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue