aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-03-04 04:34:11 +0000
committerChristian Grothoff <christian@grothoff.org>2013-03-04 04:34:11 +0000
commitbd68fcf94853210cd9c5695c8e35f2df00347807 (patch)
treef431be47940da319a227261424b68f30257aec9b /src/util
parent5573c76556d4b5055a0d55031d36ffe185454f6d (diff)
downloadgnunet-bd68fcf94853210cd9c5695c8e35f2df00347807.tar.gz
gnunet-bd68fcf94853210cd9c5695c8e35f2df00347807.zip
-fix
Diffstat (limited to 'src/util')
-rw-r--r--src/util/scheduler.c2
-rw-r--r--src/util/service.c2
-rw-r--r--src/util/time.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 0adf9f0ae..23f683808 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -1558,7 +1558,7 @@ GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
1558 void *backtrace_array[MAX_TRACE_DEPTH]; 1558 void *backtrace_array[MAX_TRACE_DEPTH];
1559#endif 1559#endif
1560 1560
1561 GNUNET_assert (active_task != NULL); 1561 GNUNET_assert (NULL != active_task);
1562 GNUNET_assert (NULL != task); 1562 GNUNET_assert (NULL != task);
1563 t = GNUNET_malloc (sizeof (struct Task)); 1563 t = GNUNET_malloc (sizeof (struct Task));
1564 t->callback = task; 1564 t->callback = task;
diff --git a/src/util/service.c b/src/util/service.c
index b9050f830..6694bee48 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1506,6 +1506,7 @@ service_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1506 1506
1507 if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) 1507 if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
1508 return; 1508 return;
1509 GNUNET_SPEEDUP_start_ (sctx->cfg);
1509 GNUNET_RESOLVER_connect (sctx->cfg); 1510 GNUNET_RESOLVER_connect (sctx->cfg);
1510 if (NULL != sctx->lsocks) 1511 if (NULL != sctx->lsocks)
1511 sctx->server = 1512 sctx->server =
@@ -1813,7 +1814,6 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
1813 /* actually run service */ 1814 /* actually run service */
1814 err = 0; 1815 err = 0;
1815 GNUNET_SCHEDULER_run (&service_task, &sctx); 1816 GNUNET_SCHEDULER_run (&service_task, &sctx);
1816 GNUNET_SPEEDUP_start_ (cfg);
1817 /* shutdown */ 1817 /* shutdown */
1818 if ((1 == do_daemonize) && (NULL != sctx.server)) 1818 if ((1 == do_daemonize) && (NULL != sctx.server))
1819 pid_file_delete (&sctx); 1819 pid_file_delete (&sctx);
diff --git a/src/util/time.c b/src/util/time.c
index afb0c00c1..b82a1ba7c 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -44,6 +44,7 @@ GNUNET_TIME_set_offset (long long offset)
44 timestamp_offset = offset; 44 timestamp_offset = offset;
45} 45}
46 46
47
47/** 48/**
48 * Get the current time (works just as "time", just that we use the 49 * Get the current time (works just as "time", just that we use the
49 * unit of time that the cron-jobs use (and is 64 bit)). 50 * unit of time that the cron-jobs use (and is 64 bit)).