Changeset 1831

Timestamp:

14/09/2007 22:23:23 (4 years ago)

Author:

chris

Message:

Don't initialise the command socket thread (on Win32) until the
configuration is known.

Create the command socket (on Win32) with the specified pipe name
in the configuration file.

Commonise some code between Windows and Unix daemon startup.

File:

• box/chris/general/bin/bbackupd/BackupDaemon.cpp (modified) (8 diffs)

box/chris/general/bin/bbackupd/BackupDaemon.cpp

@@ -127 +127 @@
         }
 
-#ifdef WIN32
-        // Create the event object to signal from main thread to worker
-        // when new messages are queued to be sent to the command socket.
-        mhMessageToSendEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-        if(mhMessageToSendEvent == INVALID_HANDLE_VALUE)
-        {
-                BOX_ERROR("Failed to create event object: error " <<
-                        GetLastError());
-                exit(1);
-        }
-
-        // Create the event object to signal from worker to main thread
-        // when a command has been received on the command socket.
-        mhCommandReceivedEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-        if(mhCommandReceivedEvent == INVALID_HANDLE_VALUE)
-        {
-                BOX_ERROR("Failed to create event object: error " <<
-                        GetLastError());
-                exit(1);
-        }
-
-        // Create the critical section to protect the message queue
-        InitializeCriticalSection(&mMessageQueueLock);
-
-        // Create a thread to handle the named pipe
-        HANDLE hThread;
-        unsigned int dwThreadId;
-
-        hThread = (HANDLE) _beginthreadex( 
-                NULL,                        // default security attributes 
-                0,                           // use default stack size  
-                HelperThread,                // thread function 
-                this,                        // argument to thread function 
-                0,                           // use default creation flags 
-                &dwThreadId);                // returns the thread identifier 
-#endif
+        #ifdef WIN32
+                // Create the event object to signal from main thread to
+                // worker when new messages are queued to be sent to the
+                // command socket.
+
+                mhMessageToSendEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+                if(mhMessageToSendEvent == INVALID_HANDLE_VALUE)
+                {
+                        BOX_ERROR("Failed to create event object: error " <<
+                                GetLastError());
+                        exit(1);
+                }
+
+                // Create the event object to signal from worker to main thread
+                // when a command has been received on the command socket.
+
+                mhCommandReceivedEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+                if(mhCommandReceivedEvent == INVALID_HANDLE_VALUE)
+                {
+                        BOX_ERROR("Failed to create event object: error " <<
+                                GetLastError());
+                        exit(1);
+                }
+
+                // Create the critical section to protect the message queue
+                InitializeCriticalSection(&mMessageQueueLock);
+        #endif
 }
 
@@ -288 +279 @@
 void BackupDaemon::RunHelperThread(void)
 {
+        const Configuration &conf(GetConfiguration());
         mpCommandSocketInfo = new CommandSocketInfo;
         WinNamedPipeStream& rSocket(mpCommandSocketInfo->mListeningSocket);
@@ -297 +289 @@
                 try
                 {
-                        rSocket.Accept(BOX_NAMED_PIPE_NAME);
+                        std::string socket = conf.GetKeyValue("CommandSocket");
+                        rSocket.Accept(socket);
                 }
                 catch (BoxException &e)
@@ -332 +325 @@
                         // Send a header line summarising the configuration 
                         // and current state
-                        const Configuration &conf(GetConfiguration());
                         char summary[256];
                         size_t summarySize = sprintf(summary, 
@@ -513 +505 @@
         Timers::Init();
         
-#ifdef WIN32
-        try
-        {
-                Run2();
-        }
-        catch(...)
-        {
-                Timers::Cleanup();
-                throw;
-        }
-#else // ! WIN32
-        // Ignore SIGPIPE (so that if a command connection is broken, the daemon doesn't terminate)
-        ::signal(SIGPIPE, SIG_IGN);
-
-        // Create a command socket?
-        const Configuration &conf(GetConfiguration());
-        if(conf.KeyExists("CommandSocket"))
-        {
-                // Yes, create a local UNIX socket
-                mpCommandSocketInfo = new CommandSocketInfo;
-                const char *socketName = conf.GetKeyValue("CommandSocket").c_str();
-                ::unlink(socketName);
-                mpCommandSocketInfo->mListeningSocket.Listen(Socket::TypeUNIX, socketName);
-        }
+        #ifdef WIN32
+                // Create a thread to handle the named pipe
+                HANDLE hThread;
+                unsigned int dwThreadId;
+
+                hThread = (HANDLE) _beginthreadex( 
+                        NULL,         // default security attributes 
+                        0,            // use default stack size  
+                        HelperThread, // thread function 
+                        this,         // argument to thread function 
+                        0,            // use default creation flags 
+                        &dwThreadId); // returns the thread identifier 
+        #else
+                // Ignore SIGPIPE so that if a command connection is broken,
+                // the daemon doesn't terminate.
+                ::signal(SIGPIPE, SIG_IGN);
+
+                // Create a command socket?
+                const Configuration &conf(GetConfiguration());
+                if(conf.KeyExists("CommandSocket"))
+                {
+                        // Yes, create a local UNIX socket
+                        mpCommandSocketInfo = new CommandSocketInfo;
+                        const char *socketName =
+                                conf.GetKeyValue("CommandSocket").c_str();
+                        ::unlink(socketName);
+                        mpCommandSocketInfo->mListeningSocket.Listen(
+                                Socket::TypeUNIX, socketName);
+                }
+        #endif // !WIN32
 
         // Handle things nicely on exceptions
@@ -545 +543 @@
         catch(...)
         {
+                #ifdef WIN32
+                        // Don't delete the socket, as the helper thread
+                        // is probably still using it. Let Windows clean
+                        // up after us.
+                #else
                 if(mpCommandSocketInfo != 0)
                 {
@@ -564 +567 @@
                         mpCommandSocketInfo = 0;
                 }
+                #endif // WIN32
 
                 Timers::Cleanup();
@@ -570 +574 @@
         }
 
-        // Clean up
-        if(mpCommandSocketInfo != 0)
-        {
-                delete mpCommandSocketInfo;
-                mpCommandSocketInfo = 0;
-        }
-#endif
+        #ifndef WIN32
+                // Clean up
+                if(mpCommandSocketInfo != 0)
+                {
+                        delete mpCommandSocketInfo;
+                        mpCommandSocketInfo = 0;
+                }
+        #endif
         
         Timers::Cleanup();