From 55da181788fefcea1333ffa2dc726960eff51a29 Mon Sep 17 00:00:00 2001 From: Matt Broadstone Date: Mon, 9 Jun 2014 19:39:09 -0400 Subject: [PATCH] a little closer to proper tuning --- src/amqp_client.cpp | 7 ++++--- tests/auto/qamqpclient/tst_qamqpclient.cpp | 8 ++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/amqp_client.cpp b/src/amqp_client.cpp index 62e3650..ba7a930 100644 --- a/src/amqp_client.cpp +++ b/src/amqp_client.cpp @@ -319,9 +319,10 @@ void ClientPrivate::tune(const Frame::Method &frame) stream >> frame_max; stream >> heartbeat_delay; - channelMax = qMax(channel_max, channelMax); - heartbeatDelay = qMax(heartbeat_delay, heartbeatDelay); - frameMax = qMax(frame_max, frameMax); + if (!frameMax) + frameMax = frame_max; + channelMax = !channelMax ? channel_max : qMax(channel_max, channelMax); + heartbeatDelay = !heartbeatDelay ? heartbeat_delay: qMax(heartbeat_delay, heartbeatDelay); qAmqpDebug(">> channel_max: %d", channelMax); qAmqpDebug(">> frame_max: %d", frameMax); diff --git a/tests/auto/qamqpclient/tst_qamqpclient.cpp b/tests/auto/qamqpclient/tst_qamqpclient.cpp index 2cae962..0046d8e 100644 --- a/tests/auto/qamqpclient/tst_qamqpclient.cpp +++ b/tests/auto/qamqpclient/tst_qamqpclient.cpp @@ -71,20 +71,16 @@ void tst_QAMQPClient::autoReconnect() void tst_QAMQPClient::tune() { - // NOTE: this is totally incomplete, but the framework is here to - // test it. currently, only channel_max matters since the default - // from rabbit is 0. - Client client; client.setChannelMax(15); - client.setFrameMax(1000); + client.setFrameMax(5000); client.setHeartbeatDelay(600); client.connectToHost(); QVERIFY(waitForSignal(&client, SIGNAL(connected()))); QCOMPARE((int)client.channelMax(), 15); QCOMPARE((int)client.heartbeatDelay(), 600); - QCOMPARE((int)client.frameMax(), 131072); + QCOMPARE((int)client.frameMax(), 5000); client.disconnectFromHost(); QVERIFY(waitForSignal(&client, SIGNAL(disconnected())));