jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Move class Event and EventHandler into the TelldusCore namespace

Browse source
This commit is contained in:
Micke Prag 2012-02-03 17:09:38 +01:00
parent 1250681514
commit e834160492
23 changed files with 125 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

4
telldus-core/common/Event.cpp
View file

@ -4,6 +4,8 @@
#include <list>
using namespace TelldusCore;
EventData::~EventData() {
}
@ -22,7 +24,7 @@ public:
std::list<EventDataRef> eventDataList;
};
EventBase::EventBase(EventHandler *handler) {
EventBase::EventBase(TelldusCore::EventHandler *handler) {
d = new PrivateData;
d->handler = handler;
}

49
telldus-core/common/Event.h
View file

@ -1,33 +1,35 @@
#ifndef EVENT_H
#define EVENT_H
class EventHandler;
#include "Thread.h"
#ifdef _WINDOWS
#include <windows.h>
#include <memory>
#include <windows.h>
#include <memory>
typedef HANDLE EVENT_T;
#else
#include <tr1/memory>
#include <tr1/memory>
typedef void* EVENT_T;
#endif
class EventData {
public:
namespace TelldusCore {
class EventHandler;
class EventData {
public:
virtual ~EventData();
virtual bool isValid() const;
};
};
class EventDataBase : public EventData {
public:
class EventDataBase : public EventData {
public:
virtual bool isValid() const;
};
};
typedef std::tr1::shared_ptr<EventData> EventDataRef;
typedef std::tr1::shared_ptr<EventData> EventDataRef;
class EventBase {
public:
class EventBase {
public:
virtual ~EventBase();
void popSignal();
@ -36,35 +38,36 @@ public:
virtual void signal(EventData *);
EventDataRef takeSignal();
protected:
protected:
EventBase(EventHandler *handler);
void clearHandler();
virtual void clearSignal() = 0;
EventHandler *handler() const;
virtual void sendSignal() = 0;
private:
private:
class PrivateData;
PrivateData *d;
};
};
class Event : public EventBase {
public:
class Event : public EventBase {
public:
virtual ~Event();
protected:
protected:
Event(EventHandler *handler);
EVENT_T retrieveNative();
virtual void clearSignal();
virtual void sendSignal();
private:
private:
class PrivateData;
PrivateData *d;
friend class EventHandler;
};
friend class EventHandler;
};
typedef std::tr1::shared_ptr<Event> EventRef;
typedef std::tr1::shared_ptr<Event> EventRef;
}
#endif //EVENT_H

13
telldus-core/common/EventHandler.h
View file

@ -3,8 +3,10 @@
#include "Event.h"
class EventHandler {
public:
namespace TelldusCore {
class EventHandler {
public:
EventHandler();
virtual ~EventHandler(void);
@ -12,15 +14,16 @@ public:
bool waitForAny();
protected:
protected:
void signal(Event *event);
private:
private:
class PrivateData;
PrivateData *d;
bool listIsSignalled();
friend class Event;
};
};
}
#endif //EVENTHANDLER_H

2
telldus-core/common/EventHandler_unix.cpp
View file

@ -6,6 +6,8 @@
#include <pthread.h>
#include <stdio.h>
using namespace TelldusCore;
class EventHandler::PrivateData {
public:
pthread_cond_t event;

2
telldus-core/common/Event_unix.cpp
View file

@ -2,6 +2,8 @@
#include "EventHandler.h"
#include "Thread.h"
using namespace TelldusCore;
class Event::PrivateData {
public:
};

4
telldus-core/service/ClientCommunicationHandler.cpp
View file

@ -7,7 +7,7 @@
class ClientCommunicationHandler::PrivateData {
public:
TelldusCore::Socket *clientSocket;
EventRef event, deviceUpdateEvent;
TelldusCore::EventRef event, deviceUpdateEvent;
bool done;
DeviceManager *deviceManager;
};
@ -16,7 +16,7 @@ ClientCommunicationHandler::ClientCommunicationHandler(){
}
ClientCommunicationHandler::ClientCommunicationHandler(TelldusCore::Socket *clientSocket, EventRef event, DeviceManager *deviceManager, EventRef deviceUpdateEvent)
ClientCommunicationHandler::ClientCommunicationHandler(TelldusCore::Socket *clientSocket, TelldusCore::EventRef event, DeviceManager *deviceManager, TelldusCore::EventRef deviceUpdateEvent)
:Thread()
{
d = new PrivateData;

2
telldus-core/service/ClientCommunicationHandler.h
View file

@ -12,7 +12,7 @@ class ClientCommunicationHandler : public TelldusCore::Thread
{
public:
ClientCommunicationHandler();
ClientCommunicationHandler(TelldusCore::Socket *clientSocket, EventRef event, DeviceManager *deviceManager, EventRef deviceUpdateEvent);
ClientCommunicationHandler(TelldusCore::Socket *clientSocket, TelldusCore::EventRef event, DeviceManager *deviceManager, TelldusCore::EventRef deviceUpdateEvent);
~ClientCommunicationHandler(void);
bool isDone();

4
telldus-core/service/ConnectionListener.h
View file

@ -10,14 +10,14 @@ namespace TelldusCore {
class Socket;
};
class ConnectionListenerEventData : public EventDataBase {
class ConnectionListenerEventData : public TelldusCore::EventDataBase {
public:
TelldusCore::Socket *socket;
};
class ConnectionListener : public TelldusCore::Thread {
public:
ConnectionListener(const std::wstring &name, EventRef waitEvent);
ConnectionListener(const std::wstring &name, TelldusCore::EventRef waitEvent);
virtual ~ConnectionListener(void);
protected:

4
telldus-core/service/ConnectionListener_unix.cpp
View file

@ -14,12 +14,12 @@
class ConnectionListener::PrivateData {
public:
EventRef waitEvent;
TelldusCore::EventRef waitEvent;
std::string name;
bool running;
};
ConnectionListener::ConnectionListener(const std::wstring &name, EventRef waitEvent)
ConnectionListener::ConnectionListener(const std::wstring &name, TelldusCore::EventRef waitEvent)
{
d = new PrivateData;
d->waitEvent = waitEvent;

4
telldus-core/service/Controller.cpp
View file

@ -4,11 +4,11 @@
class Controller::PrivateData {
public:
Event *event;
TelldusCore::Event *event;
int id;
};
Controller::Controller(int id, Event *event){
Controller::Controller(int id, TelldusCore::Event *event){
d = new PrivateData;
d->event = event;
d->id = id;

4
telldus-core/service/Controller.h
View file

@ -4,7 +4,7 @@
#include "Event.h"
#include <string>
class ControllerEventData : public EventDataBase {
class ControllerEventData : public TelldusCore::EventDataBase {
public:
std::string msg;
int controllerId;
@ -19,7 +19,7 @@ public:
virtual int reset() = 0;
protected:
Controller(int id, Event *event);
Controller(int id, TelldusCore::Event *event);
void publishData(const std::string &data) const;
void decodePublishData(const std::string &data) const;

4
telldus-core/service/ControllerListener.h
View file

@ -4,7 +4,7 @@
#include "Thread.h"
#include "Event.h"
class ControllerChangeEventData : public EventDataBase {
class ControllerChangeEventData : public TelldusCore::EventDataBase {
public:
int vid, pid;
bool inserted;
@ -12,7 +12,7 @@ public:
class ControllerListener : public TelldusCore::Thread {
public:
ControllerListener(EventRef event);
ControllerListener(TelldusCore::EventRef event);
virtual ~ControllerListener();
protected:

4
telldus-core/service/ControllerManager.cpp
View file

@ -14,11 +14,11 @@ class ControllerManager::PrivateData {
public:
int lastControllerId;
ControllerMap controllers;
Event *event;
TelldusCore::Event *event;
TelldusCore::Mutex mutex;
};
ControllerManager::ControllerManager(Event *event){
ControllerManager::ControllerManager(TelldusCore::Event *event){
d = new PrivateData;
d->lastControllerId = 0;
d->event = event;

6
telldus-core/service/ControllerManager.h
View file

@ -2,13 +2,15 @@
#define CONTROLLERMANAGER_H
class Controller;
class Event;
namespace TelldusCore {
class Event;
}
#include <string>
class ControllerManager {
public:
ControllerManager(Event *event);
ControllerManager(TelldusCore::Event *event);
~ControllerManager(void);
void deviceInsertedOrRemoved(int vid, int pid, const std::string &serial, bool inserted);

4
telldus-core/service/DeviceManager.cpp
View file

@ -21,10 +21,10 @@ public:
Settings set;
TelldusCore::Mutex lock;
ControllerManager *controllerManager;
EventRef deviceUpdateEvent;
TelldusCore::EventRef deviceUpdateEvent;
};
DeviceManager::DeviceManager(ControllerManager *controllerManager, EventRef deviceUpdateEvent){
DeviceManager::DeviceManager(ControllerManager *controllerManager, TelldusCore::EventRef deviceUpdateEvent){
d = new PrivateData;
d->controllerManager = controllerManager;
d->deviceUpdateEvent = deviceUpdateEvent;

2
telldus-core/service/DeviceManager.h
View file

@ -12,7 +12,7 @@ class Sensor;
class DeviceManager
{
public:
DeviceManager(ControllerManager *controllerManager, EventRef deviceUpdateEvent);
DeviceManager(ControllerManager *controllerManager, TelldusCore::EventRef deviceUpdateEvent);
~DeviceManager(void);
int getNumberOfDevices(void);
int addDevice();

10
telldus-core/service/EventUpdateManager.cpp
View file

@ -12,8 +12,8 @@ typedef std::list<TelldusCore::Socket *> SocketList;
class EventUpdateManager::PrivateData {
public:
EventHandler eventHandler;
EventRef stopEvent, updateEvent, clientConnectEvent;
TelldusCore::EventHandler eventHandler;
TelldusCore::EventRef stopEvent, updateEvent, clientConnectEvent;
SocketList clients;
ConnectionListener *eventUpdateClientListener;
};
@ -40,7 +40,7 @@ EventUpdateManager::~EventUpdateManager(void) {
delete d;
}
EventRef EventUpdateManager::retrieveUpdateEvent(){
TelldusCore::EventRef EventUpdateManager::retrieveUpdateEvent(){
return d->updateEvent;
}
@ -54,7 +54,7 @@ void EventUpdateManager::run(){
if(d->clientConnectEvent->isSignaled()){
//new client added
EventDataRef eventData = d->clientConnectEvent->takeSignal();
TelldusCore::EventDataRef eventData = d->clientConnectEvent->takeSignal();
ConnectionListenerEventData *data = reinterpret_cast<ConnectionListenerEventData*>(eventData.get());
if(data){
d->clients.push_back(data->socket);
@ -62,7 +62,7 @@ void EventUpdateManager::run(){
}
else if(d->updateEvent->isSignaled()){
//device event, signal all clients
EventDataRef eventData = d->updateEvent->takeSignal();
TelldusCore::EventDataRef eventData = d->updateEvent->takeSignal();
EventUpdateData *data = reinterpret_cast<EventUpdateData*>(eventData.get());
if(data){
sendMessageToClients(data);

6
telldus-core/service/EventUpdateManager.h
View file

@ -4,7 +4,7 @@
#include "Thread.h"
#include "Event.h"
class EventUpdateData : public EventDataBase {
class EventUpdateData : public TelldusCore::EventDataBase {
public:
std::wstring messageType;
int controllerId;
@ -29,8 +29,8 @@ public:
EventUpdateManager(void);
~EventUpdateManager(void);
EventRef retrieveUpdateEvent();
EventRef retrieveClientConnectEvent();
TelldusCore::EventRef retrieveUpdateEvent();
TelldusCore::EventRef retrieveClientConnectEvent();
protected:
void run();

2
telldus-core/service/TellStick.h
View file

@ -24,7 +24,7 @@ public:
class TellStick : public Controller, public TelldusCore::Thread {
public:
TellStick(int controllerId, Event *event, const TellStickDescriptor &d);
TellStick(int controllerId, TelldusCore::Event *event, const TellStickDescriptor &d);
virtual ~TellStick();
virtual int firmwareVersion();

2
telldus-core/service/TellStick_libftdi.cpp
View file

@ -42,7 +42,7 @@ public:
TelldusCore::Mutex mutex;
};
TellStick::TellStick(int controllerId, Event *event, const TellStickDescriptor &td )
TellStick::TellStick(int controllerId, TelldusCore::Event *event, const TellStickDescriptor &td )
:Controller(controllerId, event)
{
d = new PrivateData;

20
telldus-core/service/TelldusMain.cpp
View file

@ -15,8 +15,8 @@
class TelldusMain::PrivateData {
public:
EventHandler eventHandler;
EventRef stopEvent, controllerChangeEvent;
TelldusCore::EventHandler eventHandler;
TelldusCore::EventRef stopEvent, controllerChangeEvent;
};
TelldusMain::TelldusMain(void)
@ -57,16 +57,16 @@ void TelldusMain::suspend() {
}
void TelldusMain::start(void) {
EventRef clientEvent = d->eventHandler.addEvent();
EventRef dataEvent = d->eventHandler.addEvent();
EventRef janitor = d->eventHandler.addEvent(); //Used for regular cleanups
TelldusCore::EventRef clientEvent = d->eventHandler.addEvent();
TelldusCore::EventRef dataEvent = d->eventHandler.addEvent();
TelldusCore::EventRef janitor = d->eventHandler.addEvent(); //Used for regular cleanups
Timer supervisor(janitor); //Tells the janitor to go back to work
supervisor.setInterval(60); //Once every minute
supervisor.start();
ControllerManager controllerManager(dataEvent.get());
EventUpdateManager eventUpdateManager;
EventRef deviceUpdateEvent = eventUpdateManager.retrieveUpdateEvent();
TelldusCore::EventRef deviceUpdateEvent = eventUpdateManager.retrieveUpdateEvent();
eventUpdateManager.start();
DeviceManager deviceManager(&controllerManager, deviceUpdateEvent);
@ -74,7 +74,7 @@ void TelldusMain::start(void) {
std::list<ClientCommunicationHandler *> clientCommunicationHandlerList;
EventRef handlerEvent = d->eventHandler.addEvent();
TelldusCore::EventRef handlerEvent = d->eventHandler.addEvent();
#ifdef _MACOSX
//This is only needed on OS X
@ -88,7 +88,7 @@ void TelldusMain::start(void) {
}
if (clientEvent->isSignaled()) {
//New client connection
EventDataRef eventDataRef = clientEvent->takeSignal();
TelldusCore::EventDataRef eventDataRef = clientEvent->takeSignal();
ConnectionListenerEventData *data = reinterpret_cast<ConnectionListenerEventData*>(eventDataRef.get());
if (data) {
ClientCommunicationHandler *clientCommunication = new ClientCommunicationHandler(data->socket, handlerEvent, &deviceManager, deviceUpdateEvent);
@ -98,7 +98,7 @@ void TelldusMain::start(void) {
}
if (d->controllerChangeEvent->isSignaled()) {
EventDataRef eventDataRef = d->controllerChangeEvent->takeSignal();
TelldusCore::EventDataRef eventDataRef = d->controllerChangeEvent->takeSignal();
ControllerChangeEventData *data = reinterpret_cast<ControllerChangeEventData*>(eventDataRef.get());
if (data) {
controllerManager.deviceInsertedOrRemoved(data->vid, data->pid, "", data->inserted);
@ -106,7 +106,7 @@ void TelldusMain::start(void) {
}
if (dataEvent->isSignaled()) {
EventDataRef eventData = dataEvent->takeSignal();
TelldusCore::EventDataRef eventData = dataEvent->takeSignal();
ControllerEventData *data = reinterpret_cast<ControllerEventData*>(eventData.get());
if (data) {
deviceManager.handleControllerMessage(*data);

4
telldus-core/service/Timer.cpp
View file

@ -9,7 +9,7 @@
class Timer::PrivateData {
public:
PrivateData() : interval(0), running(false) {}
EventRef event;
TelldusCore::EventRef event;
int interval;
bool running;
#ifdef _WINDOWS
@ -21,7 +21,7 @@ public:
#endif
};
Timer::Timer(EventRef event)
Timer::Timer(TelldusCore::EventRef event)
:TelldusCore::Thread(), d(new PrivateData)
{
d->event = event;

2
telldus-core/service/Timer.h
View file

@ -6,7 +6,7 @@
class Timer : public TelldusCore::Thread {
public:
Timer(EventRef event);
Timer(TelldusCore::EventRef event);
virtual ~Timer();
void setInterval(int sec);