7 files changed, 310 insertions, 0 deletions
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 <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#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 <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_NET_SIGNALS_GENERICSIGNAL_H_
+#define MAD_NET_SIGNALS_GENERICSIGNAL_H_
+
+#include "SignalBase2.h"
+
+#include <map>
+#include <boost/thread/locks.hpp>
+
+namespace Mad {
+namespace Net {
+namespace Signals {
+
+template <typename FunctionType>
+class GenericSignal : protected SignalBase2 {
+  public:
+    typedef FunctionType slot_type;
+
+  protected:
+    std::map<Connection2, slot_type> handlers;
+
+  public:
+    Connection2 connect(const slot_type &slot) {
+      boost::lock_guard<boost::mutex> lock(mutex);
+
+      Connection2 con = getNewConnection();
+      handlers.insert(std::make_pair(con, slot));
+
+      return con;
+    }
+
+    bool disconnect(const Connection2 &connection) {
+      boost::lock_guard<boost::mutex> 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 <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_NET_SIGNALS_SIGNAL20_H_
+#define MAD_NET_SIGNALS_SIGNAL20_H_
+
+#include "GenericSignal.h"
+#include <Net/ThreadManager.h>
+
+#include <boost/function.hpp>
+
+namespace Mad {
+namespace Net {
+namespace Signals {
+
+class Signal20 : public GenericSignal<boost::function0<void> > {
+  public:
+    void emit() {
+      boost::lock_guard<boost::mutex> lock(mutex);
+
+      for(std::map<Connection2, slot_type>::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 <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_NET_SIGNALS_SIGNAL21_H_
+#define MAD_NET_SIGNALS_SIGNAL21_H_
+
+#include "GenericSignal.h"
+#include <Net/ThreadManager.h>
+
+#include <boost/function.hpp>
+
+namespace Mad {
+namespace Net {
+namespace Signals {
+
+template <typename T1>
+class Signal21 : public GenericSignal<boost::function1<void, T1> > {
+  public:
+    void emit(T1 arg1) {
+      boost::lock_guard<boost::mutex> lock(this->mutex);
+
+      for(typename std::map<Connection2, typename GenericSignal<boost::function1<void, T1> >::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 <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_NET_SIGNALS_SIGNAL22_H_
+#define MAD_NET_SIGNALS_SIGNAL22_H_
+
+#include "GenericSignal.h"
+#include <Net/ThreadManager.h>
+
+#include <boost/function.hpp>
+
+namespace Mad {
+namespace Net {
+namespace Signals {
+
+template <typename T1, typename T2>
+class Signal22 : public GenericSignal<boost::function2<void, T1, T2> > {
+  public:
+    void emit(T1 arg1, T2 arg2) {
+      boost::lock_guard<boost::mutex> lock(this->mutex);
+
+      for(typename std::map<Connection2, typename GenericSignal<boost::function2<void, T1, T2> >::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 <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_SIGNALS_SIGNALBASE2_H_
+#define MAD_SIGNALS_SIGNALBASE2_H_
+
+#include "Connection2.h"
+
+#include <set>
+#include <boost/thread/mutex.hpp>
+
+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_ */