ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/etp.c
(Generate patch)

Comparing libeio/etp.c (file contents):
Revision 1.6 by root, Thu Jun 25 18:08:47 2015 UTC vs.
Revision 1.7 by root, Thu Jun 25 18:12:53 2015 UTC

… …
130 130
131 xmutex_t wrklock; 131 xmutex_t wrklock;
132 xmutex_t reslock; 132 xmutex_t reslock;
133 xmutex_t reqlock; 133 xmutex_t reqlock;
134 xcond_t reqwait; 134 xcond_t reqwait;
135
136 etp_worker wrk_first;
135}; 137};
136 138
137typedef struct etp_pool *etp_pool; 139typedef struct etp_pool *etp_pool;
138 140
139typedef struct etp_worker 141typedef struct etp_worker
… …
149 151
150#ifdef ETP_WORKER_COMMON 152#ifdef ETP_WORKER_COMMON
151 ETP_WORKER_COMMON 153 ETP_WORKER_COMMON
152#endif 154#endif
153} etp_worker; 155} etp_worker;
154
155static etp_worker wrk_first; /* NOT etp */
156 156
157#define ETP_WORKER_LOCK(wrk) X_LOCK (pool->wrklock) 157#define ETP_WORKER_LOCK(wrk) X_LOCK (pool->wrklock)
158#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (pool->wrklock) 158#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (pool->wrklock)
159 159
160/* worker threads management */ 160/* worker threads management */
… …
274 274
275 abort (); 275 abort ();
276} 276}
277 277
278ETP_API_DECL int ecb_cold 278ETP_API_DECL int ecb_cold
279etp_init (etp_pool pool, void (*want_poll)(void *userdata), void (*done_poll)(void *userdata)) 279etp_init (etp_pool pool, void *userdata, void (*want_poll)(void *userdata), void (*done_poll)(void *userdata))
280{ 280{
281 X_MUTEX_CREATE (pool->wrklock); 281 X_MUTEX_CREATE (pool->wrklock);
282 X_MUTEX_CREATE (pool->reslock); 282 X_MUTEX_CREATE (pool->reslock);
283 X_MUTEX_CREATE (pool->reqlock); 283 X_MUTEX_CREATE (pool->reqlock);
284 X_COND_CREATE (pool->reqwait); 284 X_COND_CREATE (pool->reqwait);
285 285
286 reqq_init (&pool->req_queue); 286 reqq_init (&pool->req_queue);
287 reqq_init (&pool->res_queue); 287 reqq_init (&pool->res_queue);
288 288
289 wrk_first.next = 289 pool->wrk_first.next =
290 wrk_first.prev = &wrk_first; 290 pool->wrk_first.prev = &pool->wrk_first;
291 291
292 pool->started = 0; 292 pool->started = 0;
293 pool->idle = 0; 293 pool->idle = 0;
294 pool->nreqs = 0; 294 pool->nreqs = 0;
295 pool->nready = 0; 295 pool->nready = 0;
… …
297 pool->wanted = 4; 297 pool->wanted = 4;
298 298
299 pool->max_idle = 4; /* maximum number of threads that can pool->idle indefinitely */ 299 pool->max_idle = 4; /* maximum number of threads that can pool->idle indefinitely */
300 pool->idle_timeout = 10; /* number of seconds after which an pool->idle threads exit */ 300 pool->idle_timeout = 10; /* number of seconds after which an pool->idle threads exit */
301 301
302 pool->userdata = userdata;
302 pool->want_poll_cb = want_poll; 303 pool->want_poll_cb = want_poll;
303 pool->done_poll_cb = done_poll; 304 pool->done_poll_cb = done_poll;
304 305
305 return 0; 306 return 0;
306} 307}
… …
417 418
418 X_LOCK (pool->wrklock); 419 X_LOCK (pool->wrklock);
419 420
420 if (xthread_create (&wrk->tid, etp_proc, (void *)wrk)) 421 if (xthread_create (&wrk->tid, etp_proc, (void *)wrk))
421 { 422 {
422 wrk->prev = &wrk_first; 423 wrk->prev = &wpool->rk_first;
423 wrk->next = wrk_first.next; 424 wrk->next = pool->wrk_first.next;
424 wrk_first.next->prev = wrk; 425 pool->wrk_first.next->prev = wrk;
425 wrk_first.next = wrk; 426 pool->wrk_first.next = wrk;
426 ++pool->started; 427 ++pool->started;
427 } 428 }
428 else 429 else
429 free (wrk); 430 free (wrk);
430 431

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines