Fix modstore/favourites hang by adding asynchronous lua job support

[dragonfireclient.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index c0560ba3bd9b2d11711e5681c0382591d4d85a3a..167473ecf7c3bbd5dd83057d70aabbdc4e5f1449 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -19,12 +19,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 
+#include "emerge.h"
 #include "server.h"
 #include <iostream>
 #include <queue>
-#include "clientserver.h"
 #include "map.h"
-#include "jmutexautolock.h"
+#include "environment.h"
+#include "util/container.h"
+#include "util/thread.h"
 #include "main.h"
 #include "constants.h"
 #include "voxel.h"
@@ -32,12 +34,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapblock.h"
 #include "serverobject.h"
 #include "settings.h"
-#include "cpp_api/scriptapi.h"
+#include "scripting_game.h"
 #include "profiler.h"
 #include "log.h"
 #include "nodedef.h"
 #include "biome.h"
-#include "emerge.h"
 #include "mapgen_v6.h"
 #include "mapgen_v7.h"
 #include "mapgen_indev.h"
@@ -45,6 +46,46 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen_math.h"
 
 
+class EmergeThread : public SimpleThread
+{
+public:
+       Server *m_server;
+       ServerMap *map;
+       EmergeManager *emerge;
+       Mapgen *mapgen;
+       bool enable_mapgen_debug_info;
+       int id;
+       
+       Event qevent;
+       std::queue<v3s16> blockqueue;
+       
+       EmergeThread(Server *server, int ethreadid):
+               SimpleThread(),
+               m_server(server),
+               map(NULL),
+               emerge(NULL),
+               mapgen(NULL),
+               id(ethreadid)
+       {
+       }
+
+       void *Thread();
+
+       void trigger()
+       {
+               setRun(true);
+               if(IsRunning() == false)
+               {
+                       Start();
+               }
+       }
+
+       bool popBlockEmerge(v3s16 *pos, u8 *flags);
+       bool getBlockOrStartGen(v3s16 p, MapBlock **b,
+                       BlockMakeData *data, bool allow_generate);
+};
+
+
 /////////////////////////////// Emerge Manager ////////////////////////////////
 
 EmergeManager::EmergeManager(IGameDef *gamedef) {
@@ -183,6 +224,11 @@ Mapgen *EmergeManager::getCurrentMapgen() {
 }
 
 
+void EmergeManager::triggerAllThreads() {
+       for (unsigned int i = 0; i != emergethread.size(); i++)
+               emergethread[i]->trigger();
+}
+
 bool EmergeManager::enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate) {
        std::map<v3s16, BlockEmergeData *>::const_iterator iter;
        BlockEmergeData *bedata;
@@ -305,8 +351,11 @@ MapgenParams *EmergeManager::getParamsFromSettings(Settings *settings) {
        if (!mgparams)
                return NULL;
        
+       std::string seedstr = settings->get(settings == g_settings ?
+                                                                       "fixed_map_seed" : "seed");
+       
        mgparams->mg_name     = mg_name;
-       mgparams->seed        = settings->getU64(settings == g_settings ? "fixed_map_seed" : "seed");
+       mgparams->seed        = read_seed(seedstr.c_str());
        mgparams->water_level = settings->getS16("water_level");
        mgparams->chunksize   = settings->getS16("chunksize");
        mgparams->flags       = settings->getFlagStr("mg_flags", flagdesc_mapgen);
@@ -380,6 +429,8 @@ bool EmergeThread::getBlockOrStartGen(v3s16 p, MapBlock **b,
        if (!block || block->isDummy() || !block->isGenerated()) {
                EMERGE_DBG_OUT("not in memory, attempting to load from disk");
                block = map->loadBlock(p);
+               if (block && block->isGenerated())
+                       map->prepareBlock(block);
        }
 
        // If could not load and allowed to generate,
@@ -466,7 +517,7 @@ void *EmergeThread::Thread() {
                                                ign(&m_server->m_ignore_map_edit_events_area,
                                                VoxelArea(minp, maxp));
                                        {  // takes about 90ms with -O1 on an e3-1230v2
-                                               SERVER_TO_SA(m_server)->environment_OnGenerated(
+                                               m_server->getScriptIface()->environment_OnGenerated(
                                                                minp, maxp, emerge->getBlockSeed(minp));
                                        }