foundational changes; tying up some loose ends

[chaz/yoink] / src / Moof / Dispatcher.cc

diff --git a/src/Moof/Dispatcher.cc b/src/Moof/Dispatcher.cc
deleted file mode 100644 (file)
index 3207464..0000000
--- a/src/Moof/Dispatcher.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include <map>
-
-#include "Dispatcher.hh"
-
-
-namespace Mf {
-
-
-class Dispatcher::Impl
-{
-       friend class Dispatcher;
-
-       Impl() :
-               mId(1) {}
-
-       Dispatcher::Handler getNewHandler()
-       {
-               mId += 2;
-               return (Dispatcher::Handler)mId;
-       }
-
-       typedef std::pair<Dispatcher::Handler,Dispatcher::Function>     Callback;
-       typedef std::multimap<std::string,Callback>                                     CallbackLookup;
-       typedef CallbackLookup::iterator                                                        CallbackIter;
-
-       typedef std::multimap<Dispatcher::Handler,std::string>          HandlerLookup;
-       typedef HandlerLookup::iterator                                                         HandlerIter;
-
-
-       inline Handler addHandler(const std::string& message,
-                       const Function& callback, Handler id)
-       {
-               mCallbacks.insert(std::make_pair(message, std::make_pair(id, callback)));
-               mHandlers.insert(std::make_pair(id, message));
-
-               return id;
-       }
-
-       inline void removeHandler(Handler id)
-       {
-               std::pair<HandlerIter,HandlerIter> matching(mHandlers.equal_range(id));
-
-               for (HandlerIter it = matching.first; it != matching.second; ++it)
-               {
-                       CallbackIter first = mCallbacks.find((*it).second);
-                       CallbackIter last = mCallbacks.end();
-
-                       for (CallbackIter jt = first; jt != last; ++jt)
-                       {
-                               if ((*jt).second.first == id)
-                               {
-                                       mCallbacks.erase(jt);
-                                       break;
-                               }
-                       }
-               }
-
-               mHandlers.erase(id);
-       }
-
-       void dispatch(const std::string& message, const Notification* param)
-       {
-               std::pair<CallbackIter,CallbackIter>
-                       callbacks(mCallbacks.equal_range(message));
-
-               for (CallbackIter it = callbacks.first; it != callbacks.second; ++it)
-               {
-                       Function callback = (*it).second.second;
-                       callback(param);
-               }
-       }
-
-
-       unsigned long   mId;
-
-       CallbackLookup  mCallbacks;
-       HandlerLookup   mHandlers;
-};
-
-
-Dispatcher::Dispatcher() :
-       mImpl(new Dispatcher::Impl) {}
-
-Dispatcher::~Dispatcher() {}
-
-
-Dispatcher& Dispatcher::getInstance()
-{
-       static Dispatcher dispatcher;
-       return dispatcher;
-}
-
-
-Dispatcher::Handler Dispatcher::addHandler(const std::string& message,
-               const Function& callback)
-{
-       return addHandler(message, callback, mImpl->getNewHandler());
-}
-
-Dispatcher::Handler Dispatcher::addHandler(const std::string& message,
-               const Function& callback, Handler id)
-{
-       // pass through
-       return mImpl->addHandler(message, callback, id);
-}
-
-
-void Dispatcher::removeHandler(Handler id)
-{
-       // pass through
-       return mImpl->removeHandler(id);
-}
-
-
-void Dispatcher::dispatch(const std::string& message, const Notification* param)
-{
-       // pass through
-       mImpl->dispatch(message, param);
-}
-
-
-} // namespace Mf
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-