diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-13 14:29:44 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-13 14:29:44 +0000 |
commit | dc07973dba8f12365b563d59dfbd65b9e8920a3a (patch) | |
tree | 878a1a0adbdcac830a4bbe8fa6320adf938af727 /src/util | |
parent | 00284d606dcff37fa25dba8780a78f54a03ca497 (diff) | |
download | gnunet-dc07973dba8f12365b563d59dfbd65b9e8920a3a.tar.gz gnunet-dc07973dba8f12365b563d59dfbd65b9e8920a3a.zip |
- osx fixes
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/program.c | 5 | ||||
-rw-r--r-- | src/util/service.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/util/program.c b/src/util/program.c index 01a8b496a..5cd129b47 100644 --- a/src/util/program.c +++ b/src/util/program.c | |||
@@ -78,6 +78,7 @@ GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg); | |||
78 | int | 78 | int |
79 | GNUNET_SPEEDUP_stop_ (void); | 79 | GNUNET_SPEEDUP_stop_ (void); |
80 | 80 | ||
81 | |||
81 | /** | 82 | /** |
82 | * Initial task called by the scheduler for each | 83 | * Initial task called by the scheduler for each |
83 | * program. Runs the program-specific main task. | 84 | * program. Runs the program-specific main task. |
@@ -86,8 +87,10 @@ static void | |||
86 | program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 87 | program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
87 | { | 88 | { |
88 | struct CommandContext *cc = cls; | 89 | struct CommandContext *cc = cls; |
89 | GNUNET_SPEEDUP_start_(cc->cfg); | ||
90 | 90 | ||
91 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | ||
92 | return; | ||
93 | GNUNET_SPEEDUP_start_(cc->cfg); | ||
91 | GNUNET_RESOLVER_connect (cc->cfg); | 94 | GNUNET_RESOLVER_connect (cc->cfg); |
92 | cc->task (cc->task_cls, cc->args, cc->cfgfile, cc->cfg); | 95 | cc->task (cc->task_cls, cc->args, cc->cfgfile, cc->cfg); |
93 | } | 96 | } |
diff --git a/src/util/service.c b/src/util/service.c index c6fdc1f8d..b9050f830 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -1504,6 +1504,8 @@ service_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1504 | struct GNUNET_SERVICE_Context *sctx = cls; | 1504 | struct GNUNET_SERVICE_Context *sctx = cls; |
1505 | unsigned int i; | 1505 | unsigned int i; |
1506 | 1506 | ||
1507 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | ||
1508 | return; | ||
1507 | GNUNET_RESOLVER_connect (sctx->cfg); | 1509 | GNUNET_RESOLVER_connect (sctx->cfg); |
1508 | if (NULL != sctx->lsocks) | 1510 | if (NULL != sctx->lsocks) |
1509 | sctx->server = | 1511 | sctx->server = |