libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Showing more patience with temporarily busy drives on Linux

Browse Source
This commit is contained in:
Thomas Schmitt 2010-03-04 12:13:04 +00:00
parent 2d40b098e5
commit 7446ed7daa
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2010.03.03.141407" #define Cdrskin_timestamP "2010.03.04.121441"

10
libburn/sg-linux.c
View File

@ -1651,6 +1651,7 @@ int sg_drive_is_open(struct burn_drive * d)
int sg_grab(struct burn_drive *d) int sg_grab(struct burn_drive *d)
{ {
int fd, os_errno= 0, ret; int fd, os_errno= 0, ret;
int max_tries = 3, tries = 0;
/* ts A60813 */ /* ts A60813 */
int open_mode = O_RDWR; int open_mode = O_RDWR;
@ -1684,6 +1685,7 @@ int sg_grab(struct burn_drive *d)
value -1 of open(2) war used. */ value -1 of open(2) war used. */
if(! burn_drive_is_open(d)) { if(! burn_drive_is_open(d)) {
try_open:;
/* ts A60821 /* ts A60821
<<< debug: for tracing calls which might use open drive fds */ <<< debug: for tracing calls which might use open drive fds */
mmc_function_spy(NULL, "sg_grab ----------- opening"); mmc_function_spy(NULL, "sg_grab ----------- opening");
@ -1717,13 +1719,19 @@ int sg_grab(struct burn_drive *d)
fcntl(fd, F_SETOWN, getpid()); fcntl(fd, F_SETOWN, getpid());
d->released = 0; d->released = 0;
return 1; return 1;
} } else if (errno == EBUSY)
goto drive_is_in_use;
libdax_msgs_submit(libdax_messenger, d->global_index, 0x00020003, libdax_msgs_submit(libdax_messenger, d->global_index, 0x00020003,
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH, LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
"Could not grab drive", os_errno, 0); "Could not grab drive", os_errno, 0);
return 0; return 0;
drive_is_in_use:; drive_is_in_use:;
tries++;
if (tries < max_tries) {
usleep(2000000);
goto try_open;
}
libdax_msgs_submit(libdax_messenger, d->global_index, libdax_msgs_submit(libdax_messenger, d->global_index,
0x00020003, 0x00020003,
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH, LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,