Rename writer to client

writer_test.go → client_test.go

@@ -35,37 +35,37 @@ func TestMmvFileLocation(t *testing.T) {
 }
 
 func TestTocCountAndLength(t *testing.T) {
-	w, err := NewPCPWriter("test", ProcessFlag)
+	c, err := NewPCPClient("test", ProcessFlag)
 	if err != nil {
 		t.Errorf("cannot create writer, error: %v", err)
 	}
 
-	if w.tocCount() != 2 {
-		t.Errorf("expected tocCount to be 2, got %v", w.tocCount())
+	if c.tocCount() != 2 {
+		t.Errorf("expected tocCount to be 2, got %v", c.tocCount())
 	}
 
 	expectedLength := HeaderLength + 2*TocLength
-	if w.Length() != expectedLength {
-		t.Errorf("expected Length to be %v, got %v", expectedLength, w.Length())
+	if c.Length() != expectedLength {
+		t.Errorf("expected Length to be %v, got %v", expectedLength, c.Length())
 	}
 
 	m, err := NewPCPSingletonMetric(10, "test", Int32Type, CounterSemantics, OneUnit, "test", "")
 	if err != nil {
 		t.Error("Cannot create a metric")
 	}
 
-	w.MustRegister(m)
-	if w.tocCount() != 3 {
-		t.Errorf("expected tocCount to be 3, got %v", w.tocCount())
+	c.MustRegister(m)
+	if c.tocCount() != 3 {
+		t.Errorf("expected tocCount to be 3, got %v", c.tocCount())
 	}
 
 	expectedLength = HeaderLength + 3*TocLength + 1*MetricLength + 1*ValueLength + 1*StringLength
-	if w.Length() != expectedLength {
-		t.Errorf("expected Length to be %v, got %v", expectedLength, w.Length())
+	if c.Length() != expectedLength {
+		t.Errorf("expected Length to be %v, got %v", expectedLength, c.Length())
 	}
 
 	indom, _ := NewPCPInstanceDomain("testindom", []string{"test"}, "", "")
-	w.MustRegisterIndom(indom)
+	c.MustRegisterIndom(indom)
 
 	m2, err := NewPCPInstanceMetric(
 		Instances{
@@ -77,36 +77,36 @@ func TestTocCountAndLength(t *testing.T) {
 		t.Error("Cannot create a metric")
 	}
 
-	err = w.Register(m2)
+	err = c.Register(m2)
 	if err != nil {
 		t.Error("Cannot register m2")
 	}
 
-	if w.tocCount() != 5 {
-		t.Errorf("expected tocCount to be 5, got %v", w.tocCount())
+	if c.tocCount() != 5 {
+		t.Errorf("expected tocCount to be 5, got %v", c.tocCount())
 	}
 }
 
 func TestMapping(t *testing.T) {
-	w, err := NewPCPWriter("test", ProcessFlag)
-	_, err = w.RegisterString("test.1", 2, CounterSemantics, Int32Type, OneUnit)
+	c, err := NewPCPClient("test", ProcessFlag)
+	_, err = c.RegisterString("test.1", 2, CounterSemantics, Int32Type, OneUnit)
 	if err != nil {
 		t.Error("Cannot Register")
 	}
 
-	w.MustStart()
+	c.MustStart()
 	loc, _ := mmvFileLocation("test")
 	if _, err = os.Stat(loc); err != nil {
 		t.Error("expected a MMV file to be created on startup")
 	}
 
-	_, err = w.RegisterString("test.2", 2, CounterSemantics, Int32Type, OneUnit)
+	_, err = c.RegisterString("test.2", 2, CounterSemantics, Int32Type, OneUnit)
 	if err == nil {
 		t.Error("expected registration to fail when a mapping is active")
 	}
 
 	EraseFileOnStop = true
-	err = w.Stop()
+	err = c.Stop()
 	if err != nil {
 		t.Error("Cannot stop a mapping")
 	}

examples/acme/main.go

@@ -58,17 +58,17 @@ func main() {
 		panic(err)
 	}
 
-	writer, err := speed.NewPCPWriter("acme", speed.ProcessFlag)
+	client, err := speed.NewPCPClient("acme", speed.ProcessFlag)
 	if err != nil {
 		panic(err)
 	}
 
-	writer.MustRegisterIndom(indom)
-	writer.MustRegister(countmetric)
-	writer.MustRegister(timemetric)
+	client.MustRegisterIndom(indom)
+	client.MustRegister(countmetric)
+	client.MustRegister(timemetric)
 
-	writer.MustStart()
-	defer writer.MustStop()
+	client.MustStart()
+	defer client.MustStop()
 
 	time.Sleep(time.Second * 5)
 	err = countmetric.SetInstance("Anvils", 42)

examples/http_counter/server.go

@@ -27,15 +27,15 @@ func main() {
 		panic(err)
 	}
 
-	writer, err := speed.NewPCPWriter("example", speed.ProcessFlag)
+	client, err := speed.NewPCPClient("example", speed.ProcessFlag)
 	if err != nil {
 		panic(err)
 	}
 
-	writer.MustRegister(metric)
+	client.MustRegister(metric)
 
-	writer.MustStart()
-	defer writer.MustStop()
+	client.MustStart()
+	defer client.MustStop()
 
 	http.HandleFunc("/increment", handleIncrement)
 	go func() {

examples/instance_string/main.go

@@ -12,12 +12,12 @@ var timelimit = flag.Int("time", 60, "number of seconds to run for")
 func main() {
 	flag.Parse()
 
-	w, err := speed.NewPCPWriter("strings", speed.ProcessFlag)
+	c, err := speed.NewPCPClient("strings", speed.ProcessFlag)
 	if err != nil {
 		panic(err)
 	}
 
-	m, err := w.RegisterString("language[go, javascript, php].users", speed.Instances{
+	m, err := c.RegisterString("language[go, javascript, php].users", speed.Instances{
 		"go":         1,
 		"javascript": 100,
 		"php":        10,
@@ -26,8 +26,8 @@ func main() {
 		panic(err)
 	}
 
-	w.MustStart()
-	defer w.MustStop()
+	c.MustStart()
+	defer c.MustStop()
 
 	metric := m.(speed.InstanceMetric)
 	for i := 0; i < *timelimit; i++ {

examples/simple/main.go

@@ -21,15 +21,15 @@ func main() {
 		panic(err)
 	}
 
-	writer, err := speed.NewPCPWriter("simple", speed.ProcessFlag)
+	client, err := speed.NewPCPClient("simple", speed.ProcessFlag)
 	if err != nil {
 		panic(err)
 	}
 
-	writer.MustRegister(metric)
+	client.MustRegister(metric)
 
-	writer.MustStart()
-	defer writer.MustStop()
+	client.MustStart()
+	defer client.MustStop()
 
 	fmt.Println("The metric is currently mapped as mmv.simple.simple.counter, to stop the mapping, press enter")
 	_, _ = os.Stdin.Read(make([]byte, 1))

examples/simple_string_metric/main.go

@@ -12,7 +12,7 @@ var timelimit = flag.Int("time", 60, "number of seconds to run for")
 func main() {
 	flag.Parse()
 
-	w, err := speed.NewPCPWriter("stringtest", speed.ProcessFlag)
+	c, err := speed.NewPCPClient("stringtest", speed.ProcessFlag)
 	if err != nil {
 		panic(err)
 	}
@@ -26,13 +26,13 @@ func main() {
 		"Red Hood",
 	}
 
-	m, err := w.RegisterString("bat.names", names[0], speed.InstantSemantics, speed.StringType, speed.OneUnit)
+	m, err := c.RegisterString("bat.names", names[0], speed.InstantSemantics, speed.StringType, speed.OneUnit)
 	if err != nil {
 		panic(err)
 	}
 
-	w.MustStart()
-	defer w.MustStop()
+	c.MustStart()
+	defer c.MustStop()
 
 	metric := m.(speed.SingletonMetric)
 	for i := 0; i < *timelimit; i++ {

examples/singleton_counter/main.go

@@ -28,18 +28,18 @@ func main() {
 		panic(err)
 	}
 
-	writer, err := speed.NewPCPWriter("singletoncounter", speed.ProcessFlag)
+	client, err := speed.NewPCPClient("singletoncounter", speed.ProcessFlag)
 	if err != nil {
 		panic(err)
 	}
 
-	err = writer.Register(metric)
+	err = client.Register(metric)
 	if err != nil {
 		panic(err)
 	}
 
-	writer.MustStart()
-	defer writer.MustStop()
+	client.MustStart()
+	defer client.MustStop()
 
 	fmt.Println("The metric should be visible as mmv.singletoncounter.counter")
 	for i := 0; i < *timelimit; i++ {

examples/singleton_string/main.go

@@ -13,18 +13,18 @@ var timelimit = flag.Int("time", 60, "number of seconds to run for")
 func main() {
 	flag.Parse()
 
-	w, err := speed.NewPCPWriter("strings", speed.ProcessFlag)
+	c, err := speed.NewPCPClient("strings", speed.ProcessFlag)
 	if err != nil {
 		panic(err)
 	}
 
-	m, err := w.RegisterString("simple.counter", 10, speed.CounterSemantics, speed.Int32Type, speed.OneUnit)
+	m, err := c.RegisterString("simple.counter", 10, speed.CounterSemantics, speed.Int32Type, speed.OneUnit)
 	if err != nil {
 		panic(err)
 	}
 
-	w.MustStart()
-	defer w.MustStop()
+	c.MustStart()
+	defer c.MustStop()
 
 	metric := m.(speed.SingletonMetric)
 	for i := 0; i < *timelimit; i++ {