#define BLOCK_EMERGE_ALLOWGEN (1<<0)
+#define EMERGE_DBG_OUT(x) \
+ { if (enable_mapgen_debug_info) \
+ infostream << "EmergeThread: " x << std::endl; }
+
class Mapgen;
class MapgenParams;
class MapgenFactory;
#include "server.h"
struct BlockMakeData {
- bool no_op;
ManualMapVoxelManipulator *vmanip;
u64 seed;
v3s16 blockpos_min;
INodeDefManager *nodedef;
BlockMakeData():
- no_op(false),
vmanip(NULL),
seed(0),
nodedef(NULL)
class EmergeManager {
public:
std::map<std::string, MapgenFactory *> mglist;
-
+
+ std::vector<Mapgen *> mapgen;
+ std::vector<EmergeThread *> emergethread;
+
//settings
MapgenParams *params;
-
+ bool mapgen_debug_info;
+ u16 qlimit_total;
+ u16 qlimit_diskonly;
+ u16 qlimit_generate;
+
+ //block emerge queue data structures
JMutex queuemutex;
std::map<v3s16, BlockEmergeData *> blocks_enqueued;
std::map<u16, u16> peer_queue_count;
- Mapgen *mapgen;
- EmergeThread *emergethread;
//biome manager
BiomeDefManager *biomedef;
void initMapgens(MapgenParams *mgparams);
Mapgen *createMapgen(std::string mgname, int mgid,
- MapgenParams *mgparams, EmergeManager *emerge);
+ MapgenParams *mgparams);
MapgenParams *createMapgenParams(std::string mgname);
- Mapgen *getMapgen();
bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
- bool popBlockEmerge(v3s16 *pos, u8 *flags);
- bool registerMapgen(std::string name, MapgenFactory *mgfactory);
+ void registerMapgen(std::string name, MapgenFactory *mgfactory);
MapgenParams *getParamsFromSettings(Settings *settings);
void setParamsToSettings(Settings *settings);
EmergeManager *emerge;
Mapgen *mapgen;
bool enable_mapgen_debug_info;
+ int id;
public:
Event qevent;
std::queue<v3s16> blockqueue;
- EmergeThread(Server *server):
+ EmergeThread(Server *server, int ethreadid):
SimpleThread(),
m_server(server),
map(NULL),
emerge(NULL),
- mapgen(NULL)
+ mapgen(NULL),
+ id(ethreadid)
{
- enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
}
void *Thread();
}
}
+ bool popBlockEmerge(v3s16 *pos, u8 *flags);
bool getBlockOrStartGen(v3s16 p, MapBlock **b,
BlockMakeData *data, bool allow_generate);
};