Merge pull request #76 from AutoRoute/bandwidth_estimation

Bandwidth estimation

Author: djpetti

integration_tests/autoroute_binary.go

@@ -27,6 +27,8 @@ type BinaryOptions struct {
 	BTCHost              string
 	BTCUser              string
 	BTCPass              string
+	// Whether to enable race condition checker.
+	Race bool
 }
 
 // Transforms a BinaryOptions into a valid AutoRoute command line.
@@ -70,11 +72,18 @@ func ProduceCommandLine(b BinaryOptions) []string {
 
 // Produces a AutoRoute Binary which can be run. Must call Start in order to
 // make it start running.
+// Args:
+//  b: Options for the binary.
+// Returns:
+//  The new autoroute binary.
 func NewNodeBinary(b BinaryOptions) AutoRouteBinary {
 	port := GetUnusedPort()
 	args := ProduceCommandLine(b)
 	args = append(args, "--status=[::1]:"+fmt.Sprint(port))
-	binary := NewWrappedBinary(GetAutoRoutePath(), args...)
+
+	path := GetAutoRoutePath(b.Race)
+	binary := NewWrappedBinary(path, args...)
+
 	return AutoRouteBinary{binary, port}
 }
 

integration_tests/bitcoin_test.go

@@ -73,6 +73,7 @@ func TestBitcoin(t *testing.T) {
 		BTCHost: "[::1]:19001",
 		BTCUser: "admin1",
 		BTCPass: "123",
+		Race: true,
 	})
 	listen.Start()
 	defer listen.KillAndPrint(t)

integration_tests/build.go

@@ -7,11 +7,23 @@ import (
 )
 
 func BuildBinary(path string) (string, error) {
-	cmd := exec.Command("go", "install", "-race", path)
+	// Install a version with race condition checking enabled and one without.
+	cmd := exec.Command("go", "install", path)
+	race_cmd := exec.Command("go", "install", "-race", path)
 	cmd.Env = os.Environ()
 	cmd.Env = append(cmd.Env, "GOBIN=/tmp")
+	race_cmd.Env = cmd.Env
+	race_out, race_err := race_cmd.CombinedOutput()
+	// Rename the race binary.
+	os.Rename(GetAutoRoutePath(false), GetAutoRoutePath(true))
 	out, err := cmd.CombinedOutput()
-	return string(out), err
+	ret_err := race_err
+	ret_out := race_out
+	if err != nil {
+		ret_err = err
+		ret_out = out
+	}
+	return string(ret_out), ret_err
 }
 
 func init() {
@@ -21,6 +33,16 @@ func init() {
 	}
 }
 
-func GetAutoRoutePath() string {
-	return "/tmp/autoroute"
+// Gets the path for the version of the autoroute binary.
+// Args:
+//  race: Whether to use the version with race checking.
+// Returns:
+//  The path requested.
+func GetAutoRoutePath(race bool) string {
+	path := "/tmp/autoroute"
+	if race {
+	  path += "_race"
+	}
+
+	return path
 }

integration_tests/connection_test.go

@@ -5,7 +5,8 @@ import (
 )
 
 func TestConnection(t *testing.T) {
-	listen := NewNodeBinary(BinaryOptions{Listen: "[::1]:9999", Fake_money: true})
+	listen := NewNodeBinary(BinaryOptions{Listen: "[::1]:9999",
+		Fake_money: true})
 	listen.Start()
 	defer listen.KillAndPrint(t)
 	listen_id, err := WaitForID(listen)
@@ -21,7 +22,7 @@ func TestConnection(t *testing.T) {
 	defer connect.KillAndPrint(t)
 	connect_id, err := WaitForID(connect)
 	if err != nil {
-	  t.Fatal(err)
+		t.Fatal(err)
 	}
 
 	err = WaitForConnection(listen, connect_id)

integration_tests/loopback2/loopback2.go

@@ -83,10 +83,10 @@ func waitForOffline(devices map[string]l2.FrameReadWriteCloser) {
 
 		// Check for timeout.
 		select {
-		  case <-timeout:
-		    log.Fatal("Waiting for devices to go offline took too long.\n")
-		  default:
-		    continue
+		case <-timeout:
+			log.Fatal("Waiting for devices to go offline took too long.\n")
+		default:
+			continue
 		}
 	}
 }
@@ -244,8 +244,9 @@ func (t *TapNetwork) doCreateNetwork() {
 	}
 	waitForOffline(devices)
 
-	t.waiter.Done()
 	log.Print("Loopback2: Exiting...\n")
+	// Tell the caller we're done quitting.
+	t.waiter.Done()
 }
 
 // Stops a running network simulation.

integration_tests/packet_test.go

@@ -41,6 +41,9 @@ func TestPacket(t *testing.T) {
 	connect.Start()
 	defer connect.KillAndPrint(t)
 	connect_id, err := WaitForID(connect)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	err = WaitForConnection(listen, connect_id)
 	if err != nil {

integration_tests/ports.go

@@ -10,6 +10,7 @@ var l *sync.Mutex = &sync.Mutex{}
 func GetUnusedPort() int {
 	l.Lock()
 	defer l.Unlock()
+	ret := port
 	port = port + 1
-	return port - 1
+	return ret
 }

integration_tests/root/autodiscovery_test.go

@@ -122,6 +122,7 @@ func TestConnection(t *testing.T) {
 		Fake_money:           true,
 		Autodiscover:         true,
 		Autodiscover_devices: []string{listen_dev.Name},
+		Race:                 true,
 	})
 	listen.Start()
 	defer listen.KillAndPrint(t)
@@ -132,6 +133,7 @@ func TestConnection(t *testing.T) {
 		Fake_money:           true,
 		Autodiscover:         true,
 		Autodiscover_devices: []string{connect_dev.Name},
+		Race:                 true,
 	})
 	connect.Start()
 	defer connect.KillAndPrint(t)

integration_tests/root/latency_sim_network.json

@@ -0,0 +1,50 @@
+{
+  "connections": [
+    {
+      "source": "A",
+      "destination": "C"
+    },
+    {
+      "source": "C",
+      "destination": "D"
+    },
+    {
+      "source": "D",
+      "destination": "B"
+    },
+    {
+      "source": "A",
+      "destination": "E"
+    },
+    {
+      "source": "E",
+      "destination": "B"
+    },
+    {
+      "source": "A",
+      "destination": "F"
+    },
+    {
+      "source": "F",
+      "destination": "B"
+    }
+  ],
+  "devices": [
+    {
+      "name": "C",
+      "bandwidth": "25000"
+    },
+    {
+      "name": "D",
+      "bandwidth": "15000"
+    },
+    {
+      "name": "E",
+      "bandwidth": "5000"
+    },
+    {
+      "name": "F",
+      "bandwidth": "25000"
+    }
+  ]
+}