korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-27 12:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

badblocks: If nanosleep() does not exist, try using usleep() instead

Browse Source 
For portability on systems that don't have nanosleep().

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2008-07-13 16:17:57 -04:00
parent 38dd11f595
commit c13ab4fa7a
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -14883,7 +14883,9 @@ fi
for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid
for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5

2
configure.in
View File

@ -741,7 +741,7 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
[#include <sys/types.h>
#include <sys/socket.h>])
dnl
AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid)
AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep)
dnl
dnl Check to see if -lsocket is required (solaris) to make something
dnl that uses socket() to compile; this is needed for the UUID library

18
misc/badblocks.c
View File

@ -297,6 +297,7 @@ static int do_read (int dev, unsigned char * buffer, int try, int block_size,
fprintf(stderr, _("Weird value (%ld) in do_read\n"), got);
got /= block_size;
if (d_flag && got == try) {
#ifdef HAVE_NANOSLEEP
struct timespec ts;
ts.tv_sec = tv2.tv_sec - tv1.tv_sec;
ts.tv_nsec = (tv2.tv_usec - tv1.tv_usec) * MILISEC;
@ -313,6 +314,23 @@ static int do_read (int dev, unsigned char * buffer, int try, int block_size,
}
if (ts.tv_sec || ts.tv_nsec)
nanosleep(&ts, NULL);
#else
#ifdef HAVE_USLEEP
struct timeval tv;
tv.tv_sec = tv2.tv_sec - tv1.tv_sec;
tv.tv_usec = tv2.tv_usec - tv1.tv_usec;
tv.tv_sec = tv.tv_sec * d_flag / 100;
tv.tv_usec = tv.tv_usec * d_flag / 100;
if (tv.tv_usec > 1000000) {
tv.tv_sec += tv.tv_usec / 1000000;
tv.tv_usec %= 1000000;
}
if (tv.tv_sec)
sleep(tv.tv_sec);
if (tv.tv_usec)
usleep(tv.tv_usec);
#endif
#endif
}
return got;
}