fix(ipc): try to reconnect when failed

rime · Feb 24, 2018 · 3c286b6 · 3c286b6
1 parent 784679c
commit 3c286b6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/WeaselIPC/PipeChannel.cpp b/WeaselIPC/PipeChannel.cpp
@@ -6,8 +6,9 @@ using namespace weasel;
 using namespace std;
 using namespace boost;
 
-#define _ThrowLastError throw GetLastError()
-
+#define _ThrowLastError throw ::GetLastError()
+#define _ThrowCode(__c) throw __c
+#define _ThrowIfNot(__c) { DWORD err; if ((err = ::GetLastError()) != __c) throw __c; }
 
 PipeChannelBase::PipeChannelBase(std::wstring &pn_cmd, size_t bs = 4 * 1024, SECURITY_ATTRIBUTES *s = NULL)
 	: cmd_name(pn_cmd),
@@ -74,18 +75,13 @@ void PipeChannelBase::_Reconnect(HANDLE pipe)
 
 HANDLE PipeChannelBase::_TryConnect(const wchar_t *name)
 {
-	DWORD connectErr;
 	auto pipe = ::CreateFile(name, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
-
 	if (!_Invalid(pipe)) {
 		// connected to the pipe
 		return pipe;
 	}
 	// being busy is not really an error since we just need to wait.
-	if ((connectErr = ::GetLastError()) != ERROR_PIPE_BUSY) {
-
-		throw connectErr; // otherwise, pipe creation fails
-	}
+	_ThrowIfNot(ERROR_PIPE_BUSY);
 	// All pipe instances are busy
 	return INVALID_HANDLE_VALUE;
 }
@@ -100,7 +96,7 @@ size_t PipeChannelBase::_WritePipe(HANDLE p, size_t s, char *b)
 	return lwritten;
 }
 
-void PipeChannelBase::_FinalizePipe(HANDLE pipe)
+void PipeChannelBase::_FinalizePipe(HANDLE &pipe)
 {
 	if (!_Invalid(pipe)) {
 		DisconnectNamedPipe(pipe);
@@ -115,9 +111,8 @@ void PipeChannelBase::_Receive(HANDLE pipe, LPVOID msg, size_t rec_len)
 	DWORD lread;
 	BOOL success = ::ReadFile(pipe, msg, rec_len, &lread, NULL);
 	if (!success) {
-		if (GetLastError() != ERROR_MORE_DATA) {
-			_ThrowLastError;
-		}
+		_ThrowIfNot(ERROR_MORE_DATA);
+
 		memset(buffer.get(), 0, buff_size);
 		success = ::ReadFile(pipe, buffer.get(), buff_size, &lread, NULL);
 		if (!success) {

diff --git a/WeaselIPC/WeaselClientImpl.cpp b/WeaselIPC/WeaselClientImpl.cpp
@@ -58,6 +58,7 @@ void ClientImpl::Disconnect()
 {
 	if (_Active())
 		EndSession();
+	channel.Disconnect();
 }
 
 void ClientImpl::ShutdownServer()
@@ -192,7 +193,7 @@ LRESULT ClientImpl::_SendMessage(WEASEL_IPC_COMMAND Msg, DWORD wParam, DWORD lPa
 		PipeMessage req{ Msg, wParam, lParam };
 		return channel.Transact(req);
 	}
-	catch (...) {
+	catch (DWORD ex) {
 		return 0;
 	}
 }

diff --git a/WeaselIPCServer/WeaselServerImpl.cpp b/WeaselIPCServer/WeaselServerImpl.cpp
@@ -334,7 +334,7 @@ void PipeServer::Listen(ServerHandler const &handler)
 				_ProcessPipeThread(pipe, handler);
 			});
 		}
-		catch (...) {
+		catch (DWORD ex) {
 			_FinalizePipe(pipe);
 		}
 		boost::this_thread::interruption_point();

diff --git a/WeaselTSF/WeaselTSF.cpp b/WeaselTSF/WeaselTSF.cpp
@@ -216,6 +216,7 @@ void WeaselTSF::_EnsureServerConnected()
 {
 	if (!m_client.Echo())
 	{
+		m_client.Disconnect();
 		m_client.Connect(NULL);
 		m_client.StartSession();
 	}

diff --git a/include/PipeChannel.h b/include/PipeChannel.h
@@ -15,6 +15,10 @@ namespace weasel {
 		PipeChannelBase(PipeChannelBase &&r);
 		~PipeChannelBase();
 
+		bool Connect() { return _Ensure(); }
+		bool Connected() const { return !_Invalid(msg_pipe); }
+		void Disconnect() { _FinalizePipe(msg_pipe); }
+
 	protected:
 
 		/* To ensure connection before operation */
@@ -26,7 +30,7 @@ namespace weasel {
 		/* Try to connect for one time */
 		HANDLE _TryConnect(const wchar_t *name);
 		size_t _WritePipe(HANDLE p, size_t s, char *b);
-		void _FinalizePipe(HANDLE pipe);
+		void _FinalizePipe(HANDLE &pipe);
 		void _Receive(HANDLE pipe, LPVOID msg, size_t rec_len);
 		/* Try to get a connection from client */
 		HANDLE _ConnectServerPipe(std::wstring &pn);
@@ -127,8 +131,6 @@ namespace weasel {
 			return handler((LPWSTR)buffer.get(), buff_size * sizeof(char) / sizeof(wchar_t));
 		}
 
-		bool Connect() { return _Ensure(); }
-		bool Connected() const { return !_Invalid(msg_pipe); }
 
 	protected: