* fine tuned TCP_NODELAY && TCP_CORK

* scores can get retrieved from within running game as well
velnias75 · Aug 18, 2015 · 1421152 · 1421152
1 parent 6a23076
commit 1421152
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/client/abstractclient.cpp b/src/client/abstractclient.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "base64.h"
+#include "tcpopt_cork.h"
 #include "tcpopt_nodelay.h"
 #include "abstractclientv05impl.h"      // for AbstractClientV05Impl
 #include "logger.h"                     // for BasicLogger, logDebug
@@ -271,10 +272,14 @@ throw(NetMauMau::Common::Exception::SocketException) {
 void AbstractClientV05::play(timeval *timeout)
 throw(NetMauMau::Common::Exception::SocketException) {
 
-	TCPOPT_NODELAY(_pimpl->m_connection.getSocketFD());
+	{
+		TCPOPT_CORK(_pimpl->m_connection.getSocketFD());
 
-	_pimpl->m_connection.setTimeout(timeout);
-	_pimpl->m_connection.connect(this, _pimpl->m_pngData.data(), _pimpl->m_pngData.size());
+		_pimpl->m_connection.setTimeout(timeout);
+		_pimpl->m_connection.connect(this, _pimpl->m_pngData.data(), _pimpl->m_pngData.size());
+	}
+
+	TCPOPT_NODELAY(_pimpl->m_connection.getSocketFD());
 
 	AbstractClientV05Impl::PNGDATA().swap(_pimpl->m_pngData);
 
@@ -822,9 +827,6 @@ throw(NetMauMau::Common::Exception::SocketException) {
 
 AbstractClientV09::SCORES AbstractClientV09::getScores(SCORE_TYPE::_scoreType type,
 		std::size_t limit, timeval *timeout) throw(NetMauMau::Common::Exception::SocketException) {
-
-	if(_pimpl->m_playing) throw Exception::ScoresException("Attempt to get scores in running game");
-
 	_pimpl->m_connection.setTimeout(timeout);
 	return _pimpl->m_connection.getScores(type, limit);
 }

diff --git a/src/client/clientconnection.cpp b/src/client/clientconnection.cpp
@@ -110,6 +110,7 @@ Connection::PLAYERINFOS Connection::playerList(const IPlayerPicListener *hdl, bo
 throw(NetMauMau::Common::Exception::SocketException) {
 
 	BLOCK_MOST_SIGNALS;
+	TCPOPT_CORK(getSocketFD());
 
 	PLAYERINFOS plv;
 
@@ -184,7 +185,7 @@ Connection::CAPABILITIES Connection::capabilities()
 throw(NetMauMau::Common::Exception::SocketException) {
 
 	BLOCK_ALL_SIGNALS;
-	TCPOPT_NODELAY(getSocketFD());
+	TCPOPT_CORK(getSocketFD());
 
 	Connection::CAPABILITIES caps;
 
@@ -218,7 +219,7 @@ Connection::SCORES Connection::getScores(SCORE_TYPE::_scoreType type, std::size_
 throw(NetMauMau::Common::Exception::SocketException) {
 
 	BLOCK_ALL_SIGNALS;
-	TCPOPT_NODELAY(getSocketFD());
+	TCPOPT_CORK(getSocketFD());
 
 	try {