Skip to content

sse: introduce sync pool for rawEvent to optimize memory usage. #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: v3
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 54 additions & 30 deletions sse.go
Original file line number Diff line number Diff line change
Expand Up @@ -534,45 +534,54 @@ func (es *EventSource) listenStream(res *http.Response) error {
return nil
}

e, err := readEvent(scanner)
if err != nil {
if err == io.EOF {
return err
}
es.triggerOnError(err)
if err := es.processEvent(scanner); err != nil {
return err
}
}
}

ed, err := parseEvent(e)
if err != nil {
es.triggerOnError(err)
continue // parsing errors, just continue
func (es *EventSource) processEvent(scanner *bufio.Scanner) error {
e, err := readEvent(scanner)
if err != nil {
if err == io.EOF {
return err
}
es.triggerOnError(err)
return err
}

ed, err := parseEvent(e)
if err != nil {
es.triggerOnError(err)
return nil // parsing errors, will not return error.
}
defer putRawEvent(ed)

if len(ed.ID) > 0 {
es.lock.Lock()
es.lastEventID = string(ed.ID)
es.lock.Unlock()
}

if len(ed.ID) > 0 {
if len(ed.Retry) > 0 {
if retry, err := strconv.Atoi(string(ed.Retry)); err == nil {
es.lock.Lock()
es.lastEventID = string(ed.ID)
es.serverSentRetry = time.Millisecond * time.Duration(retry)
es.lock.Unlock()
} else {
es.triggerOnError(err)
}
}

if len(ed.Retry) > 0 {
if retry, err := strconv.Atoi(string(ed.Retry)); err == nil {
es.lock.Lock()
es.serverSentRetry = time.Millisecond * time.Duration(retry)
es.lock.Unlock()
} else {
es.triggerOnError(err)
}
}

if len(ed.Data) > 0 {
es.handleCallback(&Event{
ID: string(ed.ID),
Name: string(ed.Event),
Data: string(ed.Data),
})
}
if len(ed.Data) > 0 {
es.handleCallback(&Event{
ID: string(ed.ID),
Name: string(ed.Event),
Data: string(ed.Data),
})
}

return nil
}

func (es *EventSource) handleCallback(e *Event) {
Expand Down Expand Up @@ -633,7 +642,7 @@ func parseEventFunc(msg []byte) (*rawEvent, error) {
return nil, errors.New("resty:sse: event message was empty")
}

e := new(rawEvent)
e := newRawEvent()

// Split the line by "\n"
for _, line := range bytes.FieldsFunc(msg, func(r rune) bool { return r == '\n' }) {
Expand Down Expand Up @@ -670,3 +679,18 @@ func trimHeader(size int, data []byte) []byte {
data = bytes.TrimSuffix(data, []byte("\n"))
return data
}

var rawEventPool = &sync.Pool{New: func() any { return new(rawEvent) }}

func newRawEvent() *rawEvent {
e := rawEventPool.Get().(*rawEvent)
e.ID = e.ID[:0]
e.Data = e.Data[:0]
e.Event = e.Event[:0]
e.Retry = e.Retry[:0]
return e
}

func putRawEvent(e *rawEvent) {
rawEventPool.Put(e)
}