b=18721

[fs/lustre-release.git] / libcfs / libcfs / user-prim.c

diff --git a/libcfs/libcfs/user-prim.c b/libcfs/libcfs/user-prim.c
index bf57b4c..03e4bea 100644 (file)
--- a/libcfs/libcfs/user-prim.c
+++ b/libcfs/libcfs/user-prim.c
@@ -117,28 +117,32 @@ void cfs_waitq_wait(struct cfs_waitlink *link, cfs_task_state_t state)
 {
         LASSERT(link != NULL);
         (void)link;
+
+        /* well, wait for something to happen */
+        call_wait_handler(0);
 }
 
-int64_t cfs_waitq_timedwait(struct cfs_waitlink *link, cfs_task_state_t state, 
+int64_t cfs_waitq_timedwait(struct cfs_waitlink *link, cfs_task_state_t state,
                             int64_t timeout)
 {
         LASSERT(link != NULL);
         (void)link;
+        call_wait_handler(timeout);
         return 0;
 }
 
 void cfs_schedule_timeout(cfs_task_state_t state, int64_t timeout)
 {
-        cfs_waitlink_t    l;  
+        cfs_waitlink_t    l;
         /* sleep(timeout) here instead? */
         cfs_waitq_timedwait(&l, state, timeout);
 }
 
-void 
+void
 cfs_pause(cfs_duration_t d)
 {
         struct timespec s;
-        
+
         cfs_duration_nsec(d, &s);
         nanosleep(&s, NULL);
 }
@@ -198,7 +202,7 @@ cfs_time_t cfs_timer_deadline(cfs_timer_t *l)
  */
 
 struct lustre_thread_arg {
-        cfs_thread_t f; 
+        cfs_thread_t f;
         void *arg;
 };
 static void *cfs_thread_helper(void *data)
@@ -208,7 +212,7 @@ static void *cfs_thread_helper(void *data)
         void *arg = targ->arg;
 
         free(targ);
-        
+
         (void)f(arg);
         return NULL;
 }
@@ -221,11 +225,11 @@ int cfs_create_thread(cfs_thread_t func, void *arg)
 
         if ( targ_p == NULL )
                 return -ENOMEM;
-        
+
         targ_p->f = func;
         targ_p->arg = arg;
 
-        pthread_attr_init(&tattr); 
+        pthread_attr_init(&tattr);
         pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
         rc = pthread_create(&tid, &tattr, cfs_thread_helper, targ_p);
         pthread_attr_destroy(&tattr);
@@ -238,23 +242,6 @@ uid_t cfs_curproc_uid(void)
         return getuid();
 }
 
-int cfs_parse_int_tunable(int *value, char *name)
-{
-        char    *env = getenv(name);
-        char    *end;
-
-        if (env == NULL)
-                return 0;
-
-        *value = (int)strtoull(env, &end, 0);
-        if (*end == 0)
-                return 0;
-
-        CERROR("Can't parse tunable %s=%s\n", name, env);
-        return -EINVAL;
-}
-
-
 void cfs_enter_debugger(void)
 {
         /*
@@ -289,7 +276,7 @@ cfs_sigset_t cfs_block_sigs(cfs_sigset_t blocks)
 {
         cfs_sigset_t   old;
         int   rc;
-        
+
         rc = sigprocmask(SIG_SETMASK, &blocks, &old);
         LASSERT (rc == 0);