Fix build for FreeBSD 10.0

[openafs.git] / src / afs / FBSD / osi_sleep.c

diff --git a/src/afs/FBSD/osi_sleep.c b/src/afs/FBSD/osi_sleep.c
index b42e75d..a8de041 100644 (file)
--- a/src/afs/FBSD/osi_sleep.c
+++ b/src/afs/FBSD/osi_sleep.c
@@ -11,29 +11,17 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID
-    ("$Header$");
 
 #include "afs/sysincludes.h"   /* Standard vendor system headers */
 #include "afsincludes.h"       /* Afs-based standard headers */
 #include "afs/afs_stats.h"     /* afs statistics */
 
-#ifndef AFS_FBSD50_ENV
-static int osi_TimedSleep(char *event, afs_int32 ams, int aintok);
-static char waitV;
-#endif
-
-
 void
 afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle)
 {
     AFS_STATCNT(osi_InitWaitHandle);
-#ifdef AFS_FBSD50_ENV
     cv_init(&achandle->wh_condvar, "afscondvar");
     achandle->wh_inited = 1;
-#else
-    achandle->proc = NULL;
-#endif
 }
 
 /* cancel osi_Wait */
@@ -45,25 +33,13 @@ afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle)
 void
 afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle)
 {
-#ifndef AFS_FBSD50_ENV
-    caddr_t proc;
-#endif
-
     AFS_STATCNT(osi_CancelWait);
 
-#ifdef AFS_FBSD50_ENV
     /* XXX should not be necessary */
     if (!achandle->wh_inited)
        return;
     AFS_ASSERT_GLOCK();
     cv_signal(&achandle->wh_condvar);
-#else
-    proc = achandle->proc;
-    if (proc == 0)
-       return;
-    achandle->proc = NULL;     /* so dude can figure out he was signalled */
-    afs_osi_Wakeup(&waitV);
-#endif
 }
 
 /* afs_osi_Wait
@@ -74,15 +50,10 @@ int
 afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
 {
     int code;
-#ifdef AFS_FBSD50_ENV
     struct timeval tv;
     int ticks;
-#else
-    afs_int32 endTime;
-#endif
 
     AFS_STATCNT(osi_Wait);
-#ifdef AFS_FBSD50_ENV
     tv.tv_sec = ams / 1000;
     tv.tv_usec = (ams % 1000) * 1000;
     ticks = tvtohz(&tv);
@@ -95,48 +66,17 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
     } else {
        if (!ahandle->wh_inited)
            afs_osi_InitWaitHandle(ahandle);    /* XXX should not be needed */
-
        if (aintok)
            code = cv_timedwait_sig(&ahandle->wh_condvar, &afs_global_mtx,
                ticks);
        else
            code = cv_timedwait(&ahandle->wh_condvar, &afs_global_mtx, ticks);
     }
-#else
-    endTime = osi_Time() + (ams / 1000);
-    if (ahandle)
-       ahandle->proc = (caddr_t) curproc;
-    do {
-       AFS_ASSERT_GLOCK();
-       code = osi_TimedSleep(&waitV, ams, aintok);
-       if (code)
-           break;              /* if something happened, quit now */
-       /* if we we're cancelled, quit now */
-       if (ahandle && (ahandle->proc == NULL)) {
-           /* we've been signalled */
-           break;
-       }
-    } while (osi_Time() < endTime);
-#endif
     return code;
 }
 
-/*
- * All this gluck should probably also be replaced with CVs.
- */
-typedef struct afs_event {
-    struct afs_event *next;    /* next in hash chain */
-    char *event;               /* lwp event: an address */
-    int refcount;              /* Is it in use? */
-    int seq;                   /* Sequence number: this is incremented
-                                * by wakeup calls; wait will not return until
-                                * it changes */
-    int cond;
-} afs_event_t;
-
-#define HASHSIZE 128
-afs_event_t *afs_evhasht[HASHSIZE];    /* Hash table for events */
-#define afs_evhash(event)      (afs_uint32) ((((long)event)>>2) & (HASHSIZE-1));
+afs_event_t *afs_evhasht[AFS_EVHASHSIZE];      /* Hash table for events */
+#define afs_evhash(event)      (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
 int afs_evhashcnt = 0;
 
 /* Get and initialize event structure corresponding to lwp event (i.e. address)
@@ -160,7 +100,7 @@ afs_getevent(char *event)
        evp = evp->next;
     }
     if (!newp) {
-       newp = (afs_event_t *) osi_AllocSmallSpace(sizeof(afs_event_t));
+       newp = (afs_event_t *) afs_osi_Alloc_NoSleep(sizeof(afs_event_t));
        afs_evhashcnt++;
        newp->next = afs_evhasht[hashcode];
        afs_evhasht[hashcode] = newp;
@@ -185,13 +125,7 @@ afs_osi_Sleep(void *event)
     seq = evp->seq;
     while (seq == evp->seq) {
        AFS_ASSERT_GLOCK();
-#ifdef AFS_FBSD50_ENV
        msleep(event, &afs_global_mtx, PVFS, "afsslp", 0);
-#else
-       AFS_GUNLOCK();
-       tsleep(event, PVFS, "afs_osi_Sleep", 0);
-       AFS_GLOCK();
-#endif
     }
     relevent(evp);
 }
@@ -203,7 +137,6 @@ afs_osi_SleepSig(void *event)
     return 0;
 }
 
-#ifndef AFS_FBSD50_ENV
 /* osi_TimedSleep
  * 
  * Arguments:
@@ -213,32 +146,30 @@ afs_osi_SleepSig(void *event)
  *
  * Returns 0 if timeout and EINTR if signalled.
  */
-static int
-osi_TimedSleep(char *event, afs_int32 ams, int aintok)
+int
+afs_osi_TimedSleep(void *event, afs_int32 ams, int aintok)
 {
-    int code = 0;
     struct afs_event *evp;
+    int seq, code;
+    struct timeval tv;
     int ticks;
-    int seq, prio;
-
-    ticks = (ams * afs_hz) / 1000;
 
+    tv.tv_sec = ams / 1000;
+    tv.tv_usec = (ams % 1000) * 1000;
+    ticks = tvtohz(&tv);
 
     evp = afs_getevent(event);
     seq = evp->seq;
-    AFS_GUNLOCK();
-    if (aintok)
-       prio = PCATCH | PPAUSE;
-    else
-       prio = PVFS;
-    code = tsleep(event, prio, "afs_osi_TimedSleep", ticks);
-    AFS_GLOCK();
-    if (seq == evp->seq)
-       code = EINTR;
+    while (seq == evp->seq) {
+       AFS_ASSERT_GLOCK();
+       code = msleep(event, &afs_global_mtx, (aintok ? PPAUSE|PCATCH : PVFS),
+           "afstslp", ticks);
+       if (code == EINTR)
+           break;
+    }
     relevent(evp);
     return code;
 }
-#endif /* not AFS_FBSD50_ENV */
 
 int
 afs_osi_Wakeup(void *event)