Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remap gethrestime() with #define to new symbol and export that new 

symbol to avoid direct use of GPL only symbol.


git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@36 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
behlendo 2008-03-10 21:38:39 +00:00
parent 51f443a074
commit ee4766827a
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/sys/time.h
View File

@ -15,14 +15,17 @@ extern "C" {
#include <sys/types.h> #include <sys/types.h>
extern unsigned long long monotonic_clock(void); extern unsigned long long monotonic_clock(void);
extern void __gethrestime(timestruc_t *);
#define TIME32_MAX INT32_MAX #define gethrestime(ts) __gethrestime(ts)
#define TIME32_MIN INT32_MIN
#define SEC 1 #define TIME32_MAX INT32_MAX
#define MILLISEC 1000 #define TIME32_MIN INT32_MIN
#define MICROSEC 1000000
#define NANOSEC 1000000000 #define SEC 1
#define MILLISEC 1000
#define MICROSEC 1000000
#define NANOSEC 1000000000
#define hz \ #define hz \
({ \ ({ \
@ -30,7 +33,14 @@ extern unsigned long long monotonic_clock(void);
HZ; \ HZ; \
}) })
#define gethrestime(ts) getnstimeofday((ts)) static __inline__ time_t
gethrestime_sec(void)
{
timestruc_t now;
__gethrestime(&now);
return now.tv_sec;
}
static __inline__ hrtime_t static __inline__ hrtime_t
gethrtime(void) { gethrtime(void) {
@ -44,15 +54,6 @@ gethrtime(void) {
return monotonic_clock(); return monotonic_clock();
} }
static __inline__ time_t
gethrestime_sec(void)
{
timestruc_t now;
gethrestime(&now);
return (now.tv_sec);
}
#ifdef __cplusplus #ifdef __cplusplus
} }

1
modules/spl/Makefile.in
View File

@ -15,6 +15,7 @@ spl-objs += spl-taskq.o
spl-objs += spl-rwlock.o spl-objs += spl-rwlock.o
spl-objs += spl-vnode.o spl-objs += spl-vnode.o
spl-objs += spl-err.o spl-objs += spl-err.o
spl-objs += spl-time.o
spl-objs += spl-generic.o spl-objs += spl-generic.o
splmodule := spl.ko splmodule := spl.ko

11
modules/spl/spl-time.c Normal file
View File

@ -0,0 +1,11 @@
#include <sys/sysmacros.h>
#include <sys/time.h>
#include "config.h"
void
__gethrestime(timestruc_t *ts)
{
getnstimeofday((struct timespec *)ts);
}
EXPORT_SYMBOL(__gethrestime);