From c7662795f519d2b6797e4b1ac7fa4a22afa26310 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 27 Jul 2006 23:18:35 +0000 Subject: * merge - This is my current patch queue. I think that all of these are safe to apply. This is just under half of the pending changes in chris/general (the easy half). --- bin/bbstored/BackupStoreDaemon.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'bin/bbstored/BackupStoreDaemon.h') diff --git a/bin/bbstored/BackupStoreDaemon.h b/bin/bbstored/BackupStoreDaemon.h index 2fbe486d..857a9356 100644 --- a/bin/bbstored/BackupStoreDaemon.h +++ b/bin/bbstored/BackupStoreDaemon.h @@ -38,11 +38,13 @@ private: BackupStoreDaemon(const BackupStoreDaemon &rToCopy); public: +#ifndef WIN32 // For BackupContext to comminicate with housekeeping process void SendMessageToHousekeepingProcess(const void *Msg, int MsgLen) { mInterProcessCommsSocket.Write(Msg, MsgLen); } +#endif protected: @@ -57,9 +59,11 @@ protected: const ConfigurationVerify *GetConfigVerify() const; +#ifndef WIN32 // Housekeeping functions void HousekeepingProcess(); bool CheckForInterProcessMsg(int AccountNum = 0, int MaximumWaitTime = 0); +#endif void LogConnectionStats(const char *commonName, const SocketStreamTLS &s); @@ -70,8 +74,17 @@ private: bool mHaveForkedHousekeeping; bool mIsHousekeepingProcess; +#ifdef WIN32 + virtual void OnIdle(); + bool mHousekeepingInited; +#else SocketStream mInterProcessCommsSocket; IOStreamGetLine mInterProcessComms; +#endif + + void HousekeepingInit(); + void RunHousekeepingIfNeeded(); + int64_t mLastHousekeepingRun; }; -- cgit v1.2.3