version 0.1.9

[fms.git] / src / freenet / freenetmasterthread.cpp

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 689641f..a9f2391 100644 (file)
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -8,7 +8,6 @@
 #include "../../include/freenet/introductionpuzzleinserter.h"\r
 #include "../../include/freenet/identityintroductionrequester.h"\r
 #include "../../include/freenet/introductionpuzzlerequester.h"\r
-#include "../../include/freenet/introductionpuzzleremover.h"\r
 #include "../../include/freenet/identityintroductioninserter.h"\r
 #include "../../include/freenet/trustlistinserter.h"\r
 #include "../../include/freenet/trustlistrequester.h"\r
@@ -16,8 +15,10 @@
 #include "../../include/freenet/messagerequester.h"\r
 #include "../../include/freenet/messageinserter.h"\r
 #include "../../include/freenet/messagelistinserter.h"\r
+#include "../../include/freenet/periodicdbmaintenance.h"\r
 \r
-#include <zthread/Thread.h>\r
+//#include <zthread/Thread.h>\r
+#include "../../include/pthreadwrapper/thread.h"\r
 \r
 #ifdef XMEM\r
        #include <xmem.h>\r
@@ -27,22 +28,22 @@ FreenetMasterThread::FreenetMasterThread()
 {\r
        std::string fcpport;\r
 \r
-       if(Option::instance()->Get("FCPHost",m_fcphost)==false)\r
+       if(Option::Instance()->Get("FCPHost",m_fcphost)==false)\r
        {\r
                m_fcphost="localhost";\r
-               Option::instance()->Set("FCPHost",m_fcphost);\r
+               Option::Instance()->Set("FCPHost",m_fcphost);\r
        }\r
-       if(Option::instance()->Get("FCPPort",fcpport)==false)\r
+       if(Option::Instance()->Get("FCPPort",fcpport)==false)\r
        {\r
                fcpport="9481";\r
-               Option::instance()->Set("FCPPort",fcpport);\r
+               Option::Instance()->Set("FCPPort",fcpport);\r
        }\r
 \r
        // convert fcp port to long, and make sure it's within the valid port range\r
        if(StringFunctions::Convert(fcpport,m_fcpport)==false)\r
        {\r
                m_fcpport=9481;\r
-               Option::instance()->Set("FCPPort","9481");\r
+               Option::Instance()->Set("FCPPort","9481");\r
        }\r
 \r
        m_receivednodehello=false;\r
@@ -163,12 +164,14 @@ void FreenetMasterThread::RegisterPeriodicProcessor(IPeriodicProcessor *obj)
        m_processors.push_back(obj);\r
 }\r
 \r
-void FreenetMasterThread::run()\r
+void FreenetMasterThread::Run()\r
 {\r
 \r
        FCPMessage message;\r
        bool done=false;\r
 \r
+       m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread started.");\r
+\r
        Setup();\r
 \r
        do\r
@@ -181,6 +184,7 @@ void FreenetMasterThread::run()
                                m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");\r
 \r
                                // wait 60 seconds - will then try to connect again\r
+                               /*\r
                                try\r
                                {\r
                                        ZThread::Thread::sleep(60000);\r
@@ -189,6 +193,11 @@ void FreenetMasterThread::run()
                                {\r
                                        done=true;\r
                                }\r
+                               */\r
+                               for(int i=0; i<60 && !IsCancelled(); i++)\r
+                               {\r
+                                       Sleep(1000);\r
+                               }\r
                        }\r
                }\r
                // fcp is connected\r
@@ -215,12 +224,15 @@ void FreenetMasterThread::run()
                        }\r
 \r
                }\r
-       }while(!ZThread::Thread::interrupted() && done==false);\r
+//     }while(!ZThread::Thread::interrupted() && done==false);\r
+       }while(!IsCancelled() && done==false);\r
 \r
        m_fcp.Disconnect();\r
 \r
        Shutdown();\r
 \r
+       m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread exiting.");\r
+\r
 }\r
 \r
 void FreenetMasterThread::Setup()\r
@@ -235,7 +247,6 @@ void FreenetMasterThread::Setup()
        m_registrables.push_back(new IntroductionPuzzleInserter(&m_fcp));\r
        m_registrables.push_back(new IdentityIntroductionRequester(&m_fcp));\r
        m_registrables.push_back(new IntroductionPuzzleRequester(&m_fcp));\r
-       m_registrables.push_back(new IntroductionPuzzleRemover());\r
        m_registrables.push_back(new IdentityIntroductionInserter(&m_fcp));\r
        m_registrables.push_back(new TrustListInserter(&m_fcp));\r
        m_registrables.push_back(new TrustListRequester(&m_fcp));\r
@@ -243,6 +254,7 @@ void FreenetMasterThread::Setup()
        m_registrables.push_back(new MessageRequester(&m_fcp));\r
        m_registrables.push_back(new MessageInserter(&m_fcp));\r
        m_registrables.push_back(new MessageListInserter(&m_fcp));\r
+       m_registrables.push_back(new PeriodicDBMaintenance());\r
 \r
        for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)\r
        {\r