dave/youtube-downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak in server

Browse Source 
Remove server instrumentation
This commit is contained in:
David Majdandžić
2024-06-27 11:16:25 +02:00
parent 4ca3053243
commit 51a94b6636
3 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ws-server/connection.go
View File

@@ -53,39 +53,40 @@ func (ws *WSConnection) messageReader() {
for { for {
_, message, err := ws.conn.ReadMessage() _, message, err := ws.conn.ReadMessage()
if !ws.alive { if !ws.alive {
return break
} }
ws.conn.SetReadDeadline(time.Now().Add(ws.IdleTimeout)) ws.conn.SetReadDeadline(time.Now().Add(ws.IdleTimeout))
if err != nil { if err != nil {
ws.ErrorChan <- err ws.ErrorChan <- err
return break
} }
log.Printf("Client %d: Received: %s, %d in output channel", ws.id, message, len(ws.ReadChan)) log.Printf("Client %d: Received: %s, %d in output channel", ws.id, message, len(ws.ReadChan))
ws.ReadChan <- string(message) ws.ReadChan <- string(message)
} }
log.Printf("Client %d: Stopped reading messages", ws.id)
} }
func (ws *WSConnection) messageSender() { func (ws *WSConnection) messageSender() {
log.Printf("Client %d: Sending messages", ws.id) log.Printf("Client %d: Sending messages", ws.id)
for { for {
func() { msg, ok := <-ws.WriteChan
msg, ok := <-ws.WriteChan if !ok || !ws.alive {
if !ok || !ws.alive { break
return }
} ws.writeLock.Lock()
ws.writeLock.Lock()
defer ws.writeLock.Unlock() ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
log.Printf("Client %d: Sending: %s, %d in input channel", ws.id, msg, len(ws.WriteChan))
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout)) err := ws.conn.WriteMessage(websocket.TextMessage, []byte(msg))
log.Printf("Client %d: Sending: %s, %d in input channel", ws.id, msg, len(ws.WriteChan)) if err != nil {
err := ws.conn.WriteMessage(websocket.TextMessage, []byte(msg)) log.Printf("Client %d: Error during message writing: %v", ws.id, err)
if err != nil { ws.ErrorChan <- err
log.Printf("Client %d: Error during message writing: %v", ws.id, err) ws.writeLock.Unlock()
ws.ErrorChan <- err break
return }
} ws.writeLock.Unlock()
}()
} }
log.Printf("Client %d: Stopped sending messages", ws.id)
} }
func (ws *WSConnection) pinger() { func (ws *WSConnection) pinger() {
@@ -93,7 +94,7 @@ func (ws *WSConnection) pinger() {
for { for {
time.Sleep(ws.PingInterval) time.Sleep(ws.PingInterval)
if !ws.alive { if !ws.alive {
return break
} }
// log.Printf("Client %d: Ping", ws.id) // log.Printf("Client %d: Ping", ws.id)
@@ -102,10 +103,11 @@ func (ws *WSConnection) pinger() {
if err != nil { if err != nil {
log.Printf("Client %d: Error during ping: %+v", ws.id, err) log.Printf("Client %d: Error during ping: %+v", ws.id, err)
ws.ErrorChan <- err ws.ErrorChan <- err
return break
} }
ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout)) ws.conn.SetWriteDeadline(time.Now().Add(ws.IdleTimeout))
ws.writeLock.Unlock() ws.writeLock.Unlock()
// log.Printf("Client %d: Ping OK", ws.id) // log.Printf("Client %d: Ping OK", ws.id)
} }
log.Printf("Client %d: Stopped pinger", ws.id)
} }

24
ws-server/main.go
View File

@@ -44,10 +44,32 @@ func handleDownload(responseWriter http.ResponseWriter, request *http.Request) {
} }
func init() { func init() {
log.SetFlags(log.Lmicroseconds | log.Lshortfile) // log.SetFlags(log.Lmicroseconds | log.Lshortfile)
log.SetFlags(log.Lmicroseconds)
} }
// Mainly used to detect memory leaks
// func instrument() {
// numGoroutines := runtime.NumGoroutine()
// var m runtime.MemStats
// runtime.ReadMemStats(&m)
// malloc := float64(m.Alloc)
// ramUsedMB := malloc / 1024 / 1024
// kbPerGoroutine := malloc / 1024 / float64(numGoroutines)
// log.Printf("Number of active goroutines: %d; RAM used: %.2f MB; KB per goroutine: %.2f", numGoroutines, ramUsedMB, kbPerGoroutine)
// }
func main() { func main() {
// go func() {
// for {
// time.Sleep(1 * time.Second)
// instrument()
// }
// }()
http.HandleFunc("/ws", wsHandler) http.HandleFunc("/ws", wsHandler)
http.HandleFunc("/download", handleDownload) http.HandleFunc("/download", handleDownload)
log.Println("Server starting on :8080") log.Println("Server starting on :8080")

1
ws-server/server.go
View File

@@ -49,6 +49,7 @@ func (server *WSServer) HandleNew(conn *websocket.Conn) {
close(wsconn.WriteChan) close(wsconn.WriteChan)
close(wsconn.ErrorChan) close(wsconn.ErrorChan)
log.Printf("Client %d: disconnected due to %+v, now %d clients", wsconn.id, err, len(server.connections)) log.Printf("Client %d: disconnected due to %+v, now %d clients", wsconn.id, err, len(server.connections))
wsconn.conn.Close()
delete(server.connections, wsconn) delete(server.connections, wsconn)
}() }()
} }