finished ipc connect with unit test.

This commit is contained in:
Nick Bolton 2012-07-01 21:18:21 +00:00
parent d829e854a4
commit 05775bc73d
5 changed files with 171 additions and 14 deletions

View File

@ -16,8 +16,10 @@
*/
#include "CIpcClientProxy.h"
#include "IStream.h"
CIpcClientProxy::CIpcClientProxy()
CIpcClientProxy::CIpcClientProxy(IStream& stream) :
m_stream(stream)
{
}

View File

@ -17,8 +17,13 @@
#pragma once
class IStream;
class CIpcClientProxy {
public:
CIpcClientProxy();
CIpcClientProxy(IStream& stream);
virtual ~CIpcClientProxy();
private:
IStream& m_stream;
};

View File

@ -17,15 +17,30 @@
#include "CIpcServer.h"
#include "Ipc.h"
#include "IEventQueue.h"
#include "TMethodEventJob.h"
#include "CEvent.h"
#include "CLog.h"
#include "CIpcClientProxy.h"
#include "IStream.h"
#include "IDataSocket.h"
CEvent::Type CIpcServer::s_clientConnectedEvent = CEvent::kUnknown;
CIpcServer::CIpcServer() :
m_address(CNetworkAddress(IPC_HOST, IPC_PORT))
{
m_address.resolve();
EVENTQUEUE->adoptHandler(
IListenSocket::getConnectingEvent(), &m_socket,
new TMethodEventJob<CIpcServer>(
this, &CIpcServer::handleClientConnecting));
}
CIpcServer::~CIpcServer()
{
EVENTQUEUE->removeHandler(IListenSocket::getConnectingEvent(), &m_socket);
}
void
@ -33,3 +48,26 @@ CIpcServer::listen()
{
m_socket.bind(m_address);
}
void
CIpcServer::handleClientConnecting(const CEvent&, void*)
{
IStream* stream = m_socket.accept();
if (stream == NULL) {
return;
}
LOG((CLOG_NOTE "accepted ipc client connection"));
// TODO: delete on disconnect
CIpcClientProxy* proxy = new CIpcClientProxy(*stream);
m_clients.insert(proxy);
EVENTQUEUE->addEvent(CEvent(getClientConnectedEvent(), this, proxy));
}
CEvent::Type
CIpcServer::getClientConnectedEvent()
{
return EVENTQUEUE->registerTypeOnce(
s_clientConnectedEvent, "CIpcServer::clientConnected");
}

View File

@ -19,23 +19,47 @@
#include "CTCPListenSocket.h"
#include "CNetworkAddress.h"
#include <set>
class CEvent;
class CIpcClientProxy;
//! IPC server for communication between daemon and GUI.
/*!
* The IPC server listens on localhost. The IPC client runs on both the
* client/server process or the GUI. The IPC server runs on the daemon process.
* This allows the GUI to send config changes to the daemon and client/server,
* and allows the daemon and client/server to send log data to the GUI.
*/
The IPC server listens on localhost. The IPC client runs on both the
client/server process or the GUI. The IPC server runs on the daemon process.
This allows the GUI to send config changes to the daemon and client/server,
and allows the daemon and client/server to send log data to the GUI.
*/
class CIpcServer {
public:
CIpcServer();
virtual ~CIpcServer();
//! Opens a TCP socket only allowing local connections
void listen();
//! @name manipulators
//@{
//! Opens a TCP socket only allowing local connections.
void listen();
//@}
//! @name accessors
//@{
//! This event is raised when we have created the client proxy.
static CEvent::Type getClientConnectedEvent();
//@}
private:
CTCPListenSocket m_socket;
CNetworkAddress m_address;
void handleClientConnecting(const CEvent&, void*);
private:
typedef std::set<CIpcClientProxy*> CClientSet;
CTCPListenSocket m_socket;
CNetworkAddress m_address;
CClientSet m_clients;
static CEvent::Type s_clientConnectedEvent;
};

View File

@ -20,17 +20,105 @@
#include "CIpcClient.h"
#include "CSocketMultiplexer.h"
#include "CEventQueue.h"
#include "TMethodEventJob.h"
#include "CThread.h"
#include "TMethodJob.h"
#include "CArch.h"
#include "CLog.h"
TEST(CIpcTests, connectToServer)
class CIpcTests : public ::testing::Test
{
public:
CIpcTests();
virtual ~CIpcTests();
void handleClientConnected(const CEvent&, void* vclient);
void raiseQuitEvent();
private:
void timeoutThread(void*);
public:
bool m_quitOnClientConnect;
bool m_clientConnected;
bool m_timeoutCheck;
double m_timeout;
private:
CThread* m_timeoutThread;
};
TEST_F(CIpcTests, connectToServer)
{
m_quitOnClientConnect = true;
CSocketMultiplexer multiplexer;
CEventQueue eventQueue;
CEventQueue events;
CIpcServer server;
server.listen();
events.adoptHandler(
CIpcServer::getClientConnectedEvent(), &server,
new TMethodEventJob<CIpcTests>(
this, &CIpcTests::handleClientConnected));
CIpcClient client;
client.connect();
eventQueue.loop();
m_timeoutCheck = true;
m_timeout = ARCH->time() + 5; // 5 sec timeout.
events.loop();
EXPECT_EQ(true, m_clientConnected);
}
CIpcTests::CIpcTests() :
m_timeoutThread(nullptr),
m_quitOnClientConnect(false),
m_clientConnected(false),
m_timeoutCheck(false),
m_timeout(0)
{
m_timeoutThread = new CThread(
new TMethodJob<CIpcTests>(
this, &CIpcTests::timeoutThread, nullptr));
}
CIpcTests::~CIpcTests()
{
delete m_timeoutThread;
}
void
CIpcTests::handleClientConnected(const CEvent&, void* vclient)
{
m_clientConnected = true;
if (m_quitOnClientConnect) {
raiseQuitEvent();
}
}
void
CIpcTests::raiseQuitEvent()
{
EVENTQUEUE->addEvent(CEvent(CEvent::kQuit, nullptr));
}
void
CIpcTests::timeoutThread(void*)
{
while (true) {
if (!m_timeoutCheck) {
ARCH->sleep(1);
continue;
}
if (ARCH->time() > m_timeout) {
LOG((CLOG_ERR "timeout"));
raiseQuitEvent();
m_timeoutCheck = false;
}
}
}