--- libeio/etp.c	2015/06/25 18:12:53	1.7
+++ libeio/etp.c	2018/08/14 09:29:50	1.12
@@ -1,7 +1,7 @@
 /*
  * libetp implementation
  *
- * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libetp@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2015 Marc Alexander Lehmann <libetp@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -107,6 +107,24 @@
   int size;
 } etp_reqq;
 
+typedef struct etp_pool *etp_pool;
+
+typedef struct etp_worker
+{
+  etp_pool pool;
+
+  struct etp_tmpbuf tmpbuf;
+
+  /* locked by pool->wrklock */
+  struct etp_worker *prev, *next;
+
+  xthread_t tid;
+
+#ifdef ETP_WORKER_COMMON
+  ETP_WORKER_COMMON
+#endif
+} etp_worker;
+
 struct etp_pool
 {
    void *userdata;
@@ -136,24 +154,6 @@
    etp_worker wrk_first;
 };
 
-typedef struct etp_pool *etp_pool;
-
-typedef struct etp_worker
-{
-  etp_pool pool;
-
-  struct etp_tmpbuf tmpbuf;
-
-  /* locked by pool->wrklock */
-  struct etp_worker *prev, *next;
-
-  xthread_t tid;
-
-#ifdef ETP_WORKER_COMMON
-  ETP_WORKER_COMMON
-#endif
-} etp_worker;
-
 #define ETP_WORKER_LOCK(wrk)   X_LOCK   (pool->wrklock)
 #define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (pool->wrklock)
 
@@ -345,7 +345,7 @@
         {
           req = reqq_shift (&pool->req_queue);
 
-          if (req)
+          if (ecb_expect_true (req))
             break;
 
           if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
@@ -379,7 +379,7 @@
 
       X_UNLOCK (pool->reqlock);
      
-      if (req->type == ETP_TYPE_QUIT)
+      if (ecb_expect_false (req->type == ETP_TYPE_QUIT))
         goto quit;
 
       ETP_EXECUTE (self, req);
@@ -389,7 +389,7 @@
       ++pool->npending;
 
       if (!reqq_push (&pool->res_queue, req))
-        ETP_WANT_POLL (poll);
+        ETP_WANT_POLL (pool);
 
       etp_worker_clear (self);
 
@@ -420,7 +420,7 @@
 
   if (xthread_create (&wrk->tid, etp_proc, (void *)wrk))
     {
-      wrk->prev = &wpool->rk_first;
+      wrk->prev = &pool->wrk_first;
       wrk->next = pool->wrk_first.next;
       pool->wrk_first.next->prev = wrk;
       pool->wrk_first.next = wrk;
@@ -487,17 +487,17 @@
       X_LOCK (pool->reslock);
       req = reqq_shift (&pool->res_queue);
 
-      if (req)
+      if (ecb_expect_true (req))
         {
           --pool->npending;
 
           if (!pool->res_queue.size)
-            ETP_DONE_POLL (pool->userdata);
+            ETP_DONE_POLL (pool);
         }
 
       X_UNLOCK (pool->reslock);
 
-      if (!req)
+      if (ecb_expect_false (!req))
         return 0;
 
       X_LOCK (pool->reqlock);
@@ -588,10 +588,10 @@
 }
 
 ETP_API_DECL void ecb_cold
-etp_set_max_poll_time (etp_pool pool, double nseconds)
+etp_set_max_poll_time (etp_pool pool, double seconds)
 {
   if (WORDACCESS_UNSAFE) X_LOCK   (pool->reslock);
-  pool->max_poll_time = nseconds * ETP_TICKS;
+  pool->max_poll_time = seconds * ETP_TICKS;
   if (WORDACCESS_UNSAFE) X_UNLOCK (pool->reslock);
 }
 
@@ -604,10 +604,10 @@
 }
 
 ETP_API_DECL void ecb_cold
-etp_set_max_idle (etp_pool pool, unsigned int nthreads)
+etp_set_max_idle (etp_pool pool, unsigned int threads)
 {
   if (WORDACCESS_UNSAFE) X_LOCK   (pool->reqlock);
-  pool->max_idle = nthreads;
+  pool->max_idle = threads;
   if (WORDACCESS_UNSAFE) X_UNLOCK (pool->reqlock);
 }
 
@@ -620,17 +620,17 @@
 }
 
 ETP_API_DECL void ecb_cold
-etp_set_min_parallel (etp_pool pool, unsigned int nthreads)
+etp_set_min_parallel (etp_pool pool, unsigned int threads)
 {
-  if (pool->wanted < nthreads)
-    pool->wanted = nthreads;
+  if (pool->wanted < threads)
+    pool->wanted = threads;
 }
 
 ETP_API_DECL void ecb_cold
-etp_set_max_parallel (etp_pool pool, unsigned int nthreads)
+etp_set_max_parallel (etp_pool pool, unsigned int threads)
 {
-  if (pool->wanted > nthreads)
-    pool->wanted = nthreads;
+  if (pool->wanted > threads)
+    pool->wanted = threads;
 
   while (pool->started > pool->wanted)
     etp_end_thread (pool);