X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RIC-E2-TERMINATION%2FsctpThread.h;h=7112082a069e585ba469eec6a818b34306d81ccb;hb=ecd97947e72d4f1ca1016c8d1b50ede80780a49f;hp=9dfbf9d89189167d8d97f42381f2a8f2c676cd2d;hpb=84bd3343061399a2af06a34d384c56c34758d306;p=ric-plt%2Fe2.git

diff --git a/RIC-E2-TERMINATION/sctpThread.h b/RIC-E2-TERMINATION/sctpThread.h
index 9dfbf9d..7112082 100644
--- a/RIC-E2-TERMINATION/sctpThread.h
+++ b/RIC-E2-TERMINATION/sctpThread.h
@@ -84,11 +84,9 @@
 #include "cxxopts.hpp"
 //#include "config-cpp/include/config-cpp/config-cpp.h"
 
-#ifdef __TRACING__
-#include "openTracing.h"
-#endif
 
 #include "mapWrapper.h"
+#include "statCollector.h"
 
 #include "base64.h"
 
@@ -108,21 +106,19 @@ namespace expr = boost::log::expressions;
 
 #define MAXEVENTS 128
 
-#define RECEIVE_SCTP_BUFFER_SIZE (8*1024)
+#define RECEIVE_SCTP_BUFFER_SIZE (128 * 1024)
 #define RECEIVE_XAPP_BUFFER_SIZE RECEIVE_SCTP_BUFFER_SIZE 
 
 typedef mapWrapper Sctp_Map_t;
 
-#ifdef __TRACING__
-typedef const std::unique_ptr<opentracing::Span> otSpan;
-#else
-typedef const int otSpan;
-#endif
+
 
 #define VOLUME_URL_SIZE 256
+#define KA_MESSAGE_SIZE 2048
 
 typedef struct sctp_params {
     uint16_t rmrPort = 0;
+    uint16_t sctpPort = SRC_PORT;
     int      epoll_fd = 0;
     int      listenFD = 0;
     int      rmrListenFd = 0;
@@ -130,7 +126,7 @@ typedef struct sctp_params {
     int      inotifyWD = 0;
     void     *rmrCtx = nullptr;
     Sctp_Map_t *sctpMap = nullptr;
-    char      ka_message[4096] {};
+    char      ka_message[KA_MESSAGE_SIZE] {};
     int       ka_message_length = 0;
     char       rmrAddress[256] {}; // "tcp:portnumber" "tcp:5566" listen to all address on port 5566
     mdclog_severity_t logLevel = MDCLOG_INFO;
@@ -159,13 +155,13 @@ typedef struct ConnectedCU {
 
 #define MAX_RMR_BUFF_ARRY 32
 typedef struct RmrMessagesBuffer {
-    char ka_message[4096] {};
+    char ka_message[KA_MESSAGE_SIZE] {};
     int  ka_message_len = 0;
     void *rmrCtx = nullptr;
     rmr_mbuf_t *sendMessage= nullptr;
-    rmr_mbuf_t *sendBufferedMessages[MAX_RMR_BUFF_ARRY] {};
+    //rmr_mbuf_t *sendBufferedMessages[MAX_RMR_BUFF_ARRY] {};
     rmr_mbuf_t *rcvMessage= nullptr;
-    rmr_mbuf_t *rcvBufferedMessages[MAX_RMR_BUFF_ARRY] {};
+    //rmr_mbuf_t *rcvBufferedMessages[MAX_RMR_BUFF_ARRY] {};
 } RmrMessagesBuffer_t;
 
 typedef struct formatedMessage {
@@ -183,6 +179,7 @@ typedef struct ReportingMessages {
     long outLen = 0;
     unsigned char base64Data[RECEIVE_SCTP_BUFFER_SIZE * 2] {};
     char buffer[RECEIVE_SCTP_BUFFER_SIZE * 8] {};
+    StatCollector *statCollector = nullptr;
 } ReportingMessages_t;
 
 cxxopts::ParseResult parse(int argc, char *argv[], sctp_params_t &pSctpParams);
@@ -202,27 +199,23 @@ int setSocketNoBlocking(int socket);
 void handleEinprogressMessages(struct epoll_event &event,
                                ReportingMessages_t &message,
                                RmrMessagesBuffer_t &rmrMessageBuffer,
-                               sctp_params_t *params,
-                               otSpan *pSpan);
+                               sctp_params_t *params);
 
 void handlepoll_error(struct epoll_event &event,
                       ReportingMessages_t &message,
                       RmrMessagesBuffer_t &rmrMessageBuffer,
-                      sctp_params_t *params,
-                      otSpan *pSpan);
+                      sctp_params_t *params);
 
 
-void cleanHashEntry(ConnectedCU_t *peerInfo, Sctp_Map_t *m, otSpan *pSpan);
+void cleanHashEntry(ConnectedCU_t *peerInfo, Sctp_Map_t *m);
 
-int getSetupRequestMetaData(ReportingMessages_t &message, char *data, char *host, uint16_t &port, otSpan *pSpan);
 
 /**
  *
  * @param message
  * @param rmrMessageBuffer
- * @param pSpan
  */
-void getRequestMetaData(ReportingMessages_t &message, RmrMessagesBuffer_t &rmrMessageBuffer, otSpan *pSpan);
+void getRequestMetaData(ReportingMessages_t &message, RmrMessagesBuffer_t &rmrMessageBuffer);
 
 /**
  *
@@ -230,23 +223,20 @@ void getRequestMetaData(ReportingMessages_t &message, RmrMessagesBuffer_t &rmrMe
  * @param messagBuffer
  * @param message
  * @param failedMesgId
- * @param pSpan
  * @return
  */
 int sendMessagetoCu(Sctp_Map_t *sctpMap,
                     RmrMessagesBuffer_t &messagBuffer,
                     ReportingMessages_t &message,
-                    int failedMesgId, otSpan *pSpan);
+                    int failedMesgId);
 
 void sendFailedSendingMessagetoXapp(RmrMessagesBuffer_t &rmrMessageBuffer,
                                     ReportingMessages_t &message,
-                                    int failedMesgId,
-                                    otSpan *pSpan);
+                                    int failedMesgId);
 
 int sendRequestToXapp(ReportingMessages_t &message,
                       int requestId,
-                      RmrMessagesBuffer_t &rmrMmessageBuffer,
-                      otSpan *pSpan);
+                      RmrMessagesBuffer_t &rmrMmessageBuffer);
 
 /**
  *
@@ -255,7 +245,6 @@ int sendRequestToXapp(ReportingMessages_t &message,
  * @param requestType
  * @param rmrMessageBuffer
  * @param sctpMap
- * @param pSpan
  * @return
  */
 /*
@@ -263,8 +252,7 @@ int sendResponseToXapp(ReportingMessages_t &message,
                        int msgType,
                        int requestType,
                        RmrMessagesBuffer_t &rmrMessageBuffer,
-                       Sctp_Map_t *sctpMap,
-                       otSpan *pSpan);
+                       Sctp_Map_t *sctpMap);
 */
 
 /**
@@ -272,13 +260,11 @@ int sendResponseToXapp(ReportingMessages_t &message,
  * @param peerInfo
  * @param message
  * @param m
- * @param pSpan
  * @return
  */
 int sendSctpMsg(ConnectedCU_t *peerInfo,
                 ReportingMessages_t &message,
-                Sctp_Map_t *m,
-                otSpan *pSpan);
+                Sctp_Map_t *m);
 
 /**
  *
@@ -287,23 +273,20 @@ int sendSctpMsg(ConnectedCU_t *peerInfo,
  * @param numOfMessages
  * @param rmrMessageBuffer
  * @param ts
- * @param pSpan
  * @return
  */
 int receiveDataFromSctp(struct epoll_event *events,
                         Sctp_Map_t *sctpMap,
                         int &numOfMessages,
                         RmrMessagesBuffer_t &rmrMessageBuffer,
-                        struct timespec &ts,
-                        otSpan *pSpan);
+                        struct timespec &ts);
 
 /**
  *
  * @param rmrAddress
- * @param pSpan
  * @return
  */
-void getRmrContext(sctp_params_t &pSctpParams, otSpan *pSpan);
+void getRmrContext(sctp_params_t &pSctpParams);
 
 /**
  *
@@ -311,89 +294,60 @@ void getRmrContext(sctp_params_t &pSctpParams, otSpan *pSpan);
  * @param rmrCtx
  * @param sctpMap
  * @param messagBuffer
- * @param pSpan
  * @return
  */
-int receiveXappMessages(int epoll_fd,
-                        Sctp_Map_t *sctpMap,
+int receiveXappMessages(Sctp_Map_t *sctpMap,
                         RmrMessagesBuffer_t &rmrMessageBuffer,
-                        struct timespec &ts,
-                        otSpan *pSpan);
-
-/**
- *
- * @param rmrMessageBuffer
- * @param message
- * @param epoll_fd
- * @param sctpMap
- * @param pSpan
- * @return
- */
-int connectToCUandSetUp(RmrMessagesBuffer_t &rmrMessageBuffer,
-                           ReportingMessages_t &message,
-                           int epoll_fd,
-                           Sctp_Map_t *sctpMap,
-                           otSpan *pSpan);
+                        struct timespec &ts);
 
 /**
  *
  * @param messagBuffer
  * @param failedMsgId
  * @param sctpMap
- * @param pSpan
  * @return
  */
 int sendDirectionalSctpMsg(RmrMessagesBuffer_t &messagBuffer,
                            ReportingMessages_t &message,
                            int failedMsgId,
-                           Sctp_Map_t *sctpMap,
-                           otSpan *pSpan);
+                           Sctp_Map_t *sctpMap);
 /**
  *
  * @param pdu
  * @param message
  * @param rmrMessageBuffer
- * @param pSpan
  */
 void asnInitiatingRequest(E2AP_PDU_t *pdu,
                           ReportingMessages_t &message,
-                          RmrMessagesBuffer_t &rmrMessageBuffer,
-                          otSpan *pSpan);
+                          RmrMessagesBuffer_t &rmrMessageBuffer);
 /**
  *
  * @param pdu
  * @param message
  * @param sctpMap
  * @param rmrMessageBuffer
- * @param pSpan
  */
 void asnSuccsesfulMsg(E2AP_PDU_t *pdu,
                       ReportingMessages_t &message,
-                      Sctp_Map_t *sctpMap,
-                      RmrMessagesBuffer_t &rmrMessageBuffer,
-                      otSpan *pSpan);
+                      RmrMessagesBuffer_t &rmrMessageBuffer);
 /**
  *
  * @param pdu
  * @param message
  * @param sctpMap
  * @param rmrMessageBuffer
- * @param pSpan
  */
 void asnUnSuccsesfulMsg(E2AP_PDU_t *pdu,
                         ReportingMessages_t &message,
-                        Sctp_Map_t *sctpMap,
-                        RmrMessagesBuffer_t &rmrMessageBuffer,
-                        otSpan *pSpan);
+                        RmrMessagesBuffer_t &rmrMessageBuffer);
 
 /**
  *
  * @param rmrMessageBuffer
  * @param message
- * @param pSpan
  * @return
  */
-int sendRmrMessage(RmrMessagesBuffer_t &rmrMessageBuffer, ReportingMessages_t &message, otSpan *pSpan);
+int sendRmrMessage(RmrMessagesBuffer_t &rmrMessageBuffer, ReportingMessages_t &message);
 /**
  *
  * @param epoll_fd
@@ -402,10 +356,9 @@ int sendRmrMessage(RmrMessagesBuffer_t &rmrMessageBuffer, ReportingMessages_t &m
  * @param sctpMap
  * @param enodbName
  * @param msgType
- * @param pSpan
  * @returnsrc::logger_mt& lg = my_logger::get();
  */
-int addToEpoll(int epoll_fd, ConnectedCU_t *peerInfo, uint32_t events, Sctp_Map_t *sctpMap, char *enodbName, int msgType, otSpan *pSpan);
+int addToEpoll(int epoll_fd, ConnectedCU_t *peerInfo, uint32_t events, Sctp_Map_t *sctpMap, char *enodbName, int msgType);
 /**
  *
  * @param epoll_fd
@@ -414,10 +367,9 @@ int addToEpoll(int epoll_fd, ConnectedCU_t *peerInfo, uint32_t events, Sctp_Map_
  * @param sctpMap
  * @param enodbName
  * @param msgType
- * @param pSpan
  * @return
  */
-int modifyToEpoll(int epoll_fd, ConnectedCU_t *peerInfo, uint32_t events, Sctp_Map_t *sctpMap, char *enodbName, int msgType, otSpan *pSpan);
+int modifyToEpoll(int epoll_fd, ConnectedCU_t *peerInfo, uint32_t events, Sctp_Map_t *sctpMap, char *enodbName, int msgType);
 
 /**
  *