Merge branch 'release'

Author: vlevendel

CMake/rtsdkInfo.cmake

@@ -13,8 +13,8 @@ unset(rtsdk_DEPENDS_LIST)
 set(rtsdk_INTERNAL_API_VERSION_MAJOR 3)
 set(rtsdk_INTERNAL_API_VERSION_MINOR 6)
 set(rtsdk_INTERNAL_API_VERSION_PATCH 1)
-set(rtsdk_INTERNAL_API_VERSION_TWEAK 1)
-set(rtsdk_INTERNAL_RELEASE_TWEAK L2)
+set(rtsdk_INTERNAL_API_VERSION_TWEAK 2)
+set(rtsdk_INTERNAL_RELEASE_TWEAK G1)
 set(rtsdk_RELEASE_TYPE rrg)
 
 set( librssl_SO_VERSION 14 )

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.10.3)
 # guarantee of a successful build if changed.
 
 project (rtsdk
-		VERSION 2.0.1.1
+		VERSION 2.0.1.2
 		LANGUAGES C CXX)
 
 set(rtsdk_CMAKE_DIR "${rtsdk_SOURCE_DIR}/CMake")

Cpp-C/CHANGELOG.md

@@ -9,26 +9,65 @@ There are three types of RTSDK releases that append a letter directly followed b
 "E" releases (E-Loads) are emergency RTSDK releases that are uploaded to MyRefinitiv and Developer Community but not to GitHub. Also note that emergency releases may only be partial (i.e., Java or C++/C only).
 
 ----------------------------------------------------------------------------------------
-CURRENT RELEASE HIGHLIGHTS - RTSDK C/CPP 2.0.1.L2 aka EMA 3.6.1.L2 and ETA 3.6.1.L2 
+CURRENT RELEASE HIGHLIGHTS - RTSDK C/CPP 2.0.1.G1 aka EMA 3.6.1.G1 and ETA 3.6.1.G1 
 ----------------------------------------------------------------------------------------
 
-This release removes unused files from GitHub and RRG packages 
+This is a maintenace release with fixes for customer issues 
+
+Customer Issues Resolved
+------------------
+- [Case Number: 09514087] - [RTSDK-4606] - ETA crash when a websocket client does not specify sub protocol and closes the connection 
+- [GitHub #138] - [RTSDK-3884] - EMA C++: Destructor of OmmConsumer occasionally hangs forever in deadlock
+- [GitHub #152] - [RTSDK-4291] - OmmConsumerImpl::registerClient implementation doesn't unlock mutex when exception is thrown
+- [GitHub #161] - [RTSDK-4371] - ETA compilation warning
+- [GitHub #164] - [RTSDK-4589] - In VAConsumer refresh message is received the channel is closed if the streamState is not open
+- [GitHub #168] - [RTSDK-4706] - EMA C++: configuration parameters ConnectionPingTimeout / ConnectionMinPingTimeout are applied as number of seconds, not milliseconds
+- [GitHub #170] - [RTSDK-4941] - Buggy code in rsslRDMDictionaryMsg.c
+- [GitHub #171] - [RTSDK-4957] - EMA WebSocket example default port in EmaConfig.xml
+- [GitHub #172] - [RTSDK-4951] - EMA C++ Websocket example mismatch between Readme and source code
 
 ----------------------------------------------------------------------------------------
 FULL CHANGELOG
 ----------------------------------------------------------------------------------------
 
 --------------------------------------------
-RTSDK C++/C Release 2.0.1.L2 (March 31, 2021)
+RTSDK C++/C Release 2.0.1.G1 (Apr 21, 2021)
+--------------------------------------------
+
+EMA C++ 3.6.1.G1 Issues Resolved
+--------------------------------
+- [RTSDK-3884] - EMA C++: Destructor of OmmConsumer occasionally hangs forever in deadlock - [GitHub #138]
+- [RTSDK-4291] - OmmConsumerImpl::registerClient implementation doesn't unlock mutex when exception is thrown - [GitHub #152]
+- [RTSDK-4706] - EMA C++: configuration parameters ConnectionPingTimeout / ConnectionMinPingTimeout are applied as number of seconds, not milliseconds - [GitHub #168]
+- [RTSDK-4719] - Support encryption connection type for EMAC consumer performance tool
+- [RTSDK-4951] - EMA C++ Websocket example mismatch between Readme and source code - [GitHub #172]
+- [RTSDK-4957] - EMA WebSocket example default port in EmaConfig.xml - [GitHub #171]
+- [RTSDK-4954] - Correction to IProvider180 README file
+
+ETA C 3.6.1.G1 Issues Resolved
+--------------------------------
+- [RTSDK-4371] - ETA compilation warning - [GitHub #161]
+- [RTSDK-4382] - Change RDP 'scope' default value to trapi.streaming.pricing.read
+- [RTSDK-4508] - JSON converter library fails to conform to UTF-8 when passing the JSON dictionary message over the network
+- [RTSDK-4606] - TRCERouter Crash in ETA - [Case Number: 09514087]
+- [RTSDK-4713] - ETAC: Websocket Transport should handle Sec-Websocket-Extensions with unsupported parameter: client_max_window_bits
+- [RTSDK-4727] - rsslNumericStringToReal does not return error with an input like 1151194421449.10009766
+- [RTSDK-4589] - In VAConsumer refresh message is received the channel is closed if the streamState is not open - [GitHub #164]
+- [RTSDK-4941] - Buggy code in rsslRDMDictionaryMsg.c - [GitHub #170]
+
+
+--------------------------------------------
+RTSDK C++/C Release 2.0.1.L2 (Mar 31, 2021)
 --------------------------------------------
 
 Both ETA C and EMA C++ 3.6.1.L2 Issues Resolved
----------------------------------------------------
+-----------------------------------------------
 - [RTSDK-4860, RTSDK-4861] - Remove unused EtaJni files 
 
+
 --------------------------------------------
 RTSDK C++/C Release 2.0.1.L1 (Mar 4, 2021)
----------------------------------------------
+--------------------------------------------
 
 EMA C++ 3.6.1.L1 Issues Resolved
 --------------------------------
@@ -59,7 +98,7 @@ Both ETA C and EMA C++ 3.6.1.L1 Issues Resolved
 
 --------------------------------------------
 RTSDK C++/C Release 2.0.0.L1 (Oct 19, 2020)
----------------------------------------------
+--------------------------------------------
 
 New Features Added
 ------------------

Cpp-C/Ema/EmaConfig.xml

@@ -372,7 +372,7 @@
 			<CompressionType value="CompressionType::None"/>
 			<GuaranteedOutputBuffers value="5000"/>
 			<Host value="localhost"/>
-			<Port value="14002"/>
+			<Port value="15000"/>
 			<WsMaxMsgSize value="61440"/>
 			<WsProtocols value="rssl.json.v2, rssl.rwf, tr_json2"/>
 		</Channel>
@@ -490,7 +490,7 @@
 			<GuaranteedOutputBuffers value="5000"/>
 			<ConnectionPingTimeout value="30000"/>
 			<TcpNodelay value="1"/>
-			<Port value="14002"/>
+			<Port value="15000"/>
 			<MaxFragmentSize value="6144"/>
 			<WsProtocols value="rssl.json.v2, rssl.rwf, tr_json2"/>
 		</Server>

Cpp-C/Ema/Examples/PerfTools/Common/AppUtil.cpp

@@ -7,6 +7,7 @@
 
 #include "AppUtil.h"
 #include "CtrlBreakHandler.h"
+#include "GetTime.h"
 #include "Mutex.h"
 
 #include <stdlib.h>
@@ -174,6 +175,27 @@ void AppUtil::sleep(UInt64 millisecs)
 #endif
 }
 
+void AppUtil::sleepUI(UInt64 millisecs, UInt64 millisecsQuantum)
+{
+	PerfTimeValue startTime = perftool::common::GetTime::getTimeMilli();
+	PerfTimeValue currentTime = startTime;
+	PerfTimeValue endTime = startTime + millisecs;
+	bool lastSleep = false;
+
+	while (!lastSleep && currentTime <= endTime && !CtrlBreakHandler::isTerminated())
+	{
+		if (currentTime + millisecsQuantum > endTime)
+		{
+			millisecsQuantum = endTime - currentTime;
+			lastSleep = true;
+		}
+
+		sleep(millisecsQuantum);
+
+		currentTime = perftool::common::GetTime::getTimeMilli();
+	}
+}
+
 Int32 AppUtil::getHostAddress(UInt32* address)
 {
 	char				hostName[256];

Cpp-C/Ema/Examples/PerfTools/Common/AppUtil.h

@@ -45,6 +45,7 @@ class AppUtil
 
 	static const refinitiv::ema::access::EmaString& getSysTimeStr();
 	static void sleep(refinitiv::ema::access::UInt64 millisecs);
+	static void sleepUI(refinitiv::ema::access::UInt64 millisecs, refinitiv::ema::access::UInt64 millisecsQuantum = 100);
 
 	static refinitiv::ema::access::Int32 getHostAddress(refinitiv::ema::access::UInt32* address);
 

Cpp-C/Ema/Examples/PerfTools/Common/CtrlBreakHandler.cpp

@@ -25,28 +25,34 @@ struct sigaction CtrlBreakHandler::_oldSigAction;
 CtrlBreakHandler::CtrlBreakHandler()
 {
 #if defined(WIN32)
-	SetConsoleCtrlHandler( &CtrlBreakHandler::TermHandlerRoutine, TRUE ) ;
 #else
 	bzero( &_sigAction, sizeof( _sigAction ) );
 	bzero( &_oldSigAction, sizeof( _oldSigAction ) );
-
-	_sigAction.sa_sigaction = sigAction;
-	_sigAction.sa_flags = SA_SIGINFO;
-
-	sigaction( SIGINT, &_sigAction, &_oldSigAction );
 #endif // WIN32
 }
 
-#ifndef WIN32
+#if defined(WIN32)
 void CtrlBreakHandler::registerAction()
 {
-    bzero( &_sigAction, sizeof( _sigAction ) );
-    bzero( &_oldSigAction, sizeof( _oldSigAction ) );
+	SetConsoleCtrlHandler(&CtrlBreakHandler::TermHandlerRoutine, TRUE);
+}
+#else
+void CtrlBreakHandler::registerAction()
+{
+	struct sigaction tempSigAction;
+	bzero( &tempSigAction, sizeof( tempSigAction ) );
 
-	_sigAction.sa_sigaction = sigAction;
-    _sigAction.sa_flags = SA_SIGINFO;
+	sigaction(SIGINT, NULL, &tempSigAction);
+	if (tempSigAction.sa_sigaction != sigAction)
+	{
+		bzero( &_sigAction, sizeof( _sigAction ) );
+		bzero( &_oldSigAction, sizeof( _oldSigAction ) );
 
-    sigaction( SIGINT, &_sigAction, &_oldSigAction );
+		_sigAction.sa_sigaction = sigAction;
+		_sigAction.sa_flags = SA_SIGINFO;
+
+		sigaction( SIGINT, &_sigAction, &_oldSigAction );
+	}
 }
 #endif
 
@@ -56,7 +62,8 @@ CtrlBreakHandler::~CtrlBreakHandler()
 #if defined(WIN32)
 	SetConsoleCtrlHandler( &CtrlBreakHandler::TermHandlerRoutine, FALSE );
 #else
-	sigaction( SIGINT, &_oldSigAction, NULL );
+	if (_oldSigAction.sa_sigaction != NULL)
+		sigaction( SIGINT, &_oldSigAction, NULL );
 #endif
 }
 
@@ -70,7 +77,7 @@ BOOL WINAPI CtrlBreakHandler::TermHandlerRoutine( DWORD dwCtrlType )
 	case CTRL_SHUTDOWN_EVENT:	
 	case CTRL_C_EVENT:
 		m_isTerminated = true;
-		return TRUE;
+		break;
 	}
 	return FALSE;
 }
@@ -79,6 +86,8 @@ extern "C" {
 	void CtrlBreakHandler::sigAction( int sig, siginfo_t* pSiginfo, void* pv ) 
 	{	
 		m_isTerminated = true;
+		if (_oldSigAction.sa_sigaction != NULL)
+			(_oldSigAction.sa_sigaction)(sig, pSiginfo, pv);
 	}
 }
 #endif 

Cpp-C/Ema/Examples/PerfTools/Common/CtrlBreakHandler.h

@@ -69,9 +69,13 @@ class CtrlBreakHandler
 		*/
 		static bool isTerminated() { return m_isTerminated; }
 	//@}
-#ifndef WIN32
+
+	///@name Register action handler
+	//@{
+		/** method to register a handler for CTRL-C or CTRL_BREAK
+		*/
 		static void registerAction();
-#endif
+	//@}
 
 private:
 

Cpp-C/Ema/Examples/PerfTools/EmaCppConsPerf/ConsPerfConfig.cpp

@@ -12,7 +12,7 @@ statsFilename("ConsStats"), writeStatsInterval(5), displayStats(true), logLatenc
 itemRequestCount(100000), commonItemCount(0), itemRequestsPerSec(35000), requestSnapshots(false),
 serviceName("DIRECT_FEED"), useServiceId(false), useUserDispatch( false ), itemFilename("350k.xml"),
 msgFilename("MsgData.xml"), postsPerSec(0), latencyPostsPerSec(0), genMsgsPerSec(0), latencyGenMsgsPerSec(0), apiThreadBindList(0),
-websocketProtocol(NoWebSocketEnum)
+consumerName(""), websocketProtocol(NoWebSocketEnum)
 {
 	apiThreadBindList = new long[1];
 	apiThreadBindList[0] = -1;	
@@ -52,6 +52,8 @@ void ConsPerfConfig::clearPerfConfig()
 	msgFilename = "MsgData.xml";
 	useServiceId = false;
 	useUserDispatch = false;
+	consumerName = "";
+	websocketProtocol = NoWebSocketEnum;
 }
 
 ConsPerfConfig::~ConsPerfConfig()

Cpp-C/Ema/Examples/PerfTools/EmaCppConsPerf/ConsPerfConfig.h

@@ -54,6 +54,8 @@ class ConsPerfConfig : public PerfConfig
 	Int32			_requestsPerTickRemainder;
 	long			*apiThreadBindList;	// CPU ID list for threads that handle connections.  See -threads 
 
+	EmaString		consumerName;				// Name of the Consumer component in EmaConfig.xml. See -consumerName.
+
 	enum WebsocketProtocol
 	{
 		NoWebSocketEnum,