Code Review
/
ric-plt
/
submgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
RICPLT-3007 Replace msg Mtype numbers with variables defined in xapp frame
[ric-plt/submgr.git]
/
pkg
/
control
/
registry.go
diff --git
a/pkg/control/registry.go
b/pkg/control/registry.go
index
2c5bd8c
..
a1fe4b8
100644
(file)
--- a/
pkg/control/registry.go
+++ b/
pkg/control/registry.go
@@
-42,7
+42,7
@@
func (r *Registry) Initialize(seedsn uint16) {
}
// Reserves and returns the next free sequence number
}
// Reserves and returns the next free sequence number
-func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid) (*Subscription, error) {
+func (r *Registry) ReserveSubscription(endPoint
*
RmrEndpoint, meid *xapp.RMRMeid) (*Subscription, error) {
// Check is current SequenceNumber valid
// Allocate next SequenceNumber value and retry N times
r.mutex.Lock()
// Check is current SequenceNumber valid
// Allocate next SequenceNumber value and retry N times
r.mutex.Lock()
@@
-58,9
+58,10
@@
func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid)
}
if _, ok := r.register[sequenceNumber]; ok == false {
subs := &Subscription{
}
if _, ok := r.register[sequenceNumber]; ok == false {
subs := &Subscription{
+ registry: r,
Seq: sequenceNumber,
Active: false,
Seq: sequenceNumber,
Active: false,
- RmrEndpoint: endPoint,
+ RmrEndpoint:
*
endPoint,
Meid: meid,
Trans: nil,
}
Meid: meid,
Trans: nil,
}
@@
-68,7
+69,7
@@
func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid)
// Update routing
r.mutex.Unlock()
// Update routing
r.mutex.Unlock()
- err := subs.UpdateRoute(CREATE
, r.rtmgrClient
)
+ err := subs.UpdateRoute(CREATE)
r.mutex.Lock()
if err != nil {
if _, ok := r.register[sequenceNumber]; ok {
r.mutex.Lock()
if err != nil {
if _, ok := r.register[sequenceNumber]; ok {
@@
-96,16
+97,7
@@
func (r *Registry) DelSubscription(sn uint16) bool {
r.mutex.Lock()
defer r.mutex.Unlock()
if _, ok := r.register[sn]; ok {
r.mutex.Lock()
defer r.mutex.Unlock()
if _, ok := r.register[sn]; ok {
- subs := r.register[sn]
delete(r.register, sn)
delete(r.register, sn)
-
- // Update routing
- r.mutex.Unlock()
- err := subs.UpdateRoute(DELETE, r.rtmgrClient)
- r.mutex.Lock()
- if err != nil {
- xapp.Logger.Error("Registry: Failed to del route. SubId: %d, RmrEndpoint: %s", subs.Seq, subs.RmrEndpoint)
- }
return true
}
return false
return true
}
return false