X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frmr.go;h=44f0178ae807b30ed2bb874eb9ec65e951b6d3d3;hb=8dcedb41ac9ae5150847542d0a3d52c43cf35aac;hp=3cb4f8481866919390fc2fbfa757f48c5a348a0b;hpb=f49009aad3b16524cb53ae954a0711c17ec4f82a;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index 3cb4f84..44f0178 100755
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -32,7 +32,7 @@ void write_bytes_array(unsigned char *dst, void *data, int len) {
 }
 
 #cgo CFLAGS: -I../
-#cgo LDFLAGS: -lrmr_nng -lnng
+#cgo LDFLAGS: -lrmr_si
 */
 import "C"
 
@@ -81,14 +81,19 @@ type RMRParams struct {
 	SubId      int
 	Src        string
 	Mbuf       *C.rmr_mbuf_t
+	Whid       int
+	status     int
 }
 
-func NewRMRClientWithParams(protPort string, maxSize int, numWorkers int, statDesc string) *RMRClient {
+func NewRMRClientWithParams(protPort string, maxSize int, numWorkers int, threadType int, statDesc string) *RMRClient {
 	p := C.CString(protPort)
 	m := C.int(maxSize)
+	c := C.int(threadType)
 	defer C.free(unsafe.Pointer(p))
 
-	ctx := C.rmr_init(p, m, C.int(0))
+	//ctx := C.rmr_init(p, m, C.int(0))
+	//ctx := C.rmr_init(p, m, C.RMRFL_NOTHREAD)
+	ctx := C.rmr_init(p, m, c)
 	if ctx == nil {
 		Logger.Error("rmrClient: Initializing RMR context failed, bailing out!")
 	}
@@ -103,7 +108,7 @@ func NewRMRClientWithParams(protPort string, maxSize int, numWorkers int, statDe
 }
 
 func NewRMRClient() *RMRClient {
-	return NewRMRClientWithParams(viper.GetString("rmr.protPort"), viper.GetInt("rmr.maxSize"), viper.GetInt("rmr.numWorkers"), "RMR")
+	return NewRMRClientWithParams(viper.GetString("rmr.protPort"), viper.GetInt("rmr.maxSize"), viper.GetInt("rmr.numWorkers"), viper.GetInt("rmr.threadType"), "RMR")
 }
 
 func (m *RMRClient) Start(c MessageConsumer) {
@@ -111,13 +116,17 @@ func (m *RMRClient) Start(c MessageConsumer) {
 		m.consumers = append(m.consumers, c)
 	}
 
+	var counter int = 0
 	for {
-		Logger.Info("rmrClient: Waiting for RMR to be ready ...")
-
 		if m.ready = int(C.rmr_ready(m.context)); m.ready == 1 {
+			Logger.Info("rmrClient: RMR is ready after %d seconds waiting...", counter)
 			break
 		}
-		time.Sleep(10 * time.Second)
+		if counter%10 == 0 {
+			Logger.Info("rmrClient: Waiting for RMR to be ready ...")
+		}
+		time.Sleep(1 * time.Second)
+		counter++
 	}
 	m.wg.Add(m.numWorkers)
 
@@ -175,10 +184,24 @@ func (m *RMRClient) parseMessage(rxBuffer *C.rmr_mbuf_t) {
 		params.Src = strings.TrimRight(string(srcBuf[0:64]), "\000")
 	}
 
+	// Default case: a single consumer
+	if len(m.consumers) == 1 && m.consumers[0] != nil {
+		params.PayloadLen = int(rxBuffer.len)
+		params.Payload = (*[1 << 30]byte)(unsafe.Pointer(rxBuffer.payload))[:params.PayloadLen:params.PayloadLen]
+		err := m.consumers[0].Consume(params)
+		if err != nil {
+			Logger.Warn("rmrClient: Consumer returned error: %v", err)
+		}
+		return
+	}
+
+	// Special case for multiple consumers
 	for _, c := range m.consumers {
 		cptr := unsafe.Pointer(rxBuffer.payload)
 		params.Payload = C.GoBytes(cptr, C.int(rxBuffer.len))
 		params.PayloadLen = int(rxBuffer.len)
+		params.Mtype = int(rxBuffer.mtype)
+		params.SubId = int(rxBuffer.sub_id)
 
 		err := c.Consume(params)
 		if err != nil {
@@ -243,21 +266,28 @@ func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
 	}
 	C.write_bytes_array(txBuffer.payload, datap, txBuffer.len)
 
-	return m.SendBuf(txBuffer, isRts)
+	params.status = m.SendBuf(txBuffer, isRts, params.Whid)
+	if params.status == int(C.RMR_OK) {
+		return true
+	}
+	return false
 }
 
-func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) bool {
+func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool, whid int) int {
 	var (
 		currBuffer  *C.rmr_mbuf_t
-		state       bool   = true
 		counterName string = "Transmitted"
 	)
 
 	txBuffer.state = 0
-	if isRts {
-		currBuffer = C.rmr_rts_msg(m.context, txBuffer)
+	if whid != 0 {
+		currBuffer = C.rmr_wh_send_msg(m.context, C.rmr_whid_t(whid), txBuffer)
 	} else {
-		currBuffer = C.rmr_send_msg(m.context, txBuffer)
+		if isRts {
+			currBuffer = C.rmr_rts_msg(m.context, txBuffer)
+		} else {
+			currBuffer = C.rmr_send_msg(m.context, txBuffer)
+		}
 	}
 
 	if currBuffer == nil {
@@ -266,22 +296,63 @@ func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) bool {
 	}
 
 	// Just quick retry seems to help for K8s issue
-	for j := 0; j < 3 && currBuffer != nil && currBuffer.state == C.RMR_ERR_RETRY; j++ {
-		if isRts {
-			currBuffer = C.rmr_rts_msg(m.context, currBuffer)
+	maxRetryOnFailure := viper.GetInt("rmr.maxRetryOnFailure")
+	if maxRetryOnFailure == 0 {
+		maxRetryOnFailure = 5
+	}
+
+	for j := 0; j < maxRetryOnFailure && currBuffer != nil && currBuffer.state == C.RMR_ERR_RETRY; j++ {
+		if whid != 0 {
+			currBuffer = C.rmr_wh_send_msg(m.context, C.rmr_whid_t(whid), txBuffer)
 		} else {
-			currBuffer = C.rmr_send_msg(m.context, currBuffer)
+			if isRts {
+				currBuffer = C.rmr_rts_msg(m.context, txBuffer)
+			} else {
+				currBuffer = C.rmr_send_msg(m.context, txBuffer)
+			}
 		}
 	}
 
 	if currBuffer.state != C.RMR_OK {
 		counterName = "TransmitError"
-		state = m.LogMBufError("SendBuf failed", currBuffer)
+		m.LogMBufError("SendBuf failed", currBuffer)
 	}
 
 	m.UpdateStatCounter(counterName)
-	m.Free(currBuffer)
-	return state
+	defer m.Free(currBuffer)
+
+	return int(currBuffer.state)
+}
+
+func (m *RMRClient) Openwh(target string) C.rmr_whid_t {
+	return m.Wh_open(target)
+}
+
+func (m *RMRClient) Wh_open(target string) C.rmr_whid_t {
+	endpoint := C.CString(target)
+	return C.rmr_wh_open(m.context, endpoint)
+}
+
+func (m *RMRClient) Closewh(whid int) {
+	m.Wh_close(C.rmr_whid_t(whid))
+}
+
+func (m *RMRClient) Wh_close(whid C.rmr_whid_t) {
+	C.rmr_wh_close(m.context, whid)
+}
+
+func (m *RMRClient) IsRetryError(params *RMRParams) bool {
+	if params.status == int(C.RMR_ERR_RETRY) {
+		return true
+	}
+	return false
+}
+
+func (m *RMRClient) IsNoEndPointError(params *RMRParams) bool {
+	if params.status == int(C.RMR_ERR_NOENDPT) {
+		return true
+	}
+	return false
 }
 
 func (m *RMRClient) UpdateStatCounter(name string) {
@@ -321,9 +392,9 @@ func (m *RMRClient) GetRicMessageName(id int) (s string) {
 	return
 }
 
-func (m *RMRClient) LogMBufError(text string, mbuf *C.rmr_mbuf_t) bool {
+func (m *RMRClient) LogMBufError(text string, mbuf *C.rmr_mbuf_t) int {
 	Logger.Debug(fmt.Sprintf("rmrClient: %s -> [tp=%v] %v - %s", text, mbuf.tp_state, mbuf.state, RMRErrors[int(mbuf.state)]))
-	return false
+	return int(mbuf.state)
 }
 
 // To be removed ...