X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frmr.go;h=90777925100223feaa5cf7b5ec8d61aea72f4221;hb=f0ee2c6552c6ea705c6c015e2a4e263532a4ce44;hp=9b1edd77451305dcc1e2308ea32bfff3d5327f70;hpb=2e78e42c5896b61b77ab3a97e45704f6749161b2;p=ric-plt%2Fxapp-frame.git diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go index 9b1edd7..9077792 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,40 +51,38 @@ 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 -} - -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 { - r := &RMRClient{} - r.consumers = make([]MessageConsumer, 0) - p := C.CString(viper.GetString("rmr.protPort")) m := C.int(viper.GetInt("rmr.maxSize")) defer C.free(unsafe.Pointer(p)) - r.context = C.rmr_init(p, m, C.int(0)) - if r.context == nil { - Logger.Fatal("rmrClient: Initializing RMR context failed, bailing out!") + ctx := C.rmr_init(p, m, C.int(0)) + if ctx == nil { + Logger.Error("rmrClient: Initializing RMR context failed, bailing out!") } - return r + return &RMRClient{ + context: ctx, + consumers: make([]MessageConsumer, 0), + stat: Metric.RegisterCounterGroup(RMRCounterOpts, "RMR"), + } } func (m *RMRClient) Start(c MessageConsumer) { - m.RegisterMetrics() + if c != nil { + m.consumers = append(m.consumers, c) + } for { Logger.Info("rmrClient: Waiting for RMR to be ready ...") @@ -96,14 +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) } - m.Wait() } @@ -130,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) } @@ -144,51 +163,89 @@ 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) if buf == nil { - Logger.Fatal("rmrClient: Allocating message buffer failed!") + Logger.Error("rmrClient: Allocating message buffer failed!") } - return buf } -func (m *RMRClient) Send(mtype int, sid int, len int, payload []byte) bool { - buf := m.Allocate() - - buf.mtype = C.int(mtype) - buf.sub_id = C.int(sid) - buf.len = C.int(len) - datap := C.CBytes(payload) - defer C.free(datap) +func (m *RMRClient) Free(mbuf *C.rmr_mbuf_t) { + if mbuf == nil { + Logger.Error("rmrClient: Can't free mbuffer, given nil pointer") + return + } + C.rmr_free_msg(mbuf) +} - C.write_bytes_array(buf.payload, datap, C.int(len)) +func (m *RMRClient) SendMsg(params *RMRParams) bool { + return m.SendBuffer(params, false) +} - return m.SendBuf(buf) +func (m *RMRClient) SendRts(params *RMRParams) bool { + return m.SendBuffer(params, true) } -func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t) bool { +func (m *RMRClient) SendBuffer(params *RMRParams, isRts bool) bool { + defer m.Free(params.Mbuf) for i := 0; i < 10; i++ { - txBuffer.state = 0 - txBuffer := C.rmr_send_msg(m.context, txBuffer) - if txBuffer == nil { - break - } else if txBuffer.state != C.RMR_OK { - if txBuffer.state != C.RMR_ERR_RETRY { - time.Sleep(100 * time.Microsecond) - m.UpdateStatCounter("TransmitError") - } - for j := 0; j < 100 && txBuffer.state == C.RMR_ERR_RETRY; j++ { - txBuffer = C.rmr_send_msg(m.context, txBuffer) - } - } - - if txBuffer.state == C.RMR_OK { + errCode := m.Send(params, isRts) + if errCode == C.RMR_OK { m.UpdateStatCounter("Transmitted") return true } + if errCode != C.RMR_ERR_RETRY { + Logger.Error("rmrClient: rmr_send returned hard error - %d", errCode) + break + } + } m.UpdateStatCounter("TransmitError") return false } +func (m *RMRClient) Send(params *RMRParams, isRts bool) C.int { + txBuffer := params.Mbuf + if txBuffer == nil { + txBuffer = m.Allocate() + } + + txBuffer.mtype = C.int(params.Mtype) + txBuffer.sub_id = C.int(params.SubId) + txBuffer.len = C.int(len(params.Payload)) + if params.PayloadLen != 0 { + txBuffer.len = C.int(params.PayloadLen) + } + datap := C.CBytes(params.Payload) + defer C.free(datap) + + if params != nil { + if params.Meid != nil { + b := make([]byte, int(C.RMR_MAX_MEID)) + copy(b, []byte(params.Meid.RanName)) + C.rmr_bytes2meid(txBuffer, (*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(txBuffer, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b))) + } + } + C.write_bytes_array(txBuffer.payload, datap, txBuffer.len) + + txBuffer.state = 0 + currBuffer := txBuffer + if isRts { + currBuffer = C.rmr_rts_msg(m.context, txBuffer) + } else { + currBuffer = C.rmr_send_msg(m.context, txBuffer) + } + + if currBuffer != nil { + return currBuffer.state + } + return -1 +} + func (m *RMRClient) UpdateStatCounter(name string) { m.mux.Lock() m.stat[name].Inc() @@ -199,11 +256,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() } @@ -212,6 +264,26 @@ func (m *RMRClient) IsReady() bool { return m.ready != 0 } -func (m *RMRClient) GetRicMessageId(mid string) int { - return RICMessageTypes[mid] +func (m *RMRClient) SetReadyCB(cb ReadyCB, params interface{}) { + m.readyCb = cb + m.readyCbParams = params +} + +func (m *RMRClient) GetRicMessageId(name string) (int, bool) { + id, ok := RICMessageTypes[name] + return id, ok +} + +func (m *RMRClient) GetRicMessageName(id int) (s string) { + for k, v := range RICMessageTypes { + if id == v { + return k + } + } + return +} + +// To be removed ... +func (m *RMRClient) GetStat() (r RMRStatistics) { + return }