RICPLT-2988 Unittest timing issues during retransmission case

[ric-plt/submgr.git] / pkg / control / registry.go

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index c349921..3d70d63 100644 (file)
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -19,32 +19,78 @@
 
 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 Subscription struct {
+       Seq    uint16
+       Active bool
+}
+
+func (s *Subscription) Confirmed() {
+       s.Active = true
+}
+
+func (s *Subscription) UnConfirmed() {
+       s.Active = false
+}
+
+func (s *Subscription) IsConfirmed() bool {
+       return s.Active
+}
 
 type Registry struct {
-       register map[uint16]bool
+       register map[uint16]*Subscription
        counter  uint16
+       mutex    sync.Mutex
 }
 
 // This method should run as a constructor
 func (r *Registry) Initialize(seedsn uint16) {
-       r.register = make(map[uint16]bool)
+       r.register = make(map[uint16]*Subscription)
        r.counter = seedsn
 }
 
 // Reserves and returns the next free sequence number
-func (r *Registry) ReserveSequenceNumber() uint16 {
-       if r.IsValidSequenceNumber(r.counter){
+func (r *Registry) ReserveSubscription() *Subscription {
+       // Check is current SequenceNumber valid
+       // Allocate next SequenceNumber value and retry N times
+       r.mutex.Lock()
+       defer r.mutex.Unlock()
+       var subs *Subscription = nil
+       var retrytimes uint16 = 1000
+       for ; subs == nil && retrytimes > 0; retrytimes-- {
+               sequenceNumber := r.counter
+               if r.counter == 65535 {
+                       r.counter = 0
+               } else {
+                       r.counter++
+               }
+               if _, ok := r.register[sequenceNumber]; ok == false {
+                       r.register[sequenceNumber] = &Subscription{sequenceNumber, false}
+                       return r.register[sequenceNumber]
+               }
+       }
+       return nil
+}
 
+// This function checks the validity of the given subscription id
+func (r *Registry) GetSubscription(sn uint16) *Subscription {
+       r.mutex.Lock()
+       defer r.mutex.Unlock()
+       xapp.Logger.Debug("Registry map: %v", r.register)
+       if _, ok := r.register[sn]; ok {
+               return r.register[sn]
        }
-       sequenceNumber := r.counter
-       r.register[sequenceNumber] = false
-       r.shift()
-       return sequenceNumber
+       return nil
 }
 
 // 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 +100,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.register[sn] = true
-}
-
-func (r *Registry) shift() {
-       if r.counter == 65535 {
-               r.counter = 0
-       } else {
-               r.counter++
-       }
+       r.mutex.Lock()
+       defer r.mutex.Unlock()
+       r.register[sn].Confirmed()
 }
 
 //This function sets the given id as unused in the register
-func (r *Registry) deleteSubscription(sn uint16) {
-       r.register[sn] = false
+func (r *Registry) setSubscriptionToUnConfirmed(sn uint16) {
+       r.mutex.Lock()
+       defer r.mutex.Unlock()
+       r.register[sn].UnConfirmed()
 }
 
 //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
+       }
+}