[tor-commits] [tor/master] Make some scheduler.c static functions visible to the test suite

[nickm at torproject.org]

commit 71a9ed6feb9e28cce0a2e776e23b440b0139e479
Author: Andrea Shepard <andrea at torproject.org>
Date:   Thu Jan 23 21:13:26 2014 -0800

    Make some scheduler.c static functions visible to the test suite
---
 src/or/scheduler.c |    7 +++----
 src/or/scheduler.h |    7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index 71da4a4..1b4ae04 100644
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -12,6 +12,7 @@
 #include "channel.h"
 
 #include "compat_libevent.h"
+#define SCHEDULER_PRIVATE_
 #include "scheduler.h"
 
 #ifdef HAVE_EVENT2_EVENT_H
@@ -141,8 +142,6 @@ static void scheduler_retrigger(void);
 #if 0
 static void scheduler_trigger(void);
 #endif
-static uint64_t scheduler_get_queue_heuristic(void);
-static void scheduler_update_queue_heuristic(time_t now);
 
 /* Scheduler function implementations */
 
@@ -642,7 +641,7 @@ scheduler_adjust_queue_size(channel_t *chan, char dir, uint64_t adj)
  * Query the current value of the queue heuristic
  */
 
-static uint64_t
+STATIC uint64_t
 scheduler_get_queue_heuristic(void)
 {
   time_t now = approx_time();
@@ -656,7 +655,7 @@ scheduler_get_queue_heuristic(void)
  * Adjust the queue heuristic value to the present time
  */
 
-static void
+STATIC void
 scheduler_update_queue_heuristic(time_t now)
 {
   time_t diff;
diff --git a/src/or/scheduler.h b/src/or/scheduler.h
index 7f59ec4..3c0d86d 100644
--- a/src/or/scheduler.h
+++ b/src/or/scheduler.h
@@ -34,5 +34,12 @@ void scheduler_adjust_queue_size(channel_t *chan, char dir, uint64_t adj);
 /* Notify scheduler that a channel's queue position may have changed */
 void scheduler_touch_channel(channel_t *chan);
 
+/* Things only scheduler.c and its test suite should see */
+
+#ifdef SCHEDULER_PRIVATE_
+STATIC uint64_t scheduler_get_queue_heuristic(void);
+STATIC void scheduler_update_queue_heuristic(time_t now);
+#endif
+
 #endif /* !defined(TOR_SCHEDULER_H) */