From 95f2a6b40f5e9dc27be6609d3f7018b3342c4182 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 2 Jun 2009 22:36:44 +0200 Subject: Asyncrone Signale (Version 2) implementiert --- src/Net/Signals/Connection2.h | 53 +++++++++++++++++++++++++++++++++++ src/Net/Signals/GenericSignal.h | 61 +++++++++++++++++++++++++++++++++++++++++ src/Net/Signals/Signal20.h | 46 +++++++++++++++++++++++++++++++ src/Net/Signals/Signal21.h | 47 +++++++++++++++++++++++++++++++ src/Net/Signals/Signal22.h | 47 +++++++++++++++++++++++++++++++ src/Net/Signals/SignalBase2.h | 53 +++++++++++++++++++++++++++++++++++ src/Net/Signals/Signals.h | 3 ++ 7 files changed, 310 insertions(+) create mode 100644 src/Net/Signals/Connection2.h create mode 100644 src/Net/Signals/GenericSignal.h create mode 100644 src/Net/Signals/Signal20.h create mode 100644 src/Net/Signals/Signal21.h create mode 100644 src/Net/Signals/Signal22.h create mode 100644 src/Net/Signals/SignalBase2.h (limited to 'src/Net') diff --git a/src/Net/Signals/Connection2.h b/src/Net/Signals/Connection2.h new file mode 100644 index 0000000..ab80a61 --- /dev/null +++ b/src/Net/Signals/Connection2.h @@ -0,0 +1,53 @@ +/* + * Connection2.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MAD_NET_SIGNALS_CONNECTION2_H_ +#define MAD_NET_SIGNALS_CONNECTION2_H_ + +namespace Mad { +namespace Net { +namespace Signals { + +class SignalBase2; + +class Connection2 { + private: + friend class SignalBase2; + + SignalBase2 *signal; + unsigned long id; + + Connection2(SignalBase2 *signal0, unsigned long id0) + : signal(signal0), id(id0) {} + + public: + bool operator==(const Connection2 &o) const { + return (signal == o.signal && id == o.id); + } + + bool operator<(const Connection2 &o) const { + return (signal != o.signal) ? (signal < o.signal) : (id < o.id); + } +}; + +} +} +} + +#endif /* MAD_NET_SIGNALS_CONNECTION2_H_ */ diff --git a/src/Net/Signals/GenericSignal.h b/src/Net/Signals/GenericSignal.h new file mode 100644 index 0000000..d4fa8df --- /dev/null +++ b/src/Net/Signals/GenericSignal.h @@ -0,0 +1,61 @@ +/* + * GenericSignal.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MAD_NET_SIGNALS_GENERICSIGNAL_H_ +#define MAD_NET_SIGNALS_GENERICSIGNAL_H_ + +#include "SignalBase2.h" + +#include +#include + +namespace Mad { +namespace Net { +namespace Signals { + +template +class GenericSignal : protected SignalBase2 { + public: + typedef FunctionType slot_type; + + protected: + std::map handlers; + + public: + Connection2 connect(const slot_type &slot) { + boost::lock_guard lock(mutex); + + Connection2 con = getNewConnection(); + handlers.insert(std::make_pair(con, slot)); + + return con; + } + + bool disconnect(const Connection2 &connection) { + boost::lock_guard lock(mutex); + + return handlers.erase(connection); + } +}; + +} +} +} + +#endif /* MAD_NET_SIGNALS_GENERICSIGNAL_H_ */ diff --git a/src/Net/Signals/Signal20.h b/src/Net/Signals/Signal20.h new file mode 100644 index 0000000..0a12640 --- /dev/null +++ b/src/Net/Signals/Signal20.h @@ -0,0 +1,46 @@ +/* + * Signal20.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MAD_NET_SIGNALS_SIGNAL20_H_ +#define MAD_NET_SIGNALS_SIGNAL20_H_ + +#include "GenericSignal.h" +#include + +#include + +namespace Mad { +namespace Net { +namespace Signals { + +class Signal20 : public GenericSignal > { + public: + void emit() { + boost::lock_guard lock(mutex); + + for(std::map::iterator handler = handlers.begin(); handler != handlers.end(); ++handler) + Net::ThreadManager::get()->pushWork(handler->second); + } +}; + +} +} +} + +#endif /* MAD_NET_SIGNALS_SIGNAL20_H_ */ diff --git a/src/Net/Signals/Signal21.h b/src/Net/Signals/Signal21.h new file mode 100644 index 0000000..799296f --- /dev/null +++ b/src/Net/Signals/Signal21.h @@ -0,0 +1,47 @@ +/* + * Signal21.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MAD_NET_SIGNALS_SIGNAL21_H_ +#define MAD_NET_SIGNALS_SIGNAL21_H_ + +#include "GenericSignal.h" +#include + +#include + +namespace Mad { +namespace Net { +namespace Signals { + +template +class Signal21 : public GenericSignal > { + public: + void emit(T1 arg1) { + boost::lock_guard lock(this->mutex); + + for(typename std::map >::slot_type>::iterator handler = this->handlers.begin(); handler != this->handlers.end(); ++handler) + Net::ThreadManager::get()->pushWork(boost::bind(handler->second, arg1)); + } +}; + +} +} +} + +#endif /* MAD_NET_SIGNALS_SIGNAL21_H_ */ diff --git a/src/Net/Signals/Signal22.h b/src/Net/Signals/Signal22.h new file mode 100644 index 0000000..a3b2ac4 --- /dev/null +++ b/src/Net/Signals/Signal22.h @@ -0,0 +1,47 @@ +/* + * Signal22.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MAD_NET_SIGNALS_SIGNAL22_H_ +#define MAD_NET_SIGNALS_SIGNAL22_H_ + +#include "GenericSignal.h" +#include + +#include + +namespace Mad { +namespace Net { +namespace Signals { + +template +class Signal22 : public GenericSignal > { + public: + void emit(T1 arg1, T2 arg2) { + boost::lock_guard lock(this->mutex); + + for(typename std::map >::slot_type>::iterator handler = this->handlers.begin(); handler != this->handlers.end(); ++handler) + Net::ThreadManager::get()->pushWork(boost::bind(handler->second, arg1, arg2)); + } +}; + +} +} +} + +#endif /* MAD_NET_SIGNALS_SIGNAL22_H_ */ diff --git a/src/Net/Signals/SignalBase2.h b/src/Net/Signals/SignalBase2.h new file mode 100644 index 0000000..d5cb0a7 --- /dev/null +++ b/src/Net/Signals/SignalBase2.h @@ -0,0 +1,53 @@ +/* + * SignalBase2.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef MAD_SIGNALS_SIGNALBASE2_H_ +#define MAD_SIGNALS_SIGNALBASE2_H_ + +#include "Connection2.h" + +#include +#include + +namespace Mad { +namespace Net { +namespace Signals { + +class SignalBase2 : private boost::noncopyable { + private: + friend class Connection2; + + unsigned long connectionId; + + protected: + boost::mutex mutex; + + Connection2 getNewConnection() { + return Connection2(this, connectionId++); + } + + SignalBase2() : connectionId(0) {} + virtual ~SignalBase2() {} +}; + +} +} +} + +#endif /* MAD_SIGNALS_SIGNALBASE2_H_ */ diff --git a/src/Net/Signals/Signals.h b/src/Net/Signals/Signals.h index 4ee4f95..b4c9bac 100644 --- a/src/Net/Signals/Signals.h +++ b/src/Net/Signals/Signals.h @@ -23,5 +23,8 @@ #include "Signal0.h" #include "Signal1.h" #include "Signal2.h" +#include "Signal20.h" +#include "Signal21.h" +#include "Signal22.h" #endif /* MAD_SIGNALS_SIGNALS_H_ */ -- cgit v1.2.3