jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Portability fixes for OS X

Browse source 
Fix os_get_reltime() and os_fdatasync() for OS X.

Signed-off-by: Alan DeKok <aland@freeradius.org>
This commit is contained in:
Alan T. DeKok 2015-09-22 10:56:51 -04:00 committed by Jouni Malinen
parent 10cac5b1a2
commit b0c70f37b7
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/utils/os_unix.c
View file

@ -17,6 +17,12 @@
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#endif /* ANDROID */ #endif /* ANDROID */
#ifdef __MACH__
#include <CoreServices/CoreServices.h>
#include <mach/mach.h>
#include <mach/mach_time.h>
#endif /* __MACH__ */
#include "os.h" #include "os.h"
#include "common.h" #include "common.h"
@ -63,6 +69,7 @@ int os_get_time(struct os_time *t)
int os_get_reltime(struct os_reltime *t) int os_get_reltime(struct os_reltime *t)
{ {
#ifndef __MACH__
#if defined(CLOCK_BOOTTIME) #if defined(CLOCK_BOOTTIME)
static clockid_t clock_id = CLOCK_BOOTTIME; static clockid_t clock_id = CLOCK_BOOTTIME;
#elif defined(CLOCK_MONOTONIC) #elif defined(CLOCK_MONOTONIC)
@ -95,6 +102,23 @@ int os_get_reltime(struct os_reltime *t)
return -1; return -1;
} }
} }
#else /* __MACH__ */
uint64_t abstime, nano;
static mach_timebase_info_data_t info = { 0, 0 };
if (!info.denom) {
if (mach_timebase_info(&info) != KERN_SUCCESS)
return -1;
}
abstime = mach_absolute_time();
nano = (abstime * info.numer) / info.denom;
t->sec = nano / NSEC_PER_SEC;
t->usec = (nano - (((uint64_t) t->sec) * NSEC_PER_SEC)) / NSEC_PER_USEC;
return 0;
#endif /* __MACH__ */
} }
@ -420,8 +444,19 @@ int os_file_exists(const char *fname)
int os_fdatasync(FILE *stream) int os_fdatasync(FILE *stream)
{ {
if (!fflush(stream)) if (!fflush(stream)) {
#ifndef __MACH__
return fdatasync(fileno(stream)); return fdatasync(fileno(stream));
#else /* __MACH__ */
#ifdef F_FULLFSYNC
/* OS X does not implement fdatasync(). */
return fcntl(fileno(stream), F_FULLFSYNC);
#else /* F_FULLFSYNC */
#error Neither fdatasync nor F_FULLSYNC are defined
#endif /* F_FULLFSYNC */
#endif /* __MACH__ */
}
return -1; return -1;
} }