consistency

* cli talekfrontend / talekreplica use server.Run()
* integrate #82 to make sure tests pass
* remove `http.Client` from rpc_call interface

cli/clinfo/fallback.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"log"
+)
+
+func fallback() {
+	log.Fatal("Can't run CLinfo without openCL tag")
+}
+
+func main() {
+	return
+}

cli/clinfo/main.go

@@ -73,6 +73,6 @@ func StatInfo() {
 	}
 }
 
-func main() {
+func init() {
 	StatInfo()
 }

cli/talekfrontend/main.go

@@ -2,8 +2,6 @@ package main
 
 import (
 	"log"
-	"net"
-	"net/http"
 	"os"
 	"os/signal"
 
@@ -42,18 +40,11 @@ func main() {
 
 	f := server.NewFrontendServer("Talek Frontend", serverConfig, config.TrustDomains)
 	f.Frontend.Verbose = *verbose
-
-	bindAddr, err := net.ResolveTCPAddr("ip", *listen)
-	if err != nil {
-		log.Printf("Couldn't resolve address '%s': %v\n", *listen, err)
-		return
-	}
-	listener, err := net.ListenTCP("ip", bindAddr)
+	listener, err := f.Run(*listen)
 	if err != nil {
 		log.Printf("Couldn't listen to frontend address: %v\n", err)
 		return
 	}
-	go http.Serve(listener, f)
 
 	log.Println("Running.")
 

cli/talekreplica/main.go

@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"log"
-	"net"
-	"net/http"
 	"os"
 	"os/signal"
 	"time"
@@ -74,18 +72,11 @@ func main() {
 	log.Printf("serverConfig.Config=%#+v\n", serverConfig.Config)
 
 	r := server.NewReplicaServer(serverConfig.TrustDomain.Name, *backing, serverConfig)
-
-	bindAddr, err := net.ResolveTCPAddr("ip", *listen)
-	if err != nil {
-		log.Printf("Couldn't resolve frontend address '%s': %v\n", *listen, err)
-		return
-	}
-	listener, err := net.ListenTCP("ip", bindAddr)
+	listener, err := r.Run(*listen)
 	if err != nil {
 		log.Printf("Couldn't listen to frontend address: %v\n", err)
 		return
 	}
-	go http.Serve(listener, r)
 
 	log.Println("Running.")
 

common/frontend_rpc.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"log"
-	"net/http"
 	"os"
 )
 
@@ -12,7 +11,6 @@ type FrontendRPC struct {
 	name         string
 	address      string
 	methodPrefix string
-	*http.Client
 }
 
 // NewFrontendRPC instantiates a LeaderRPC stub
@@ -35,25 +33,25 @@ func (f *FrontendRPC) GetName(_ *interface{}, reply *string) error {
 // GetConfig tells the client about current config.
 func (f *FrontendRPC) GetConfig(_ *interface{}, reply *Config) error {
 	var args interface{}
-	err := RPCCall(f.Client, f.address, f.methodPrefix+".GetConfig", &args, reply)
+	err := RPCCall(f.address, f.methodPrefix+".GetConfig", &args, reply)
 	return err
 }
 
 func (f *FrontendRPC) Write(args *WriteArgs, reply *WriteReply) error {
 	//l.log.Printf("Write: enter\n")
-	err := RPCCall(f.Client, f.address, f.methodPrefix+".Write", args, reply)
+	err := RPCCall(f.address, f.methodPrefix+".Write", args, reply)
 	return err
 }
 
 func (f *FrontendRPC) Read(args *EncodedReadArgs, reply *ReadReply) error {
 	//l.log.Printf("Read: enter\n")
-	err := RPCCall(f.Client, f.address, f.methodPrefix+".Read", args, reply)
+	err := RPCCall(f.address, f.methodPrefix+".Read", args, reply)
 	return err
 }
 
 // GetUpdates provides the global interest vector.
 func (f *FrontendRPC) GetUpdates(args *GetUpdatesArgs, reply *GetUpdatesReply) error {
 	//l.log.Printf("GetUpdates: enter\n")
-	err := RPCCall(f.Client, f.address, f.methodPrefix+".GetUpdates", args, reply)
+	err := RPCCall(f.address, f.methodPrefix+".GetUpdates", args, reply)
 	return err
 }

common/replica_rpc.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"log"
-	"net/http"
 	"os"
 )
 
@@ -12,7 +11,6 @@ type ReplicaRPC struct {
 	name         string
 	address      string
 	methodPrefix string
-	*http.Client
 }
 
 // NewReplicaRPC creates a new ReplicaRPC
@@ -33,20 +31,20 @@ func NewReplicaRPC(name string, config *TrustDomainConfig) *ReplicaRPC {
 
 func (r *ReplicaRPC) Write(args *ReplicaWriteArgs, reply *ReplicaWriteReply) error {
 	//f.log.Printf("Write: enter\n")
-	err := RPCCall(r.Client, r.address, r.methodPrefix+".Write", args, reply)
+	err := RPCCall(r.address, r.methodPrefix+".Write", args, reply)
 	return err
 }
 
 // BatchRead performs a set of PIR reads.
 func (r *ReplicaRPC) BatchRead(args *BatchReadRequest, reply *BatchReadReply) error {
 	//f.log.Printf("BatchRead: enter\n")
-	err := RPCCall(r.Client, r.address, r.methodPrefix+".BatchRead", args, reply)
+	err := RPCCall(r.address, r.methodPrefix+".BatchRead", args, reply)
 	return err
 }
 
 // GetUpdates provies the most recent set of global interest vector changes.
 func (r *ReplicaRPC) GetUpdates(args *GetUpdatesArgs, reply *GetUpdatesReply) error {
 	//f.log.Printf("GetUpdates: enter\n")
-	err := RPCCall(r.Client, r.address, r.methodPrefix+".GetUpdates", args, reply)
+	err := RPCCall(r.address, r.methodPrefix+".GetUpdates", args, reply)
 	return err
 }

common/rpc_call.go

@@ -8,11 +8,8 @@ import (
 )
 
 // RPCCall Makes a JSON RPC client.
-func RPCCall(client *http.Client, address string, methodName string, args interface{}, reply interface{}) error {
+func RPCCall(address string, methodName string, args interface{}, reply interface{}) error {
 	var err error
-	if client == nil {
-		client = &http.Client{}
-	}
 
 	// Encode arguments
 	message, err := json.EncodeClientRequest(methodName, args)
@@ -28,7 +25,7 @@ func RPCCall(client *http.Client, address string, methodName string, args interf
 	req.Header.Set("Content-Type", "application/json")
 
 	// Do RPC
-	resp, err := client.Do(req)
+	resp, err := (&http.Client{}).Do(req)
 	if err != nil {
 		return err
 	}

pir/pircl.go

@@ -1,4 +1,4 @@
-//+build !noopencl,!travis
+//+build +opencl,!travis
 
 package pir
 

pir/pircl/context_cl.go

@@ -1,4 +1,4 @@
-//+build !noopencl,!travis
+//+build +opencl,!travis
 
 package pircl
 

pir/pircl/shard_cl.go

@@ -1,4 +1,4 @@
-//+build !noopencl,!travis
+//+build +opencl,!travis
 
 package pircl
 

pir/pircl/shard_cl_test.go

@@ -1,4 +1,4 @@
-//+build !noopencl,!travis
+//+build +opencl,!travis
 
 package pircl
 

pir/pircuda.go

@@ -1,4 +1,4 @@
-//+build !nocuda,!travis
+//+build +cuda,!travis
 
 package pir
 

pir/pircuda/context_cuda.go

@@ -1,4 +1,4 @@
-//+build !nocuda,!travis
+//+build +cuda,!travis
 
 package pircuda
 

pir/pircuda/shard_cuda.go

@@ -1,4 +1,4 @@
-//+build !nocuda,!travis
+//+build +cuda,!travis
 
 package pircuda
 

pir/pircuda/shard_cuda_test.go

@@ -1,4 +1,4 @@
-//+build !nocuda,!travis
+//+build +cuda,!travis
 
 package pircuda
 

protocol/coordinator/client.go

@@ -27,31 +27,31 @@ func (c *Client) Close() error {
 // GetInfo returns info about this server
 func (c *Client) GetInfo(_ *interface{}, reply *GetInfoReply) error {
 	var args interface{}
-	c.lastErr = common.RPCCall(nil, c.address, "Coordinator.GetInfo", &args, reply)
+	c.lastErr = common.RPCCall(c.address, "Coordinator.GetInfo", &args, reply)
 	return c.lastErr
 }
 
 // GetCommonConfig returns the current config.
 func (c *Client) GetCommonConfig(_ *interface{}, reply *common.Config) error {
 	var args interface{}
-	c.lastErr = common.RPCCall(nil, c.address, "Coordinator.GetCommonConfig", &args, reply)
+	c.lastErr = common.RPCCall(c.address, "Coordinator.GetCommonConfig", &args, reply)
 	return c.lastErr
 }
 
 // GetLayout provides the layout for a shard
 func (c *Client) GetLayout(args *GetLayoutArgs, reply *GetLayoutReply) error {
-	c.lastErr = common.RPCCall(nil, c.address, "Coordinator.GetLayout", args, reply)
+	c.lastErr = common.RPCCall(c.address, "Coordinator.GetLayout", args, reply)
 	return c.lastErr
 }
 
 // GetIntVec provides the global interest vector
 func (c *Client) GetIntVec(args *GetIntVecArgs, reply *GetIntVecReply) error {
-	c.lastErr = common.RPCCall(nil, c.address, "Coordinator.GetIntVec", args, reply)
+	c.lastErr = common.RPCCall(c.address, "Coordinator.GetIntVec", args, reply)
 	return c.lastErr
 }
 
 // Commit a set of Writes
 func (c *Client) Commit(args *CommitArgs, reply *CommitReply) error {
-	c.lastErr = common.RPCCall(nil, c.address, "Coordinator.Commit", args, reply)
+	c.lastErr = common.RPCCall(c.address, "Coordinator.Commit", args, reply)
 	return c.lastErr
 }