Code Review
/
ric-plt
/
xapp-frame.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Free allocated mbuffers
[ric-plt/xapp-frame.git]
/
pkg
/
xapp
/
rmr.go
diff --git
a/pkg/xapp/rmr.go
b/pkg/xapp/rmr.go
index
c0e1c8f
..
40f47b2
100755
(executable)
--- a/
pkg/xapp/rmr.go
+++ b/
pkg/xapp/rmr.go
@@
-165,10
+165,17
@@
func (m *RMRClient) Allocate() *C.rmr_mbuf_t {
if buf == nil {
Logger.Error("rmrClient: Allocating message buffer failed!")
}
if buf == nil {
Logger.Error("rmrClient: Allocating message buffer failed!")
}
-
return buf
}
return buf
}
+func (m *RMRClient) Free(mbuf *C.rmr_mbuf_t) {
+ if mbuf == nil {
+ Logger.Error("rmrClient: Can't free mbuffer, given nil pointer")
+ return
+ }
+ C.rmr_free_msg(mbuf)
+}
+
func (m *RMRClient) SendMsg(params *RMRParams) bool {
return m.Send(params, false)
}
func (m *RMRClient) SendMsg(params *RMRParams) bool {
return m.Send(params, false)
}
@@
-211,27
+218,30
@@
func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
}
func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) bool {
}
func (m *RMRClient) SendBuf(txBuffer *C.rmr_mbuf_t, isRts bool) bool {
+ defer C.rmr_free_msg(txBuffer)
+ var currBuffer *C.rmr_mbuf_t
+
for i := 0; i < 10; i++ {
txBuffer.state = 0
if isRts {
for i := 0; i < 10; i++ {
txBuffer.state = 0
if isRts {
-
tx
Buffer = C.rmr_rts_msg(m.context, txBuffer)
+
curr
Buffer = C.rmr_rts_msg(m.context, txBuffer)
} else {
} else {
-
tx
Buffer = C.rmr_send_msg(m.context, txBuffer)
+
curr
Buffer = C.rmr_send_msg(m.context, txBuffer)
}
}
- if
tx
Buffer == nil {
+ if
curr
Buffer == nil {
break
break
- } else if
tx
Buffer.state != C.RMR_OK {
- if
tx
Buffer.state != C.RMR_ERR_RETRY {
+ } else if
curr
Buffer.state != C.RMR_OK {
+ if
curr
Buffer.state != C.RMR_ERR_RETRY {
time.Sleep(100 * time.Microsecond)
m.UpdateStatCounter("TransmitError")
}
time.Sleep(100 * time.Microsecond)
m.UpdateStatCounter("TransmitError")
}
- for j := 0; j < 100 &&
tx
Buffer.state == C.RMR_ERR_RETRY; j++ {
-
tx
Buffer = C.rmr_send_msg(m.context, txBuffer)
+ for j := 0; j < 100 &&
curr
Buffer.state == C.RMR_ERR_RETRY; j++ {
+
curr
Buffer = C.rmr_send_msg(m.context, txBuffer)
}
}
}
}
- if
tx
Buffer.state == C.RMR_OK {
+ if
curr
Buffer.state == C.RMR_OK {
m.UpdateStatCounter("Transmitted")
return true
}
m.UpdateStatCounter("Transmitted")
return true
}