X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fxapp-utils%2Fxapp_rmr.cc;h=31cf774a68e7ed442b4a0d9065e138d69fb28bce;hb=refs%2Fchanges%2F07%2F4907%2F2;hp=f7576679219fb4cb5ce45a9461effbf212a3533b;hpb=433b7b2a72c174c75ce2c0c75b225fa0bb813d32;p=ric-app%2Fhw.git

diff --git a/src/xapp-utils/xapp_rmr.cc b/src/xapp-utils/xapp_rmr.cc
index f757667..31cf774 100755
--- a/src/xapp-utils/xapp_rmr.cc
+++ b/src/xapp-utils/xapp_rmr.cc
@@ -1,7 +1,7 @@
 /*
 ==================================================================================
 
-        Copyright (c) 2018-2019 AT&T Intellectual Property.
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,20 +20,19 @@
 
 #include "xapp_rmr.hpp"
 
-XappRmr::XappRmr(std::string xname, std::string port, int rmrattempts){
+XappRmr::XappRmr(std::string port, int rmrattempts){
 
 	_proto_port = port;
-	_xapp_name = xname;
 	_nattempts = rmrattempts;
 	_xapp_rmr_ctx = NULL;
 	_xapp_received_buff = NULL;
 	_xapp_send_buff =NULL;
 	_rmr_is_ready = false;
+	_listen = false;
 
 };
 
 XappRmr::~XappRmr(void){
-
 	// free memory
 	if(_xapp_received_buff)
 		rmr_free_msg(_xapp_received_buff);
@@ -47,7 +46,8 @@ XappRmr::~XappRmr(void){
 };
 
 //Get RMR Context.
-void XappRmr::xapp_rmr_init(){
+void XappRmr::xapp_rmr_init(bool rmr_listen){
+
 
 	// Initialize the RMR context
 	_xapp_rmr_ctx = rmr_init(const_cast<char*>(_proto_port.c_str()), RMR_MAX_RCV_BYTES, RMRFL_NONE);
@@ -62,60 +62,113 @@ void XappRmr::xapp_rmr_init(){
 	_rmr_is_ready = true;
 	mdclog_write(MDCLOG_INFO,"RMR Context is Ready, file= %s, line=%d",__FILE__,__LINE__);
 
+	//Set the listener requirement
+	_listen = rmr_listen;
 	return;
 
 }
 
-bool XappRmr::xapp_rmr_rts()
-{
-	_xapp_send_buff = rmr_realloc_payload( _xapp_send_buff, 128, false, false );  // ensure payload is large enough
-	strncpy( (char*)_xapp_send_buff->payload, "OK\n", rmr_payload_size( _xapp_send_buff) );
-	rmr_rts_msg(_xapp_rmr_ctx, _xapp_send_buff );
-	_xapp_send_buff = NULL;
+bool XappRmr::rmr_header(xapp_rmr_header *hdr){
+
+	_xapp_send_buff->mtype  = hdr->message_type;
+	_xapp_send_buff->len = hdr->payload_length;
+	_xapp_send_buff->sub_id = -1;
+	rmr_str2meid(_xapp_send_buff, hdr->meid);
+
+
 	return true;
 }
 
 //RMR Send with payload and header.
 bool XappRmr::xapp_rmr_send(xapp_rmr_header *hdr, void *payload){
 
+	// Get the thread id
+	std::thread::id my_id = std::this_thread::get_id();
+	std::stringstream thread_id;
+	std::stringstream ss;
+
+	thread_id << my_id;
+	mdclog_write(MDCLOG_INFO, "Sending thread %s",  thread_id.str().c_str());
+
+
+	int rmr_attempts = _nattempts;
+
 	if( _xapp_send_buff == NULL ) {
 		_xapp_send_buff = rmr_alloc_msg(_xapp_rmr_ctx, RMR_DEF_SIZE);
 	}
 
-
-	_xapp_send_buff->mtype  = hdr->message_type;
+	bool res = rmr_header(hdr);
+	if(!res){
+		mdclog_write(MDCLOG_ERR,"RMR HEADERS were incorrectly populated, file= %s, line=%d",__FILE__,__LINE__);
+		return false;
+	}
 
 	memcpy(_xapp_send_buff->payload, payload, hdr->payload_length);
-
 	_xapp_send_buff->len = hdr->payload_length;
+
 	if(!_rmr_is_ready) {
 		mdclog_write(MDCLOG_ERR,"RMR Context is Not Ready in SENDER, file= %s, line=%d",__FILE__,__LINE__);
 		return false;
 	}
-	if( _xapp_send_buff == NULL ) {
-		return false;
-	}
 
+	while(rmr_attempts > 0){
 
-	while(_nattempts > 0){
 		_xapp_send_buff = rmr_send_msg(_xapp_rmr_ctx,_xapp_send_buff);
-
 		if(!_xapp_send_buff) {
-			mdclog_write(MDCLOG_ERR,"Error In Sending Message , file= %s, line=%d",__FILE__,__LINE__);
-			_nattempts--;
+			mdclog_write(MDCLOG_ERR,"Error In Sending Message , file= %s, line=%d, attempt=%d",__FILE__,__LINE__,rmr_attempts);
+			rmr_attempts--;
 		}
 		else if (_xapp_send_buff->state == RMR_OK){
-			mdclog_write(MDCLOG_INFO,"The okay message is %d, file= %s, line=%d", RMR_OK, __FILE__,__LINE__);
-			_nattempts = 0;
+			mdclog_write(MDCLOG_INFO,"Message Sent: RMR State = RMR_OK");
+			rmr_attempts = 0;
+			_xapp_send_buff = NULL;
 			return true;
 		}
 		else
 		{
-			mdclog_write(MDCLOG_INFO,"Need to retry RMR MSG NUM %d, file= %s, line=%d",_xapp_send_buff->state, __FILE__,__LINE__);
-			_nattempts--;
+			mdclog_write(MDCLOG_INFO,"Need to retry RMR: state=%d, attempt=%d, file=%s, line=%d",_xapp_send_buff->state, rmr_attempts,__FILE__,__LINE__);
+			if(_xapp_send_buff->state == RMR_ERR_RETRY){
+				usleep(1);			}
+				rmr_attempts--;
 		}
 		sleep(1);
 	}
 	return false;
 }
 
+//----------------------------------------
+// Some get/set methods
+//---------------------------------------
+bool XappRmr::get_listen(void){
+  return _listen;
+}
+
+
+void XappRmr::set_listen(bool listen){
+  _listen = listen;
+}
+
+int XappRmr::get_is_ready(void){
+  return _rmr_is_ready;
+}
+
+bool XappRmr::get_isRunning(void){
+  return _listen;
+}
+
+
+void * XappRmr::get_rmr_context(void){
+  return _xapp_rmr_ctx;
+}
+
+
+void init_logger(const char  *AppName, mdclog_severity_t log_level)
+{
+    mdclog_attr_t *attr;
+    mdclog_attr_init(&attr);
+    mdclog_attr_set_ident(attr, AppName);
+    mdclog_init(attr);
+    mdclog_level_set(log_level);
+    mdclog_attr_destroy(attr);
+}
+