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.71 by root, Tue Oct 24 16:35:04 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC

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

Diff Legend

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