From 278e23076123f9160ad2e14a77c78bc56a8ab762 Mon Sep 17 00:00:00 2001 From: kdeme Date: Wed, 13 Nov 2019 12:04:38 +0100 Subject: [PATCH] Fix memleaks in old example --- wrappers/wrapper_example.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/wrappers/wrapper_example.go b/wrappers/wrapper_example.go index cd64cbec5..c49954401 100644 --- a/wrappers/wrapper_example.go +++ b/wrappers/wrapper_example.go @@ -9,6 +9,8 @@ import ( /* +#include + #cgo LDFLAGS: -Wl,-rpath,'$ORIGIN' -L${SRCDIR}/../build -lnimbus -lm #include "libnimbus.h" @@ -39,19 +41,21 @@ func receiveHandler(msg *C.received_message) { func Start() { C.NimMain() fmt.Println("[nim-status] Start Nimbus") - C.nimbus_start(30306, true, false, 0.002, nil, false) + if C.nimbus_start(30306, true, false, 0.002, nil, false) == false { + panic("Can't start nimbus") + } - peer1 := "enode://2d3e27d7846564f9b964308038dfadd4076e4373ac938e020708ad8819fd4fd90e5eb8314140768f782db704cb313b60707b968f8b61108a6fecd705b041746d@192.168.0.33:30303" - peer2 := "enode://4ea35352702027984a13274f241a56a47854a7fd4b3ba674a596cff917d3c825506431cf149f9f2312a293bb7c2b1cca55db742027090916d01529fe0729643b@206.189.243.178:443" - peer3 := "enode://94d2403d0c55b5c1627eb032c4c6ea8d30b523ae84661aafa18c539ce3af3f114a5bfe1a3cde7776988a6ab2906169dca8ce6a79e32d30c445629b24e6f59e0a@0.0.0.0:30303" - C.nimbus_add_peer(C.CString(peer1)) - C.nimbus_add_peer(C.CString(peer2)) - C.nimbus_add_peer(C.CString(peer3)) + peer1 := C.CString("enode://2d3e27d7846564f9b964308038dfadd4076e4373ac938e020708ad8819fd4fd90e5eb8314140768f782db704cb313b60707b968f8b61108a6fecd705b041746d@192.168.0.33:30303") + C.nimbus_add_peer(peer1) + C.free(unsafe.Pointer(peer1)) } func StatusListenAndPost(channel string) { fmt.Println("[nim-status] Status Public ListenAndPost") - C.nimbus_join_public_chat(C.CString(channel), + channelC := C.CString(channel) + defer C.free(unsafe.Pointer(channelC)) + + C.nimbus_join_public_chat(channelC, (C.received_msg_handler)(unsafe.Pointer(C.receiveHandler_cgo))) i := 0 for { @@ -63,7 +67,9 @@ func StatusListenAndPost(channel string) { message := fmt.Sprintf("[\"~#c4\",[\"Message:%d\",\"text/plain\",\"~:public-group-user-message\",%d,%d,[\"^ \",\"~:chat-id\",\"%s\",\"~:text\",\"Message:%d\"]]]", i, t*100, t, channel, i) if i%1000 == 0 { fmt.Println("[nim-status] posting", message) - C.nimbus_post_public(C.CString(channel), C.CString(message)) + messageC := C.CString(message) + C.nimbus_post_public(channelC, messageC) + C.free(unsafe.Pointer(messageC)) } } }