mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 07:23:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

spark: make cVideo::openDevice() more robust

Browse Source 
we sometimes seem to get EBUSY when opening the video device
directly after close() - retry for half a second to get it opened
This commit is contained in:
Stefan Seyfried
2012-02-25 21:18:07 +01:00
parent 1cddb85070
commit 7bf0a98909
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libspark/video.cpp
View File

@@ -23,6 +23,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <utime.h> #include <utime.h>
#include <errno.h>
#include <cstring> #include <cstring>
#include <cstdio> #include <cstdio>
@@ -156,13 +157,25 @@ cVideo::~cVideo(void)
void cVideo::openDevice(void) void cVideo::openDevice(void)
{ {
int n = 0;
lt_debug("%s\n", __func__); lt_debug("%s\n", __func__);
/* todo: this fd checking is racy, should be protected by a lock */ /* todo: this fd checking is racy, should be protected by a lock */
if (fd != -1) /* already open */ if (fd != -1) /* already open */
return; return;
retry:
if ((fd = open(VIDEO_DEVICE, O_RDWR)) < 0) if ((fd = open(VIDEO_DEVICE, O_RDWR)) < 0)
lt_info("%s cannot open %s: %m\n", __FUNCTION__, VIDEO_DEVICE); {
fcntl(fd, F_SETFD, FD_CLOEXEC); if (errno == EBUSY)
{
/* sometimes we get busy quickly after close() */
usleep(50000);
if (++n < 10)
goto retry;
}
lt_info("%s cannot open %s: %m, retries %d\n", __func__, VIDEO_DEVICE, n);
}
else
fcntl(fd, F_SETFD, FD_CLOEXEC);
playstate = VIDEO_STOPPED; playstate = VIDEO_STOPPED;
} }