re
/
ledisdb
forked from mirror/ledisdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove confused command coroutine 

may degrade some performance, but I think people can understand this
code easily
This commit is contained in:
siddontang 2015-02-03 14:14:46 +08:00
parent 61941bfa15
commit 84002e0499
1 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
server/client.go
View File

@ -6,7 +6,6 @@ import (
"github.com/siddontang/go/sync2" "github.com/siddontang/go/sync2"
"github.com/siddontang/ledisdb/ledis" "github.com/siddontang/ledisdb/ledis"
"io" "io"
"sync"
"time" "time"
) )
@ -79,13 +78,6 @@ type client struct {
script *ledis.Multi script *ledis.Multi
slaveListeningAddr string slaveListeningAddr string
quit chan struct{}
done chan error
wg sync.WaitGroup
fc chan CommandFunc
} }
func newClient(app *App) *client { func newClient(app *App) *client {
@ -95,35 +87,11 @@ func newClient(app *App) *client {
c.ldb = app.ldb c.ldb = app.ldb
c.db, _ = app.ldb.Select(0) //use default db c.db, _ = app.ldb.Select(0) //use default db
// c.reqErr = make(chan error)
c.quit = make(chan struct{})
c.done = make(chan error, 1)
c.fc = make(chan CommandFunc, 1)
c.wg.Add(1)
go c.run()
return c return c
} }
func (c *client) close() { func (c *client) close() {
close(c.quit)
c.wg.Wait()
}
func (c *client) run() {
defer c.wg.Done()
for {
select {
case <-c.quit:
return
case f := <-c.fc:
c.done <- f(c)
}
}
} }
func (c *client) perform() { func (c *client) perform() {
@ -147,14 +115,7 @@ func (c *client) perform() {
} }
if err == nil { if err == nil {
// go func() { err = exeCmd(c)
// c.reqErr <- exeCmd(c)
// }()
// err = <-c.reqErr
c.fc <- exeCmd
err = <-c.done
} }
} }