From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 Nov 2014 03:39:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
X-Git-Tag: tor-0.2.6.2-alpha~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a28df3fb6713043e801fb5fcf5019fc0539b5066;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'

Conflicts:
	src/or/or.h
	src/test/Makefile.nmake
---

a28df3fb6713043e801fb5fcf5019fc0539b5066
diff --cc src/or/include.am
index 0f53f007f0,b2b940614f..643f7ce001
--- a/src/or/include.am
+++ b/src/or/include.am
@@@ -74,11 -80,12 +74,12 @@@ LIBTOR_A_SOURCES = 
  	src/or/routerlist.c				\
  	src/or/routerparse.c				\
  	src/or/routerset.c				\
+ 	src/or/scheduler.c				\
  	src/or/statefile.c				\
  	src/or/status.c					\
 +	src/or/onion_ntor.c				\
  	$(evdns_source)					\
  	$(tor_platform_source)				\
 -	$(onion_ntor_source)				\
  	src/or/config_codedigest.c
  
  src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
diff --cc src/or/or.h
index bff7267d37,25df54a669..ccb29ee7df
--- a/src/or/or.h
+++ b/src/or/or.h
@@@ -4230,6 -4227,21 +4248,18 @@@ typedef struct 
    /** How long (seconds) do we keep a guard before picking a new one? */
    int GuardLifetime;
  
 -  /** Should we send the timestamps that pre-023 hidden services want? */
 -  int Support022HiddenServices;
 -
+   /** Low-water mark for global scheduler - start sending when estimated
+    * queued size falls below this threshold.
+    */
+   uint32_t SchedulerLowWaterMark;
+   /** High-water mark for global scheduler - stop sending when estimated
+    * queued size exceeds this threshold.
+    */
+   uint32_t SchedulerHighWaterMark;
+   /** Flush size for global scheduler - flush this many cells at a time
+    * when sending.
+    */
+   unsigned int SchedulerMaxFlushCells;
  } or_options_t;
  
  /** Persistent state for an onion router, as saved to disk. */
diff --cc src/test/Makefile.nmake
index f6ee7f3f53,e2cf53895f..0435617683
--- a/src/test/Makefile.nmake
+++ b/src/test/Makefile.nmake
@@@ -11,11 -11,11 +11,12 @@@ LIBS = ..\..\..\build-alpha\lib\libeven
   ws2_32.lib advapi32.lib shell32.lib \
   crypt32.lib gdi32.lib user32.lib
  
- TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \
+ TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_channeltls.obj \
 -	test_containers.obj test_controller_events.obj test_crypto.obj \
 -	test_data.obj test_dir.obj test_microdesc.obj test_pt.obj test_util.obj \
 -	test_config.obj test_cell_formats.obj test_relay.obj test_replay.obj \
++        test_containers.obj \
 +	test_controller_events.obj test_crypto.obj test_data.obj test_dir.obj \
 +	test_checkdir.obj test_microdesc.obj test_pt.obj test_util.obj test_config.obj \
- 	test_cell_formats.obj test_replay.obj test_introduce.obj tinytest.obj \
- 	test_hs.obj
++	test_cell_formats.obj test_relay.obj test_replay.obj \
+ 	test_scheduler.obj test_introduce.obj test_hs.obj tinytest.obj
  
  tinytest.obj: ..\ext\tinytest.c
  	$(CC) $(CFLAGS) /D snprintf=_snprintf /c ..\ext\tinytest.c