OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Use a O_NONBLOCK pipe for iso completion signals for thread-safety, by Arnon Gilboa. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3492 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2007-10-31 00:27:50 +00:00
parent 5ad265ee5b
commit 046833eae3
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
usb-linux.c
View File

@ -68,6 +68,7 @@ struct endp_data {
typedef struct USBHostDevice { typedef struct USBHostDevice {
USBDevice dev; USBDevice dev;
int fd; int fd;
int pipe_fds[2];
USBPacket *packet; USBPacket *packet;
struct endp_data endp_table[MAX_ENDPOINTS]; struct endp_data endp_table[MAX_ENDPOINTS];
int configuration; int configuration;
@ -78,8 +79,6 @@ typedef struct USBHostDevice {
typedef struct PendingURB { typedef struct PendingURB {
struct usbdevfs_urb *urb; struct usbdevfs_urb *urb;
USBHostDevice *dev;
QEMUBH *bh;
int status; int status;
struct PendingURB *next; struct PendingURB *next;
} PendingURB; } PendingURB;
@ -91,8 +90,6 @@ static int add_pending_urb(struct usbdevfs_urb *urb)
PendingURB *purb = qemu_mallocz(sizeof(PendingURB)); PendingURB *purb = qemu_mallocz(sizeof(PendingURB));
if (purb) { if (purb) {
purb->urb = urb; purb->urb = urb;
purb->dev = NULL;
purb->bh = NULL;
purb->status = 0; purb->status = 0;
purb->next = pending_urbs; purb->next = pending_urbs;
pending_urbs = purb; pending_urbs = purb;
@ -341,16 +338,21 @@ static int usb_host_handle_data(USBDevice *dev, USBPacket *p)
} }
#ifdef USE_ASYNCIO #ifdef USE_ASYNCIO
static void usb_linux_bh_cb(void *opaque) static void urb_completion_pipe_read(void *opaque)
{ {
PendingURB *pending_urb = (PendingURB *)opaque; USBHostDevice *s = opaque;
USBHostDevice *s = pending_urb->dev;
struct usbdevfs_urb *purb = NULL;
USBPacket *p = s->packet; USBPacket *p = s->packet;
int ret; PendingURB *pending_urb = NULL;
struct usbdevfs_urb *purb = NULL;
int len, ret;
/* FIXME: handle purb->status */ len = read(s->pipe_fds[0], &pending_urb, sizeof(pending_urb));
qemu_free(pending_urb->bh); if (len != sizeof(pending_urb)) {
printf("urb_completion: error reading pending_urb, len=%d\n", len);
return;
}
/* FIXME: handle pending_urb->status */
del_pending_urb(pending_urb->urb); del_pending_urb(pending_urb->urb);
if (!p) { if (!p) {
@ -360,14 +362,14 @@ static void usb_linux_bh_cb(void *opaque)
ret = ioctl(s->fd, USBDEVFS_REAPURBNDELAY, &purb); ret = ioctl(s->fd, USBDEVFS_REAPURBNDELAY, &purb);
if (ret < 0) { if (ret < 0) {
printf("usb_linux_bh_cb: REAPURBNDELAY ioctl=%d errno=%d\n", printf("urb_completion: REAPURBNDELAY ioctl=%d errno=%d\n",
ret, errno); ret, errno);
return; return;
} }
#ifdef DEBUG_ISOCH #ifdef DEBUG_ISOCH
if (purb == pending_urb->urb) { if (purb == pending_urb->urb) {
printf("usb_linux_bh_cb: urb mismatch reaped=%p pending=%p\n", printf("urb_completion: urb mismatch reaped=%p pending=%p\n",
purb, urb); purb, urb);
} }
#endif #endif
@ -391,12 +393,8 @@ static void isoch_done(int signum, siginfo_t *info, void *context)
purb = get_pending_urb(urb); purb = get_pending_urb(urb);
if (purb) { if (purb) {
purb->bh = qemu_bh_new(usb_linux_bh_cb, purb); purb->status = info->si_errno;
if (purb->bh) { write(s->pipe_fds[1], &purb, sizeof(purb));
purb->dev = s;
purb->status = info->si_errno;
qemu_bh_schedule(purb->bh);
}
} }
} }
#endif #endif
@ -627,7 +625,7 @@ USBDevice *usb_host_device_open(const char *devname)
/* read the device description */ /* read the device description */
dev->descr_len = read(fd, dev->descr, sizeof(dev->descr)); dev->descr_len = read(fd, dev->descr, sizeof(dev->descr));
if (dev->descr_len <= 0) { if (dev->descr_len <= 0) {
perror("usb_host_update_interfaces: reading device data failed"); perror("usb_host_device_open: reading device data failed");
goto fail; goto fail;
} }
@ -650,7 +648,7 @@ USBDevice *usb_host_device_open(const char *devname)
ret = ioctl(fd, USBDEVFS_CONNECTINFO, &ci); ret = ioctl(fd, USBDEVFS_CONNECTINFO, &ci);
if (ret < 0) { if (ret < 0) {
perror("USBDEVFS_CONNECTINFO"); perror("usb_host_device_open: USBDEVFS_CONNECTINFO");
goto fail; goto fail;
} }
@ -688,8 +686,17 @@ USBDevice *usb_host_device_open(const char *devname)
sigact.sa_restorer = 0; sigact.sa_restorer = 0;
ret = sigaction(SIG_ISOCOMPLETE, &sigact, NULL); ret = sigaction(SIG_ISOCOMPLETE, &sigact, NULL);
if (ret < 0) { if (ret < 0) {
printf("sigaction SIG_ISOCOMPLETE=%d errno=%d\n", ret, errno); perror("usb_host_device_open: sigaction failed");
goto fail;
} }
if (pipe(dev->pipe_fds) < 0) {
perror("usb_host_device_open: pipe creation failed");
goto fail;
}
fcntl(dev->pipe_fds[0], F_SETFL, O_NONBLOCK | O_ASYNC);
fcntl(dev->pipe_fds[1], F_SETFL, O_NONBLOCK);
qemu_set_fd_handler(dev->pipe_fds[0], urb_completion_pipe_read, NULL, dev);
#endif #endif
dev->urbs_ready = 0; dev->urbs_ready = 0;
return (USBDevice *)dev; return (USBDevice *)dev;