Changeset 2318 for box/trunk/bin/bbackupd/BackupDaemon.h

Timestamp:

04/10/2008 00:22:36 (3 years ago)

Author:

chris

Message:

Remove Win32 command socket thread, as it has caused too much trouble.

Handle command socket on Win32 the same as all other platforms, removing
#ifdefs from BackupDaemon?.

Will replace this thread with regular but not excessive command socket
polling using timers in future.

Change error messages when command socket comms fail to make them clearer.

File:

• box/trunk/bin/bbackupd/BackupDaemon.h (modified) (4 diffs)

box/trunk/bin/bbackupd/BackupDaemon.h

@@ -28 +28 @@
 
 #ifdef WIN32
+        #include "WinNamedPipeListener.h"
         #include "WinNamedPipeStream.h"
 #endif
@@ -194 +195 @@
         public:
 #ifdef WIN32
-                WinNamedPipeStream mListeningSocket;
+                WinNamedPipeListener<1 /* listen backlog */> mListeningSocket;
+                std::auto_ptr<WinNamedPipeStream> mpConnectedSocket;
 #else
                 SocketListen<SocketStream, 1 /* listen backlog */> mListeningSocket;
@@ -203 +205 @@
         
         // Using a socket?
-        CommandSocketInfo *mpCommandSocketInfo;
+        std::auto_ptr<CommandSocketInfo> mapCommandSocketInfo;
         
         // Stop notifications being repeated.
@@ -504 +506 @@
 
 #ifdef WIN32
-        public:
-        void RunHelperThread(void);
-
         private:
-        bool mDoSyncFlagOut, mSyncIsForcedOut;
         bool mInstallService, mRemoveService, mRunAsService;
         std::string mServiceName;
-        HANDLE mhMessageToSendEvent, mhCommandReceivedEvent;
-        CRITICAL_SECTION mMessageQueueLock;
-        std::vector<std::string> mMessageList;
 #endif
 };