afs: Always define our own osi_timeval32_t

[openafs.git] / src / afs / HPUX / osi_machdep.h

diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h
index e2674bb..f2afe21 100644 (file)
--- a/src/afs/HPUX/osi_machdep.h
+++ b/src/afs/HPUX/osi_machdep.h
@@ -1,7 +1,8 @@
+
 /*
  * 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
@@ -18,83 +19,115 @@
 #ifndef _OSI_MACHDEP_H_
 #define _OSI_MACHDEP_H_
 
-#include "../h/kern_sem.h"
+#include "h/kern_sem.h"
+#include "h/proc_iface.h"
 
 #define        afs_hz      hz
 extern struct timeval time;
 #define osi_Time() (time.tv_sec)
 
-#ifdef PAGESIZE
-#undef PAGESIZE
-#endif
-#define PAGESIZE 8192
-
-#define        AFS_UCRED       ucred
-#define        AFS_PROC        proc_t
+typedef struct ucred afs_ucred_t;
+typedef proc_t afs_proc_t;
 
-#define osi_vnhold(avc, r)  do { VN_HOLD(AFSTOV(avc)); } while(0)
 #define gop_rdwr(rw,gp,base,len,offset,segflg,unit,aresid) \
   vn_rdwr((rw),(gp),(base),(len),(offset),(segflg),(unit),(aresid),0)
+#define gop_lookupname(fnamep,segflg,followlink,compvpp) \
+  lookupname((fnamep),(segflg),(followlink),NULL,(compvpp))
+#define gop_lookupname_user(fnamep,segflg,followlink,compvpp) \
+  lookupname((fnamep),(segflg),(followlink),NULL,(compvpp))
 
 #undef afs_suser
 
+#define osi_curcred()          (p_cred(u.u_procp))
+
 #define getpid()                (afs_uint32)p_pid(u.u_procp)
 
 #define getppid()               (afs_uint32)p_ppid(u.u_procp)
 
-#ifdef KERNEL
 /*
- * Global lock support. 
+ * Global lock support.
  *
  * HP uses global mutex to protect afs land
  */
 
+#if !defined(AFS_HPUX110_ENV)
 extern sema_t afs_global_sema;
+#else
+extern b_sema_t afs_global_sema;
+#endif
 
 extern void osi_InitGlock(void);
 
-extern void       afsHash(int nbuckets);
+#if !defined(AFS_HPUX110_ENV)
+extern void afsHash(int nbuckets);
 extern sv_sema_t *afsHashInsertFind(tid_t key);
 extern sv_sema_t *afsHashFind(tid_t key);
-extern void       afsHashRelease(tid_t key);
+extern void afsHashRelease(tid_t key);
 
 #define AFS_GLOCK_PID   kt_tid(u.u_kthreadp)
 #define AFS_SAVE_SEMA   afsHashInsertFind(AFS_GLOCK_PID)
 #define AFS_FIND_SEMA   afsHashFind(AFS_GLOCK_PID)
+
 #define AFS_GLOCK()     MP_PXSEMA(&afs_global_sema, AFS_SAVE_SEMA)
 #define AFS_GUNLOCK()   (AFS_ASSERT_GLOCK(), MP_VXSEMA(&afs_global_sema,AFS_FIND_SEMA), (!uniprocessor ? (afsHashRelease(AFS_GLOCK_PID),0) : 0))
 #define ISAFS_GLOCK()   (!uniprocessor ? owns_sema(&afs_global_sema):1)
 
-#define AFS_RXGLOCK() 
-#define AFS_RXGUNLOCK()
-#define ISAFS_RXGLOCK() 1
+#else
+#define AFS_GLOCK()  b_psema(&afs_global_sema)
+#define AFS_GUNLOCK() b_vsema(&afs_global_sema)
+#define ISAFS_GLOCK() b_owns_sema(&afs_global_sema)
+
+#endif
 
 /* Uses splnet only in the SP case */
-#define SPLVAR      register ulong_t splvar
+#define SPLVAR      ulong_t splvar
 #define NETPRI      NET_SPLNET(splvar)
 #define USERPRI     NET_SPLX(splvar)
-#endif /* KERNEL */
 
-/* 
+#if !defined(AFS_HPUX110_ENV)
+/*
  * On HP, the global lock is an alpha semaphore, hence it is automatically
  * released and reacquired aroubd a sleep() and wakeup().
  */
 
 #define        afs_osi_Sleep(x)        sleep((caddr_t) x,PZERO-2)
-#define        afs_osi_Wakeup(x)       wakeup((caddr_t) x)
+#else
+/*
+ * On 11.22 global lock is a beta semaphore, hence we need to
+ * release and reacquire around sllep and wakeup. We also need to
+ * use the get_sleep_lock.
+ * afs_osi_Sleep and afs_osi_Wakeup are defined
+ */
+void afs_osi_Sleep(void *event);
+int afs_osi_Wakeup(void *event);
+#endif
+
 #define        osi_NullHandle(x)       ((x)->proc == (caddr_t) 0)
 
+#if !defined(AFS_HPUX110_ENV)
 extern caddr_t kmem_alloc();
+#endif
+#if defined(AFS_HPUX1111_ENV)
 #include <sys/kthread_iface.h> /* for kt_cred() */
+#endif
 
 /* Expected to be available as a patch from HP */
+/* See section D of the top level README for details */
+#if defined(AFS_HPUX110_ENV)
+#include <sys/vfs_vm.h>
+#else
 #include <vfs_vm.h>
+#endif
 
-#endif /* _OSI_MACHDEP_H_ */
-
-
-
-
-
+#define osi_procname(procname, size) strncpy(procname, "", size)
 
+static_inline void
+osi_GetTime(osi_timeval32_t *atv)
+{
+    struct timeval now;
+    uniqtime(&now);
+    atv->tv_sec = now.tv_sec;
+    atv->tv_usec = now.tv_usec;
+}
 
+#endif /* _OSI_MACHDEP_H_ */