aboutsummaryrefslogtreecommitdiff
path: root/src/arm/test_arm_api.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-11-05 18:21:50 +0000
committerNathan S. Evans <evans@in.tum.de>2010-11-05 18:21:50 +0000
commit75a33a1499cf60ea4364c9aa673816629a6c1413 (patch)
tree0620da4312bb04de4d7b65074fdd3b0c3dd6cc0e /src/arm/test_arm_api.c
parent7217c601ad30760872823193d62307e7a335d226 (diff)
downloadgnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz
gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/arm/test_arm_api.c')
-rw-r--r--src/arm/test_arm_api.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 6ec95f4a0..6952b2e59 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -38,8 +38,6 @@
38 38
39#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15) 39#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
40 40
41static struct GNUNET_SCHEDULER_Handle *sched;
42
43static const struct GNUNET_CONFIGURATION_Handle *cfg; 41static const struct GNUNET_CONFIGURATION_Handle *cfg;
44 42
45static struct GNUNET_ARM_Handle *arm; 43static struct GNUNET_ARM_Handle *arm;
@@ -95,8 +93,7 @@ resolver_notify (void *cls, int success)
95#endif 93#endif
96 return; 94 return;
97 } 95 }
98 GNUNET_RESOLVER_ip_get (sched, 96 GNUNET_RESOLVER_ip_get (cfg,
99 cfg,
100 "localhost", AF_INET, TIMEOUT, &dns_notify, NULL); 97 "localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
101} 98}
102 99
@@ -118,14 +115,12 @@ arm_notify (void *cls, int success)
118 115
119static void 116static void
120task (void *cls, 117task (void *cls,
121 struct GNUNET_SCHEDULER_Handle *s,
122 char *const *args, 118 char *const *args,
123 const char *cfgfile, 119 const char *cfgfile,
124 const struct GNUNET_CONFIGURATION_Handle *c) 120 const struct GNUNET_CONFIGURATION_Handle *c)
125{ 121{
126 cfg = c; 122 cfg = c;
127 sched = s; 123 arm = GNUNET_ARM_connect (cfg, NULL);
128 arm = GNUNET_ARM_connect (cfg, sched, NULL);
129#if START_ARM 124#if START_ARM
130 GNUNET_ARM_start_service (arm, "arm", START_TIMEOUT, &arm_notify, NULL); 125 GNUNET_ARM_start_service (arm, "arm", START_TIMEOUT, &arm_notify, NULL);
131#else 126#else