From 83c852c12b4c40eef5961d1da9e0978f1ba6777f Mon Sep 17 00:00:00 2001
From: Helin Wang <ustc.harry@gmail.com>
Date: Fri, 9 Jun 2017 22:39:32 +0000
Subject: [PATCH] better logging

---
 go/pserver/cclient/cclient.go | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/go/pserver/cclient/cclient.go b/go/pserver/cclient/cclient.go
index c87f3853c5..6a76ec920e 100644
--- a/go/pserver/cclient/cclient.go
+++ b/go/pserver/cclient/cclient.go
@@ -132,7 +132,7 @@ func paddle_init_param(client C.paddle_pserver_client, param C.paddle_parameter,
 
 	if err != nil {
 		if err.Error() == pserver.AlreadyInitialized {
-			log.Println("parameter", name, "already initialized, treat paddle_init_param as sucessful.")
+			log.Printf("parameter %s already initialized, treat paddle_init_param as sucessful.\n", name)
 			return 0
 		}
 		log.Println(err)
@@ -194,12 +194,38 @@ func paddle_get_params(client C.paddle_pserver_client, dst **C.paddle_parameter,
 		return -1
 	}
 
+	names := func() (string, string) {
+		retNames := ""
+		for _, p := range ps {
+			if retNames == "" {
+				retNames = p.Name
+			} else {
+				retNames = ", " + p.Name
+			}
+		}
+
+		requestedNames := ""
+		for _, n := range ns {
+			if requestedNames == "" {
+				requestedNames = n
+			} else {
+				requestedNames = ", " + n
+			}
+		}
+
+		return requestedNames, retNames
+	}
+
 	if len(ps) != len(ns) {
+		requestedNames, retNames := names()
+		log.Printf("pserver returned wrong number of parameters. Requested: %s, returned: %s.\n", retNames, requestedNames)
 		return -1
 	}
 
 	for i := range ps {
 		if ns[i] != ps[i].Name {
+			requestedNames, retNames := names()
+			log.Printf("pserver returned wrong parameters, or not in requested order. Requested: %s, returned: %s.\n", retNames, requestedNames)
 			return -1
 		}
 	}
@@ -209,12 +235,12 @@ func paddle_get_params(client C.paddle_pserver_client, dst **C.paddle_parameter,
 		param := *(**C.paddle_parameter)(unsafe.Pointer((uintptr(unsafe.Pointer(dst)) + uintptr(i)*unsafe.Sizeof(*dst))))
 
 		if unsafe.Pointer(param) == nullPtr {
-			log.Println("Error: must pre-allocate parameter.")
+			log.Println("must pre-allocate parameter.")
 			return -1
 		} else {
 			if unsafe.Pointer(param.content) != nullPtr {
 				if int(param.content_len) != len(p.Content) {
-					log.Println("Error: the pre-allocated content len does not match parameter content len.", param.content_len, len(p.Content))
+					log.Printf("the pre-allocated content len does not match parameter content len. Pre-allocated len: %d, returned len: %d", param.content_len, len(p.Content))
 					return -1
 				}
 			}
-- 
GitLab