Tryanks/gousb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-use the same done channel for every callback of a single transfer.

Browse Source
This commit is contained in:
Sebastian Zagrodzki
2017-04-26 21:35:26 +02:00
parent c1009ed25d
commit eed6d08423
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
usb/transfer.go
View File

@@ -16,7 +16,6 @@ package usb
import ( import (
"errors" "errors"
"fmt"
"runtime" "runtime"
"sync" "sync"
"time" "time"
@@ -46,15 +45,14 @@ func (t *usbTransfer) submit() error {
if t.submitted { if t.submitted {
return errors.New("transfer was already submitted and is not finished yet") return errors.New("transfer was already submitted and is not finished yet")
} }
t.done = make(chan struct{}) if err := libusb.submit(t.xfer); err != nil {
if err := libusb.submit(t.xfer, t.done); err != nil {
return err return err
} }
t.submitted = true t.submitted = true
return nil return nil
} }
// wait waits for libusb to signal the release of transfer data. // waits for libusb to signal the release of transfer data.
// After wait returns, the transfer contents are safe to access // After wait returns, the transfer contents are safe to access
// via t.buf. The number returned by wait indicates how many bytes // via t.buf. The number returned by wait indicates how many bytes
// of the buffer were read or written by libusb, and it can be // of the buffer were read or written by libusb, and it can be
@@ -65,11 +63,7 @@ func (t *usbTransfer) wait() (n int, err error) {
if !t.submitted { if !t.submitted {
return 0, nil return 0, nil
} }
select { <-t.done
case <-time.After(10 * time.Second):
return 0, fmt.Errorf("wait timed out after 10s")
case <-t.done:
}
t.submitted = false t.submitted = false
n, status := libusb.data(t.xfer) n, status := libusb.data(t.xfer)
if status != TransferCompleted { if status != TransferCompleted {
@@ -129,7 +123,8 @@ func newUSBTransfer(dev *libusbDevHandle, ei *EndpointInfo, buf []byte, timeout
debug.Printf("New isochronous transfer - buffer length %d, using %d packets of %d bytes each", len(buf), isoPackets, isoPktSize) debug.Printf("New isochronous transfer - buffer length %d, using %d packets of %d bytes each", len(buf), isoPackets, isoPktSize)
} }
xfer, err := libusb.alloc(dev, ei, timeout, isoPackets, buf) done := make(chan struct{}, 1)
xfer, err := libusb.alloc(dev, ei, timeout, isoPackets, buf, done)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -141,6 +136,7 @@ func newUSBTransfer(dev *libusbDevHandle, ei *EndpointInfo, buf []byte, timeout
t := &usbTransfer{ t := &usbTransfer{
xfer: xfer, xfer: xfer,
buf: buf, buf: buf,
done: done,
} }
runtime.SetFinalizer(t, func(t *usbTransfer) { runtime.SetFinalizer(t, func(t *usbTransfer) {
t.cancel() t.cancel()