[Box Backup-dev] COMMIT r203 - box/chris/win32/crash-test-pipes/bin/bbackupd

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2005-12-12 00:40:53 +0000 (Mon, 12 Dec 2005)
New Revision: 203

Modified:
   box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp
Log:
Disabled more code, still crashes

Modified: box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp	2005-12-12 00:34:14 UTC (rev 202)
+++ box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp	2005-12-12 00:40:53 UTC (rev 203)
@@ -16,11 +16,60 @@
 #include <unistd.h>
 
 #include "ServerException.h"
+#include "WinNamedPipeStream.h"
 
-#include "BackupDaemon.h"
+class BackupDaemon
+{
+public:
+	BackupDaemon();
+	~BackupDaemon();
+private:
+	BackupDaemon(const BackupDaemon &);
+public:
 
-// #include "emu.h"
+	void Run();
 
+	// Allow other classes to call this too
+	enum
+	{
+		NotifyEvent_StoreFull = 0,
+		NotifyEvent_ReadError = 1,
+		NotifyEvent__MAX = 1
+		// When adding notifications, remember to add strings to NotifySysadmin()
+	};
+
+private:
+	void Run2();
+
+	void CloseCommandConnection();
+
+	/*	
+private:
+	// For the command socket
+	class CommandSocketInfo
+	{
+	public:
+		CommandSocketInfo();
+		~CommandSocketInfo();
+	private:
+		CommandSocketInfo(const CommandSocketInfo &);	// no copying
+		CommandSocketInfo &operator=(const CommandSocketInfo &);
+	public:
+	*/
+
+	WinNamedPipeStream mListeningSocket;
+
+	/*
+	};
+	
+	// Using a socket?
+	CommandSocketInfo *mpCommandSocketInfo;
+	*/
+	
+	public:
+	void RunHelperThread(void);
+};
+
 #define LOG_INFO 6
 #define LOG_WARNING 4
 #define LOG_ERR 3
@@ -41,7 +90,6 @@
 //
 // --------------------------------------------------------------------------
 BackupDaemon::BackupDaemon()
-	: mpCommandSocketInfo(0)
 { }
 
 // --------------------------------------------------------------------------
@@ -53,13 +101,7 @@
 //
 // --------------------------------------------------------------------------
 BackupDaemon::~BackupDaemon()
-{
-	if(mpCommandSocketInfo != 0)
-	{
-		delete mpCommandSocketInfo;
-		mpCommandSocketInfo = 0;
-	}
-}
+{ }
 
 void ConnectorConnectPipe()
 {
@@ -119,15 +161,11 @@
 
 void BackupDaemon::RunHelperThread(void)
 {
-	mpCommandSocketInfo = new CommandSocketInfo;
-	this->mReceivedCommandConn = false;
-
 	while (true)
 	{
 		try
 		{
-			mpCommandSocketInfo->mListeningSocket.Accept(
-				BOX_NAMED_PIPE_NAME);
+			mListeningSocket.Accept(BOX_NAMED_PIPE_NAME);
 		}
 		catch (ConnectionException &e)
 		{
@@ -184,22 +222,9 @@
 	}
 	catch(...)
 	{
-		if(mpCommandSocketInfo != 0)
-		{
-			delete mpCommandSocketInfo;
-			mpCommandSocketInfo = 0;
-		}
-
-		throw;
+		printf("Caught exception in Run()");
 	}
 	
-	// Clean up
-	if(mpCommandSocketInfo != 0)
-	{
-		delete mpCommandSocketInfo;
-		mpCommandSocketInfo = 0;
-	}
-
 	// clean up windows specific stuff.
 	FiniTimer();
 }
@@ -260,33 +285,10 @@
 {
 	try
 	{
-		mpCommandSocketInfo->mListeningSocket.Close();
+		mListeningSocket.Close();
 	}
 	catch(...)
 	{
 		// Ignore any errors
 	}
 }
-
-// --------------------------------------------------------------------------
-//
-// Function
-//		Name:    BackupDaemon::CommandSocketInfo::CommandSocketInfo()
-//		Purpose: Constructor
-//		Created: 18/2/04
-//
-// --------------------------------------------------------------------------
-BackupDaemon::CommandSocketInfo::CommandSocketInfo()
-{ }
-
-
-// --------------------------------------------------------------------------
-//
-// Function
-//		Name:    BackupDaemon::CommandSocketInfo::~CommandSocketInfo()
-//		Purpose: Destructor
-//		Created: 18/2/04
-//
-// --------------------------------------------------------------------------
-BackupDaemon::CommandSocketInfo::~CommandSocketInfo()
-{ }