Changeset 2541 for box/trunk/bin/bbstored/BackupStoreDaemon.h

Timestamp:

28/06/2009 20:29:10 (3 years ago)

Author:

chris

Message:

Make housekeeping check the object reference counts and fix them if
they're wrong.

Add a callback interface to decouple housekeeping from the
BackupStoreDaemon?, allowing it to be called directly in tests.

Allow housekeeping callers to request it to keep trying forever to get a
lock on the account if it's busy.

File:

• box/trunk/bin/bbstored/BackupStoreDaemon.h (modified) (3 diffs)

box/trunk/bin/bbstored/BackupStoreDaemon.h

@@ -15 +15 @@
 #include "BackupConstants.h"
 #include "BackupStoreContext.h"
+#include "HousekeepStoreAccount.h"
 #include "IOStreamGetLine.h"
 
 class BackupStoreAccounts;
 class BackupStoreAccountDatabase;
-class HousekeepStoreAccount;
 
 // --------------------------------------------------------------------------
@@ -30 +30 @@
 // --------------------------------------------------------------------------
 class BackupStoreDaemon : public ServerTLS<BOX_PORT_BBSTORED>,
-        HousekeepingInterface
+        HousekeepingInterface, HousekeepingCallback
 {
-        friend class HousekeepStoreAccount;
-
 public:
         BackupStoreDaemon();
@@ -65 +63 @@
         // Housekeeping functions
         void HousekeepingProcess();
-        bool CheckForInterProcessMsg(int AccountNum = 0, int MaximumWaitTime = 0);
 
         void LogConnectionStats(const char *commonName, const SocketStreamTLS &s);
+
+public:
+        // HousekeepingInterface implementation
+        virtual bool CheckForInterProcessMsg(int AccountNum = 0, int MaximumWaitTime = 0);
 
 private: