[tor-commits] [tor/master] sched: Groundwork before KIST implementation

[nickm at torproject.org]

commit 2034e0d1d42c4f36a24c1eb88f95d057dacacf72
Author: Matt Traudt <sirmatt at ksu.edu>
Date:   Mon Jul 10 16:10:29 2017 -0400

    sched: Groundwork before KIST implementation
    
    - HT_FOREACH_FN defined in an additional place because nickm did that
      in an old kist prototype
    - Make channel_more_to_flush mockable for future sched tests
    - Add empty scheduler_{vanilla,kist}.c files and put in include.am
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/ext/ht.h               | 2 ++
 src/or/channel.c           | 4 ++--
 src/or/channel.h           | 2 +-
 src/or/include.am          | 2 ++
 src/or/scheduler_kist.c    | 5 +++++
 src/or/scheduler_vanilla.c | 5 +++++
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/ext/ht.h b/src/ext/ht.h
index caa420e9b..99da773fa 100644
--- a/src/ext/ht.h
+++ b/src/ext/ht.h
@@ -150,6 +150,8 @@
 #define HT_CLEAR(name, head)         name##_HT_CLEAR(head)
 #define HT_INIT(name, head)          name##_HT_INIT(head)
 #define HT_REP_IS_BAD_(name, head)    name##_HT_REP_IS_BAD_(head)
+#define HT_FOREACH_FN(name, head, fn, data) \
+   name##_HT_FOREACH_FN((head), (fn), (data))
 /* Helper: */
 static inline unsigned
 ht_improve_hash(unsigned h)
diff --git a/src/or/channel.c b/src/or/channel.c
index 9f8a03683..d64a0347a 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2601,8 +2601,8 @@ channel_flush_cells(channel_t *chan)
  * available.
  */
 
-int
-channel_more_to_flush(channel_t *chan)
+MOCK_IMPL(int,
+channel_more_to_flush, (channel_t *chan))
 {
   tor_assert(chan);
 
diff --git a/src/or/channel.h b/src/or/channel.h
index 2d0ec3992..8c776c53f 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -568,7 +568,7 @@ MOCK_DECL(ssize_t, channel_flush_some_cells,
           (channel_t *chan, ssize_t num_cells));
 
 /* Query if data available on this channel */
-int channel_more_to_flush(channel_t *chan);
+MOCK_DECL(int, channel_more_to_flush, (channel_t *chan));
 
 /* Notify flushed outgoing for dirreq handling */
 void channel_notify_flushed(channel_t *chan);
diff --git a/src/or/include.am b/src/or/include.am
index 021f5f9d5..7216aba9a 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -99,6 +99,8 @@ LIBTOR_A_SOURCES = \
 	src/or/routerparse.c				\
 	src/or/routerset.c				\
 	src/or/scheduler.c				\
+	src/or/scheduler_kist.c				\
+	src/or/scheduler_vanilla.c			\
 	src/or/statefile.c				\
 	src/or/status.c					\
 	src/or/torcert.c				\
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
new file mode 100644
index 000000000..c14084953
--- /dev/null
+++ b/src/or/scheduler_kist.c
@@ -0,0 +1,5 @@
+/* Copyright (c) 2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#include "scheduler.h"
+
diff --git a/src/or/scheduler_vanilla.c b/src/or/scheduler_vanilla.c
new file mode 100644
index 000000000..c14084953
--- /dev/null
+++ b/src/or/scheduler_vanilla.c
@@ -0,0 +1,5 @@
+/* Copyright (c) 2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#include "scheduler.h"
+