Elgato_dark/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm synced 2026-05-23 00:38:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix huge memory leak in RPC system (#2510)

Browse source 
always remove from reqmap in Finalize even if done flag is already set.
This commit is contained in:
Mike Sawka 2025-11-03 16:54:01 -08:00 committed by GitHub
parent 984ed46a7a
commit e359c766b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "waveterm",
"version": "0.12.1",
"version": "0.12.2-beta.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "waveterm",
"version": "0.12.1",
"version": "0.12.2-beta.1",
"hasInstallScript": true,
"license": "Apache-2.0",
"workspaces": [

36
pkg/wshutil/wshrpc.go
View file

@ -269,25 +269,26 @@ func (w *WshRpc) cancelRequest(reqId string) {
}
func (w *WshRpc) handleRequest(req *RpcMessage) {
pprof.Do(context.Background(), pprof.Labels("rpc", req.Command), func(ctx context.Context) {
w.handleRequestInternal(req)
pprof.Do(context.Background(), pprof.Labels("rpc", req.Command), func(pprofCtx context.Context) {
w.handleRequestInternal(req, pprofCtx)
})
}
func (w *WshRpc) handleRequestInternal(req *RpcMessage) {
// events first
func (w *WshRpc) handleEventRecv(req *RpcMessage) {
if req.Data == nil {
return
}
var waveEvent wps.WaveEvent
err := utilfn.ReUnmarshal(&waveEvent, req.Data)
if err != nil {
return
}
w.EventListener.RecvEvent(&waveEvent)
}
func (w *WshRpc) handleRequestInternal(req *RpcMessage, pprofCtx context.Context) {
if req.Command == wshrpc.Command_EventRecv {
if req.Data == nil {
// invalid
return
}
var waveEvent wps.WaveEvent
err := utilfn.ReUnmarshal(&waveEvent, req.Data)
if err != nil {
// invalid
return
}
w.EventListener.RecvEvent(&waveEvent)
w.handleEventRecv(req)
return
}
@ -670,12 +671,15 @@ func (handler *RpcResponseHandler) close() {
// if async, caller must call finalize
func (handler *RpcResponseHandler) Finalize() {
// Always unregister the handler from the map, even if already done
if handler.reqId != "" {
handler.w.unregisterResponseHandler(handler.reqId)
}
if handler.reqId == "" || handler.done.Load() {
return
}
handler.SendResponse(nil, true)
handler.close()
handler.w.unregisterResponseHandler(handler.reqId)
}
func (handler *RpcResponseHandler) IsDone() bool {