X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Ftransaction.go;h=9821fac7ff3a76991f76e7b8bebf8e12aeb31742;hb=refs%2Fchanges%2F26%2F2226%2F1;hp=2f4acab0c1164694831129e0934bf7b7b8d71087;hpb=e406a34d5547107533e65ddfbb2074e96d77b4b3;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/transaction.go b/pkg/control/transaction.go index 2f4acab..9821fac 100644 --- a/pkg/control/transaction.go +++ b/pkg/control/transaction.go @@ -20,6 +20,8 @@ package control import ( + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" "strconv" "sync" ) @@ -41,12 +43,19 @@ 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 + Mtype int //type of initiating message + 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 + Payload []byte //packed message to optimize retransmissions + PayloadLen int //packed message len to optimize retransmissions RespReceived bool ForwardRespToXapp bool } @@ -73,6 +82,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() @@ -96,6 +114,7 @@ func (t *Transaction) RetryTransaction() { } func (t *Transaction) Release() { + xapp.Logger.Info("Transaction: Releasing %s", t) t.mutex.Lock() defer t.mutex.Unlock() if t.Subs != nil {