Skip to content

event/internal: Unbind calls now take the current reset of the bus #208

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.

Sign up for GitHub

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

Merged
200sc merged 1 commit into from
Jun 5, 2022
Merged

event/internal: Unbind calls now take the current reset of the bus #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion event/internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (bus *Bus) trigger(binds bindableList, eventID UnsafeEventID, callerID Call
// A: This goroutine does not own a write lock on the bus, and should therefore
// not modify its contents. We do not have a simple way of promoting our read lock
// to a write lock.
bus.Unbind(Binding{EventID: eventID, CallerID: callerID, BindID: bindID})
bus.Unbind(Binding{EventID: eventID, CallerID: callerID, BindID: bindID, busResetCount: bus.resetCount})
case ResponseUnbindThisCaller:
bus.UnbindAllFrom(callerID)
}
Expand Down
3 changes: 3 additions & 0 deletions event/response_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ func TestBindingResponses(t *testing.T) {
t.Run("UnbindThisBinding", func(t *testing.T) {
b := event.NewBus(event.NewCallerMap())

// bus reset counts are checked against bindings
b.Reset()

var calls int32
b1 := b.UnsafeBind(1, 0, func(ci event.CallerID, h event.Handler, i interface{}) event.Response {
atomic.AddInt32(&calls, 1)
Expand Down