[tor-commits] [tor/master] Add initial circuitmux_ewma.{c,h}

[andrea at torproject.org]

commit 184560c4f6fa8262fe1316d5e169a16b47b11e6b
Author: Andrea Shepard <andrea at torproject.org>
Date:   Sun Sep 30 21:41:25 2012 -0700

    Add initial circuitmux_ewma.{c,h}
---
 src/or/Makefile.nmake    |   16 ++++++++--------
 src/or/circuitmux_ewma.c |   12 ++++++++++++
 src/or/circuitmux_ewma.h |   18 ++++++++++++++++++
 src/or/include.am        |    2 ++
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index 9f948d6..677618e 100644
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -9,14 +9,14 @@ LIBS = ..\..\..\build-alpha\lib\libevent.a \
  ws2_32.lib advapi32.lib shell32.lib
 
 LIBTOR_OBJECTS = buffers.obj channel.obj channeltls.obj circuitbuild.obj \
-	circuitlist.obj circuitmux.obj circuituse.obj command.obj config.obj \
-	connection.obj connection_edge.obj connection_or.obj control.obj \
-	cpuworker.obj directory.obj dirserv.obj dirvote.obj dns.obj \
-	dnsserv.obj geoip.obj hibernate.obj main.obj microdesc.obj \
-	networkstatus.obj nodelist.obj onion.obj policies.obj reasons.obj \
-	relay.obj rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \
-	rephist.obj router.obj routerlist.obj routerparse.obj status.obj \
-	config_codedigest.obj ntmain.obj
+	circuitlist.obj circuitmux.obj circuitmux_ewma.obj circuituse.obj \
+	command.obj config.obj connection.obj connection_edge.obj \
+	connection_or.obj control.obj cpuworker.obj directory.obj \
+	dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj hibernate.obj \
+	main.obj microdesc.obj networkstatus.obj nodelist.obj onion.obj \
+	policies.obj reasons.obj relay.obj rendclient.obj rendcommon.obj \
+	rendmid.obj rendservice.obj rephist.obj router.obj routerlist.obj \
+	routerparse.obj status.obj config_codedigest.obj ntmain.obj
 
 libtor.lib: $(LIBTOR_OBJECTS)
 	lib $(LIBTOR_OBJECTS) /out:libtor.lib
diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
new file mode 100644
index 0000000..b31e908
--- /dev/null
+++ b/src/or/circuitmux_ewma.c
@@ -0,0 +1,12 @@
+/* * Copyright (c) 2012, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file circuitmux_ewma.c
+ * \brief EWMA circuit selection as a circuitmux_t policy
+ **/
+
+#include "or.h"
+#include "circuitmux.h"
+#include "circuitmux_ewma.h"
+
diff --git a/src/or/circuitmux_ewma.h b/src/or/circuitmux_ewma.h
new file mode 100644
index 0000000..fcbe298
--- /dev/null
+++ b/src/or/circuitmux_ewma.h
@@ -0,0 +1,18 @@
+/* * Copyright (c) 2012, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file circuitmux_ewma.h
+ * \brief Header file for circuitmux_ewma.c
+ **/
+
+#ifndef _TOR_CIRCUITMUX_EWMA_H
+#define _TOR_CIRCUITMUX_EWMA_H
+
+#include "or.h"
+#include "circuitmux.h"
+
+/* TODO */
+
+#endif /* _TOR_CIRCUITMUX_EWMA_H */
+
diff --git a/src/or/include.am b/src/or/include.am
index 3ec94e5..90dea44 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -22,6 +22,7 @@ src_or_libtor_a_SOURCES = \
 	src/or/circuitbuild.c				\
 	src/or/circuitlist.c				\
 	src/or/circuitmux.c				\
+	src/or/circuitmux_ewma.c			\
 	src/or/circuituse.c				\
 	src/or/command.c				\
 	src/or/config.c					\
@@ -94,6 +95,7 @@ ORHEADERS = \
 	src/or/circuitbuild.h				\
 	src/or/circuitlist.h				\
 	src/or/circuitmux.h				\
+	src/or/circuitmux_ewma.h			\
 	src/or/circuituse.h				\
 	src/or/command.h				\
 	src/or/config.h					\