External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-19 21:59:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use sessionpool in Grumble.

Browse source
This commit is contained in:
Mikkel Krautz 2011-05-13 18:49:45 +02:00
parent 9703241e27
commit 37fe6dd0c2
1 changed files with 7 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

46
server.go
View file

@ -23,10 +23,10 @@ import (
"gob" "gob"
"grumble/blobstore" "grumble/blobstore"
"grumble/serverconf" "grumble/serverconf"
"grumble/sessionpool"
"hash" "hash"
"io" "io"
"path/filepath" "path/filepath"
"rand"
"strings" "strings"
"time" "time"
) )
@ -92,8 +92,7 @@ type Server struct {
nextUserId uint32 nextUserId uint32
// Sessions // Sessions
sessions map[uint32]bool pool *sessionpool.SessionPool
sessionlock sync.Mutex
// ACL cache // ACL cache
aclcache ACLCache aclcache ACLCache
@ -109,11 +108,7 @@ type clientLogForwarder struct {
func (lf clientLogForwarder) Write(incoming []byte) (int, os.Error) { func (lf clientLogForwarder) Write(incoming []byte) (int, os.Error) {
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
if lf.client.Session == 0 { buf.WriteString(fmt.Sprintf("<%v:%v(%v)> ", lf.client.Session, lf.client.ShownName(), lf.client.UserId()))
buf.WriteString("<?:(-1)> ")
} else {
buf.WriteString(fmt.Sprintf("<%v>:%v(%v)> ", lf.client.Session, lf.client.ShownName(), lf.client.UserId()))
}
buf.Write(incoming) buf.Write(incoming)
lf.logger.Output(3, buf.String()) lf.logger.Output(3, buf.String())
return len(incoming), nil return len(incoming), nil
@ -135,7 +130,7 @@ func NewServer(id int64, addr string, port int) (s *Server, err os.Error) {
s.cfg = serverconf.New(nil) s.cfg = serverconf.New(nil)
s.sessions = make(map[uint32]bool) s.pool = sessionpool.New()
s.clients = make(map[uint32]*Client) s.clients = make(map[uint32]*Client)
s.Users = make(map[uint32]*User) s.Users = make(map[uint32]*User)
s.UserCertMap = make(map[string]*User) s.UserCertMap = make(map[string]*User)
@ -212,8 +207,8 @@ func (server *Server) NewClient(conn net.Conn) (err os.Error) {
client.lf = &clientLogForwarder{client, server.Logger} client.lf = &clientLogForwarder{client, server.Logger}
client.Logger = log.New(client.lf, "", 0) client.Logger = log.New(client.lf, "", 0)
client.Session = server.GetSessionId() client.Session = server.pool.Get()
client.Printf("New connection: %v", conn.RemoteAddr()) client.Printf("New connection: %v (%v)", conn.RemoteAddr(), client.Session)
client.tcpaddr = addr.(*net.TCPAddr) client.tcpaddr = addr.(*net.TCPAddr)
client.server = server client.server = server
@ -255,7 +250,7 @@ func (server *Server) RemoveClient(client *Client, kicked bool) {
server.hmutex.Unlock() server.hmutex.Unlock()
server.clients[client.Session] = nil, false server.clients[client.Session] = nil, false
server.ReclaimSessionId(client.Session) server.pool.Reclaim(client.Session)
// Remove client from channel // Remove client from channel
channel := client.Channel channel := client.Channel
@ -322,33 +317,6 @@ func (server *Server) UnlinkChannels(channel *Channel, other *Channel) {
other.Links[channel.Id] = nil, false other.Links[channel.Id] = nil, false
} }
// Get a unique session id.
func (server *Server) GetSessionId() (session uint32) {
server.sessionlock.Lock()
defer server.sessionlock.Unlock()
for {
session = rand.Uint32()
_, exists := server.sessions[session]
if exists {
continue
} else {
server.sessions[session] = true
return
}
}
return
}
// Reclaim a session id when it is no longer in use.
func (server *Server) ReclaimSessionId(session uint32) {
server.sessionlock.Lock()
defer server.sessionlock.Unlock()
server.sessions[session] = false, false
}
// This is the synchronous handler goroutine. // This is the synchronous handler goroutine.
// Important control channel messages are routed through this Goroutine // Important control channel messages are routed through this Goroutine
// to keep server state synchronized. // to keep server state synchronized.