X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frmr.go;h=8bbae7b3ee820ce4b249986a9ddfa916935cd4da;hb=ad2e640256c82ebb4701566d1dd5aa6999fb31ce;hp=a4955d11ebee81dbd618e503fd836a597e2816f8;hpb=775722c877ef7110cdb4e992f5c216e0e03775c4;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index a4955d1..8bbae7b 100755
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -39,7 +39,7 @@ import "C"
 import (
 	"github.com/spf13/viper"
 	"strconv"
-	"sync"
+	"strings"
 	"time"
 	"unsafe"
 )
@@ -51,21 +51,15 @@ var RMRCounterOpts = []CounterOpts{
 	{Name: "ReceiveError", Help: "The total number of RMR receive errors"},
 }
 
-// To be removed ...
-type RMRStatistics struct{}
-
-type RMRClient struct {
-	context   unsafe.Pointer
-	ready     int
-	wg        sync.WaitGroup
-	mux       sync.Mutex
-	stat      map[string]Counter
-	consumers []MessageConsumer
-	readyCb   ReadyCB
-}
-
-type MessageConsumer interface {
-	Consume(mtype int, sid int, len int, payload []byte) error
+type RMRParams struct {
+	Mtype      int
+	Payload    []byte
+	PayloadLen int
+	Meid       *RMRMeid
+	Xid        string
+	SubId      int
+	Src        string
+	Mbuf       *C.rmr_mbuf_t
 }
 
 func NewRMRClient() *RMRClient {
@@ -86,6 +80,10 @@ func NewRMRClient() *RMRClient {
 }
 
 func (m *RMRClient) Start(c MessageConsumer) {
+	if c != nil {
+		m.consumers = append(m.consumers, c)
+	}
+
 	for {
 		Logger.Info("rmrClient: Waiting for RMR to be ready ...")
 
@@ -96,18 +94,13 @@ func (m *RMRClient) Start(c MessageConsumer) {
 	}
 	m.wg.Add(viper.GetInt("rmr.numWorkers"))
 
-	if c != nil {
-		m.consumers = append(m.consumers, c)
+	if m.readyCb != nil {
+		go m.readyCb(m.readyCbParams)
 	}
 
 	for w := 0; w < viper.GetInt("rmr.numWorkers"); w++ {
 		go m.Worker("worker-"+strconv.Itoa(w), 0)
 	}
-
-	if m.readyCb != nil {
-		m.readyCb()
-	}
-
 	m.Wait()
 }
 
@@ -134,11 +127,33 @@ func (m *RMRClient) parseMessage(rxBuffer *C.rmr_mbuf_t) {
 		return
 	}
 
+	params := &RMRParams{}
+	params.Mbuf = rxBuffer
+	params.Mtype = int(rxBuffer.mtype)
+	params.SubId = int(rxBuffer.sub_id)
+	params.Meid = &RMRMeid{}
+
+	meidBuf := make([]byte, int(C.RMR_MAX_MEID))
+	if meidCstr := C.rmr_get_meid(rxBuffer, (*C.uchar)(unsafe.Pointer(&meidBuf[0]))); meidCstr != nil {
+		params.Meid.RanName = strings.TrimRight(string(meidBuf), "\000")
+	}
+
+	xidBuf := make([]byte, int(C.RMR_MAX_XID))
+	if xidCstr := C.rmr_get_xact(rxBuffer, (*C.uchar)(unsafe.Pointer(&xidBuf[0]))); xidCstr != nil {
+		params.Xid = strings.TrimRight(string(xidBuf[0:32]), "\000")
+	}
+
+	srcBuf := make([]byte, int(C.RMR_MAX_SRC))
+	if srcStr := C.rmr_get_src(rxBuffer, (*C.uchar)(unsafe.Pointer(&srcBuf[0]))); srcStr != nil {
+		params.Src = strings.TrimRight(string(srcBuf[0:64]), "\000")
+	}
+
 	for _, c := range m.consumers {
 		cptr := unsafe.Pointer(rxBuffer.payload)
-		payload := C.GoBytes(cptr, C.int(rxBuffer.len))
+		params.Payload = C.GoBytes(cptr, C.int(rxBuffer.len))
+		params.PayloadLen = int(rxBuffer.len)
 
-		err := c.Consume(int(rxBuffer.mtype), int(rxBuffer.sub_id), int(rxBuffer.len), payload)
+		err := c.Consume(params)
 		if err != nil {
 			Logger.Warn("rmrClient: Consumer returned error: %v", err)
 		}
@@ -154,24 +169,53 @@ func (m *RMRClient) Allocate() *C.rmr_mbuf_t {
 	return buf
 }
 
-func (m *RMRClient) Send(mtype int, sid int, len int, payload []byte) bool {
-	buf := m.Allocate()
+func (m *RMRClient) SendMsg(params *RMRParams) bool {
+	return m.Send(params, false)
+}
+
+func (m *RMRClient) SendRts(params *RMRParams) bool {
+	return m.Send(params, true)
+}
+
+func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
+	buf := params.Mbuf
+	if buf == nil {
+		buf = m.Allocate()
+	}
 
-	buf.mtype = C.int(mtype)
-	buf.sub_id = C.int(sid)
-	buf.len = C.int(len)
-	datap := C.CBytes(payload)
+	buf.mtype = C.int(params.Mtype)
+	buf.sub_id = C.int(params.SubId)
+	buf.len = C.int(len(params.Payload))
+	datap := C.CBytes(params.Payload)
 	defer C.free(datap)
 
-	C.write_bytes_array(buf.payload, datap, C.int(len))
+	if params != nil {
+		if params.Meid != nil {
+			b := make([]byte, int(C.RMR_MAX_MEID))
+			copy(b, []byte(params.Meid.RanName))
+			C.rmr_bytes2meid(buf, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b)))
+		}
+		xidLen := len(params.Xid)
+		if xidLen > 0 && xidLen <= C.RMR_MAX_XID {
+			b := make([]byte, int(C.RMR_MAX_MEID))
+			copy(b, []byte(params.Xid))
+			C.rmr_bytes2xact(buf, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b)))
+		}
+	}
+	C.write_bytes_array(buf.payload, datap, buf.len)
 
-	return m.SendBuf(buf)
+	return m.SendBuf(buf, isRts)
 }
 
-func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t) bool {
+func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) bool {
 	for i := 0; i < 10; i++ {
 		txBuffer.state = 0
-		txBuffer := C.rmr_send_msg(m.context, txBuffer)
+		if isRts {
+			txBuffer = C.rmr_rts_msg(m.context, txBuffer)
+		} else {
+			txBuffer = C.rmr_send_msg(m.context, txBuffer)
+		}
+
 		if txBuffer == nil {
 			break
 		} else if txBuffer.state != C.RMR_OK {
@@ -203,11 +247,6 @@ func (m *RMRClient) RegisterMetrics() {
 	m.stat = Metric.RegisterCounterGroup(RMRCounterOpts, "RMR")
 }
 
-// To be removed ...
-func (m *RMRClient) GetStat() (r RMRStatistics) {
-	return
-}
-
 func (m *RMRClient) Wait() {
 	m.wg.Wait()
 }
@@ -216,8 +255,9 @@ func (m *RMRClient) IsReady() bool {
 	return m.ready != 0
 }
 
-func (m *RMRClient) SetReadyCB(cb ReadyCB) {
+func (m *RMRClient) SetReadyCB(cb ReadyCB, params interface{}) {
 	m.readyCb = cb
+	m.readyCbParams = params
 }
 
 func (m *RMRClient) GetRicMessageId(name string) (int, bool) {
@@ -233,3 +273,8 @@ func (m *RMRClient) GetRicMessageName(id int) (s string) {
 	}
 	return
 }
+
+// To be removed ...
+func (m *RMRClient) GetStat() (r RMRStatistics) {
+	return
+}