Browse Source

Ensure proper memory management by adding `Free` calls to release pooled buffers across `export`, `import`, and event handling workflows.

main
mleku 4 months ago
parent
commit
135508c390
No known key found for this signature in database
  1. 5
      app/handle-auth.go
  2. 5
      app/handle-event.go
  3. 18
      pkg/database/export.go
  4. 9
      pkg/database/import.go

5
app/handle-auth.go

@ -14,6 +14,11 @@ func (l *Listener) HandleAuth(b []byte) (err error) { @@ -14,6 +14,11 @@ func (l *Listener) HandleAuth(b []byte) (err error) {
if rem, err = env.Unmarshal(b); chk.E(err) {
return
}
defer func() {
if env != nil && env.Event != nil {
env.Event.Free()
}
}()
if len(rem) > 0 {
log.I.F("extra '%s'", rem)
}

5
app/handle-event.go

@ -21,6 +21,11 @@ func (l *Listener) HandleEvent(msg []byte) (err error) { @@ -21,6 +21,11 @@ func (l *Listener) HandleEvent(msg []byte) (err error) {
if msg, err = env.Unmarshal(msg); chk.E(err) {
return
}
defer func() {
if env != nil && env.E != nil {
env.E.Free()
}
}()
if len(msg) > 0 {
log.I.F("extra '%s'", msg)
}

18
pkg/database/export.go

@ -49,6 +49,7 @@ func (d *D) Export(c context.Context, w io.Writer, pubkeys ...[]byte) { @@ -49,6 +49,7 @@ func (d *D) Export(c context.Context, w io.Writer, pubkeys ...[]byte) {
if _, err = w.Write([]byte{'\n'}); chk.E(err) {
return
}
ev.Free()
evBuf.Reset()
}
return
@ -86,14 +87,15 @@ func (d *D) Export(c context.Context, w io.Writer, pubkeys ...[]byte) { @@ -86,14 +87,15 @@ func (d *D) Export(c context.Context, w io.Writer, pubkeys ...[]byte) {
if err = ev.UnmarshalBinary(evBuf); chk.E(err) {
continue
}
// Serialize the event to JSON and write it to the output
if _, err = w.Write(ev.Serialize()); chk.E(err) {
continue
}
if _, err = w.Write([]byte{'\n'}); chk.E(err) {
continue
}
evBuf.Reset()
// Serialize the event to JSON and write it to the output
if _, err = w.Write(ev.Serialize()); chk.E(err) {
continue
}
if _, err = w.Write([]byte{'\n'}); chk.E(err) {
continue
}
ev.Free()
evBuf.Reset()
}
return
},

9
pkg/database/import.go

@ -52,17 +52,22 @@ func (d *D) Import(rr io.Reader) { @@ -52,17 +52,22 @@ func (d *D) Import(rr io.Reader) {
continue
}
ev := &event.E{}
ev := event.New()
if _, err = ev.Unmarshal(b); err != nil {
// return the pooled buffer on error
ev.Free()
continue
}
if _, _, err = d.SaveEvent(d.ctx, ev); err != nil {
// return the pooled buffer on error paths too
ev.Free()
continue
}
// return the pooled buffer after successful save
ev.Free()
b = nil
ev = nil
count++
if count%100 == 0 {
log.I.F("received %d events", count)

Loading…
Cancel
Save