backup

Coder0yang · Coder0yang · commit 6597efcdaad6 · 2016-08-31T18:24:17.000+08:00
diff --git a/MyStruct/Makefile b/MyStruct/Makefile
@@ -0,0 +1,21 @@
+RM ?= rm -rf
+GOBUILD = go build
+GOTEST = go test # -v
+
+VARS=vars.mk
+$(shell ./build_config ${VARS})
+include ${VARS}
+
+.PHONY: test clean build
+
+build:
+	@cd bin/ && ${GOBUILD} Main && cd ..
+
+test:
+	@cd src/FreqCtrl/ && ${GOTEST} && cd ../..
+
+bench:
+	@cd src/FreqCtrl/ && ${GOTEST} -bench=. && cd ../..
+
+clean:
+	${RM} ${VARS} bin/*
diff --git a/MyStruct/MyStruct/struct.go b/MyStruct/MyStruct/struct.go
@@ -0,0 +1,8 @@
+package MyStruct
+
+type Conn struct{
+    c int
+    a int
+    CC int
+    AA int
+}
diff --git a/MyStruct/build_config b/MyStruct/build_config
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+OUTPUT=$1
+PWD=$(pwd)
+
+if test -z "${OUTPUT}"; then
+    echo "Usage: $0 <output_file>"
+    exit 1
+fi
+
+rm -f ${OUTPUT}
+touch ${OUTPUT}
+
+if [ ! -d "bin" ]; then
+    $(mkdir bin)
+fi
+
+echo "GOPATH=${GOPATH}:${PWD}" >> ${OUTPUT}
diff --git a/MyStruct/vars.mk b/MyStruct/vars.mk
@@ -0,0 +1 @@
+GOPATH=/usr/local/godown:/home/yang/Work/GolangCode/FreqCtrl
diff --git a/conn.go b/conn.go
@@ -0,0 +1,47 @@
+package redistest
+
+import (
+	"github.com/garyburd/redigo/redis"
+)
+
+//var conn redis.Conn
+func newPool() *redis.Pool {
+	return &redis.Pool{
+		MaxIdle:   80,
+		MaxActive: 200,
+		Dial: func() (redis.Conn, error) {
+			c, err := redis.Dial("tcp", "localhost:6379")
+			if err != nil {
+				panic(err.Error())
+			}
+			return c, err
+		},
+	}
+}
+
+var pool = newPool()
+
+/*
+func Init()error{
+    pool = newPool()
+}
+*/
+
+func getConn() redis.Pool {
+	c := pool.Get()
+	return c
+}
+
+func (c *redis.Pool) releaseConn() {
+	c.Close()
+}
+
+func DoGet(userId string) {
+	c := getConn()
+	defer c.releaseConn()
+}
+
+func PipeGet(userId string) {
+}
+func Release() {
+}
diff --git a/redis_test/conn.go b/redis_test/conn.go
@@ -4,7 +4,6 @@ import (
 	"github.com/garyburd/redigo/redis"
 )
 
-//var conn redis.Conn
 func newPool() *redis.Pool {
 	return &redis.Pool{
 		MaxIdle:   80,
@@ -21,29 +20,27 @@ func newPool() *redis.Pool {
 
 var pool = newPool()
 
-/*
-func Init()error{
-    pool = newPool()
-}
-*/
-
 func getConn() redis.Conn {
 	c := pool.Get()
 	return c
 }
 
-func releaseConn(c *redis.Conn) {
-	(*c).Close()
+func releaseConn() error {
+	return nil
 }
 
 func DoGet(userId string) {
-	c := getConn()
+	c := pool.Get()
 	c.Do("INCR", userId)
-	c.Close()
+	defer c.Close()
+}
+
+func GetActiveConnNum() int {
+	return pool.ActiveCount()
 }
 
 func PipeGet(userId string) {
-	c := getConn()
+	c := pool.Get()
 	c.Send("INCR", userId)
-	c.Close()
+	defer c.Close()
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +package MyStruct
++
 +type Conn struct{
 +    c int
 +    a int
 +    CC int
 +    AA int
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+GOPATH=/usr/local/godown:/home/yang/Work/GolangCode/FreqCtrl`