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@torproject.org>
This commit is contained in:
parent
b2c56eacdd
commit
2034e0d1d4
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
/* Copyright (c) 2017, The Tor Project, Inc. */
|
||||
/* See LICENSE for licensing information */
|
||||
|
||||
#include "scheduler.h"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
/* Copyright (c) 2017, The Tor Project, Inc. */
|
||||
/* See LICENSE for licensing information */
|
||||
|
||||
#include "scheduler.h"
|
||||
|
Loading…
Reference in New Issue