diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:35:48 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:35:48 +0000 |
commit | d3e7a5e40dd2d5409009a30e1e41148c4d852673 (patch) | |
tree | 21ff19580a99137e9b8aec4393feb67f0f1c7b5a /src/fs/fs_test_lib.h | |
parent | ec69ceabc67a72373a2579d871c5fe85676a73bd (diff) | |
download | gnunet-d3e7a5e40dd2d5409009a30e1e41148c4d852673.tar.gz gnunet-d3e7a5e40dd2d5409009a30e1e41148c4d852673.zip |
-use simpler, modern scheduler API
Diffstat (limited to 'src/fs/fs_test_lib.h')
-rw-r--r-- | src/fs/fs_test_lib.h | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index 2a8237aac..72348e018 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h | |||
@@ -42,10 +42,10 @@ | |||
42 | * @param fn name of the file on disk to be removed upon | 42 | * @param fn name of the file on disk to be removed upon |
43 | * completion, or NULL for inserted files (also NULL on error) | 43 | * completion, or NULL for inserted files (also NULL on error) |
44 | */ | 44 | */ |
45 | typedef void (*GNUNET_FS_TEST_UriContinuation) (void *cls, | 45 | typedef void |
46 | const struct GNUNET_FS_Uri * | 46 | (*GNUNET_FS_TEST_UriContinuation) (void *cls, |
47 | uri, | 47 | const struct GNUNET_FS_Uri *uri, |
48 | const char *fn); | 48 | const char *fn); |
49 | 49 | ||
50 | 50 | ||
51 | /** | 51 | /** |
@@ -55,20 +55,24 @@ typedef void (*GNUNET_FS_TEST_UriContinuation) (void *cls, | |||
55 | * @param timeout if this operation cannot be completed within the | 55 | * @param timeout if this operation cannot be completed within the |
56 | * given period, call the continuation with an error code | 56 | * given period, call the continuation with an error code |
57 | * @param anonymity option for publication | 57 | * @param anonymity option for publication |
58 | * @param do_index GNUNET_YES for index, GNUNET_NO for insertion, | 58 | * @param do_index #GNUNET_YES for index, #GNUNET_NO for insertion, |
59 | * GNUNET_SYSERR for simulation | 59 | * #GNUNET_SYSERR for simulation |
60 | * @param size size of the file to publish | 60 | * @param size size of the file to publish |
61 | * @param seed seed to use for file generation | 61 | * @param seed seed to use for file generation |
62 | * @param verbose how verbose to be in reporting | 62 | * @param verbose how verbose to be in reporting |
63 | * @param cont function to call when done | 63 | * @param cont function to call when done |
64 | * @param cont_cls closure for cont | 64 | * @param cont_cls closure for @a cont |
65 | */ | 65 | */ |
66 | void | 66 | void |
67 | GNUNET_FS_TEST_publish (struct GNUNET_TESTBED_Peer *peer, | 67 | GNUNET_FS_TEST_publish (struct GNUNET_TESTBED_Peer *peer, |
68 | struct GNUNET_TIME_Relative timeout, uint32_t anonymity, | 68 | struct GNUNET_TIME_Relative timeout, |
69 | int do_index, uint64_t size, uint32_t seed, | 69 | uint32_t anonymity, |
70 | int do_index, | ||
71 | uint64_t size, | ||
72 | uint32_t seed, | ||
70 | unsigned int verbose, | 73 | unsigned int verbose, |
71 | GNUNET_FS_TEST_UriContinuation cont, void *cont_cls); | 74 | GNUNET_FS_TEST_UriContinuation cont, |
75 | void *cont_cls); | ||
72 | 76 | ||
73 | 77 | ||
74 | /** | 78 | /** |
@@ -82,14 +86,17 @@ GNUNET_FS_TEST_publish (struct GNUNET_TESTBED_Peer *peer, | |||
82 | * @param uri URI of file to download (CHK/LOC only) | 86 | * @param uri URI of file to download (CHK/LOC only) |
83 | * @param verbose how verbose to be in reporting | 87 | * @param verbose how verbose to be in reporting |
84 | * @param cont function to call when done | 88 | * @param cont function to call when done |
85 | * @param cont_cls closure for cont | 89 | * @param cont_cls closure for @a cont |
86 | */ | 90 | */ |
87 | void | 91 | void |
88 | GNUNET_FS_TEST_download (struct GNUNET_TESTBED_Peer *peer, | 92 | GNUNET_FS_TEST_download (struct GNUNET_TESTBED_Peer *peer, |
89 | struct GNUNET_TIME_Relative timeout, | 93 | struct GNUNET_TIME_Relative timeout, |
90 | uint32_t anonymity, uint32_t seed, | 94 | uint32_t anonymity, |
91 | const struct GNUNET_FS_Uri *uri, unsigned int verbose, | 95 | uint32_t seed, |
92 | GNUNET_SCHEDULER_TaskCallback cont, void *cont_cls); | 96 | const struct GNUNET_FS_Uri *uri, |
97 | unsigned int verbose, | ||
98 | GNUNET_SCHEDULER_TaskCallback cont, | ||
99 | void *cont_cls); | ||
93 | 100 | ||
94 | 101 | ||
95 | 102 | ||