From a5c3dfe99fa1831e3b416e89f52a03fd1cf9f73d Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Tue, 2 Jun 2020 13:12:14 -0500 Subject: [PATCH] afs: Move osi_GetTime out of param.h Most platforms currently #define osi_GetTime in their param.h. This is really redundant, since the definition of osi_GetTime almost never changes for a given platform, so we end up with many copies of the same osi_GetTime definition for a given platform. Move osi_GetTime out of param.h for these platforms, and define it in osi_machdep.h instead, which is where most platform-specific definitions go. For DFBSD, we don't have an osi_machdep.h at all yet, so create a new one to contain the osi_GetTime definition. Currently we don't build libafs at all on DFBSD, but do this anyway so we don't lose the existing osi_GetTime definition. For NBSD, we were providing (conflicting!) definitions for osi_GetTime in param.h and in osi_machdep.h. Just remove the definitions in param.h, since those should have been getting overridden by the osi_machdep.h definition. Change-Id: I7097d9fe2fcd38c06ecc275e8fe3a2c69c9d0436 Reviewed-on: https://gerrit.openafs.org/14237 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk --- src/afs/AIX/osi_machdep.h | 2 ++ src/afs/DARWIN/osi_machdep.h | 2 ++ src/afs/DFBSD/osi_machdep.h | 24 ++++++++++++++++++++++++ src/afs/FBSD/osi_machdep.h | 2 ++ src/afs/HPUX/osi_machdep.h | 2 ++ src/afs/IRIX/osi_machdep.h | 5 +++++ src/afs/SOLARIS/osi_machdep.h | 2 ++ src/config/param.arm_darwin_100.h | 1 - src/config/param.generic_fbsd.h | 1 - src/config/param.hp_ux102.h | 1 - src/config/param.hp_ux110.h | 1 - src/config/param.hp_ux1123.h | 1 - src/config/param.hp_ux11i.h | 1 - src/config/param.ia64_hpux1122.h | 1 - src/config/param.ia64_hpux1123.h | 1 - src/config/param.nbsd15.h | 1 - src/config/param.nbsd16.h | 1 - src/config/param.nbsd20.h | 1 - src/config/param.nbsd21.h | 1 - src/config/param.nbsd30.h | 1 - src/config/param.nbsd40.h | 1 - src/config/param.nbsd50.h | 1 - src/config/param.nbsd60.h | 1 - src/config/param.nbsd70.h | 1 - src/config/param.ppc_darwin_70.h | 1 - src/config/param.ppc_darwin_80.h | 1 - src/config/param.ppc_darwin_90.h | 1 - src/config/param.rs_aix42.h | 1 - src/config/param.rs_aix51.h | 1 - src/config/param.rs_aix52.h | 1 - src/config/param.rs_aix53.h | 1 - src/config/param.rs_aix61.h | 1 - src/config/param.sgi_65.h | 5 ----- src/config/param.sun4x_510.h | 1 - src/config/param.sun4x_511.h | 1 - src/config/param.sun4x_58.h | 1 - src/config/param.sun4x_59.h | 1 - src/config/param.sunx86_510.h | 1 - src/config/param.sunx86_511.h | 1 - src/config/param.sunx86_58.h | 1 - src/config/param.sunx86_59.h | 1 - src/config/param.x86_darwin_100.h | 1 - src/config/param.x86_darwin_110.h | 1 - src/config/param.x86_darwin_120.h | 1 - src/config/param.x86_darwin_130.h | 1 - src/config/param.x86_darwin_140.h | 1 - src/config/param.x86_darwin_150.h | 1 - src/config/param.x86_darwin_160.h | 1 - src/config/param.x86_darwin_170.h | 1 - src/config/param.x86_darwin_180.h | 1 - src/config/param.x86_darwin_190.h | 1 - src/config/param.x86_darwin_80.h | 1 - src/config/param.x86_darwin_90.h | 1 - 53 files changed, 39 insertions(+), 50 deletions(-) create mode 100644 src/afs/DFBSD/osi_machdep.h diff --git a/src/afs/AIX/osi_machdep.h b/src/afs/AIX/osi_machdep.h index 1c285b8..23060fd 100644 --- a/src/afs/AIX/osi_machdep.h +++ b/src/afs/AIX/osi_machdep.h @@ -84,4 +84,6 @@ extern simple_lock_data afs_global_lock; * src/afs/AIX/osi_gcpags.c for how to look at the process list */ #define osi_procname(procname, size) strncpy(procname, "", size) +#define osi_GetTime(x) do {curtime(x); (x)->tv_usec = (x)->tv_usec/1000;} while (0) + #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h index eb774c9..a5e34f0 100644 --- a/src/afs/DARWIN/osi_machdep.h +++ b/src/afs/DARWIN/osi_machdep.h @@ -235,4 +235,6 @@ extern int (**afs_vnodeop_p) (); #define osi_procname(procname, size) strncpy(procname, curproc->p_comm, size) #endif +#define osi_GetTime(x) microtime(x) + #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/DFBSD/osi_machdep.h b/src/afs/DFBSD/osi_machdep.h new file mode 100644 index 0000000..d2dfc1c --- /dev/null +++ b/src/afs/DFBSD/osi_machdep.h @@ -0,0 +1,24 @@ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +/* + * + * DFBSD OSI header file. Extends afs_osi.h. + * + * afs_osi.h includes this file, which is the only way this file should + * be included in a source file. This file can redefine macros declared in + * afs_osi.h. + */ + +#ifndef _OSI_MACHDEP_H_ +#define _OSI_MACHDEP_H_ + +#define osi_GetTime(x) microtime(x) + +#endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h index 67544e1..17baaa6 100644 --- a/src/afs/FBSD/osi_machdep.h +++ b/src/afs/FBSD/osi_machdep.h @@ -133,4 +133,6 @@ extern struct thread *afs_global_owner; #define osi_procname(procname, size) strncpy(procname, curproc->p_comm, size) +#define osi_GetTime(x) microtime(x) + #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h index bc90b81..ef4a1d6 100644 --- a/src/afs/HPUX/osi_machdep.h +++ b/src/afs/HPUX/osi_machdep.h @@ -121,4 +121,6 @@ extern caddr_t kmem_alloc(); #define osi_procname(procname, size) strncpy(procname, "", size) +#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) + #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/IRIX/osi_machdep.h b/src/afs/IRIX/osi_machdep.h index 3c0f78d..a5ba80e 100644 --- a/src/afs/IRIX/osi_machdep.h +++ b/src/afs/IRIX/osi_machdep.h @@ -387,5 +387,10 @@ extern long afs_global_owner; #define osi_procname(procname, size) strncpy(procname, proc_name(curproc()), size) +#ifdef _K64U64 +# define osi_GetTime(x) irix5_microtime((struct __irix5_timeval*)(x)) +#else +# define osi_GetTime(x) microtime(x) +#endif #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h index c34ffb5..a9bb4c5 100644 --- a/src/afs/SOLARIS/osi_machdep.h +++ b/src/afs/SOLARIS/osi_machdep.h @@ -125,4 +125,6 @@ struct afs_ifinfo { #define osi_procname(procname, size) strncpy(procname, PTOU(ttoproc(curthread))->u_comm, size) +#define osi_GetTime(x) uniqtime32(x) + #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/config/param.arm_darwin_100.h b/src/config/param.arm_darwin_100.h index 2344be0..2783416 100644 --- a/src/config/param.arm_darwin_100.h +++ b/src/config/param.arm_darwin_100.h @@ -133,7 +133,6 @@ struct rt_addrinfo { #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.generic_fbsd.h b/src/config/param.generic_fbsd.h index bc193bf..e388db8 100644 --- a/src/config/param.generic_fbsd.h +++ b/src/config/param.generic_fbsd.h @@ -68,7 +68,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) osi_fbsd_alloc((x), 1) #undef AFS_KALLOC_NOSLEEP #define AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0) diff --git a/src/config/param.hp_ux102.h b/src/config/param.hp_ux102.h index bf83b16..93fd121 100644 --- a/src/config/param.hp_ux102.h +++ b/src/config/param.hp_ux102.h @@ -63,7 +63,6 @@ #define AFS_UIOUSER UIOSEG_USER #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free #define VATTR_NULL vattr_null diff --git a/src/config/param.hp_ux110.h b/src/config/param.hp_ux110.h index 8f0616b..ca541f9 100644 --- a/src/config/param.hp_ux110.h +++ b/src/config/param.hp_ux110.h @@ -64,7 +64,6 @@ #define AFS_UIOUSER UIOSEG_USER #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free #define VATTR_NULL vattr_null diff --git a/src/config/param.hp_ux1123.h b/src/config/param.hp_ux1123.h index fd5246c..1ac65ab 100644 --- a/src/config/param.hp_ux1123.h +++ b/src/config/param.hp_ux1123.h @@ -69,7 +69,6 @@ #define AFS_UIOUSER UIOSEG_USER #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free #define VATTR_NULL vattr_null diff --git a/src/config/param.hp_ux11i.h b/src/config/param.hp_ux11i.h index 074db76..9a76aec 100644 --- a/src/config/param.hp_ux11i.h +++ b/src/config/param.hp_ux11i.h @@ -68,7 +68,6 @@ #define AFS_UIOUSER UIOSEG_USER #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free #define VATTR_NULL vattr_null diff --git a/src/config/param.ia64_hpux1122.h b/src/config/param.ia64_hpux1122.h index 82435e8..d659b49 100644 --- a/src/config/param.ia64_hpux1122.h +++ b/src/config/param.ia64_hpux1122.h @@ -68,7 +68,6 @@ #define AFS_UIOUSER UIOSEG_USER #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free #define VATTR_NULL vattr_null diff --git a/src/config/param.ia64_hpux1123.h b/src/config/param.ia64_hpux1123.h index 00b513f..5931bc8 100644 --- a/src/config/param.ia64_hpux1123.h +++ b/src/config/param.ia64_hpux1123.h @@ -69,7 +69,6 @@ #define AFS_UIOUSER UIOSEG_USER #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free #define VATTR_NULL vattr_null diff --git a/src/config/param.nbsd15.h b/src/config/param.nbsd15.h index 905a1c1..9714ee6 100644 --- a/src/config/param.nbsd15.h +++ b/src/config/param.nbsd15.h @@ -67,7 +67,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd16.h b/src/config/param.nbsd16.h index bb88fe2..6694be2 100644 --- a/src/config/param.nbsd16.h +++ b/src/config/param.nbsd16.h @@ -68,7 +68,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd20.h b/src/config/param.nbsd20.h index 07e7415..c294b77 100644 --- a/src/config/param.nbsd20.h +++ b/src/config/param.nbsd20.h @@ -74,7 +74,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd21.h b/src/config/param.nbsd21.h index bb63588..7de8d32 100644 --- a/src/config/param.nbsd21.h +++ b/src/config/param.nbsd21.h @@ -74,7 +74,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd30.h b/src/config/param.nbsd30.h index 95a1c02..2c67a8f 100644 --- a/src/config/param.nbsd30.h +++ b/src/config/param.nbsd30.h @@ -70,7 +70,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd40.h b/src/config/param.nbsd40.h index adb4ae6..0761607 100644 --- a/src/config/param.nbsd40.h +++ b/src/config/param.nbsd40.h @@ -72,7 +72,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd50.h b/src/config/param.nbsd50.h index e8c1f07..0be55a1 100644 --- a/src/config/param.nbsd50.h +++ b/src/config/param.nbsd50.h @@ -70,7 +70,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd60.h b/src/config/param.nbsd60.h index 29519c8..f6a1aef 100644 --- a/src/config/param.nbsd60.h +++ b/src/config/param.nbsd60.h @@ -71,7 +71,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.nbsd70.h b/src/config/param.nbsd70.h index 4395bab..ac5b98d 100644 --- a/src/config/param.nbsd70.h +++ b/src/config/param.nbsd70.h @@ -72,7 +72,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.ppc_darwin_70.h b/src/config/param.ppc_darwin_70.h index e72b317..7a71a32 100644 --- a/src/config/param.ppc_darwin_70.h +++ b/src/config/param.ppc_darwin_70.h @@ -50,7 +50,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) kalloc(x) #define AFS_KFREE(x,y) kfree(x,y) #define v_count v_usecount diff --git a/src/config/param.ppc_darwin_80.h b/src/config/param.ppc_darwin_80.h index 8743530..7b4a4d1 100644 --- a/src/config/param.ppc_darwin_80.h +++ b/src/config/param.ppc_darwin_80.h @@ -75,7 +75,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.ppc_darwin_90.h b/src/config/param.ppc_darwin_90.h index 01e3ad1..bce4212 100644 --- a/src/config/param.ppc_darwin_90.h +++ b/src/config/param.ppc_darwin_90.h @@ -80,7 +80,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h index b993bb5..dc38566 100644 --- a/src/config/param.rs_aix42.h +++ b/src/config/param.rs_aix42.h @@ -68,7 +68,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do {curtime(x); (x)->tv_usec = (x)->tv_usec/1000;} while (0) #define osi_GTime(x) time /* something for the silly time(0)?? */ #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free diff --git a/src/config/param.rs_aix51.h b/src/config/param.rs_aix51.h index 6e26501..08304c9 100644 --- a/src/config/param.rs_aix51.h +++ b/src/config/param.rs_aix51.h @@ -69,7 +69,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do {curtime(x); (x)->tv_usec = (x)->tv_usec/1000;} while (0) #define osi_GTime(x) time /* something for the silly time(0)?? */ #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free diff --git a/src/config/param.rs_aix52.h b/src/config/param.rs_aix52.h index cd9f29d..4a64879 100644 --- a/src/config/param.rs_aix52.h +++ b/src/config/param.rs_aix52.h @@ -70,7 +70,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do {curtime(x); (x)->tv_usec = (x)->tv_usec/1000;} while (0) #define osi_GTime(x) time /* something for the silly time(0)?? */ #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free diff --git a/src/config/param.rs_aix53.h b/src/config/param.rs_aix53.h index 8cec483..382af53 100644 --- a/src/config/param.rs_aix53.h +++ b/src/config/param.rs_aix53.h @@ -71,7 +71,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do {curtime(x); (x)->tv_usec = (x)->tv_usec/1000;} while (0) #define osi_GTime(x) time /* something for the silly time(0)?? */ #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free diff --git a/src/config/param.rs_aix61.h b/src/config/param.rs_aix61.h index 85fbdc8..868fe9f 100644 --- a/src/config/param.rs_aix61.h +++ b/src/config/param.rs_aix61.h @@ -72,7 +72,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) do {curtime(x); (x)->tv_usec = (x)->tv_usec/1000;} while (0) #define osi_GTime(x) time /* something for the silly time(0)?? */ #define AFS_KALLOC kmem_alloc #define AFS_KFREE kmem_free diff --git a/src/config/param.sgi_65.h b/src/config/param.sgi_65.h index 3596196..bd40c4b 100644 --- a/src/config/param.sgi_65.h +++ b/src/config/param.sgi_65.h @@ -91,11 +91,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#ifdef _K64U64 -#define osi_GetTime(x) irix5_microtime((struct __irix5_timeval*)(x)) -#else -#define osi_GetTime(x) microtime(x) -#endif #define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) #define AFS_KALLOC_NOSLEEP(n) kmem_alloc(n, KM_NOSLEEP) #define AFS_KFREE kmem_free diff --git a/src/config/param.sun4x_510.h b/src/config/param.sun4x_510.h index 6a5e061..803ea2a 100644 --- a/src/config/param.sun4x_510.h +++ b/src/config/param.sun4x_510.h @@ -74,7 +74,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) /** * These defines are for the 64 bit Solaris 7 port diff --git a/src/config/param.sun4x_511.h b/src/config/param.sun4x_511.h index 256e89e..a6891bb 100644 --- a/src/config/param.sun4x_511.h +++ b/src/config/param.sun4x_511.h @@ -77,7 +77,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) /** * These defines are for the 64 bit Solaris 7 port diff --git a/src/config/param.sun4x_58.h b/src/config/param.sun4x_58.h index 4de40e7..df29054 100644 --- a/src/config/param.sun4x_58.h +++ b/src/config/param.sun4x_58.h @@ -70,7 +70,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) /** * These defines are for the 64 bit Solaris 7 port diff --git a/src/config/param.sun4x_59.h b/src/config/param.sun4x_59.h index ad50f36..6ee6d6b 100644 --- a/src/config/param.sun4x_59.h +++ b/src/config/param.sun4x_59.h @@ -71,7 +71,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) /** * These defines are for the 64 bit Solaris 7 port diff --git a/src/config/param.sunx86_510.h b/src/config/param.sunx86_510.h index e0ce387..371e5ee 100644 --- a/src/config/param.sunx86_510.h +++ b/src/config/param.sunx86_510.h @@ -84,7 +84,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) /** * These defines are for the 64 bit Solaris 7 port diff --git a/src/config/param.sunx86_511.h b/src/config/param.sunx86_511.h index 1ac462e..b20c0d0 100644 --- a/src/config/param.sunx86_511.h +++ b/src/config/param.sunx86_511.h @@ -87,7 +87,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) /** * These defines are for the 64 bit Solaris 7 port diff --git a/src/config/param.sunx86_58.h b/src/config/param.sunx86_58.h index 9f9ffec..e9969d3 100644 --- a/src/config/param.sunx86_58.h +++ b/src/config/param.sunx86_58.h @@ -81,7 +81,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) #define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) #define AFS_KALLOC_NOSLEEP(n) kmem_alloc(n, KM_NOSLEEP) diff --git a/src/config/param.sunx86_59.h b/src/config/param.sunx86_59.h index 4875e3c..0c072f7 100644 --- a/src/config/param.sunx86_59.h +++ b/src/config/param.sunx86_59.h @@ -82,7 +82,6 @@ #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES MCLBYTES #define AFS_MINCHANGE 2 -#define osi_GetTime(x) uniqtime32(x) #define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) #define AFS_KALLOC_NOSLEEP(n) kmem_alloc(n, KM_NOSLEEP) diff --git a/src/config/param.x86_darwin_100.h b/src/config/param.x86_darwin_100.h index 9d8de10..554eb24 100644 --- a/src/config/param.x86_darwin_100.h +++ b/src/config/param.x86_darwin_100.h @@ -113,7 +113,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_110.h b/src/config/param.x86_darwin_110.h index eae5983..ca893b9 100644 --- a/src/config/param.x86_darwin_110.h +++ b/src/config/param.x86_darwin_110.h @@ -116,7 +116,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_120.h b/src/config/param.x86_darwin_120.h index da6f48a..a6c881a 100644 --- a/src/config/param.x86_darwin_120.h +++ b/src/config/param.x86_darwin_120.h @@ -119,7 +119,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_130.h b/src/config/param.x86_darwin_130.h index a29a938..7571e05 100644 --- a/src/config/param.x86_darwin_130.h +++ b/src/config/param.x86_darwin_130.h @@ -122,7 +122,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_140.h b/src/config/param.x86_darwin_140.h index 83e009f..989e39b 100644 --- a/src/config/param.x86_darwin_140.h +++ b/src/config/param.x86_darwin_140.h @@ -125,7 +125,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_150.h b/src/config/param.x86_darwin_150.h index 6c0df11..666c1de 100644 --- a/src/config/param.x86_darwin_150.h +++ b/src/config/param.x86_darwin_150.h @@ -128,7 +128,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_160.h b/src/config/param.x86_darwin_160.h index 0648752..f2d786a 100644 --- a/src/config/param.x86_darwin_160.h +++ b/src/config/param.x86_darwin_160.h @@ -131,7 +131,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_170.h b/src/config/param.x86_darwin_170.h index b9be380..99c8cd7 100644 --- a/src/config/param.x86_darwin_170.h +++ b/src/config/param.x86_darwin_170.h @@ -134,7 +134,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_180.h b/src/config/param.x86_darwin_180.h index bc671a8..6b6ac01 100644 --- a/src/config/param.x86_darwin_180.h +++ b/src/config/param.x86_darwin_180.h @@ -137,7 +137,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_190.h b/src/config/param.x86_darwin_190.h index cd29e77..17dfbe4 100644 --- a/src/config/param.x86_darwin_190.h +++ b/src/config/param.x86_darwin_190.h @@ -140,7 +140,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_80.h b/src/config/param.x86_darwin_80.h index 2a079a7..fc70f98 100644 --- a/src/config/param.x86_darwin_80.h +++ b/src/config/param.x86_darwin_80.h @@ -75,7 +75,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount diff --git a/src/config/param.x86_darwin_90.h b/src/config/param.x86_darwin_90.h index 6814c28..7f832f9 100644 --- a/src/config/param.x86_darwin_90.h +++ b/src/config/param.x86_darwin_90.h @@ -80,7 +80,6 @@ #define AFS_UIOSYS UIO_SYSSPACE #define AFS_UIOUSER UIO_USERSPACE #define AFS_CLBYTES CLBYTES -#define osi_GetTime(x) microtime(x) #define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK) #define AFS_KFREE(x,y) _FREE(x,M_TEMP) #define v_count v_usecount -- 1.9.4