Merge pull request #2 from getlantern/benchmarks-e2e-results

perf: reuse pre-warmed Core to cut connection setup cost by 44%

Author: myleshorton

BENCHMARKS.md

@@ -0,0 +1,47 @@
+// echoserver is a standalone TCP echo server for remote benchmarking.
+// Any data received on a connection is echoed back immediately via io.Copy.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+func main() {
+	port := flag.Int("port", 8080, "TCP port to listen on")
+	flag.Parse()
+
+	addr := fmt.Sprintf(":%d", *port)
+	lis, err := net.Listen("tcp", addr)
+	if err != nil {
+		log.Fatalf("listen %s: %v", addr, err)
+	}
+	log.Printf("echo server listening on %s", addr)
+
+	go func() {
+		for {
+			conn, err := lis.Accept()
+			if err != nil {
+				return
+			}
+			go handle(conn)
+		}
+	}()
+
+	sig := make(chan os.Signal, 1)
+	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
+	<-sig
+	log.Println("shutting down")
+	lis.Close()
+}
+
+func handle(c net.Conn) {
+	defer c.Close()
+	io.Copy(c, c)
+}

cmd/echoserver/main.go

@@ -32,7 +32,7 @@ type Dialer interface {
 	mustEmbedUnimplementedDialer()
 }
 
-type newDialerFunc func(context.Context, *Config) (Dialer, error)
+type newDialerFunc func(context.Context, *Config, Core) (Dialer, error)
 
 var (
 	knownDialerVersions = make(map[string]newDialerFunc)
@@ -117,10 +117,11 @@ func NewDialerWithContext(ctx context.Context, c *Config) (Dialer, error) {
 	// in a more organized way.
 	for exportName := range core.Exports() {
 		if f, ok := knownDialerVersions[exportName]; ok {
-			return f(ctx, c)
+			return f(ctx, c, core)
 		}
 	}
 
+	core.Close()
 	return nil, ErrDialerVersionNotFound
 }
 
@@ -144,7 +145,7 @@ type FixedDialer interface {
 	mustEmbedUnimplementedFixedDialer()
 }
 
-type newFixedDialerFunc func(context.Context, *Config) (FixedDialer, error)
+type newFixedDialerFunc func(context.Context, *Config, Core) (FixedDialer, error)
 
 var (
 	knownFixedDialerVersions = make(map[string]newFixedDialerFunc)
@@ -190,9 +191,10 @@ func NewFixedDialerWithContext(ctx context.Context, cfg *Config) (FixedDialer, e
 	// Sniff the version of the dialer
 	for exportName := range core.Exports() {
 		if f, ok := knownFixedDialerVersions[exportName]; ok {
-			return f(ctx, cfg)
+			return f(ctx, cfg, core)
 		}
 	}
 
+	core.Close()
 	return nil, ErrFixedDialerVersionNotFound
 }