summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2014-01-24 07:03:14 -0800
committerAndrea Shepard <andrea@torproject.org>2014-09-30 23:14:58 -0700
commitf8ceb0f028eb7661cb31b2f82d5a82460e96ece9 (patch)
treed3421ccf079a9649296b8ba20714eeb77864243b
parent314c2f18ae53c73e790b815567d4c266a4b67382 (diff)
downloadtor-f8ceb0f028eb7661cb31b2f82d5a82460e96ece9.tar.gz
tor-f8ceb0f028eb7661cb31b2f82d5a82460e96ece9.zip
Make scheduler_run() mockable
-rw-r--r--src/or/scheduler.c4
-rw-r--r--src/or/scheduler.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index 544ec83258..bf86810517 100644
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -376,8 +376,8 @@ scheduler_release_channel,(channel_t *chan))
/** Run the scheduling algorithm if necessary */
-void
-scheduler_run(void)
+MOCK_IMPL(void,
+scheduler_run, (void))
{
int n_cells, n_chans_before, n_chans_after;
uint64_t q_len_before, q_heur_before, q_len_after, q_heur_after;
diff --git a/src/or/scheduler.h b/src/or/scheduler.h
index b99491b221..b0b66ee957 100644
--- a/src/or/scheduler.h
+++ b/src/or/scheduler.h
@@ -18,7 +18,7 @@
/* Set up and shut down the scheduler from main.c */
void scheduler_free_all(void);
void scheduler_init(void);
-void scheduler_run(void);
+MOCK_DECL(void, scheduler_run, (void));
/* Mark channels as having cells or wanting/not wanting writes */
MOCK_DECL(void,scheduler_channel_doesnt_want_writes,(channel_t *chan));