Merge pull request #2789 from sipa/overdump

Dump addresses every 15 minutes instead of 10 seconds
This commit is contained in:
Jeff Garzik 2013-06-24 07:32:20 -07:00
commit 396485b14d
2 changed files with 6 additions and 3 deletions

View file

@ -22,6 +22,9 @@
#include <miniupnpc/upnperrors.h> #include <miniupnpc/upnperrors.h>
#endif #endif
// Dump addresses to peers.dat every 15 minutes (900s)
#define DUMP_ADDRESSES_INTERVAL 900
using namespace std; using namespace std;
using namespace boost; using namespace boost;
@ -1730,7 +1733,7 @@ void StartNode(boost::thread_group& threadGroup)
threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "msghand", &ThreadMessageHandler)); threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "msghand", &ThreadMessageHandler));
// Dump network addresses // Dump network addresses
threadGroup.create_thread(boost::bind(&LoopForever<void (*)()>, "dumpaddr", &DumpAddresses, 10000)); threadGroup.create_thread(boost::bind(&LoopForever<void (*)()>, "dumpaddr", &DumpAddresses, DUMP_ADDRESSES_INTERVAL * 1000));
} }
bool StopNode() bool StopNode()

View file

@ -527,7 +527,7 @@ inline uint32_t ByteReverse(uint32_t value)
// Standard wrapper for do-something-forever thread functions. // Standard wrapper for do-something-forever thread functions.
// "Forever" really means until the thread is interrupted. // "Forever" really means until the thread is interrupted.
// Use it like: // Use it like:
// new boost::thread(boost::bind(&LoopForever<void (*)()>, "dumpaddr", &DumpAddresses, 10000)); // new boost::thread(boost::bind(&LoopForever<void (*)()>, "dumpaddr", &DumpAddresses, 900000));
// or maybe: // or maybe:
// boost::function<void()> f = boost::bind(&FunctionWithArg, argument); // boost::function<void()> f = boost::bind(&FunctionWithArg, argument);
// threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "nothing", f, milliseconds)); // threadGroup.create_thread(boost::bind(&LoopForever<boost::function<void()> >, "nothing", f, milliseconds));
@ -540,8 +540,8 @@ template <typename Callable> void LoopForever(const char* name, Callable func,
{ {
while (1) while (1)
{ {
func();
MilliSleep(msecs); MilliSleep(msecs);
func();
} }
} }
catch (boost::thread_interrupted) catch (boost::thread_interrupted)