Updated xapp-frame to 0.4.18. Updated rmr to 4.1.2.

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

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 087b781..46971d9 100644 (file)
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -30,49 +30,78 @@ import (
 //-----------------------------------------------------------------------------
 type Tracker struct {
        mutex                sync.Mutex
-       transactionXappTable map[TransactionXappKey]*Transaction
+       transactionXappTable map[TransactionXappKey]*TransactionXapp
+       transSeq             uint64
 }
 
 func (t *Tracker) Init() {
-       t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
+       t.transactionXappTable = make(map[TransactionXappKey]*TransactionXapp)
 }
 
-func (t *Tracker) TrackTransaction(subs *Subscription, endpoint RmrEndpoint, params *xapp.RMRParams, respReceived bool, forwardRespToXapp bool) (*Transaction, error) {
+func (t *Tracker) initTransaction(transBase *Transaction) {
+       t.mutex.Lock()
+       defer t.mutex.Unlock()
+       transBase.EventChan = make(chan interface{})
+       transBase.tracker = t
+       transBase.Seq = t.transSeq
+       t.transSeq++
+}
+
+func (t *Tracker) NewSubsTransaction(subs *Subscription) *TransactionSubs {
+       trans := &TransactionSubs{}
+       trans.Meid = subs.GetMeid()
+       t.initTransaction(&trans.Transaction)
+       xapp.Logger.Debug("CREATE %s", trans.String())
+       return trans
+}
+
+func (t *Tracker) NewXappTransaction(
+       endpoint *xapp.RmrEndpoint,
+       xid string,
+       subid uint32,
+       meid *xapp.RMRMeid) *TransactionXapp {
 
-       trans := &Transaction{
-               tracker:           nil,
-               Subs:              nil,
-               RmrEndpoint:       endpoint,
-               Xid:               params.Xid,
-               OrigParams:        params,
-               RespReceived:      respReceived,
-               ForwardRespToXapp: forwardRespToXapp,
+       trans := &TransactionXapp{}
+       trans.XappKey = &TransactionXappKey{*endpoint, xid}
+       trans.Meid = meid
+       trans.SubId = subid
+       t.initTransaction(&trans.Transaction)
+       xapp.Logger.Debug("CREATE %s", trans.String())
+       return trans
+}
+
+func (t *Tracker) Track(trans *TransactionXapp) error {
+
+       if trans.GetEndpoint() == nil {
+               err := fmt.Errorf("Tracker: No valid endpoint given in %s", trans.String())
+               return err
        }
 
        t.mutex.Lock()
        defer t.mutex.Unlock()
 
-       xappkey := TransactionXappKey{endpoint, params.Xid}
-       if _, ok := t.transactionXappTable[xappkey]; ok {
-               err := fmt.Errorf("Tracker: Similar transaction with xappkey %s is ongoing, transaction %s not created ", xappkey, trans)
-               return nil, err
-       }
+       theKey := *trans.XappKey
 
-       err := subs.SetTransaction(trans)
-       if err != nil {
-               return nil, err
+       if othtrans, ok := t.transactionXappTable[theKey]; ok {
+               err := fmt.Errorf("Tracker: %s is ongoing, not tracking %s", othtrans, trans)
+               return err
        }
+
        trans.tracker = t
-       t.transactionXappTable[xappkey] = trans
-       return trans, nil
+       t.transactionXappTable[theKey] = trans
+       xapp.Logger.Debug("Tracker: Append %s", trans.String())
+       //xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
+       return nil
 }
 
-func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*Transaction, error) {
+func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*TransactionXapp, error) {
        t.mutex.Lock()
        defer t.mutex.Unlock()
        if trans, ok2 := t.transactionXappTable[xappKey]; ok2 {
+               xapp.Logger.Debug("Tracker: Remove %s", trans.String())
                delete(t.transactionXappTable, xappKey)
+               //xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
                return trans, nil
        }
-       return nil, fmt.Errorf("Tracker: No record for xappkey %s", xappKey)
+       return nil, fmt.Errorf("Tracker: No record %s", xappKey)
 }