#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 */
-
-
-static int osi_TimedSleep(char *event, afs_int32 ams, int aintok);
-
static char waitV;
}
/* cancel osi_Wait */
+/* XXX
+ * I can't tell -- is this supposed to be cv_signal() or cv_waitq_remove()?
+ * Or perhaps cv_broadcast()?
+ * Assuming cv_signal() is the desired meaning. -GAW
+ */
void
afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle)
{
caddr_t proc;
AFS_STATCNT(osi_CancelWait);
+
proc = achandle->proc;
if (proc == 0)
return;
- achandle->proc = (caddr_t) 0; /* so dude can figure out he was signalled */
+ achandle->proc = NULL; /* so dude can figure out he was signalled */
afs_osi_Wakeup(&waitV);
}
afs_int32 endTime;
AFS_STATCNT(osi_Wait);
+
endTime = osi_Time() + (ams / 1000);
if (ahandle)
ahandle->proc = (caddr_t) curproc;
do {
AFS_ASSERT_GLOCK();
- code = 0;
- code = osi_TimedSleep(&waitV, ams, aintok);
-
+ code = afs_osi_TimedSleep(&waitV, ams, aintok);
if (code)
break; /* if something happened, quit now */
/* if we we're cancelled, quit now */
break;
}
} while (osi_Time() < endTime);
+
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 seq; /* Sequence number: this is incremented
* by wakeup calls; wait will not return until
* it changes */
- int cond;
+ struct mtx *lck;
+ struct thread *owner;
} afs_event_t;
#define HASHSIZE 128
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (HASHSIZE-1));
int afs_evhashcnt = 0;
+#define EVTLOCK_INIT(e) \
+ do { \
+ mtx_init((e)->lck, "event lock", NULL, MTX_DEF); \
+ (e)->owner = 0; \
+ } while (0)
+#define EVTLOCK_LOCK(e) \
+ do { \
+ osi_Assert((e)->owner != curthread); \
+ mtx_lock((e)->lck); \
+ osi_Assert((e)->owner == 0); \
+ (e)->owner = curthread; \
+ } while (0)
+#define EVTLOCK_UNLOCK(e) \
+ do { \
+ osi_Assert((e)->owner == curthread); \
+ (e)->owner = 0; \
+ mtx_unlock((e)->lck); \
+ } while (0)
+#define EVTLOCK_DESTROY(e) mtx_destroy((e)->lck)
+
/* Get and initialize event structure corresponding to lwp event (i.e. address)
* */
static afs_event_t *
hashcode = afs_evhash(event);
evp = afs_evhasht[hashcode];
while (evp) {
+ EVTLOCK_LOCK(evp);
if (evp->event == event) {
evp->refcount++;
return evp;
}
if (evp->refcount == 0)
newp = evp;
+ EVTLOCK_UNLOCK(evp);
evp = evp->next;
}
if (!newp) {
- newp = (afs_event_t *) osi_AllocSmallSpace(sizeof(afs_event_t));
+ newp = osi_AllocSmallSpace(sizeof(afs_event_t));
+ newp->lck = osi_AllocSmallSpace(sizeof(struct mtx));
+ memset(newp->lck, 0, sizeof(struct mtx));
afs_evhashcnt++;
newp->next = afs_evhasht[hashcode];
afs_evhasht[hashcode] = newp;
newp->seq = 0;
+ EVTLOCK_INIT(newp);
}
+ EVTLOCK_LOCK(newp);
newp->event = event;
newp->refcount = 1;
return newp;
}
/* Release the specified event */
-#define relevent(evp) ((evp)->refcount--)
-
+#define relevent(evp) \
+ do { \
+ osi_Assert((evp)->owner == curthread); \
+ (evp)->refcount--; \
+ (evp)->owner = 0; \
+ mtx_unlock((evp)->lck); \
+ } while (0)
void
afs_osi_Sleep(void *event)
evp = afs_getevent(event);
seq = evp->seq;
+ AFS_GUNLOCK();
while (seq == evp->seq) {
- AFS_ASSERT_GLOCK();
- AFS_GUNLOCK();
- tsleep(event, PVFS, "afs_osi_Sleep", 0);
- AFS_GLOCK();
+ evp->owner = 0;
+ msleep(event, evp->lck, PVFS, "afsslp", 0);
+ evp->owner = curthread;
}
relevent(evp);
+ AFS_GLOCK();
}
int
return 0;
}
-/* osi_TimedSleep
+/* afs_osi_TimedSleep
*
* Arguments:
* event - event to sleep on
*
* 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 ticks;
int seq, prio;
- ticks = (ams * afs_hz) / 1000;
-
-
evp = afs_getevent(event);
seq = evp->seq;
AFS_GUNLOCK();
prio = PCATCH | PPAUSE;
else
prio = PVFS;
- code = tsleep(event, prio, "afs_osi_TimedSleep", ticks);
- AFS_GLOCK();
+ evp->owner = 0;
+ code = msleep(event, evp->lck, prio, "afsslp", (ams * hz) / 1000);
+ evp->owner = curthread;
if (seq == evp->seq)
code = EINTR;
relevent(evp);
+ AFS_GLOCK();
return code;
}
-
int
afs_osi_Wakeup(void *event)
{
relevent(evp);
return ret;
}
+
+void
+shutdown_osisleep(void) {
+ struct afs_event *evp, *nevp, **pevpp;
+ int i;
+ for (i=0; i < HASHSIZE; i++) {
+ evp = afs_evhasht[i];
+ pevpp = &afs_evhasht[i];
+ while (evp) {
+ EVTLOCK_LOCK(evp);
+ nevp = evp->next;
+ if (evp->refcount == 0) {
+ EVTLOCK_DESTROY(evp);
+ *pevpp = evp->next;
+ osi_FreeSmallSpace(evp->lck);
+ osi_FreeSmallSpace(evp);
+ afs_evhashcnt--;
+ } else {
+ EVTLOCK_UNLOCK(evp);
+ pevpp = &evp->next;
+ }
+ evp = nevp;
+ }
+ }
+}
git://git.openafs.org / openafs.git / blobdiff