aboutsummaryrefslogtreecommitdiff
path: root/src/experimentation/gnunet-daemon-experimentation_experiments.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/experimentation/gnunet-daemon-experimentation_experiments.c')
-rw-r--r--src/experimentation/gnunet-daemon-experimentation_experiments.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
index 99348a2cb..891865b39 100644
--- a/src/experimentation/gnunet-daemon-experimentation_experiments.c
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -158,7 +158,7 @@ find_it (void *cls,
158 158
159 if (0 != strcmp(e->name, find_ctx->name)) 159 if (0 != strcmp(e->name, find_ctx->name))
160 return GNUNET_OK; 160 return GNUNET_OK;
161 if (e->version.abs_value != find_ctx->version.abs_value) 161 if (e->version.abs_value_us != find_ctx->version.abs_value_us)
162 return GNUNET_OK; 162 return GNUNET_OK;
163 163
164 find_ctx->res = e; 164 find_ctx->res = e;
@@ -272,8 +272,8 @@ int GNUNET_EXPERIMENTATION_experiments_add (struct Issuer *i,
272 e->name, 272 e->name,
273 GNUNET_STRINGS_absolute_time_to_string (start), 273 GNUNET_STRINGS_absolute_time_to_string (start),
274 GNUNET_STRINGS_absolute_time_to_string (stop), 274 GNUNET_STRINGS_absolute_time_to_string (stop),
275 (long long unsigned int) frequency.rel_value / 1000, 275 (long long unsigned int) frequency.rel_value_us / 1000000LL,
276 (long long unsigned int) duration.rel_value / 1000); 276 (long long unsigned int) duration.rel_value_us / 1000000LL);
277 GNUNET_CONTAINER_multihashmap_put (experiments, &e->issuer.hashPubKey, e, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); 277 GNUNET_CONTAINER_multihashmap_put (experiments, &e->issuer.hashPubKey, e, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
278 GNUNET_STATISTICS_set (GED_stats, "# experiments", GNUNET_CONTAINER_multihashmap_size (experiments), GNUNET_NO); 278 GNUNET_STATISTICS_set (GED_stats, "# experiments", GNUNET_CONTAINER_multihashmap_size (experiments), GNUNET_NO);
279 279
@@ -336,7 +336,7 @@ void exp_file_iterator (void *cls,
336 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Experiment `%s': Version missing or invalid \n"), name); 336 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Experiment `%s': Version missing or invalid \n"), name);
337 return; 337 return;
338 } 338 }
339 version.abs_value = number; 339 version.abs_value_us = number; // FIXME: what is this supposed to be? Version != TIME!???
340 340
341 /* Required capabilities */ 341 /* Required capabilities */
342 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "CAPABILITIES", &number)) 342 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "CAPABILITIES", &number))
@@ -358,14 +358,14 @@ void exp_file_iterator (void *cls,
358 358
359 359
360 360
361 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value)) 361 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value_us))
362 start = GNUNET_TIME_UNIT_ZERO_ABS; 362 start = GNUNET_TIME_UNIT_ZERO_ABS;
363 363
364 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "FREQUENCY", &frequency)) 364 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "FREQUENCY", &frequency))
365 frequency = EXP_DEFAULT_EXP_FREQ; 365 frequency = EXP_DEFAULT_EXP_FREQ;
366 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "DURATION", &duration)) 366 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "DURATION", &duration))
367 duration = EXP_DEFAULT_EXP_DUR; 367 duration = EXP_DEFAULT_EXP_DUR;
368 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "STOP", (long long unsigned int *)&stop.abs_value)) 368 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "STOP", (long long unsigned int *)&stop.abs_value_us))
369 stop = GNUNET_TIME_UNIT_FOREVER_ABS; 369 stop = GNUNET_TIME_UNIT_FOREVER_ABS;
370 370
371 GNUNET_EXPERIMENTATION_experiments_add (i, name, issuer, version, 371 GNUNET_EXPERIMENTATION_experiments_add (i, name, issuer, version,