From: Mohamed Abukar <abukar.mohamed@nokia.com>
Date: Tue, 28 Apr 2020 14:11:33 +0000 (+0300)
Subject: Preserve the message order
X-Git-Tag: v0.4.9^0
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9cfde09a7042e9aaf0f5aa3b97cd2017915e7dbc;p=ric-plt%2Fxapp-frame.git

Preserve the message order

Change-Id: I12c3034f4fceb869bba24c5c38546bcca087445d
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>
---

diff --git a/pkg/xapp/restapi.go b/pkg/xapp/restapi.go
old mode 100644
new mode 100755
index 291a874..1eab7b6
--- a/pkg/xapp/restapi.go
+++ b/pkg/xapp/restapi.go
@@ -53,7 +53,7 @@ func NewRouter() *Router {
 func (r *Router) serviceChecker(inner http.HandlerFunc) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 		Logger.Info("restapi: method=%s url=%s", req.Method, req.URL.RequestURI())
-		if req.URL.RequestURI() == AliveURL || (Rmr.IsReady() && r.CheckStatus()) {
+		if req.URL.RequestURI() == AliveURL || r.CheckStatus() {
 			inner.ServeHTTP(w, req)
 		} else {
 			respondWithJSON(w, http.StatusServiceUnavailable, nil)
diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index 9a3116d..d310b3a 100755
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -155,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
diff --git a/pkg/xapp/types.go b/pkg/xapp/types.go
old mode 100644
new mode 100755
index 2e1eb09..251dae5
--- a/pkg/xapp/types.go
+++ b/pkg/xapp/types.go
@@ -32,6 +32,7 @@ type RMRClient struct {
 	context       unsafe.Pointer
 	ready         int
 	wg            sync.WaitGroup
+	msgWg         sync.WaitGroup
 	mux           sync.Mutex
 	stat          map[string]Counter
 	consumers     []MessageConsumer