ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.63 by root, Mon Oct 23 23:48:31 2006 UTC vs.
Revision 1.86 by root, Mon Oct 30 23:30:00 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
39# else 43# else
40# error sendfile support requested but not available 44# error sendfile support requested but not available
41# endif 45# endif
42#endif 46#endif
43 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
44/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 52#ifndef NAME_MAX
46# define NAME_MAX 4096 53# define NAME_MAX 4096
47#endif 54#endif
48 55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
49#if __ia64 61#if __ia64
50# define STACKSIZE 65536 62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
51#else 65#else
52# define STACKSIZE 8192 66# define STACKSIZE 16384
53#endif 67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536
83
84#define dBUF \
85 char *aio_buf; \
86 LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \
89 if (!aio_buf) \
90 return -1;
54 91
55enum { 92enum {
56 REQ_QUIT, 93 REQ_QUIT,
57 REQ_OPEN, REQ_CLOSE, 94 REQ_OPEN, REQ_CLOSE,
58 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
59 REQ_SENDFILE, 96 REQ_SENDFILE,
60 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
61 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
62 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
63 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
64 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
65 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
66 REQ_SLEEP, 103 REQ_BUSY,
67}; 104};
68 105
69#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
70#define AIO_GRP_KLASS "IO::AIO::GRP" 107#define AIO_GRP_KLASS "IO::AIO::GRP"
71 108
72typedef struct aio_cb 109typedef struct aio_cb
73{ 110{
74 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
75 112
76 SV *data, *callback; 113 SV *callback, *fh;
77 SV *fh, *fh2; 114 SV *sv1, *sv2;
78 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
79 Stat_t *statdata; 116 Stat_t *statdata;
80 off_t offset; 117 off_t offs;
81 size_t length; 118 size_t size;
82 ssize_t result; 119 ssize_t result;
83 120
84 STRLEN dataoffset; 121 STRLEN stroffset;
85 int type; 122 int type;
86 int fd, fd2; 123 int int1, int2;
87 int errorno; 124 int errorno;
88 mode_t mode; /* open */ 125 mode_t mode; /* open */
89 126
90 unsigned char flags; 127 unsigned char flags;
91 unsigned char pri; 128 unsigned char pri;
93 SV *self; /* the perl counterpart of this request, if any */ 130 SV *self; /* the perl counterpart of this request, if any */
94 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
95} aio_cb; 132} aio_cb;
96 133
97enum { 134enum {
98 FLAG_CANCELLED = 0x01, 135 FLAG_CANCELLED = 0x01,
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */
99}; 137};
100 138
101typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
102typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
103 141
105 PRI_MIN = -4, 143 PRI_MIN = -4,
106 PRI_MAX = 4, 144 PRI_MAX = 4,
107 145
108 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
109 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
110}; 149};
111 150
151#define AIO_TICKS ((1000000 + 1023) >> 10)
152
153static unsigned int max_poll_time = 0;
154static unsigned int max_poll_reqs = 0;
155
156/* calculcate time difference in ~1/AIO_TICKS of a second */
157static int tvdiff (struct timeval *tv1, struct timeval *tv2)
158{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161}
162
112static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
113 164
114static int started, wanted; 165static unsigned int started, idle, wanted;
115static volatile int nreqs;
116static int max_outstanding = 1<<30;
117static int respipe [2];
118 166
119#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
120# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121#else 169#else
122# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123#endif 171#endif
124 172
173#define LOCK(mutex) pthread_mutex_lock (&(mutex))
174#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
175
176/* worker threads management */
177static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
178
179typedef struct worker {
180 /* locked by wrklock */
181 struct worker *prev, *next;
182
183 pthread_t tid;
184
185 /* locked by reslock, reqlock or wrklock */
186 aio_req req; /* currently processed request */
187 void *dbuf;
188 DIR *dirp;
189} worker;
190
191static worker wrk_first = { &wrk_first, &wrk_first, 0 };
192
193static void worker_clear (worker *wrk)
194{
195 if (wrk->dirp)
196 {
197 closedir (wrk->dirp);
198 wrk->dirp = 0;
199 }
200
201 if (wrk->dbuf)
202 {
203 free (wrk->dbuf);
204 wrk->dbuf = 0;
205 }
206}
207
208static void worker_free (worker *wrk)
209{
210 wrk->next->prev = wrk->prev;
211 wrk->prev->next = wrk->next;
212
213 free (wrk);
214}
215
216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
218static volatile unsigned int max_outstanding = 0xffffffff;
219static int respipe [2];
220
125static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128 224
129static volatile aio_req reqs, reqe; /* queue start, queue end */ 225#if WORDACCESS_UNSAFE
130static volatile aio_req ress, rese; /* queue start, queue end */
131 226
227static unsigned int get_nready ()
228{
229 unsigned int retval;
230
231 LOCK (reqlock);
232 retval = nready;
233 UNLOCK (reqlock);
234
235 return retval;
236}
237
238static unsigned int get_npending ()
239{
240 unsigned int retval;
241
242 LOCK (reslock);
243 retval = npending;
244 UNLOCK (reslock);
245
246 return retval;
247}
248
249static unsigned int get_nthreads ()
250{
251 unsigned int retval;
252
253 LOCK (wrklock);
254 retval = started;
255 UNLOCK (wrklock);
256
257 return retval;
258}
259
260#else
261
262# define get_nready() nready
263# define get_npending() npending
264# define get_nthreads() started
265
266#endif
267
268/*
269 * a somewhat faster data structure might be nice, but
270 * with 8 priorities this actually needs <20 insns
271 * per shift, the most expensive operation.
272 */
273typedef struct {
274 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
275 int size;
276} reqq;
277
278static reqq req_queue;
279static reqq res_queue;
280
281int reqq_push (reqq *q, aio_req req)
282{
283 int pri = req->pri;
284 req->next = 0;
285
286 if (q->qe[pri])
287 {
288 q->qe[pri]->next = req;
289 q->qe[pri] = req;
290 }
291 else
292 q->qe[pri] = q->qs[pri] = req;
293
294 return q->size++;
295}
296
297aio_req reqq_shift (reqq *q)
298{
299 int pri;
300
301 if (!q->size)
302 return 0;
303
304 --q->size;
305
306 for (pri = NUM_PRI; pri--; )
307 {
308 aio_req req = q->qs[pri];
309
310 if (req)
311 {
312 if (!(q->qs[pri] = req->next))
313 q->qe[pri] = 0;
314
315 return req;
316 }
317 }
318
319 abort ();
320}
321
322static int poll_cb ();
132static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
133static void req_free (aio_req req); 324static void req_free (aio_req req);
325static void req_cancel (aio_req req);
134 326
135/* must be called at most once */ 327/* must be called at most once */
136static SV *req_sv (aio_req req, const char *klass) 328static SV *req_sv (aio_req req, const char *klass)
137{ 329{
138 if (!req->self) 330 if (!req->self)
156 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
157} 349}
158 350
159static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
160{ 352{
161 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
162 { 354 {
163 int old_len = grp->length; 355 int old_len = grp->size;
164 356
165 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
166 { 358 {
167 dSP; 359 dSP;
168 360
169 ENTER; 361 ENTER;
170 SAVETMPS; 362 SAVETMPS;
171 PUSHMARK (SP); 363 PUSHMARK (SP);
172 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
173 PUTBACK; 365 PUTBACK;
174 call_sv (grp->fh2, G_VOID | G_EVAL); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
175 SPAGAIN; 367 SPAGAIN;
176 FREETMPS; 368 FREETMPS;
177 LEAVE; 369 LEAVE;
178 } 370 }
179 371
180 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
181 if (old_len == grp->length) 373 if (old_len == grp->size)
182 { 374 {
183 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
184 grp->fh2 = 0; 376 grp->sv2 = 0;
185 break; 377 break;
186 } 378 }
187 } 379 }
188} 380}
189 381
190static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
191{ 383{
192 --grp->length; 384 --grp->size;
193 385
194 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
195 aio_grp_feed (grp); 387 aio_grp_feed (grp);
196 388
197 /* finish, if done */ 389 /* finish, if done */
198 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
199 { 391 {
200 req_invoke (grp); 392 req_invoke (grp);
201 req_free (grp); 393 req_free (grp);
202 } 394 }
203} 395}
204 396
205static void poll_wait ()
206{
207 fd_set rfd;
208
209 while (nreqs)
210 {
211 aio_req req;
212 pthread_mutex_lock (&reslock);
213 req = ress;
214 pthread_mutex_unlock (&reslock);
215
216 if (req)
217 return;
218
219 FD_ZERO(&rfd);
220 FD_SET(respipe [0], &rfd);
221
222 select (respipe [0] + 1, &rfd, 0, 0, 0);
223 }
224}
225
226static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
227{ 398{
228 dSP; 399 dSP;
229 int errorno = errno;
230 400
401 if (req->flags & FLAG_DATA_RO_OFF)
402 SvREADONLY_off (req->sv1);
403
404 if (req->statdata)
405 {
406 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
407 PL_laststatval = req->result;
408 PL_statcache = *(req->statdata);
409 }
410
231 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
232 return; 412 {
233
234 errno = req->errorno;
235
236 ENTER; 413 ENTER;
237 SAVETMPS; 414 SAVETMPS;
238 PUSHMARK (SP); 415 PUSHMARK (SP);
239 EXTEND (SP, 1); 416 EXTEND (SP, 1);
240 417
241 switch (req->type) 418 switch (req->type)
242 {
243 case REQ_READDIR:
244 { 419 {
245 SV *rv = &PL_sv_undef; 420 case REQ_READDIR:
246
247 if (req->result >= 0)
248 { 421 {
249 char *buf = req->data2ptr; 422 SV *rv = &PL_sv_undef;
250 AV *av = newAV ();
251 423
252 while (req->result) 424 if (req->result >= 0)
253 { 425 {
426 int i;
427 char *buf = req->ptr2;
428 AV *av = newAV ();
429
430 av_extend (av, req->result - 1);
431
432 for (i = 0; i < req->result; ++i)
433 {
254 SV *sv = newSVpv (buf, 0); 434 SV *sv = newSVpv (buf, 0);
255 435
256 av_push (av, sv); 436 av_store (av, i, sv);
257 buf += SvCUR (sv) + 1; 437 buf += SvCUR (sv) + 1;
258 req->result--; 438 }
439
440 rv = sv_2mortal (newRV_noinc ((SV *)av));
259 } 441 }
260 442
261 rv = sv_2mortal (newRV_noinc ((SV *)av)); 443 PUSHs (rv);
262 } 444 }
445 break;
263 446
447 case REQ_OPEN:
448 {
449 /* convert fd to fh */
450 SV *fh;
451
452 PUSHs (sv_2mortal (newSViv (req->result)));
453 PUTBACK;
454 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
455 SPAGAIN;
456
457 fh = SvREFCNT_inc (POPs);
458
459 PUSHMARK (SP);
460 XPUSHs (sv_2mortal (fh));
461 }
462 break;
463
464 case REQ_GROUP:
465 req->int1 = 2; /* mark group as finished */
466
467 if (req->sv1)
468 {
469 int i;
470 AV *av = (AV *)req->sv1;
471
472 EXTEND (SP, AvFILL (av) + 1);
473 for (i = 0; i <= AvFILL (av); ++i)
474 PUSHs (*av_fetch (av, i, 0));
475 }
476 break;
477
478 case REQ_NOP:
479 case REQ_BUSY:
480 break;
481
482 case REQ_READLINK:
483 if (req->result > 0)
484 {
485 SvCUR_set (req->sv1, req->result);
486 *SvEND (req->sv1) = 0;
264 PUSHs (rv); 487 PUSHs (req->sv1);
488 }
489 break;
490
491 case REQ_READ:
492 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
493 *SvEND (req->sv1) = 0;
494 /* fall through */
495 default:
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
265 } 498 }
266 break;
267 499
268 case REQ_OPEN: 500 errno = req->errorno;
269 {
270 /* convert fd to fh */
271 SV *fh;
272 501
273 PUSHs (sv_2mortal (newSViv (req->result)));
274 PUTBACK; 502 PUTBACK;
275 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
276 SPAGAIN;
277
278 fh = SvREFCNT_inc (POPs);
279
280 PUSHMARK (SP);
281 XPUSHs (sv_2mortal (fh));
282 }
283 break;
284
285 case REQ_GROUP:
286 req->fd = 2; /* mark group as finished */
287
288 if (req->data)
289 {
290 int i;
291 AV *av = (AV *)req->data;
292
293 EXTEND (SP, AvFILL (av) + 1);
294 for (i = 0; i <= AvFILL (av); ++i)
295 PUSHs (*av_fetch (av, i, 0));
296 }
297 break;
298
299 case REQ_NOP:
300 case REQ_SLEEP:
301 break;
302
303 default:
304 PUSHs (sv_2mortal (newSViv (req->result)));
305 break;
306 }
307
308
309 PUTBACK;
310 call_sv (req->callback, G_VOID | G_EVAL); 503 call_sv (req->callback, G_VOID | G_EVAL);
311 SPAGAIN; 504 SPAGAIN;
312 505
313 FREETMPS; 506 FREETMPS;
314 LEAVE; 507 LEAVE;
315
316 errno = errorno;
317
318 if (SvTRUE (ERRSV))
319 { 508 }
320 req_free (req);
321 croak (0);
322 }
323}
324 509
325static void req_free (aio_req req)
326{
327 if (req->grp) 510 if (req->grp)
328 { 511 {
329 aio_req grp = req->grp; 512 aio_req grp = req->grp;
330 513
331 /* unlink request */ 514 /* unlink request */
336 grp->grp_first = req->grp_next; 519 grp->grp_first = req->grp_next;
337 520
338 aio_grp_dec (grp); 521 aio_grp_dec (grp);
339 } 522 }
340 523
524 if (SvTRUE (ERRSV))
525 {
526 req_free (req);
527 croak (0);
528 }
529}
530
531static void req_free (aio_req req)
532{
341 if (req->self) 533 if (req->self)
342 { 534 {
343 sv_unmagic (req->self, PERL_MAGIC_ext); 535 sv_unmagic (req->self, PERL_MAGIC_ext);
344 SvREFCNT_dec (req->self); 536 SvREFCNT_dec (req->self);
345 } 537 }
346 538
347 SvREFCNT_dec (req->data);
348 SvREFCNT_dec (req->fh); 539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1);
349 SvREFCNT_dec (req->fh2); 541 SvREFCNT_dec (req->sv2);
350 SvREFCNT_dec (req->callback); 542 SvREFCNT_dec (req->callback);
351 Safefree (req->statdata); 543 Safefree (req->statdata);
352 544
353 if (req->type == REQ_READDIR && req->result >= 0) 545 if (req->type == REQ_READDIR)
354 free (req->data2ptr); 546 free (req->ptr2);
355 547
356 Safefree (req); 548 Safefree (req);
357} 549}
358 550
551static void req_cancel_subs (aio_req grp)
552{
553 aio_req sub;
554
555 if (grp->type != REQ_GROUP)
556 return;
557
558 SvREFCNT_dec (grp->sv2);
559 grp->sv2 = 0;
560
561 for (sub = grp->grp_first; sub; sub = sub->grp_next)
562 req_cancel (sub);
563}
564
359static void req_cancel (aio_req req) 565static void req_cancel (aio_req req)
360{ 566{
361 req->flags |= FLAG_CANCELLED; 567 req->flags |= FLAG_CANCELLED;
362 568
363 if (req->type == REQ_GROUP) 569 req_cancel_subs (req);
364 {
365 aio_req sub;
366
367 for (sub = req->grp_first; sub; sub = sub->grp_next)
368 req_cancel (sub);
369 }
370}
371
372static int poll_cb ()
373{
374 dSP;
375 int count = 0;
376 int do_croak = 0;
377 aio_req req;
378
379 for (;;)
380 {
381 pthread_mutex_lock (&reslock);
382 req = ress;
383
384 if (req)
385 {
386 ress = req->next;
387
388 if (!ress)
389 {
390 /* read any signals sent by the worker threads */
391 char buf [32];
392 while (read (respipe [0], buf, 32) == 32)
393 ;
394
395 rese = 0;
396 }
397 }
398
399 pthread_mutex_unlock (&reslock);
400
401 if (!req)
402 break;
403
404 --nreqs;
405
406 if (req->type == REQ_QUIT)
407 started--;
408 else if (req->type == REQ_GROUP && req->length)
409 {
410 req->fd = 1; /* mark request as delayed */
411 continue;
412 }
413 else
414 {
415 if (req->type == REQ_READ)
416 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
417
418 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
419 SvREADONLY_off (req->data);
420
421 if (req->statdata)
422 {
423 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
424 PL_laststatval = req->result;
425 PL_statcache = *(req->statdata);
426 }
427
428 req_invoke (req);
429
430 count++;
431 }
432
433 req_free (req);
434 }
435
436 return count;
437} 570}
438 571
439static void *aio_proc(void *arg); 572static void *aio_proc(void *arg);
440 573
441static void start_thread (void) 574static void start_thread (void)
442{ 575{
443 sigset_t fullsigset, oldsigset; 576 sigset_t fullsigset, oldsigset;
444 pthread_t tid;
445 pthread_attr_t attr; 577 pthread_attr_t attr;
578
579 worker *wrk = calloc (1, sizeof (worker));
580
581 if (!wrk)
582 croak ("unable to allocate worker thread data");
446 583
447 pthread_attr_init (&attr); 584 pthread_attr_init (&attr);
448 pthread_attr_setstacksize (&attr, STACKSIZE); 585 pthread_attr_setstacksize (&attr, STACKSIZE);
449 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 586 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
587#ifdef PTHREAD_SCOPE_PROCESS
588 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
589#endif
450 590
451 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
592
593 LOCK (wrklock);
452 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
453 595
454 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 596 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
597 {
598 wrk->prev = &wrk_first;
599 wrk->next = wrk_first.next;
600 wrk_first.next->prev = wrk;
601 wrk_first.next = wrk;
455 started++; 602 ++started;
603 }
604 else
605 free (wrk);
456 606
457 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock);
609}
610
611static void maybe_start_thread ()
612{
613 if (get_nthreads () >= wanted)
614 return;
615
616 /* todo: maybe use idle here, but might be less exact */
617 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
618 return;
619
620 start_thread ();
458} 621}
459 622
460static void req_send (aio_req req) 623static void req_send (aio_req req)
461{ 624{
462 while (started < wanted && nreqs >= started)
463 start_thread ();
464
465 ++nreqs; 625 ++nreqs;
466 626
467 pthread_mutex_lock (&reqlock); 627 LOCK (reqlock);
468 628 ++nready;
469 req->next = 0; 629 reqq_push (&req_queue, req);
470
471 if (reqe)
472 {
473 reqe->next = req;
474 reqe = req;
475 }
476 else
477 reqe = reqs = req;
478
479 pthread_cond_signal (&reqwait); 630 pthread_cond_signal (&reqwait);
480 pthread_mutex_unlock (&reqlock); 631 UNLOCK (reqlock);
481 632
482 if (nreqs > max_outstanding) 633 maybe_start_thread ();
483 for (;;)
484 {
485 poll_cb ();
486
487 if (nreqs <= max_outstanding)
488 break;
489
490 poll_wait ();
491 }
492} 634}
493 635
494static void end_thread (void) 636static void end_thread (void)
495{ 637{
496 aio_req req; 638 aio_req req;
639
497 Newz (0, req, 1, aio_cb); 640 Newz (0, req, 1, aio_cb);
641
498 req->type = REQ_QUIT; 642 req->type = REQ_QUIT;
643 req->pri = PRI_MAX + PRI_BIAS;
499 644
500 req_send (req); 645 LOCK (reqlock);
646 reqq_push (&req_queue, req);
647 pthread_cond_signal (&reqwait);
648 UNLOCK (reqlock);
649
650 LOCK (wrklock);
651 --started;
652 UNLOCK (wrklock);
653}
654
655static void set_max_idle (int nthreads)
656{
657 if (WORDACCESS_UNSAFE) LOCK (reqlock);
658 max_idle = nthreads <= 0 ? 1 : nthreads;
659 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
501} 660}
502 661
503static void min_parallel (int nthreads) 662static void min_parallel (int nthreads)
504{ 663{
505 if (wanted < nthreads) 664 if (wanted < nthreads)
506 wanted = nthreads; 665 wanted = nthreads;
507} 666}
508 667
509static void max_parallel (int nthreads) 668static void max_parallel (int nthreads)
510{ 669{
511 int cur = started;
512
513 if (wanted > nthreads) 670 if (wanted > nthreads)
514 wanted = nthreads; 671 wanted = nthreads;
515 672
516 while (cur > wanted)
517 {
518 end_thread ();
519 cur--;
520 }
521
522 while (started > wanted) 673 while (started > wanted)
674 end_thread ();
675}
676
677static void poll_wait ()
678{
679 fd_set rfd;
680
681 while (nreqs)
682 {
683 int size;
684 if (WORDACCESS_UNSAFE) LOCK (reslock);
685 size = res_queue.size;
686 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
687
688 if (size)
689 return;
690
691 maybe_start_thread ();
692
693 FD_ZERO(&rfd);
694 FD_SET(respipe [0], &rfd);
695
696 select (respipe [0] + 1, &rfd, 0, 0, 0);
523 { 697 }
698}
699
700static int poll_cb ()
701{
702 dSP;
703 int count = 0;
704 int maxreqs = max_poll_reqs;
705 int do_croak = 0;
706 struct timeval tv_start, tv_now;
707 aio_req req;
708
709 if (max_poll_time)
710 gettimeofday (&tv_start, 0);
711
712 for (;;)
713 {
714 for (;;)
715 {
716 maybe_start_thread ();
717
718 LOCK (reslock);
719 req = reqq_shift (&res_queue);
720
721 if (req)
722 {
723 --npending;
724
725 if (!res_queue.size)
726 {
727 /* read any signals sent by the worker threads */
728 char buf [32];
729 while (read (respipe [0], buf, 32) == 32)
730 ;
731 }
732 }
733
734 UNLOCK (reslock);
735
736 if (!req)
737 break;
738
739 --nreqs;
740
741 if (req->type == REQ_GROUP && req->size)
742 {
743 req->int1 = 1; /* mark request as delayed */
744 continue;
745 }
746 else
747 {
748 req_invoke (req);
749
750 count++;
751 }
752
753 req_free (req);
754
755 if (maxreqs && !--maxreqs)
756 break;
757
758 if (max_poll_time)
759 {
760 gettimeofday (&tv_now, 0);
761
762 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
763 break;
764 }
765 }
766
767 if (nreqs <= max_outstanding)
768 break;
769
524 poll_wait (); 770 poll_wait ();
525 poll_cb (); 771
772 ++maxreqs;
526 } 773 }
774
775 return count;
527} 776}
528 777
529static void create_pipe () 778static void create_pipe ()
530{ 779{
531 if (pipe (respipe)) 780 if (pipe (respipe))
555static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 804static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
556{ 805{
557 ssize_t res; 806 ssize_t res;
558 off_t ooffset; 807 off_t ooffset;
559 808
560 pthread_mutex_lock (&preadwritelock); 809 LOCK (preadwritelock);
561 ooffset = lseek (fd, 0, SEEK_CUR); 810 ooffset = lseek (fd, 0, SEEK_CUR);
562 lseek (fd, offset, SEEK_SET); 811 lseek (fd, offset, SEEK_SET);
563 res = read (fd, buf, count); 812 res = read (fd, buf, count);
564 lseek (fd, ooffset, SEEK_SET); 813 lseek (fd, ooffset, SEEK_SET);
565 pthread_mutex_unlock (&preadwritelock); 814 UNLOCK (preadwritelock);
566 815
567 return res; 816 return res;
568} 817}
569 818
570static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 819static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
571{ 820{
572 ssize_t res; 821 ssize_t res;
573 off_t ooffset; 822 off_t ooffset;
574 823
575 pthread_mutex_lock (&preadwritelock); 824 LOCK (preadwritelock);
576 ooffset = lseek (fd, 0, SEEK_CUR); 825 ooffset = lseek (fd, 0, SEEK_CUR);
577 lseek (fd, offset, SEEK_SET); 826 lseek (fd, offset, SEEK_SET);
578 res = write (fd, buf, count); 827 res = write (fd, buf, count);
579 lseek (fd, offset, SEEK_SET); 828 lseek (fd, offset, SEEK_SET);
580 pthread_mutex_unlock (&preadwritelock); 829 UNLOCK (preadwritelock);
581 830
582 return res; 831 return res;
583} 832}
584#endif 833#endif
585 834
586#if !HAVE_FDATASYNC 835#if !HAVE_FDATASYNC
587# define fdatasync fsync 836# define fdatasync fsync
588#endif 837#endif
589 838
590#if !HAVE_READAHEAD 839#if !HAVE_READAHEAD
591# define readahead aio_readahead 840# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
592 841
593static ssize_t readahead (int fd, off_t offset, size_t count) 842static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
594{ 843{
595 char readahead_buf[4096]; 844 dBUF;
596 845
597 while (count > 0) 846 while (count > 0)
598 { 847 {
599 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 848 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
600 849
601 pread (fd, readahead_buf, len, offset); 850 pread (fd, aio_buf, len, offset);
602 offset += len; 851 offset += len;
603 count -= len; 852 count -= len;
604 } 853 }
605 854
606 errno = 0; 855 errno = 0;
607} 856}
857
608#endif 858#endif
609 859
610#if !HAVE_READDIR_R 860#if !HAVE_READDIR_R
611# define readdir_r aio_readdir_r 861# define readdir_r aio_readdir_r
612 862
615static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 865static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
616{ 866{
617 struct dirent *e; 867 struct dirent *e;
618 int errorno; 868 int errorno;
619 869
620 pthread_mutex_lock (&readdirlock); 870 LOCK (readdirlock);
621 871
622 e = readdir (dirp); 872 e = readdir (dirp);
623 errorno = errno; 873 errorno = errno;
624 874
625 if (e) 875 if (e)
628 strcpy (ent->d_name, e->d_name); 878 strcpy (ent->d_name, e->d_name);
629 } 879 }
630 else 880 else
631 *res = 0; 881 *res = 0;
632 882
633 pthread_mutex_unlock (&readdirlock); 883 UNLOCK (readdirlock);
634 884
635 errno = errorno; 885 errno = errorno;
636 return e ? 0 : -1; 886 return e ? 0 : -1;
637} 887}
638#endif 888#endif
639 889
640/* sendfile always needs emulation */ 890/* sendfile always needs emulation */
641static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 891static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
642{ 892{
643 ssize_t res; 893 ssize_t res;
644 894
645 if (!count) 895 if (!count)
646 return 0; 896 return 0;
657 { 907 {
658 off_t sbytes; 908 off_t sbytes;
659 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 909 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
660 910
661 if (res < 0 && sbytes) 911 if (res < 0 && sbytes)
662 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 912 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
663 res = sbytes; 913 res = sbytes;
664 } 914 }
665 915
666# elif __hpux 916# elif __hpux
667 res = sendfile (ofd, ifd, offset, count, 0, 0); 917 res = sendfile (ofd, ifd, offset, count, 0, 0);
695#endif 945#endif
696 ) 946 )
697 ) 947 )
698 { 948 {
699 /* emulate sendfile. this is a major pain in the ass */ 949 /* emulate sendfile. this is a major pain in the ass */
700 char buf[4096]; 950 dBUF;
951
701 res = 0; 952 res = 0;
702 953
703 while (count) 954 while (count)
704 { 955 {
705 ssize_t cnt; 956 ssize_t cnt;
706 957
707 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 958 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
708 959
709 if (cnt <= 0) 960 if (cnt <= 0)
710 { 961 {
711 if (cnt && !res) res = -1; 962 if (cnt && !res) res = -1;
712 break; 963 break;
713 } 964 }
714 965
715 cnt = write (ofd, buf, cnt); 966 cnt = write (ofd, aio_buf, cnt);
716 967
717 if (cnt <= 0) 968 if (cnt <= 0)
718 { 969 {
719 if (cnt && !res) res = -1; 970 if (cnt && !res) res = -1;
720 break; 971 break;
728 979
729 return res; 980 return res;
730} 981}
731 982
732/* read a full directory */ 983/* read a full directory */
733static int scandir_ (const char *path, void **namesp) 984static void scandir_ (aio_req req, worker *self)
734{ 985{
735 DIR *dirp = opendir (path); 986 DIR *dirp;
736 union 987 union
737 { 988 {
738 struct dirent d; 989 struct dirent d;
739 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 990 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
740 } u; 991 } *u;
741 struct dirent *entp; 992 struct dirent *entp;
742 char *name, *names; 993 char *name, *names;
743 int memlen = 4096; 994 int memlen = 4096;
744 int memofs = 0; 995 int memofs = 0;
745 int res = 0; 996 int res = 0;
746 int errorno; 997 int errorno;
747 998
748 if (!dirp) 999 LOCK (wrklock);
749 return -1; 1000 self->dirp = dirp = opendir (req->ptr1);
750 1001 self->dbuf = u = malloc (sizeof (*u));
751 names = malloc (memlen); 1002 req->ptr2 = names = malloc (memlen);
1003 UNLOCK (wrklock);
1004
1005 if (dirp && u && names)
1006 for (;;)
1007 {
1008 errno = 0;
1009 readdir_r (dirp, &u->d, &entp);
1010
1011 if (!entp)
1012 break;
1013
1014 name = entp->d_name;
1015
1016 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1017 {
1018 int len = strlen (name) + 1;
1019
1020 res++;
1021
1022 while (memofs + len > memlen)
1023 {
1024 memlen *= 2;
1025 LOCK (wrklock);
1026 req->ptr2 = names = realloc (names, memlen);
1027 UNLOCK (wrklock);
1028
1029 if (!names)
1030 break;
1031 }
1032
1033 memcpy (names + memofs, name, len);
1034 memofs += len;
1035 }
1036 }
1037
1038 if (errno)
1039 res = -1;
1040
1041 req->result = res;
1042}
1043
1044/*****************************************************************************/
1045
1046static void *aio_proc (void *thr_arg)
1047{
1048 aio_req req;
1049 struct timespec ts;
1050 worker *self = (worker *)thr_arg;
1051
1052 /* try to distribute timeouts somewhat evenly */
1053 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1054 * (1000000000UL / 1024UL);
752 1055
753 for (;;) 1056 for (;;)
754 { 1057 {
755 errno = 0, readdir_r (dirp, &u.d, &entp); 1058 ts.tv_sec = time (0) + IDLE_TIMEOUT;
756 1059
757 if (!entp) 1060 LOCK (reqlock);
758 break;
759
760 name = entp->d_name;
761
762 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
763 {
764 int len = strlen (name) + 1;
765
766 res++;
767
768 while (memofs + len > memlen)
769 {
770 memlen *= 2;
771 names = realloc (names, memlen);
772 if (!names)
773 break;
774 }
775
776 memcpy (names + memofs, name, len);
777 memofs += len;
778 }
779 }
780
781 errorno = errno;
782 closedir (dirp);
783
784 if (errorno)
785 {
786 free (names);
787 errno = errorno;
788 res = -1;
789 }
790
791 *namesp = (void *)names;
792 return res;
793}
794
795/*****************************************************************************/
796
797static void *aio_proc (void *thr_arg)
798{
799 aio_req req;
800 int type;
801
802 do
803 {
804 pthread_mutex_lock (&reqlock);
805 1061
806 for (;;) 1062 for (;;)
807 { 1063 {
808 req = reqs; 1064 self->req = req = reqq_shift (&req_queue);
809
810 if (reqs)
811 {
812 reqs = reqs->next;
813 if (!reqs) reqe = 0;
814 }
815 1065
816 if (req) 1066 if (req)
817 break; 1067 break;
818 1068
1069 ++idle;
1070
1071 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1072 == ETIMEDOUT)
1073 {
1074 if (idle > max_idle)
1075 {
1076 --idle;
1077 UNLOCK (reqlock);
1078 LOCK (wrklock);
1079 --started;
1080 UNLOCK (wrklock);
1081 goto quit;
1082 }
1083
1084 /* we are allowed to idle, so do so without any timeout */
819 pthread_cond_wait (&reqwait, &reqlock); 1085 pthread_cond_wait (&reqwait, &reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 }
1088
1089 --idle;
820 } 1090 }
821 1091
822 pthread_mutex_unlock (&reqlock); 1092 --nready;
1093
1094 UNLOCK (reqlock);
823 1095
824 errno = 0; /* strictly unnecessary */ 1096 errno = 0; /* strictly unnecessary */
825 type = req->type; /* remember type for QUIT check */
826 1097
827 if (!(req->flags & FLAG_CANCELLED)) 1098 if (!(req->flags & FLAG_CANCELLED))
828 switch (type) 1099 switch (req->type)
829 { 1100 {
830 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1101 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
831 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1102 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
832 1103
833 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1104 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
834 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 1105 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
835 1106
836 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break;
837 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break;
838 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break;
839 1110
840 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1111 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
841 case REQ_CLOSE: req->result = close (req->fd); break; 1112 case REQ_CLOSE: req->result = close (req->int1); break;
842 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
843 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
844 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
845 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
846 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1117 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1118 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1119 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
847 1120
848 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
849 case REQ_FSYNC: req->result = fsync (req->fd); break; 1122 case REQ_FSYNC: req->result = fsync (req->int1); break;
850 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1123 case REQ_READDIR: scandir_ (req, self); break;
851 1124
852 case REQ_SLEEP: 1125 case REQ_BUSY:
853 { 1126 {
854 struct timeval tv; 1127 struct timeval tv;
855 1128
856 tv.tv_sec = req->fd; 1129 tv.tv_sec = req->int1;
857 tv.tv_usec = req->fd2; 1130 tv.tv_usec = req->int2;
858 1131
859 req->result = select (0, 0, 0, 0, &tv); 1132 req->result = select (0, 0, 0, 0, &tv);
860 } 1133 }
861 1134
862 case REQ_GROUP: 1135 case REQ_GROUP:
863 case REQ_NOP: 1136 case REQ_NOP:
1137 break;
1138
864 case REQ_QUIT: 1139 case REQ_QUIT:
865 break; 1140 goto quit;
866 1141
867 default: 1142 default:
868 req->result = ENOSYS; 1143 req->result = ENOSYS;
869 break; 1144 break;
870 } 1145 }
871 1146
872 req->errorno = errno; 1147 req->errorno = errno;
873 1148
874 pthread_mutex_lock (&reslock); 1149 LOCK (reslock);
875 1150
876 req->next = 0; 1151 ++npending;
877 1152
878 if (rese) 1153 if (!reqq_push (&res_queue, req))
879 {
880 rese->next = req;
881 rese = req;
882 }
883 else
884 {
885 rese = ress = req;
886
887 /* write a dummy byte to the pipe so fh becomes ready */ 1154 /* write a dummy byte to the pipe so fh becomes ready */
888 write (respipe [1], &respipe, 1); 1155 write (respipe [1], &respipe, 1);
889 }
890 1156
891 pthread_mutex_unlock (&reslock); 1157 self->req = 0;
1158 worker_clear (self);
1159
1160 UNLOCK (reslock);
892 } 1161 }
893 while (type != REQ_QUIT); 1162
1163quit:
1164 LOCK (wrklock);
1165 worker_free (self);
1166 UNLOCK (wrklock);
894 1167
895 return 0; 1168 return 0;
896} 1169}
897 1170
898/*****************************************************************************/ 1171/*****************************************************************************/
899 1172
900static void atfork_prepare (void) 1173static void atfork_prepare (void)
901{ 1174{
902 pthread_mutex_lock (&reqlock); 1175 LOCK (wrklock);
903 pthread_mutex_lock (&reslock); 1176 LOCK (reqlock);
1177 LOCK (reslock);
904#if !HAVE_PREADWRITE 1178#if !HAVE_PREADWRITE
905 pthread_mutex_lock (&preadwritelock); 1179 LOCK (preadwritelock);
906#endif 1180#endif
907#if !HAVE_READDIR_R 1181#if !HAVE_READDIR_R
908 pthread_mutex_lock (&readdirlock); 1182 LOCK (readdirlock);
909#endif 1183#endif
910} 1184}
911 1185
912static void atfork_parent (void) 1186static void atfork_parent (void)
913{ 1187{
914#if !HAVE_READDIR_R 1188#if !HAVE_READDIR_R
915 pthread_mutex_unlock (&readdirlock); 1189 UNLOCK (readdirlock);
916#endif 1190#endif
917#if !HAVE_PREADWRITE 1191#if !HAVE_PREADWRITE
918 pthread_mutex_unlock (&preadwritelock); 1192 UNLOCK (preadwritelock);
919#endif 1193#endif
920 pthread_mutex_unlock (&reslock); 1194 UNLOCK (reslock);
921 pthread_mutex_unlock (&reqlock); 1195 UNLOCK (reqlock);
1196 UNLOCK (wrklock);
922} 1197}
923 1198
924static void atfork_child (void) 1199static void atfork_child (void)
925{ 1200{
926 aio_req prv; 1201 aio_req prv;
927 1202
1203 while (prv = reqq_shift (&req_queue))
1204 req_free (prv);
1205
1206 while (prv = reqq_shift (&res_queue))
1207 req_free (prv);
1208
1209 while (wrk_first.next != &wrk_first)
1210 {
1211 worker *wrk = wrk_first.next;
1212
1213 if (wrk->req)
1214 req_free (wrk->req);
1215
1216 worker_clear (wrk);
1217 worker_free (wrk);
1218 }
1219
928 started = 0; 1220 started = 0;
929 1221 idle = 0;
930 while (reqs) 1222 nreqs = 0;
931 { 1223 nready = 0;
932 prv = reqs; 1224 npending = 0;
933 reqs = prv->next;
934 req_free (prv);
935 }
936
937 reqs = reqe = 0;
938
939 while (ress)
940 {
941 prv = ress;
942 ress = prv->next;
943 req_free (prv);
944 }
945
946 ress = rese = 0;
947 1225
948 close (respipe [0]); 1226 close (respipe [0]);
949 close (respipe [1]); 1227 close (respipe [1]);
950 create_pipe (); 1228 create_pipe ();
951 1229
978PROTOTYPES: ENABLE 1256PROTOTYPES: ENABLE
979 1257
980BOOT: 1258BOOT:
981{ 1259{
982 HV *stash = gv_stashpv ("IO::AIO", 1); 1260 HV *stash = gv_stashpv ("IO::AIO", 1);
1261
983 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1262 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
984 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
985 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1264 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1265 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1266 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1267 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
986 1268
987 create_pipe (); 1269 create_pipe ();
988 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
989} 1271}
990 1272
991void 1273void
992min_parallel (nthreads) 1274max_poll_reqs (int nreqs)
993 int nthreads
994 PROTOTYPE: $ 1275 PROTOTYPE: $
1276 CODE:
1277 max_poll_reqs = nreqs;
995 1278
996void 1279void
997max_parallel (nthreads) 1280max_poll_time (double nseconds)
998 int nthreads
999 PROTOTYPE: $ 1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_time = nseconds * AIO_TICKS;
1284
1285void
1286min_parallel (int nthreads)
1287 PROTOTYPE: $
1288
1289void
1290max_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_idle (int nthreads)
1295 PROTOTYPE: $
1296 CODE:
1297 set_max_idle (nthreads);
1000 1298
1001int 1299int
1002max_outstanding (nreqs) 1300max_outstanding (int maxreqs)
1003 int nreqs 1301 PROTOTYPE: $
1004 PROTOTYPE: $
1005 CODE: 1302 CODE:
1006 RETVAL = max_outstanding; 1303 RETVAL = max_outstanding;
1007 max_outstanding = nreqs; 1304 max_outstanding = maxreqs;
1305 OUTPUT:
1306 RETVAL
1008 1307
1009void 1308void
1010aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1309aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1011 SV * pathname 1310 SV * pathname
1012 int flags 1311 int flags
1016 PPCODE: 1315 PPCODE:
1017{ 1316{
1018 dREQ; 1317 dREQ;
1019 1318
1020 req->type = REQ_OPEN; 1319 req->type = REQ_OPEN;
1021 req->data = newSVsv (pathname); 1320 req->sv1 = newSVsv (pathname);
1022 req->dataptr = SvPVbyte_nolen (req->data); 1321 req->ptr1 = SvPVbyte_nolen (pathname);
1023 req->fd = flags; 1322 req->int1 = flags;
1024 req->mode = mode; 1323 req->mode = mode;
1025 1324
1026 REQ_SEND; 1325 REQ_SEND;
1027} 1326}
1028 1327
1038 PPCODE: 1337 PPCODE:
1039{ 1338{
1040 dREQ; 1339 dREQ;
1041 1340
1042 req->type = ix; 1341 req->type = ix;
1043 req->fh = newSVsv (fh); 1342 req->fh = newSVsv (fh);
1044 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1045 1344
1046 REQ_SEND (req); 1345 REQ_SEND (req);
1047} 1346}
1048 1347
1049void 1348void
1058 aio_read = REQ_READ 1357 aio_read = REQ_READ
1059 aio_write = REQ_WRITE 1358 aio_write = REQ_WRITE
1060 PROTOTYPE: $$$$$;$ 1359 PROTOTYPE: $$$$$;$
1061 PPCODE: 1360 PPCODE:
1062{ 1361{
1063 aio_req req;
1064 STRLEN svlen; 1362 STRLEN svlen;
1065 char *svptr = SvPVbyte (data, svlen); 1363 char *svptr = SvPVbyte (data, svlen);
1066 1364
1067 SvUPGRADE (data, SVt_PV); 1365 SvUPGRADE (data, SVt_PV);
1068 SvPOK_on (data); 1366 SvPOK_on (data);
1090 1388
1091 { 1389 {
1092 dREQ; 1390 dREQ;
1093 1391
1094 req->type = ix; 1392 req->type = ix;
1095 req->fh = newSVsv (fh); 1393 req->fh = newSVsv (fh);
1096 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1097 : IoOFP (sv_2io (fh))); 1395 : IoOFP (sv_2io (fh)));
1098 req->offset = offset; 1396 req->offs = offset;
1099 req->length = length; 1397 req->size = length;
1100 req->data = SvREFCNT_inc (data); 1398 req->sv1 = SvREFCNT_inc (data);
1101 req->dataptr = (char *)svptr + dataoffset; 1399 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset;
1102 1401
1103 if (!SvREADONLY (data)) 1402 if (!SvREADONLY (data))
1104 { 1403 {
1105 SvREADONLY_on (data); 1404 SvREADONLY_on (data);
1106 req->data2ptr = (void *)data; 1405 req->flags |= FLAG_DATA_RO_OFF;
1107 } 1406 }
1108 1407
1109 REQ_SEND; 1408 REQ_SEND;
1110 } 1409 }
1410}
1411
1412void
1413aio_readlink (path,callback=&PL_sv_undef)
1414 SV * path
1415 SV * callback
1416 PROTOTYPE: $$;$
1417 PPCODE:
1418{
1419 SV *data;
1420 dREQ;
1421
1422 data = newSV (NAME_MAX);
1423 SvPOK_on (data);
1424
1425 req->type = REQ_READLINK;
1426 req->fh = newSVsv (path);
1427 req->ptr2 = SvPVbyte_nolen (path);
1428 req->sv1 = data;
1429 req->ptr1 = SvPVbyte_nolen (data);
1430
1431 REQ_SEND;
1111} 1432}
1112 1433
1113void 1434void
1114aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1435aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1115 SV * out_fh 1436 SV * out_fh
1121 PPCODE: 1442 PPCODE:
1122{ 1443{
1123 dREQ; 1444 dREQ;
1124 1445
1125 req->type = REQ_SENDFILE; 1446 req->type = REQ_SENDFILE;
1126 req->fh = newSVsv (out_fh); 1447 req->fh = newSVsv (out_fh);
1127 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1128 req->fh2 = newSVsv (in_fh); 1449 req->sv2 = newSVsv (in_fh);
1129 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1130 req->offset = in_offset; 1451 req->offs = in_offset;
1131 req->length = length; 1452 req->size = length;
1132 1453
1133 REQ_SEND; 1454 REQ_SEND;
1134} 1455}
1135 1456
1136void 1457void
1143 PPCODE: 1464 PPCODE:
1144{ 1465{
1145 dREQ; 1466 dREQ;
1146 1467
1147 req->type = REQ_READAHEAD; 1468 req->type = REQ_READAHEAD;
1148 req->fh = newSVsv (fh); 1469 req->fh = newSVsv (fh);
1149 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1150 req->offset = offset; 1471 req->offs = offset;
1151 req->length = length; 1472 req->size = length;
1152 1473
1153 REQ_SEND; 1474 REQ_SEND;
1154} 1475}
1155 1476
1156void 1477void
1172 } 1493 }
1173 1494
1174 if (SvPOK (fh_or_path)) 1495 if (SvPOK (fh_or_path))
1175 { 1496 {
1176 req->type = ix; 1497 req->type = ix;
1177 req->data = newSVsv (fh_or_path); 1498 req->sv1 = newSVsv (fh_or_path);
1178 req->dataptr = SvPVbyte_nolen (req->data); 1499 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1179 } 1500 }
1180 else 1501 else
1181 { 1502 {
1182 req->type = REQ_FSTAT; 1503 req->type = REQ_FSTAT;
1183 req->fh = newSVsv (fh_or_path); 1504 req->fh = newSVsv (fh_or_path);
1184 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1185 } 1506 }
1186 1507
1187 REQ_SEND; 1508 REQ_SEND;
1188} 1509}
1189 1510
1190void 1511void
1191aio_unlink (pathname,callback=&PL_sv_undef) 1512aio_unlink (pathname,callback=&PL_sv_undef)
1192 SV * pathname 1513 SV * pathname
1193 SV * callback 1514 SV * callback
1194 ALIAS: 1515 ALIAS:
1195 aio_unlink = REQ_UNLINK 1516 aio_unlink = REQ_UNLINK
1196 aio_rmdir = REQ_RMDIR 1517 aio_rmdir = REQ_RMDIR
1197 aio_readdir = REQ_READDIR 1518 aio_readdir = REQ_READDIR
1198 PPCODE: 1519 PPCODE:
1199{ 1520{
1200 dREQ; 1521 dREQ;
1201 1522
1202 req->type = ix; 1523 req->type = ix;
1203 req->data = newSVsv (pathname); 1524 req->sv1 = newSVsv (pathname);
1204 req->dataptr = SvPVbyte_nolen (req->data); 1525 req->ptr1 = SvPVbyte_nolen (pathname);
1205 1526
1206 REQ_SEND; 1527 REQ_SEND;
1207} 1528}
1208 1529
1209void 1530void
1210aio_link (oldpath,newpath,callback=&PL_sv_undef) 1531aio_link (oldpath,newpath,callback=&PL_sv_undef)
1211 SV * oldpath 1532 SV * oldpath
1212 SV * newpath 1533 SV * newpath
1213 SV * callback 1534 SV * callback
1214 ALIAS: 1535 ALIAS:
1215 aio_link = REQ_LINK 1536 aio_link = REQ_LINK
1216 aio_symlink = REQ_SYMLINK 1537 aio_symlink = REQ_SYMLINK
1217 aio_rename = REQ_RENAME 1538 aio_rename = REQ_RENAME
1218 PPCODE: 1539 PPCODE:
1219{ 1540{
1220 dREQ; 1541 dREQ;
1221 1542
1222 req->type = ix; 1543 req->type = ix;
1223 req->fh = newSVsv (oldpath); 1544 req->fh = newSVsv (oldpath);
1224 req->data2ptr = SvPVbyte_nolen (req->fh); 1545 req->ptr2 = SvPVbyte_nolen (req->fh);
1225 req->data = newSVsv (newpath); 1546 req->sv1 = newSVsv (newpath);
1226 req->dataptr = SvPVbyte_nolen (req->data); 1547 req->ptr1 = SvPVbyte_nolen (newpath);
1227 1548
1228 REQ_SEND; 1549 REQ_SEND;
1229} 1550}
1230 1551
1231void 1552void
1232aio_sleep (delay,callback=&PL_sv_undef) 1553aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1233 double delay 1554 SV * pathname
1234 SV * callback 1555 SV * callback
1556 UV mode
1557 UV dev
1235 PPCODE: 1558 PPCODE:
1236{ 1559{
1237 dREQ; 1560 dREQ;
1561
1562 req->type = REQ_MKNOD;
1563 req->sv1 = newSVsv (pathname);
1564 req->ptr1 = SvPVbyte_nolen (pathname);
1565 req->mode = (mode_t)mode;
1566 req->offs = dev;
1567
1568 REQ_SEND;
1569}
1238 1570
1571void
1572aio_busy (delay,callback=&PL_sv_undef)
1573 double delay
1574 SV * callback
1575 PPCODE:
1576{
1577 dREQ;
1578
1239 req->type = REQ_SLEEP; 1579 req->type = REQ_BUSY;
1240 req->fd = delay < 0. ? 0 : delay; 1580 req->int1 = delay < 0. ? 0 : delay;
1241 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1242 1582
1243 REQ_SEND; 1583 REQ_SEND;
1244} 1584}
1245 1585
1246void 1586void
1250 PPCODE: 1590 PPCODE:
1251{ 1591{
1252 dREQ; 1592 dREQ;
1253 1593
1254 req->type = REQ_GROUP; 1594 req->type = REQ_GROUP;
1595
1255 req_send (req); 1596 req_send (req);
1256
1257 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1597 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1258} 1598}
1259 1599
1260void 1600void
1261aio_nop (callback=&PL_sv_undef) 1601aio_nop (callback=&PL_sv_undef)
1262 SV * callback 1602 SV * callback
1263 PPCODE: 1603 PPCODE:
1264{ 1604{
1265 dREQ; 1605 dREQ;
1266 1606
1267 req->type = REQ_NOP; 1607 req->type = REQ_NOP;
1268 1608
1269 REQ_SEND; 1609 REQ_SEND;
1270} 1610}
1271 1611
1272#if 0 1612int
1273 1613aioreq_pri (int pri = 0)
1274void 1614 PROTOTYPE: ;$
1275aio_pri (int pri = DEFAULT_PRI)
1276 CODE: 1615 CODE:
1616 RETVAL = next_pri - PRI_BIAS;
1617 if (items > 0)
1618 {
1277 if (pri < PRI_MIN) pri = PRI_MIN; 1619 if (pri < PRI_MIN) pri = PRI_MIN;
1278 if (pri > PRI_MAX) pri = PRI_MAX; 1620 if (pri > PRI_MAX) pri = PRI_MAX;
1279 next_pri = pri + PRI_BIAS; 1621 next_pri = pri + PRI_BIAS;
1622 }
1623 OUTPUT:
1624 RETVAL
1280 1625
1281#endif 1626void
1627aioreq_nice (int nice = 0)
1628 CODE:
1629 nice = next_pri - nice;
1630 if (nice < PRI_MIN) nice = PRI_MIN;
1631 if (nice > PRI_MAX) nice = PRI_MAX;
1632 next_pri = nice + PRI_BIAS;
1282 1633
1283void 1634void
1284flush () 1635flush ()
1285 PROTOTYPE: 1636 PROTOTYPE:
1286 CODE: 1637 CODE:
1287 while (nreqs) 1638 while (nreqs)
1288 { 1639 {
1289 poll_wait (); 1640 poll_wait ();
1290 poll_cb (); 1641 poll_cb (0);
1291 } 1642 }
1292 1643
1293void 1644void
1294poll() 1645poll()
1295 PROTOTYPE: 1646 PROTOTYPE:
1296 CODE: 1647 CODE:
1297 if (nreqs) 1648 if (nreqs)
1298 { 1649 {
1299 poll_wait (); 1650 poll_wait ();
1300 poll_cb (); 1651 poll_cb (0);
1301 } 1652 }
1302 1653
1303int 1654int
1304poll_fileno() 1655poll_fileno()
1305 PROTOTYPE: 1656 PROTOTYPE:
1329 CODE: 1680 CODE:
1330 RETVAL = nreqs; 1681 RETVAL = nreqs;
1331 OUTPUT: 1682 OUTPUT:
1332 RETVAL 1683 RETVAL
1333 1684
1685int
1686nready()
1687 PROTOTYPE:
1688 CODE:
1689 RETVAL = get_nready ();
1690 OUTPUT:
1691 RETVAL
1692
1693int
1694npending()
1695 PROTOTYPE:
1696 CODE:
1697 RETVAL = get_npending ();
1698 OUTPUT:
1699 RETVAL
1700
1701int
1702nthreads()
1703 PROTOTYPE:
1704 CODE:
1705 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1706 RETVAL = started;
1707 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1708 OUTPUT:
1709 RETVAL
1710
1334PROTOTYPES: DISABLE 1711PROTOTYPES: DISABLE
1335 1712
1336MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1713MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1337 1714
1338void 1715void
1339cancel (aio_req_ornot req) 1716cancel (aio_req_ornot req)
1340 PROTOTYPE:
1341 CODE: 1717 CODE:
1342 req_cancel (req); 1718 req_cancel (req);
1343 1719
1344void 1720void
1345cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1721cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1354 PPCODE: 1730 PPCODE:
1355{ 1731{
1356 int i; 1732 int i;
1357 aio_req req; 1733 aio_req req;
1358 1734
1359 if (grp->fd == 2) 1735 if (grp->int1 == 2)
1360 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1736 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1361 1737
1362 for (i = 1; i < items; ++i ) 1738 for (i = 1; i < items; ++i )
1363 { 1739 {
1364 if (GIMME_V != G_VOID) 1740 if (GIMME_V != G_VOID)
1366 1742
1367 req = SvAIO_REQ (ST (i)); 1743 req = SvAIO_REQ (ST (i));
1368 1744
1369 if (req) 1745 if (req)
1370 { 1746 {
1371 ++grp->length; 1747 ++grp->size;
1372 req->grp = grp; 1748 req->grp = grp;
1373 1749
1374 req->grp_prev = 0; 1750 req->grp_prev = 0;
1375 req->grp_next = grp->grp_first; 1751 req->grp_next = grp->grp_first;
1376 1752
1381 } 1757 }
1382 } 1758 }
1383} 1759}
1384 1760
1385void 1761void
1762cancel_subs (aio_req_ornot req)
1763 CODE:
1764 req_cancel_subs (req);
1765
1766void
1386result (aio_req grp, ...) 1767result (aio_req grp, ...)
1387 CODE: 1768 CODE:
1388{ 1769{
1389 int i; 1770 int i;
1771 AV *av;
1772
1773 grp->errorno = errno;
1774
1390 AV *av = newAV (); 1775 av = newAV ();
1391 1776
1392 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1393 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1394 1779
1395 SvREFCNT_dec (grp->data); 1780 SvREFCNT_dec (grp->sv1);
1396 grp->data = (SV *)av; 1781 grp->sv1 = (SV *)av;
1397} 1782}
1398 1783
1399void 1784void
1785errno (aio_req grp, int errorno = errno)
1786 CODE:
1787 grp->errorno = errorno;
1788
1789void
1400feed_limit (aio_req grp, int limit) 1790limit (aio_req grp, int limit)
1401 CODE: 1791 CODE:
1402 grp->fd2 = limit; 1792 grp->int2 = limit;
1403 aio_grp_feed (grp); 1793 aio_grp_feed (grp);
1404 1794
1405void 1795void
1406feed (aio_req grp, SV *callback=&PL_sv_undef) 1796feed (aio_req grp, SV *callback=&PL_sv_undef)
1407 CODE: 1797 CODE:
1408{ 1798{
1409 SvREFCNT_dec (grp->fh2); 1799 SvREFCNT_dec (grp->sv2);
1410 grp->fh2 = newSVsv (callback); 1800 grp->sv2 = newSVsv (callback);
1411 1801
1412 if (grp->fd2 <= 0) 1802 if (grp->int2 <= 0)
1413 grp->fd2 = 2; 1803 grp->int2 = 2;
1414 1804
1415 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1416} 1806}
1417 1807

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines