Hi Alan, The Cruise Control boxes I keep an eye on are failing to build the C++ code after this commit:
make[3]: *** No rule to make target `qpid/sys/LatencyMetric.cpp', needed by `qpid/sys/LatencyMetric.lo'. Stop. Are you also seeing this? Cheers Martin 2009/4/15 <[email protected]>: > Author: aconway > Date: Wed Apr 15 17:50:10 2009 > New Revision: 765286 > > URL: http://svn.apache.org/viewvc?rev=765286&view=rev > Log: > Removed un-used LatencyMetric hack: missed in lat commit. > > Modified: > qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.cpp > qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.h > qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp > > Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.cpp > URL: > http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.cpp?rev=765286&r1=765285&r2=765286&view=diff > ============================================================================== > --- qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.cpp (original) > +++ qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.cpp Wed Apr 15 17:50:10 > 2009 > @@ -28,9 +28,7 @@ > > EventFrame::EventFrame(const EventHeader& e, const framing::AMQFrame& f, int > rc) > : connectionId(e.getConnectionId()), frame(f), readCredit(rc), > type(e.getType()) > -{ > - QPID_LATENCY_INIT(frame); > -} > +{} > > std::ostream& operator<<(std::ostream& o, const EventFrame& e) { > if (e.frame.getBody()) o << e.frame; > > Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.h > URL: > http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.h?rev=765286&r1=765285&r2=765286&view=diff > ============================================================================== > --- qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.h (original) > +++ qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.h Wed Apr 15 17:50:10 > 2009 > @@ -55,8 +55,6 @@ > void mcast(const Event& e); > /** End holding mode, held events are mcast */ > void release(); > - /** Call when events are self-delivered to manage flow control. */ > - void selfDeliver(const Event&); > > private: > typedef sys::PollableQueue<Event> PollableEventQueue; > > Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp > URL: > http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp?rev=765286&r1=765285&r2=765286&view=diff > ============================================================================== > --- qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp (original) > +++ qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp Wed Apr 15 > 17:50:10 2009 > @@ -48,7 +48,6 @@ > } > if (!parent.isCatchUp()) > sent += f.encodedSize(); > - QPID_LATENCY_RECORD("up to write queue", f); > } > > void OutputInterceptor::activateOutput() { > @@ -99,7 +98,6 @@ > // Send a doOutput request if one is not already in flight. > void OutputInterceptor::sendDoOutput() { > if (!parent.isLocal()) return; > - QPID_LATENCY_INIT(*this); > doingOutput = true; > size_t request = writeEstimate.sending(getBuffered()); > > > > > --------------------------------------------------------------------- > Apache Qpid - AMQP Messaging Implementation > Project: http://qpid.apache.org > Use/Interact: mailto:[email protected] > > -- Martin Ritchie --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
