You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/06/26 18:39:10 UTC
svn commit: r550846 - in /incubator/qpid/trunk/qpid/cpp/src: Makefile.am
qpid/framing/FrameHandler.h qpid/framing/Handler.h tests/ tests/Handler.cpp
tests/Makefile.am
Author: aconway
Date: Tue Jun 26 09:39:07 2007
New Revision: 550846
URL: http://svn.apache.org/viewvc?view=rev&rev=550846
Log:
* src/qpid/framing/Handler.h: Tempates for handlers and handler chains.
* src/qpid/framing/FrameHandler.h: Use Handler.h templates.
* src/tests/Handler.cpp: handler chain test.
Added:
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h (with props)
incubator/qpid/trunk/qpid/cpp/src/tests/Handler.cpp (with props)
Modified:
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameHandler.h
incubator/qpid/trunk/qpid/cpp/src/tests/ (props changed)
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=550846&r1=550845&r2=550846
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Jun 26 09:39:07 2007
@@ -150,6 +150,8 @@
qpid/framing/Correlator.cpp \
qpid/framing/Value.cpp \
qpid/framing/Proxy.cpp \
+ qpid/framing/Handler.h \
+ qpid/framing/FrameHandler.h \
gen/qpid/framing/AMQP_ClientProxy.cpp \
gen/qpid/framing/AMQP_HighestVersion.h \
gen/qpid/framing/AMQP_MethodVersionMap.cpp \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameHandler.h?view=diff&rev=550846&r1=550845&r2=550846
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameHandler.h Tue Jun 26 09:39:07 2007
@@ -21,18 +21,12 @@
*
*/
-#include <boost/noncopyable.hpp>
+#include "Handler.h"
namespace qpid {
namespace framing {
class AMQFrame;
-
-class FrameHandler : private boost::noncopyable {
- public:
- virtual ~FrameHandler() {}
- virtual void handle(AMQFrame& frame) = 0;
-};
-
+typedef Handler<AMQFrame&> FrameHandler;
}}
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h?view=auto&rev=550846
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h Tue Jun 26 09:39:07 2007
@@ -0,0 +1,98 @@
+#ifndef QPID_FRAMING_HANDLER_H
+#define QPID_FRAMING_HANDLER_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "qpid/shared_ptr.h"
+#include <vector>
+#include <assert.h>
+
+namespace qpid {
+namespace framing {
+
+/** Handler for objects of type T. */
+template <class T> struct Handler {
+ typedef T Type;
+ typedef shared_ptr<Handler> Ptr;
+
+ virtual ~Handler() {}
+ virtual void handle(T) = 0;
+ virtual void link(Ptr next_) { next=next_; }
+ protected:
+ void nextHandler(T data) { if (next) next->handle(data); }
+ private:
+ Ptr next;
+};
+
+
+/** Factory interface that takes a context of type C */
+template <class T, class C> struct HandlerFactory {
+ virtual ~HandlerFactory() {}
+ typedef typename Handler<T>::Ptr Ptr;
+
+ /** Create a handler */
+ virtual Ptr create(C context) = 0;
+
+ /** Create a handler and link it to next */
+ Ptr create(C context, Ptr next) {
+ Ptr h=create(context);
+ h->link(next);
+ }
+};
+
+/** Factory implementation template */
+template <class FH, class C>
+struct HandlerFactoryImpl : public HandlerFactory<typename FH::Type, C> {
+ shared_ptr<Handler<typename FH::Type> > create(C context) {
+ return typename FH::Ptr(new FH(context));
+ }
+};
+
+/** A factory chain is a vector of handler factories used to create
+ * handler chains. The chain does not own the factories.
+ */
+template <class T, class C>
+struct HandlerFactoryChain : public std::vector<HandlerFactory<T,C>* > {
+ typedef typename Handler<T>::Ptr Ptr;
+
+ /** Create a handler chain, return the first handler.
+ *@param context - passed to each factory.
+ */
+ Ptr create(C context) {
+ return this->create(context, this->begin());
+ }
+
+ private:
+ typedef typename std::vector<HandlerFactory<T,C>*>::iterator iterator;
+ Ptr create(C context, iterator i) {
+ if (i != this->end()) {
+ Ptr h=(*i)->create(context);
+ h->link(create(context, i+1));
+ return h;
+ }
+ return Ptr();
+ }
+};
+
+}}
+
+
+#endif /*!QPID_FRAMING_HANDLER_H*/
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Handler.h
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 26 09:39:07 2007
@@ -19,3 +19,8 @@
Cluster.ais
Cluster.sh
Cpg.ais
+FrameHandler
+Cluster_child
+Cpg.sh
+dummy_test
+Handler
Added: incubator/qpid/trunk/qpid/cpp/src/tests/Handler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Handler.cpp?view=auto&rev=550846
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Handler.cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Handler.cpp Tue Jun 26 09:39:07 2007
@@ -0,0 +1,67 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#define BOOST_AUTO_TEST_MAIN // Must come before #include<boost/test/*>
+#include <boost/test/auto_unit_test.hpp>
+
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/FrameHandler.h"
+#include "test_tools.h"
+#include <boost/assign.hpp>
+
+using namespace std;
+using namespace qpid;
+using namespace qpid::framing;
+using namespace boost::assign;
+
+typedef int DummyFrame;
+typedef int DummyContext;
+vector<int> handledBy;
+
+/** Both a link and a terminal handler. */
+template <int N>
+struct TestHandler : public Handler<DummyFrame> {
+ TestHandler(DummyContext c) : context(c) {}
+
+ void handle(DummyFrame frame) {
+ handledBy.push_back(N+context);
+ nextHandler(frame);
+ }
+
+ typedef HandlerFactoryImpl<TestHandler<N>, DummyContext> Factory;
+ DummyContext context;
+};
+
+
+
+BOOST_AUTO_TEST_CASE(handlerChains) {
+ TestHandler<1>::Factory a;
+ TestHandler<2>::Factory b;
+ TestHandler<3>::Factory c;
+ HandlerFactoryChain<DummyFrame, DummyContext> factory;
+ factory.push_back(&a);
+ factory.push_back(&b);
+ factory.push_back(&c);
+ factory.create(10)->handle(1);
+
+ vector<int> expect;
+ expect = list_of(11)(12)(13);
+ BOOST_CHECK_EQUAL(expect, handledBy);
+}
+
+
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/Handler.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/Handler.cpp
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=550846&r1=550845&r2=550846
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue Jun 26 09:39:07 2007
@@ -25,6 +25,10 @@
Url_SOURCES=Url.cpp test_tools.h
Url_LDADD=-lboost_unit_test_framework $(lib_common)
+unit_progs+=Handler
+Handler_SOURCES=Handler.cpp test_tools.h
+Handler_LDADD=-lboost_unit_test_framework $(lib_common)
+
include cluster.mk
# NB: CppUnit test libraries below will be migrated to boost test programs.