You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2007/12/18 17:58:24 UTC
svn commit: r605251 - in /incubator/qpid/trunk/qpid/cpp/src/qpid:
broker/Connection.cpp client/Connection.cpp client/Connection.h
client/ConnectionHandler.cpp client/ExecutionHandler.cpp
client/ExecutionHandler.h framing/SendContent.cpp
Author: gsim
Date: Tue Dec 18 08:58:23 2007
New Revision: 605251
URL: http://svn.apache.org/viewvc?rev=605251&view=rev
Log:
Fixes to max frame size default and fragmentation on broker.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?rev=605251&r1=605250&r2=605251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Tue Dec 18 08:58:23 2007
@@ -46,7 +46,7 @@
broker(broker_),
outputTasks(*out_),
out(out_),
- framemax(65536),
+ framemax(65535),
heartbeat(0),
client(0),
stagingThreshold(broker.getStagingThreshold()),
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?rev=605251&r1=605250&r2=605251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Tue Dec 18 08:58:23 2007
@@ -51,7 +51,7 @@
Connection::Connection(shared_ptr<Connector> c) :
channelIdCounter(0), version(framing::highestProtocolVersion),
- max_frame_size(65536),
+ max_frame_size(65535),
isOpen(false),
impl(new ConnectionImpl(c))
{}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?rev=605251&r1=605250&r2=605251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Tue Dec 18 08:58:23 2007
@@ -74,9 +74,9 @@
* out). Optional and defaults to false.
*
* @param max_frame_size the maximum frame size that the
- * client will accept. Optional and defaults to 65536.
+ * client will accept. Optional and defaults to 65535.
*/
- Connection(bool debug = false, uint32_t max_frame_size = 65536,
+ Connection(bool debug = false, uint32_t max_frame_size = 65535,
framing::ProtocolVersion=framing::highestProtocolVersion);
Connection(boost::shared_ptr<Connector>);
~Connection();
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp?rev=605251&r1=605250&r2=605251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp Tue Dec 18 08:58:23 2007
@@ -41,7 +41,7 @@
locale = "en_US";
heartbeat = 0;
maxChannels = 32767;
- maxFrameSize = 65536;
+ maxFrameSize = 65535;
insist = true;
version = framing::highestProtocolVersion;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.cpp?rev=605251&r1=605250&r2=605251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.cpp Tue Dec 18 08:58:23 2007
@@ -206,7 +206,7 @@
if(data_length > 0){
header.setEof(false);
out(header);
- u_int32_t frag_size = maxFrameSize - (AMQFrame::frameOverhead() - 1 /*end of frame marker included in overhead but not in size*/);
+ const u_int32_t frag_size = maxFrameSize - (AMQFrame::frameOverhead() - 1 /*end of frame marker included in overhead but not in size*/);
if(data_length < frag_size){
AMQFrame frame(in_place<AMQContentBody>(content.getData()));
frame.setBof(false);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.h?rev=605251&r1=605250&r2=605251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ExecutionHandler.h Tue Dec 18 08:58:23 2007
@@ -72,7 +72,7 @@
// Allow other classes to set the out handler.
framing::FrameHandler::Chain out;
- ExecutionHandler(uint64_t maxFrameSize = 65536);
+ ExecutionHandler(uint64_t maxFrameSize = 65535);
// Incoming handler.
void handle(framing::AMQFrame& frame);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp?rev=605251&r1=605250&r2=605251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp Tue Dec 18 08:58:23 2007
@@ -30,7 +30,9 @@
bool first = frameCount == 0;
bool last = ++frameCount == expectedFrameCount;
- uint16_t maxContentSize = maxFrameSize - AMQFrame::frameOverhead();
+ /*end of frame marker is included in frameOverhead() but not in
+ real frame size, hence substract -1 from frameOverhead()*/
+ uint16_t maxContentSize = maxFrameSize - (AMQFrame::frameOverhead() - 1);
const AMQContentBody* body(f.castBody<AMQContentBody>());
if (body->size() > maxContentSize) {
uint32_t offset = 0;