X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frmr.go;h=6707ab90c681ee82c625184be2eb803301edec02;hb=refs%2Ftags%2Fad0a271;hp=a25b34084436c562b1f928b90917aaaf298bd1c2;hpb=791a77f091dff826c4ee5d27d0c3da61d4805c00;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index a25b340..6707ab9 100755
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -81,15 +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!")
 	}
@@ -104,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) {
@@ -180,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 {
@@ -248,24 +266,28 @@ func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
 	}
 	C.write_bytes_array(txBuffer.payload, datap, txBuffer.len)
 
-	params.status = 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) int {
+func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool, whid int) int {
 	var (
 		currBuffer  *C.rmr_mbuf_t
 		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 {
@@ -280,10 +302,14 @@ func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) int {
 	}
 
 	for j := 0; j < maxRetryOnFailure && currBuffer != nil && currBuffer.state == C.RMR_ERR_RETRY; j++ {
-		if isRts {
-			currBuffer = C.rmr_rts_msg(m.context, currBuffer)
+		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)
+			}
 		}
 	}
 
@@ -293,11 +319,28 @@ func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) int {
 	}
 
 	m.UpdateStatCounter(counterName)
-	m.Free(currBuffer)
+	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