[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-nim] 18/61: make the cleanup proc the finalizer (no
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet-nim] 18/61: make the cleanup proc the finalizer (no explicit call necessary anymore) |
Date: |
Sat, 13 Apr 2019 13:35:53 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet-nim.
commit 04b14305521b88732e0f2bae637fbf242cdec94d
Author: lurchi <address@hidden>
AuthorDate: Sun Jul 29 19:29:49 2018 +0200
make the cleanup proc the finalizer (no explicit call necessary anymore)
---
gnunet_application.nim | 11 ++++++-----
gnunet_nim.nim | 5 ++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gnunet_application.nim b/gnunet_application.nim
index 5f0fa0b..d72069c 100644
--- a/gnunet_application.nim
+++ b/gnunet_application.nim
@@ -56,9 +56,14 @@ proc schedulerSetWakeup(cls: pointer,
debug("setting new timeout: ", dt.abs_value_us)
app.timeoutUs = dt.abs_value_us
+proc cleanup(app: ref GnunetApplication) =
+ echo "destroying GnunetApplication"
+ GNUNET_SCHEDULER_driver_done(app.schedulerHandle)
+ GNUNET_CONFIGURATION_destroy(app.configHandle)
+
proc initGnunetApplication*(configFile: string): ref GnunetApplication =
var app: ref GnunetApplication
- new(app)
+ new(app, cleanup)
app.timeoutUs = GNUNET_TIME_absolute_get_forever().abs_value_us
app.tasks = initTable[ptr GNUNET_SCHEDULER_Task, ptr
GNUNET_SCHEDULER_FdInfo]()
app.schedulerDriver = GNUNET_SCHEDULER_Driver(cls: addr app[],
@@ -71,10 +76,6 @@ proc initGnunetApplication*(configFile: string): ref
GnunetApplication =
assert(GNUNET_SYSERR != GNUNET_CONFIGURATION_load(app.configHandle,
configFile))
return app
-proc cleanup*(app: ref GnunetApplication) =
- GNUNET_SCHEDULER_driver_done(app.schedulerHandle)
- GNUNET_CONFIGURATION_destroy(app.configHandle)
-
proc doWork*(app: ref GnunetApplication) =
discard GNUNET_SCHEDULER_do_work(app.schedulerHandle) #FIXME: don't discard
diff --git a/gnunet_nim.nim b/gnunet_nim.nim
index b4c17b5..d141f85 100644
--- a/gnunet_nim.nim
+++ b/gnunet_nim.nim
@@ -18,8 +18,7 @@ proc main() =
poll(gnunetApp.millisecondsUntilTimeout())
gnunetApp.doWork()
except ValueError:
- discard
- gnunetApp.cleanup()
- echo "quitting"
+ echo "quitting"
main()
+GC_fullCollect()
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet-nim] 39/61: add shutdown procedure, (continued)
- [GNUnet-SVN] [gnunet-nim] 39/61: add shutdown procedure, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 30/61: gitignore: add gnunet generated files and folders, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 27/61: cli option: add option to specify gnunet config, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 14/61: don't use AsyncEvent but store Futures in GnunetApplication, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 22/61: we get notified about an incoming CADET channel (and then we crash), gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 24/61: command line parsing; application code for creating channel, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 17/61: Merge branch 'master' of ssh://gnunet.org/gnunet-nim, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 16/61: disconnect after connecting (shuts down the application), gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 12/61: fix segfaults using heap allocation, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 08/61: Merge branch 'master' of ssh://gnunet.org/gnunet-nim, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 18/61: make the cleanup proc the finalizer (no explicit call necessary anymore),
gnunet <=
- [GNUnet-SVN] [gnunet-nim] 35/61: use nicer new syntax, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 31/61: use ref object where we only use heap allocation, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 29/61: fix crashes, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 38/61: comment: explain why we're reading from stdin in a nasty way, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 28/61: newline behaviour like in gnunet-cadet, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 32/61: Revert "use ref object where we only use heap allocation", gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 26/61: first try sending messages from stdin, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 40/61: fix bug (application hangs when a peer disconnects); fixes & simplifications, gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 34/61: add shutdown logic (allows GNUnet to shutdown on signals), gnunet, 2019/04/13
- [GNUnet-SVN] [gnunet-nim] 46/61: groupchat.nim: fix typo in echo message, gnunet, 2019/04/13