X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftransaction.go;h=9adaeca6067090c1cfeb99fef9f11263fa9cb5e1;hb=31797b49985822f1d402501f16ab2794838bebba;hp=2f4acab0c1164694831129e0934bf7b7b8d71087;hpb=e406a34d5547107533e65ddfbb2074e96d77b4b3;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/transaction.go b/pkg/control/transaction.go
index 2f4acab..9adaeca 100644
--- a/pkg/control/transaction.go
+++ b/pkg/control/transaction.go
@@ -20,6 +20,9 @@
 package control
 
 import (
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/packer"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"strconv"
 	"sync"
 )
@@ -33,7 +36,7 @@ type TransactionXappKey struct {
 }
 
 func (key *TransactionXappKey) String() string {
-	return key.RmrEndpoint.String() + "/" + key.Xid
+	return "transkey(" + key.RmrEndpoint.String() + "/" + key.Xid + ")"
 }
 
 //-----------------------------------------------------------------------------
@@ -41,24 +44,35 @@ func (key *TransactionXappKey) String() string {
 //-----------------------------------------------------------------------------
 type Transaction struct {
 	mutex             sync.Mutex
-	tracker           *Tracker // tracker instance
-	Subs              *Subscription
-	RmrEndpoint       RmrEndpoint
-	Mtype             int
-	Xid               string     // xapp xid in req
-	OrigParams        *RMRParams // request orginal params
+	tracker           *Tracker                             //tracker instance
+	Subs              *Subscription                        //related subscription
+	RmrEndpoint       RmrEndpoint                          //xapp endpoint
+	Xid               string                               //xapp xid in req
+	Meid              *xapp.RMRMeid                        //meid transaction related
+	SubReqMsg         *e2ap.E2APSubscriptionRequest        //SubReq TODO: maybe own transactions per type
+	SubRespMsg        *e2ap.E2APSubscriptionResponse       //SubResp TODO: maybe own transactions per type
+	SubFailMsg        *e2ap.E2APSubscriptionFailure        //SubFail TODO: maybe own transactions per type
+	SubDelReqMsg      *e2ap.E2APSubscriptionDeleteRequest  //SubDelReq TODO: maybe own transactions per type
+	SubDelRespMsg     *e2ap.E2APSubscriptionDeleteResponse //SubDelResp TODO: maybe own transactions per type
+	SubDelFailMsg     *e2ap.E2APSubscriptionDeleteFailure  //SubDelFail TODO: maybe own transactions per type
+	Mtype             int                                  //Encoded message type to be send
+	Payload           *packer.PackedData                   //Encoded message to be send
 	RespReceived      bool
 	ForwardRespToXapp bool
 }
 
-func (t *Transaction) String() string {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
+func (t *Transaction) StringImpl() string {
 	var subId string = "?"
 	if t.Subs != nil {
 		subId = strconv.FormatUint(uint64(t.Subs.Seq), 10)
 	}
-	return subId + "/" + t.RmrEndpoint.String() + "/" + t.Xid
+	return "trans(" + t.RmrEndpoint.String() + "/" + t.Xid + "/" + t.Meid.RanName + "/" + subId + ")"
+}
+
+func (t *Transaction) String() string {
+	t.mutex.Lock()
+	defer t.mutex.Unlock()
+	return t.StringImpl()
 }
 
 func (t *Transaction) GetXid() string {
@@ -73,6 +87,15 @@ func (t *Transaction) GetMtype() int {
 	return t.Mtype
 }
 
+func (t *Transaction) GetMeid() *xapp.RMRMeid {
+	t.mutex.Lock()
+	defer t.mutex.Unlock()
+	if t.Meid != nil {
+		return t.Meid
+	}
+	return nil
+}
+
 func (t *Transaction) GetSrc() string {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
@@ -97,14 +120,17 @@ func (t *Transaction) RetryTransaction() {
 
 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)
-	}
+	subs := t.Subs
+	tracker := t.tracker
+	xappkey := TransactionXappKey{t.RmrEndpoint, t.Xid}
 	t.Subs = nil
 	t.tracker = nil
+	t.mutex.Unlock()
+
+	if subs != nil {
+		subs.UnSetTransaction(t)
+	}
+	if tracker != nil {
+		tracker.UnTrackTransaction(xappkey)
+	}
 }