diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
commit | 29e6158507a0758192075ac6ece7ba8e75ddc49a (patch) | |
tree | b91ded48da322f8ba4c9bb0f5504228aa036c2d1 /src/secretsharing | |
parent | 5dfcb058ab5db9ae0c4b147d8a99c64ca0980028 (diff) | |
download | gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.tar.gz gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.zip |
small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()
Diffstat (limited to 'src/secretsharing')
-rw-r--r-- | src/secretsharing/gnunet-secretsharing-profiler.c | 5 | ||||
-rw-r--r-- | src/secretsharing/gnunet-service-secretsharing.c | 3 | ||||
-rw-r--r-- | src/secretsharing/test_secretsharing_api.c | 8 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c index 6d1eea198..917431df4 100644 --- a/src/secretsharing/gnunet-secretsharing-profiler.c +++ b/src/secretsharing/gnunet-secretsharing-profiler.c | |||
@@ -480,11 +480,9 @@ peer_info_cb (void *cb_cls, | |||
480 | * Signature of the main function of a task. | 480 | * Signature of the main function of a task. |
481 | * | 481 | * |
482 | * @param cls closure | 482 | * @param cls closure |
483 | * @param tc context information (why was this task triggered now) | ||
484 | */ | 483 | */ |
485 | static void | 484 | static void |
486 | handle_shutdown (void *cls, | 485 | handle_shutdown (void *cls) |
487 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
488 | { | 486 | { |
489 | in_shutdown = GNUNET_YES; | 487 | in_shutdown = GNUNET_YES; |
490 | 488 | ||
@@ -633,4 +631,3 @@ main (int argc, char **argv) | |||
633 | options, &run, NULL, GNUNET_YES); | 631 | options, &run, NULL, GNUNET_YES); |
634 | return 0; | 632 | return 0; |
635 | } | 633 | } |
636 | |||
diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c index 81714d279..6babe209a 100644 --- a/src/secretsharing/gnunet-service-secretsharing.c +++ b/src/secretsharing/gnunet-service-secretsharing.c | |||
@@ -703,7 +703,7 @@ keygen_session_destroy (struct KeygenSession *ks) | |||
703 | * @param tc unused | 703 | * @param tc unused |
704 | */ | 704 | */ |
705 | static void | 705 | static void |
706 | cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 706 | cleanup_task (void *cls) |
707 | { | 707 | { |
708 | while (NULL != decrypt_sessions_head) | 708 | while (NULL != decrypt_sessions_head) |
709 | decrypt_session_destroy (decrypt_sessions_head); | 709 | decrypt_session_destroy (decrypt_sessions_head); |
@@ -2274,4 +2274,3 @@ main (int argc, char *const *argv) | |||
2274 | GNUNET_SERVICE_run (argc, argv, "secretsharing", | 2274 | GNUNET_SERVICE_run (argc, argv, "secretsharing", |
2275 | GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1; | 2275 | GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1; |
2276 | } | 2276 | } |
2277 | |||
diff --git a/src/secretsharing/test_secretsharing_api.c b/src/secretsharing/test_secretsharing_api.c index fbf7681a1..5057d5c33 100644 --- a/src/secretsharing/test_secretsharing_api.c +++ b/src/secretsharing/test_secretsharing_api.c | |||
@@ -47,9 +47,9 @@ static void secret_ready_cb (void *cls, | |||
47 | GNUNET_SCHEDULER_shutdown (); | 47 | GNUNET_SCHEDULER_shutdown (); |
48 | } | 48 | } |
49 | 49 | ||
50 | |||
50 | static void | 51 | static void |
51 | handle_shutdown (void *cls, | 52 | handle_shutdown (void *cls) |
52 | const struct GNUNET_SCHEDULER_TaskContext * tc) | ||
53 | { | 53 | { |
54 | if (NULL != keygen) | 54 | if (NULL != keygen) |
55 | { | 55 | { |
@@ -58,12 +58,13 @@ handle_shutdown (void *cls, | |||
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | |||
61 | static void | 62 | static void |
62 | run (void *cls, | 63 | run (void *cls, |
63 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 64 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
64 | struct GNUNET_TESTING_Peer *peer) | 65 | struct GNUNET_TESTING_Peer *peer) |
65 | { | 66 | { |
66 | struct GNUNET_HashCode session_id; | 67 | struct GNUNET_HashCode session_id; |
67 | struct GNUNET_TIME_Absolute start; | 68 | struct GNUNET_TIME_Absolute start; |
68 | struct GNUNET_TIME_Absolute deadline; | 69 | struct GNUNET_TIME_Absolute deadline; |
69 | 70 | ||
@@ -100,4 +101,3 @@ main (int argc, char **argv) | |||
100 | return ret; | 101 | return ret; |
101 | return (GNUNET_YES == success) ? 0 : 1; | 102 | return (GNUNET_YES == success) ? 0 : 1; |
102 | } | 103 | } |
103 | |||