Skip to content
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

Jump to bottom

fix #254 Channel.Publish blocks indefinitely #508

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −9
Open

fix #254 Channel.Publish blocks indefinitely #508

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
17 changes: 8 additions & 9 deletions confirms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
package amqp

import "sync"
import (
"sync"
"sync/atomic"
)

// confirms resequences and notifies one or multiple publisher confirmation listeners
type confirms struct {
m sync.Mutex
listeners []chan Confirmation
sequencer map[uint64]Confirmation
published uint64
published *uint64
expecting uint64
}

// newConfirms allocates a confirms
func newConfirms() *confirms {
return &confirms{
sequencer: map[uint64]Confirmation{},
published: 0,
published: new(uint64),
expecting: 1,
}
}
Expand All @@ -29,11 +32,7 @@ func (c *confirms) Listen(l chan Confirmation) {

// publish increments the publishing counter
func (c *confirms) Publish() uint64 {
c.m.Lock()
defer c.m.Unlock()

c.published++
return c.published
return atomic.AddUint64(c.published, 1)
}

// confirm confirms one publishing, increments the expecting delivery tag, and
Expand All @@ -48,7 +47,7 @@ func (c *confirms) confirm(confirmation Confirmation) {

// resequence confirms any out of order delivered confirmations
func (c *confirms) resequence() {
for c.expecting <= c.published {
for c.expecting <= atomic.LoadUint64(c.published) {
sequenced, found := c.sequencer[c.expecting]
if !found {
return
Expand Down