Skip to content

Add lock for sent map #22

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
merged 1 commit into from
Jul 18, 2018
Merged

Add lock for sent map #22

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
10 changes: 9 additions & 1 deletion linux/hci/hci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func NewHCI(opts ...Option) (*HCI, error) {
chCmdPkt: make(chan *pkt),
chCmdBufs: make(chan []byte, 16),
sent: make(map[int]*pkt),
muSent: &sync.Mutex{},

evth: map[int]handlerFn{},
subh: map[int]handlerFn{},
Expand Down Expand Up @@ -73,6 +74,7 @@ type HCI struct {
// Host to Controller command flow control [Vol 2, Part E, 4.4]
chCmdPkt chan *pkt
chCmdBufs chan []byte
muSent *sync.Mutex
sent map[int]*pkt

// evtHub
Expand Down Expand Up @@ -248,7 +250,9 @@ func (h *HCI) send(c Command) ([]byte, error) {
h.close(fmt.Errorf("hci: failed to marshal cmd"))
}

h.sent[c.OpCode()] = p // TODO: lock
h.muSent.Lock()
h.sent[c.OpCode()] = p
h.muSent.Unlock()
if n, err := h.skt.Write(b[:4+c.Len()]); err != nil {
h.close(fmt.Errorf("hci: failed to send cmd"))
} else if n != 4+c.Len() {
Expand Down Expand Up @@ -412,7 +416,9 @@ func (h *HCI) handleCommandComplete(b []byte) error {
h.chCmdBufs = make(chan []byte, 16)
return nil
}
h.muSent.Lock()
p, found := h.sent[int(e.CommandOpcode())]
h.muSent.Unlock()
if !found {
return fmt.Errorf("can't find the cmd for CommandCompleteEP: % X", e)
}
Expand All @@ -426,7 +432,9 @@ func (h *HCI) handleCommandStatus(b []byte) error {
h.chCmdBufs <- make([]byte, 64)
}

h.muSent.Lock()
p, found := h.sent[int(e.CommandOpcode())]
h.muSent.Unlock()
if !found {
return fmt.Errorf("can't find the cmd for CommandStatusEP: % X", e)
}
Expand Down