claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Start to remove sleep in favor of usleep. Bug #28543.

Browse Source
This commit is contained in:
R. Bernstein
2010-02-11 20:10:11 -05:00
parent 6e53c6b19f
commit f23ca9a9da
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -487,7 +487,7 @@ AC_SUBST(LIBCDIO_SOURCE_PATH)
AC_CHECK_FUNCS( [bzero chdir drand48 ftruncate geteuid getgid \
getuid getpwuid gettimeofday lstat memcpy memset \
rand seteuid setegid snprintf setenv unsetenv tzset \
sleep vsnprintf readlink realpath gmtime_r localtime_r] )
sleep usleep vsnprintf readlink realpath gmtime_r localtime_r] )
# check for timegm() support
AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1,

29
example/cdchange.c
View File

@@ -49,30 +49,21 @@
# include <windows.h>
#endif
#ifndef HAVE_SLEEP
static void
sleep(unsigned int ms)
{
#if defined(_WIN32)
Sleep(ms);
#else
#error sleep() unimplemented
#endif
}
#ifndef HAVE_USLEEP
#error usleep() unimplemented
#endif
int
main(int argc, const char *argv[])
{
CdIo_t *p_cdio;
unsigned long i_sleep=30;
unsigned long i_sleep_ms = (30 * 1000000);
if (argc > 1) {
p_cdio = cdio_open (argv[1], DRIVER_DEVICE);
if (argc > 2) {
errno = 0;
i_sleep = strtol(argv[2], (char **)NULL, 10);
if ( (LONG_MIN == i_sleep || LONG_MAX == i_sleep) && errno != 0 ) {
i_sleep_ms = strtol(argv[2], (char **)NULL, 10) * 1000000;
if ( (LONG_MIN == i_sleep_ms || LONG_MAX == i_sleep_ms) && errno != 0 ) {
printf("Invalid sleep parameter %s\n", argv[2]);
printf("Error reported back from strtol: %s\n", strerror(errno));
return 2;
@@ -92,9 +83,13 @@ main(int argc, const char *argv[])
else
printf("Initial media status: not changed\n");
printf("Giving you %lu seconds to change CD if you want to do so.\n",
i_sleep);
sleep(30);
printf("Giving you %g seconds to change CD if you want to do so.\n",
i_sleep_ms / 1000000.0);
{
int i_ret = usleep(i_sleep_ms);
if (0 != i_ret)
fprintf(stderr, "Something went wrong with usleep\n");
}
if (cdio_get_media_changed(p_cdio))
printf("Media status: changed\n");
else