commit b7125961de3e7d2687cc52d63d000ad6b6320d63 Author: Andrea Shepard andrea@torproject.org Date: Fri Jan 24 03:12:28 2014 -0800

Expose scheduler_compare_channels() to test suite --- src/or/scheduler.c | 3 +-- src/or/scheduler.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 1b4ae04..544ec83 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -134,7 +134,6 @@ STATIC time_t queue_heuristic_timestamp = 0;

/* Scheduler static function declarations */

-static int scheduler_compare_channels(const void *c1_v, const void *c2_v); static void scheduler_evt_callback(evutil_socket_t fd, short events, void *arg); static int scheduler_more_work(void); @@ -168,7 +167,7 @@ scheduler_free_all(void) * Comparison function to use when sorting pending channels */

-static int +STATIC int scheduler_compare_channels(const void *c1_v, const void *c2_v) { channel_t *c1 = NULL, *c2 = NULL; diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 3c0d86d..b99491b 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -37,6 +37,7 @@ void scheduler_touch_channel(channel_t *chan); /* Things only scheduler.c and its test suite should see */

#ifdef SCHEDULER_PRIVATE_ +STATIC int scheduler_compare_channels(const void *c1_v, const void *c2_v); STATIC uint64_t scheduler_get_queue_heuristic(void); STATIC void scheduler_update_queue_heuristic(time_t now); #endif