projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.4
[fms.git]
/
src
/
freenet
/
freenetmasterthread.cpp
diff --git
a/src/freenet/freenetmasterthread.cpp
b/src/freenet/freenetmasterthread.cpp
index
bef4930
..
cca101c
100644
(file)
--- a/
src/freenet/freenetmasterthread.cpp
+++ b/
src/freenet/freenetmasterthread.cpp
@@
-12,8
+12,13
@@
#include "../../include/freenet/identityintroductioninserter.h"
\r
#include "../../include/freenet/trustlistinserter.h"
\r
#include "../../include/freenet/trustlistrequester.h"
\r
#include "../../include/freenet/identityintroductioninserter.h"
\r
#include "../../include/freenet/trustlistinserter.h"
\r
#include "../../include/freenet/trustlistrequester.h"
\r
+#include "../../include/freenet/messagelistrequester.h"
\r
+#include "../../include/freenet/messagerequester.h"
\r
+#include "../../include/freenet/messageinserter.h"
\r
+#include "../../include/freenet/messagelistinserter.h"
\r
\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
\r
#ifdef XMEM
\r
#include <xmem.h>
\r
@@
-23,22
+28,22
@@
FreenetMasterThread::FreenetMasterThread()
{
\r
std::string fcpport;
\r
\r
{
\r
std::string fcpport;
\r
\r
- if(Option::
i
nstance()->Get("FCPHost",m_fcphost)==false)
\r
+ if(Option::
I
nstance()->Get("FCPHost",m_fcphost)==false)
\r
{
\r
m_fcphost="localhost";
\r
{
\r
m_fcphost="localhost";
\r
- Option::
i
nstance()->Set("FCPHost",m_fcphost);
\r
+ Option::
I
nstance()->Set("FCPHost",m_fcphost);
\r
}
\r
}
\r
- if(Option::
i
nstance()->Get("FCPPort",fcpport)==false)
\r
+ if(Option::
I
nstance()->Get("FCPPort",fcpport)==false)
\r
{
\r
fcpport="9481";
\r
{
\r
fcpport="9481";
\r
- Option::
i
nstance()->Set("FCPPort",fcpport);
\r
+ Option::
I
nstance()->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
}
\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::
i
nstance()->Set("FCPPort","9481");
\r
+ Option::
I
nstance()->Set("FCPPort","9481");
\r
}
\r
\r
m_receivednodehello=false;
\r
}
\r
\r
m_receivednodehello=false;
\r
@@
-159,12
+164,14
@@
void FreenetMasterThread::RegisterPeriodicProcessor(IPeriodicProcessor *obj)
m_processors.push_back(obj);
\r
}
\r
\r
m_processors.push_back(obj);
\r
}
\r
\r
-void FreenetMasterThread::
r
un()
\r
+void FreenetMasterThread::
R
un()
\r
{
\r
\r
FCPMessage message;
\r
bool done=false;
\r
\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
Setup();
\r
\r
do
\r
@@
-177,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
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
try
\r
{
\r
ZThread::Thread::sleep(60000);
\r
@@
-185,6
+193,11
@@
void FreenetMasterThread::run()
{
\r
done=true;
\r
}
\r
{
\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
}
\r
}
\r
// fcp is connected
\r
@@
-211,7
+224,8
@@
void FreenetMasterThread::run()
}
\r
\r
}
\r
}
\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
\r
m_fcp.Disconnect();
\r
\r
@@
-235,6
+249,10
@@
void FreenetMasterThread::Setup()
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
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
+ m_registrables.push_back(new MessageListRequester(&m_fcp));
\r
+ 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
\r
for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
\r
{
\r
\r
for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
\r
{
\r