Commit a28df3fb authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold' 

Conflicts:
	src/or/or.h
	src/test/Makefile.nmake
parents 3d2366c6 12b6c7df

changes/global_scheduler

0 → 100644
+4 −0
Original line number Diff line number Diff line 
 o Major changes:

   - Implement a new inter-cmux comparison API, a global high/low watermark

     mechanism and a global scheduler loop for transmission prioritization

     across all channels as well as among circuits on one channel.

scripts/maint/checkSpace.pl

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ for $fn (@ARGV) { 
                if ($1 ne "if" and $1 ne "while" and $1 ne "for" and

                    $1 ne "switch" and $1 ne "return" and $1 ne "int" and

                    $1 ne "elsif" and $1 ne "WINAPI" and $2 ne "WINAPI" and

                    $1 ne "void" and $1 ne "__attribute__" and $1 ne "op") {

                    $1 ne "void" and $1 ne "__attribute__" and $1 ne "op" and

                    $1 ne "size_t" and $1 ne "double") {

                    print "     fn ():$fn:$.\n";

                }

            }

src/common/compat_libevent.c

+2 −2
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) 
}



/** Return the current Libevent event base that we're set up to use. */

struct event_base *

tor_libevent_get_base(void)

MOCK_IMPL(struct event_base *,

tor_libevent_get_base, (void))

{

  return the_event_base;

}

src/common/compat_libevent.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ typedef struct tor_libevent_cfg { 
} tor_libevent_cfg;



void tor_libevent_initialize(tor_libevent_cfg *cfg);

struct event_base *tor_libevent_get_base(void);

MOCK_DECL(struct event_base *, tor_libevent_get_base, (void));

const char *tor_libevent_get_method(void);

void tor_check_libevent_version(const char *m, int server,

                                const char **badness_out);

src/common/torlog.h

+3 −1
Original line number Diff line number Diff line
@@ -97,8 +97,10 @@ 
#define LD_HEARTBEAT (1u<<20)

/** Abstract channel_t code */

#define LD_CHANNEL   (1u<<21)

/** Scheduler */

#define LD_SCHED     (1u<<22)

/** Number of logging domains in the code. */

#define N_LOGGING_DOMAINS 22

#define N_LOGGING_DOMAINS 23



/** This log message is not safe to send to a callback-based logger

 * immediately.  Used as a flag, not a log domain. */