X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=4f5c4fd41f4a8aedfde3a1c1be3880cdf40a0d13;hb=refs%2Fchanges%2F22%2F2122%2F2;hp=c3499212e1c8358116afcbddfa62f818d4b6bccb;hpb=93cc3e245f87798c8753209980817727e0648401;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index c349921..4f5c4fd 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -19,11 +19,15 @@
 
 package control
 
-import "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+import (
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"sync"
+)
 
 type Registry struct {
 	register map[uint16]bool
 	counter  uint16
+	mutex    sync.Mutex
 }
 
 // This method should run as a constructor
@@ -33,18 +37,30 @@ func (r *Registry) Initialize(seedsn uint16) {
 }
 
 // Reserves and returns the next free sequence number
-func (r *Registry) ReserveSequenceNumber() uint16 {
-	if r.IsValidSequenceNumber(r.counter){
-
-	}
+func (r *Registry) ReserveSequenceNumber() (uint16, bool) {
+	// Check is current SequenceNumber valid
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 	sequenceNumber := r.counter
+	if _, ok := r.register[sequenceNumber]; ok {
+		xapp.Logger.Error("Invalid SeqenceNumber sequenceNumber: %v", sequenceNumber)
+		return sequenceNumber, false
+	}
 	r.register[sequenceNumber] = false
-	r.shift()
-	return sequenceNumber
+
+	// Allocate next SequenceNumber value
+	if r.counter == 65535 {
+		r.counter = 0
+	} else {
+		r.counter++
+	}
+	return sequenceNumber, true
 }
 
 // This function checks the validity of the given subscription id
 func (r *Registry) IsValidSequenceNumber(sn uint16) bool {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 	xapp.Logger.Debug("Registry map: %v", r.register)
 	if _, ok := r.register[sn]; ok {
 		return true
@@ -54,23 +70,26 @@ func (r *Registry) IsValidSequenceNumber(sn uint16) bool {
 
 // This function sets the give id as confirmed in the register
 func (r *Registry) setSubscriptionToConfirmed(sn uint16) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 	r.register[sn] = true
 }
 
-func (r *Registry) shift() {
-	if r.counter == 65535 {
-		r.counter = 0
-	} else {
-		r.counter++
-	}
-}
-
 //This function sets the given id as unused in the register
 func (r *Registry) deleteSubscription(sn uint16) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 	r.register[sn] = false
 }
 
 //This function releases the given id as unused in the register
-//func (r *Registry) releaseSequenceNumber(sn uint16) {
-//	delete(r.register, sn)
-//}
\ No newline at end of file
+func (r *Registry) releaseSequenceNumber(sn uint16) bool {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	if _, ok := r.register[sn]; ok {
+		delete(r.register, sn)
+		return true
+	} else {
+		return false
+	}
+}