X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frmr.go;h=d310b3a0d0d3016a7ab95b4fc89b049b768b8eed;hb=9cfde09a7042e9aaf0f5aa3b97cd2017915e7dbc;hp=d90da022b7a8abf28cd5dcb14c4282f6dfbe6abb;hpb=467a99f0a3e5352ce77514ca2e3f9cc316fa9afc;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index d90da02..d310b3a 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,53 +81,69 @@ type RMRParams struct {
 	SubId      int
 	Src        string
 	Mbuf       *C.rmr_mbuf_t
+	Whid       int
+	Callid     int
+	Timeout    int
+	status     int
 }
 
-func NewRMRClient() *RMRClient {
-	p := C.CString(viper.GetString("rmr.protPort"))
-	m := C.int(viper.GetInt("rmr.maxSize"))
+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!")
 	}
 
 	return &RMRClient{
-		context:   ctx,
-		consumers: make([]MessageConsumer, 0),
-		stat:      Metric.RegisterCounterGroup(RMRCounterOpts, "RMR"),
+		protPort:   protPort,
+		numWorkers: numWorkers,
+		context:    ctx,
+		consumers:  make([]MessageConsumer, 0),
+		stat:       Metric.RegisterCounterGroup(RMRCounterOpts, statDesc),
 	}
 }
 
+func NewRMRClient() *RMRClient {
+	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) {
 	if c != nil {
 		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(viper.GetInt("rmr.numWorkers"))
+	m.wg.Add(m.numWorkers)
 
 	if m.readyCb != nil {
 		go m.readyCb(m.readyCbParams)
 	}
 
-	for w := 0; w < viper.GetInt("rmr.numWorkers"); w++ {
+	for w := 0; w < m.numWorkers; w++ {
 		go m.Worker("worker-"+strconv.Itoa(w), 0)
 	}
 	m.Wait()
 }
 
 func (m *RMRClient) Worker(taskName string, msgSize int) {
-	p := viper.GetString("rmr.protPort")
-	Logger.Info("rmrClient: '%s': receiving messages on [%s]", taskName, p)
+	Logger.Info("rmrClient: '%s': receiving messages on [%s]", taskName, m.protPort)
 
 	defer m.wg.Done()
 	for {
@@ -139,11 +155,14 @@ func (m *RMRClient) Worker(taskName string, msgSize int) {
 		}
 		m.UpdateStatCounter("Received")
 
+		m.msgWg.Add(1)
 		go m.parseMessage(rxBuffer)
+		m.msgWg.Wait()
 	}
 }
 
 func (m *RMRClient) parseMessage(rxBuffer *C.rmr_mbuf_t) {
+	defer m.msgWg.Done()
 	if len(m.consumers) == 0 {
 		Logger.Info("rmrClient: No message handlers defined, message discarded!")
 		return
@@ -170,10 +189,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 {
@@ -182,8 +215,8 @@ func (m *RMRClient) parseMessage(rxBuffer *C.rmr_mbuf_t) {
 	}
 }
 
-func (m *RMRClient) Allocate() *C.rmr_mbuf_t {
-	buf := C.rmr_alloc_msg(m.context, 0)
+func (m *RMRClient) Allocate(size int) *C.rmr_mbuf_t {
+	buf := C.rmr_alloc_msg(m.context, C.int(size))
 	if buf == nil {
 		Logger.Error("rmrClient: Allocating message buffer failed!")
 	}
@@ -205,18 +238,25 @@ func (m *RMRClient) SendRts(params *RMRParams) bool {
 	return m.Send(params, true)
 }
 
-func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
-	txBuffer := params.Mbuf
-	if txBuffer == nil {
-		txBuffer = m.Allocate()
+func (m *RMRClient) CopyBuffer(params *RMRParams) *C.rmr_mbuf_t {
+	if params.Mbuf != nil {
+		m.Free(params.Mbuf)
+		params.Mbuf = nil
 	}
 
-	txBuffer.mtype = C.int(params.Mtype)
-	txBuffer.sub_id = C.int(params.SubId)
-	txBuffer.len = C.int(len(params.Payload))
+	payLen := len(params.Payload)
 	if params.PayloadLen != 0 {
-		txBuffer.len = C.int(params.PayloadLen)
+		payLen = params.PayloadLen
+	}
+
+	txBuffer := m.Allocate(payLen)
+	if txBuffer == nil {
+		return nil
 	}
+	txBuffer.mtype = C.int(params.Mtype)
+	txBuffer.sub_id = C.int(params.SubId)
+	txBuffer.len = C.int(payLen)
+
 	datap := C.CBytes(params.Payload)
 	defer C.free(datap)
 
@@ -234,22 +274,37 @@ func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
 		}
 	}
 	C.write_bytes_array(txBuffer.payload, datap, txBuffer.len)
+	return txBuffer
+}
+
+func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
 
-	return m.SendBuf(txBuffer, isRts)
+	txBuffer := m.CopyBuffer(params)
+	if txBuffer == nil {
+		return false
+	}
+	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 {
@@ -258,22 +313,96 @@ 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) SendCallMsg(params *RMRParams) (int, string) {
+	var (
+		currBuffer  *C.rmr_mbuf_t
+		counterName string = "Transmitted"
+	)
+	txBuffer := m.CopyBuffer(params)
+	if txBuffer == nil {
+		return C.RMR_ERR_INITFAILED, ""
+	}
+
+	txBuffer.state = 0
+
+	currBuffer = C.rmr_wh_call(m.context, C.int(params.Whid), txBuffer, C.int(params.Callid), C.int(params.Timeout))
+
+	if currBuffer == nil {
+		m.UpdateStatCounter("TransmitError")
+		return m.LogMBufError("SendBuf failed", txBuffer), ""
+	}
+
+	if currBuffer.state != C.RMR_OK {
+		counterName = "TransmitError"
+		m.LogMBufError("SendBuf failed", currBuffer)
+	}
+
+	m.UpdateStatCounter(counterName)
+	defer m.Free(currBuffer)
+
+	cptr := unsafe.Pointer(currBuffer.payload)
+	payload := C.GoBytes(cptr, C.int(currBuffer.len))
+
+	return int(currBuffer.state), string(payload)
+}
+
+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) {
@@ -313,9 +442,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 ...