*/
#include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
-RCSID("$Header$");
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* afs statistics */
-
-
-static int osi_TimedSleep(char *event, afs_int32 ams, int aintok);
-void afs_osi_Wakeup(char *event);
-void afs_osi_Sleep(char *event);
+#include "afs/sysincludes.h" /* Standard vendor system headers */
+#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* afs statistics */
+#include "osi_compat.h"
static char waitV, dummyV;
-
-void afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle)
+void
+afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle)
{
AFS_STATCNT(osi_InitWaitHandle);
achandle->proc = (caddr_t) 0;
}
/* cancel osi_Wait */
-void afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle)
+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 */
+ if (proc == 0)
+ return;
+ achandle->proc = (caddr_t) 0; /* so dude can figure out he was signalled */
afs_osi_Wakeup(&waitV);
}
* Waits for data on ahandle, or ams ms later. ahandle may be null.
* Returns 0 if timeout and EINTR if signalled.
*/
-int afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
+int
+afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
{
+ afs_int32 endTime;
int code;
- afs_int32 endTime, tid;
- struct timer_list *timer = NULL;
AFS_STATCNT(osi_Wait);
- endTime = osi_Time() + (ams/1000);
+ endTime = osi_Time() + (ams / 1000);
if (ahandle)
ahandle->proc = (caddr_t) current;
do {
- AFS_ASSERT_GLOCK();
- code = 0;
- code = osi_TimedSleep(&waitV, ams, aintok);
-
- if (code) break;
+ AFS_ASSERT_GLOCK();
+ code = afs_osi_TimedSleep(&waitV, ams, 1);
+ if (code)
+ break;
if (ahandle && (ahandle->proc == (caddr_t) 0)) {
/* we've been signalled */
break;
return code;
}
-
-
-
-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 */
-#if defined(AFS_LINUX24_ENV)
- wait_queue_head_t cond;
-#else
- struct wait_queue *cond;
-#endif
-} 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)
* */
-static afs_event_t *afs_getevent(char *event)
+static afs_event_t *
+afs_getevent(char *event)
{
afs_event_t *evp, *newp = 0;
int hashcode;
* address.
*
* Locks:
- * Called with GLOCK held. However the function might drop
- * GLOCK when it calls osi_AllocSmallSpace for allocating
- * a new event (In Linux, the allocator drops GLOCK to avoid
- * a deadlock).
+ * Called with GLOCK held.
*/
-static void afs_addevent(char *event)
+static void
+afs_addevent(char *event)
{
int hashcode;
afs_event_t *newp;
-
+
AFS_ASSERT_GLOCK();
hashcode = afs_evhash(event);
- newp = osi_AllocSmallSpace(sizeof(afs_event_t));
+ newp = kzalloc(sizeof(afs_event_t), GFP_NOFS);
afs_evhashcnt++;
newp->next = afs_evhasht[hashcode];
afs_evhasht[hashcode] = newp;
-#if defined(AFS_LINUX24_ENV)
init_waitqueue_head(&newp->cond);
-#else
- init_waitqueue(&newp->cond);
-#endif
- newp->seq = 0;
- newp->event = &dummyV; /* Dummy address for new events */
- newp->refcount = 0;
+ newp->event = &dummyV; /* Dummy address for new events */
}
#ifndef set_current_state
* Waits for an event to be notified, returning early if a signal
* is received. Returns EINTR if signaled, and 0 otherwise.
*/
-int afs_osi_SleepSig(char *event)
+int
+afs_osi_SleepSig(void *event)
{
struct afs_event *evp;
int seq, retval;
-#ifdef DECLARE_WAITQUEUE
- DECLARE_WAITQUEUE(wait, current);
-#else
- struct wait_queue wait = { current, NULL };
-#endif
+ int code;
evp = afs_getevent(event);
if (!evp) {
- afs_addevent(event);
- evp = afs_getevent(event);
+ afs_addevent(event);
+ evp = afs_getevent(event);
}
seq = evp->seq;
retval = 0;
- add_wait_queue(&evp->cond, &wait);
- while (seq == evp->seq) {
- set_current_state(TASK_INTERRUPTIBLE);
- AFS_ASSERT_GLOCK();
- AFS_GUNLOCK();
- schedule();
- AFS_GLOCK();
- if (signal_pending(current)) {
- retval = EINTR;
- break;
- }
- }
- remove_wait_queue(&evp->cond, &wait);
- set_current_state(TASK_RUNNING);
+ AFS_GUNLOCK();
+ code = wait_event_freezable(evp->cond, seq != evp->seq);
+ AFS_GLOCK();
+
+ if (code == -ERESTARTSYS)
+ code = EINTR;
+ else
+ code = -code;
relevent(evp);
- return retval;
+ return code;
}
-/* afs_osi_Sleep -- waits for an event to be notified, ignoring signals. */
-void afs_osi_Sleep(char *event)
+/* afs_osi_Sleep -- waits for an event to be notified, ignoring signals.
+ * - NOTE: that on Linux, there are circumstances in which TASK_INTERRUPTIBLE
+ * can wake up, even if all signals are blocked
+ * - TODO: handle signals correctly by passing an indication back to the
+ * caller that the wait has been interrupted and the stack should be cleaned
+ * up preparatory to signal delivery
+ */
+void
+afs_osi_Sleep(void *event)
{
sigset_t saved_set;
- spin_lock_irq(¤t->sigmask_lock);
+ SIG_LOCK(current);
saved_set = current->blocked;
sigfillset(¤t->blocked);
- recalc_sigpending(current);
- spin_unlock_irq(¤t->sigmask_lock);
+ RECALC_SIGPENDING(current);
+ SIG_UNLOCK(current);
afs_osi_SleepSig(event);
- spin_lock_irq(¤t->sigmask_lock);
+ SIG_LOCK(current);
current->blocked = saved_set;
- recalc_sigpending(current);
- spin_unlock_irq(¤t->sigmask_lock);
+ RECALC_SIGPENDING(current);
+ SIG_UNLOCK(current);
}
-/* osi_TimedSleep
+/* afs_osi_TimedSleep
*
* Arguments:
* event - event to sleep on
* Returns 0 if timeout, EINTR if signalled, and EGAIN if it might
* have raced.
*/
-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;
long ticks = (ams * HZ / 1000) + 1;
struct afs_event *evp;
-#ifdef DECLARE_WAITQUEUE
- DECLARE_WAITQUEUE(wait, current);
-#else
- struct wait_queue wait = { current, NULL };
-#endif
+ int seq;
evp = afs_getevent(event);
if (!evp) {
- afs_addevent(event);
+ afs_addevent(event);
evp = afs_getevent(event);
}
- add_wait_queue(&evp->cond, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
- /* always sleep TASK_INTERRUPTIBLE to keep load average
- from artifically increasing. */
- AFS_GUNLOCK();
-
- if (aintok) {
- if (schedule_timeout(ticks))
- code = EINTR;
- } else
- schedule_timeout(ticks);
+ seq = evp->seq;
+ AFS_GUNLOCK();
+ code = wait_event_freezable_timeout(evp->cond, evp->seq != seq, ticks);
AFS_GLOCK();
- remove_wait_queue(&evp->cond, &wait);
- set_current_state(TASK_RUNNING);
+ if (code == -ERESTARTSYS)
+ code = EINTR;
+ else
+ code = -code;
relevent(evp);
}
-void afs_osi_Wakeup(char *event)
+int
+afs_osi_Wakeup(void *event)
{
+ int ret = 2;
struct afs_event *evp;
evp = afs_getevent(event);
- if (!evp) /* No sleepers */
- return;
+ if (!evp) /* No sleepers */
+ return 1;
if (evp->refcount > 1) {
- evp->seq++;
+ evp->seq++;
wake_up(&evp->cond);
+ ret = 0;
}
relevent(evp);
+ return ret;
}
git://git.openafs.org / openafs.git / blobdiff