X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=pkg%2Fcontrol%2Ftracker.go;h=c16a76a33fca9d995ff6b9583df4030446a098f5;hb=af91f971681842c22dc0fad165c0cbf7ebaa0e4d;hp=0e6941d7d37ce31e7d99d9152c75d2d56d7051eb;hpb=0d064ecdb5239a875857b5910f7f6e83f827d7a6;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/tracker.go b/pkg/control/tracker.go
index 0e6941d..c16a76a 100644
--- a/pkg/control/tracker.go
+++ b/pkg/control/tracker.go
@@ -22,123 +22,71 @@ package control
 import (
 	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"strconv"
 	"sync"
 )
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type TransactionXappKey struct {
-	RmrEndpoint
-	Xid string // xapp xid in req
-}
-
-func (key *TransactionXappKey) String() string {
-	return key.RmrEndpoint.String() + "/" + key.Xid
+type Tracker struct {
+	mutex                sync.Mutex
+	transactionXappTable map[TransactionXappKey]*Transaction
+	transSeq             uint64
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type Transaction struct {
-	tracker           *Tracker // tracker instance
-	Subs              *Subscription
-	RmrEndpoint       RmrEndpoint
-	Xid               string          // xapp xid in req
-	OrigParams        *xapp.RMRParams // request orginal params
-	RespReceived      bool
-	ForwardRespToXapp bool
-	mutex             sync.Mutex
+func (t *Tracker) Init() {
+	t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
 }
 
-func (t *Transaction) String() string {
+func (t *Tracker) NewTransactionFromSkel(transSkel *Transaction) *Transaction {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
-	var subId string = "?"
-	if t.Subs != nil {
-		subId = strconv.FormatUint(uint64(t.Subs.Seq), 10)
+	trans := transSkel
+	if trans == nil {
+		trans = &Transaction{}
 	}
-	return subId + "/" + t.RmrEndpoint.String() + "/" + t.Xid
+	trans.EventChan = make(chan interface{})
+	trans.tracker = t
+	trans.Seq = t.transSeq
+	t.transSeq++
+	xapp.Logger.Debug("Transaction: Create %s", trans.String())
+	return trans
 }
 
-func (t *Transaction) CheckResponseReceived() bool {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-	if t.RespReceived == false {
-		t.RespReceived = true
-		return false
-	}
-	return true
+func (t *Tracker) NewTransaction(meid *xapp.RMRMeid) *Transaction {
+	trans := &Transaction{}
+	trans.Meid = meid
+	trans = t.NewTransactionFromSkel(trans)
+	return trans
 }
 
-func (t *Transaction) RetryTransaction() {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-	t.RespReceived = false
-}
+func (t *Tracker) TrackTransaction(
+	endpoint *RmrEndpoint,
+	xid string,
+	meid *xapp.RMRMeid) (*Transaction, error) {
 
-func (t *Transaction) Release() {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-	if t.Subs != nil {
-		t.Subs.UnSetTransaction(t)
-	}
-	if t.tracker != nil {
-		xappkey := TransactionXappKey{t.RmrEndpoint, t.Xid}
-		t.tracker.UnTrackTransaction(xappkey)
+	if endpoint == nil {
+		err := fmt.Errorf("Tracker: No valid endpoint given")
+		return nil, err
 	}
-	t.Subs = nil
-	t.tracker = nil
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type Tracker struct {
-	transactionXappTable map[TransactionXappKey]*Transaction
-	mutex                sync.Mutex
-}
-
-func (t *Tracker) Init() {
-	t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
-}
 
-func (t *Tracker) TrackTransaction(subs *Subscription, endpoint RmrEndpoint, params *xapp.RMRParams, respReceived bool, forwardRespToXapp bool) (*Transaction, error) {
-
-	trans := &Transaction{
-		tracker:           nil,
-		Subs:              nil,
-		RmrEndpoint:       endpoint,
-		Xid:               params.Xid,
-		OrigParams:        params,
-		RespReceived:      respReceived,
-		ForwardRespToXapp: forwardRespToXapp,
-	}
+	trans := &Transaction{}
+	trans.XappKey = &TransactionXappKey{*endpoint, xid}
+	trans.Meid = meid
+	trans = t.NewTransactionFromSkel(trans)
 
 	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
-	}
-
-	if subs.SetTransaction(trans) == false {
-		othTrans := subs.GetTransaction()
-		err := fmt.Errorf("Tracker: Subscription %s got already transaction ongoing: %s, transaction %s not created", subs, othTrans, trans)
-		return nil, err
-	}
-	trans.Subs = subs
-	if (trans.Subs.RmrEndpoint.Addr != trans.RmrEndpoint.Addr) || (trans.Subs.RmrEndpoint.Port != trans.RmrEndpoint.Port) {
-		err := fmt.Errorf("Tracker: Subscription endpoint %s mismatch with trans: %s", subs, trans)
-		trans.Subs.UnSetTransaction(nil)
+	if othtrans, ok := t.transactionXappTable[*trans.XappKey]; ok {
+		err := fmt.Errorf("Tracker: %s is ongoing, %s not created ", othtrans, trans)
 		return nil, err
 	}
 
 	trans.tracker = t
-	t.transactionXappTable[xappkey] = trans
+	t.transactionXappTable[*trans.XappKey] = trans
+	xapp.Logger.Debug("Tracker: Add %s", trans.String())
+	//xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
 	return trans, nil
 }
 
@@ -146,8 +94,10 @@ func (t *Tracker) UnTrackTransaction(xappKey TransactionXappKey) (*Transaction,
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 	if trans, ok2 := t.transactionXappTable[xappKey]; ok2 {
+		xapp.Logger.Debug("Tracker: Delete %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)
 }