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.79 by root, Thu Oct 26 16:28:33 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC

… …
43# else 43# else
44# error sendfile support requested but not available 44# error sendfile support requested but not available
45# endif 45# endif
46#endif 46#endif
47 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
48/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 52#ifndef NAME_MAX
50# define NAME_MAX 4096 53# define NAME_MAX 4096
51#endif 54#endif
52 55
… …
65 68
66/* wether word reads are potentially non-atomic. 69/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs 70 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes. 71 * on have atomic word read/writes.
69 */ 72 */
70#ifndef WORDREAD_UNSAFE 73#ifndef WORDACCESS_UNSAFE
71# if __i386 || __x86_64 74# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0 75# define WORDACCESS_UNSAFE 0
73# else 76# else
74# define WORDREAD_UNSAFE 1 77# define WORDACCESS_UNSAFE 1
75# endif 78# endif
76#endif 79#endif
77 80
78/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
… …
83 LOCK (wrklock); \ 86 LOCK (wrklock); \
84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
86 if (!aio_buf) \ 89 if (!aio_buf) \
87 return -1; 90 return -1;
91
92typedef SV SV8; /* byte-sv, used for argument-checking */
88 93
89enum { 94enum {
90 REQ_QUIT, 95 REQ_QUIT,
91 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
92 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
93 REQ_SENDFILE, 98 REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
95 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
97 REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 105 REQ_BUSY,
101}; 106};
102 107
103#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
105 110
106typedef struct aio_cb 111typedef struct aio_cb
107{ 112{
108 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
109 114
110 SV *data, *callback; 115 SV *callback, *fh;
111 SV *fh, *fh2; 116 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
113 Stat_t *statdata;
114 off_t offset; 118 off_t offs;
115 size_t length; 119 size_t size;
116 ssize_t result; 120 ssize_t result;
117 121
118 STRLEN dataoffset; 122 STRLEN stroffset;
119 int type; 123 int type;
120 int fd, fd2; 124 int int1, int2;
121 int errorno; 125 int errorno;
122 mode_t mode; /* open */ 126 mode_t mode; /* open */
123 127
124 unsigned char flags; 128 unsigned char flags;
125 unsigned char pri; 129 unsigned char pri;
… …
127 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 133} aio_cb;
130 134
131enum { 135enum {
132 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) */
133}; 139};
134 140
135typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
137 143
… …
142 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 151};
146 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
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 166
149static unsigned int started, wanted; 167static unsigned int started, idle, wanted;
150static volatile unsigned int nreqs, nready, npending;
151static volatile unsigned int max_outstanding = 0xffffffff;
152static int respipe [2];
153 168
154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
156#else 171#else
157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
198 wrk->prev->next = wrk->next; 213 wrk->prev->next = wrk->next;
199 214
200 free (wrk); 215 free (wrk);
201} 216}
202 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
203static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
204static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
205static 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
206 269
207/* 270/*
208 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
209 * with 8 priorities this actually needs <20 insns 272 * with 8 priorities this actually needs <20 insns
210 * per shift, the most expensive operation. 273 * per shift, the most expensive operation.
… …
256 } 319 }
257 320
258 abort (); 321 abort ();
259} 322}
260 323
261static int poll_cb (int max); 324static int poll_cb ();
262static void req_invoke (aio_req req); 325static void req_invoke (aio_req req);
263static void req_free (aio_req req); 326static void req_free (aio_req req);
264static void req_cancel (aio_req req); 327static void req_cancel (aio_req req);
265 328
266/* must be called at most once */ 329/* must be called at most once */
… …
287 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
288} 351}
289 352
290static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
291{ 354{
292 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
293 { 356 {
294 int old_len = grp->length; 357 int old_len = grp->size;
295 358
296 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
297 { 360 {
298 dSP; 361 dSP;
299 362
300 ENTER; 363 ENTER;
301 SAVETMPS; 364 SAVETMPS;
302 PUSHMARK (SP); 365 PUSHMARK (SP);
303 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
304 PUTBACK; 367 PUTBACK;
305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
306 SPAGAIN; 369 SPAGAIN;
307 FREETMPS; 370 FREETMPS;
308 LEAVE; 371 LEAVE;
309 } 372 }
310 373
311 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
312 if (old_len == grp->length) 375 if (old_len == grp->size)
313 { 376 {
314 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
315 grp->fh2 = 0; 378 grp->sv2 = 0;
316 break; 379 break;
317 } 380 }
318 } 381 }
319} 382}
320 383
321static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
322{ 385{
323 --grp->length; 386 --grp->size;
324 387
325 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
326 aio_grp_feed (grp); 389 aio_grp_feed (grp);
327 390
328 /* finish, if done */ 391 /* finish, if done */
329 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
330 { 393 {
331 req_invoke (grp); 394 req_invoke (grp);
332 req_free (grp); 395 req_free (grp);
333 } 396 }
334} 397}
335 398
336static void poll_wait ()
337{
338 fd_set rfd;
339
340 while (nreqs)
341 {
342 int size;
343 if (WORDREAD_UNSAFE) LOCK (reslock);
344 size = res_queue.size;
345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
346
347 if (size)
348 return;
349
350 FD_ZERO(&rfd);
351 FD_SET(respipe [0], &rfd);
352
353 select (respipe [0] + 1, &rfd, 0, 0, 0);
354 }
355}
356
357static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
358{ 400{
359 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
360 405
361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
362 { 407 {
363 ENTER; 408 ENTER;
364 SAVETMPS; 409 SAVETMPS;
… …
372 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
373 418
374 if (req->result >= 0) 419 if (req->result >= 0)
375 { 420 {
376 int i; 421 int i;
377 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
378 AV *av = newAV (); 423 AV *av = newAV ();
379 424
380 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
381 426
382 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
402 PUSHs (sv_2mortal (newSViv (req->result))); 447 PUSHs (sv_2mortal (newSViv (req->result)));
403 PUTBACK; 448 PUTBACK;
404 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
405 SPAGAIN; 450 SPAGAIN;
406 451
407 fh = SvREFCNT_inc (POPs); 452 fh = POPs;
408
409 PUSHMARK (SP); 453 PUSHMARK (SP);
410 XPUSHs (sv_2mortal (fh)); 454 XPUSHs (fh);
411 } 455 }
412 break; 456 break;
413 457
414 case REQ_GROUP: 458 case REQ_GROUP:
415 req->fd = 2; /* mark group as finished */ 459 req->int1 = 2; /* mark group as finished */
416 460
417 if (req->data) 461 if (req->sv1)
418 { 462 {
419 int i; 463 int i;
420 AV *av = (AV *)req->data; 464 AV *av = (AV *)req->sv1;
421 465
422 EXTEND (SP, AvFILL (av) + 1); 466 EXTEND (SP, AvFILL (av) + 1);
423 for (i = 0; i <= AvFILL (av); ++i) 467 for (i = 0; i <= AvFILL (av); ++i)
424 PUSHs (*av_fetch (av, i, 0)); 468 PUSHs (*av_fetch (av, i, 0));
425 } 469 }
… …
427 471
428 case REQ_NOP: 472 case REQ_NOP:
429 case REQ_BUSY: 473 case REQ_BUSY:
430 break; 474 break;
431 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
432 default: 500 default:
433 PUSHs (sv_2mortal (newSViv (req->result))); 501 PUSHs (sv_2mortal (newSViv (req->result)));
434 break; 502 break;
435 } 503 }
436 504
… …
471 { 539 {
472 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
473 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
474 } 542 }
475 543
476 SvREFCNT_dec (req->data);
477 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
478 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
479 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
480 Safefree (req->statdata);
481 548
482 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
483 free (req->data2ptr); 550 free (req->ptr2);
484 551
485 Safefree (req); 552 Safefree (req);
486} 553}
487 554
488static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
490 aio_req sub; 557 aio_req sub;
491 558
492 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
493 return; 560 return;
494 561
495 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
496 grp->fh2 = 0; 563 grp->sv2 = 0;
497 564
498 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub); 566 req_cancel (sub);
500} 567}
501 568
502static void req_cancel (aio_req req) 569static void req_cancel (aio_req req)
503{ 570{
504 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
505 572
506 req_cancel_subs (req); 573 req_cancel_subs (req);
507}
508
509static int poll_cb (int max)
510{
511 dSP;
512 int count = 0;
513 int do_croak = 0;
514 aio_req req;
515
516 for (;;)
517 {
518 while (max <= 0 || count < max)
519 {
520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
522
523 if (req)
524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
529 /* read any signals sent by the worker threads */
530 char buf [32];
531 while (read (respipe [0], buf, 32) == 32)
532 ;
533 }
534 }
535
536 UNLOCK (reslock);
537
538 if (!req)
539 break;
540
541 --nreqs;
542
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length)
546 {
547 req->fd = 1; /* mark request as delayed */
548 continue;
549 }
550 else
551 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req);
566
567 count++;
568 }
569
570 req_free (req);
571 }
572
573 if (nreqs <= max_outstanding)
574 break;
575
576 poll_wait ();
577
578 max = 0;
579 }
580
581 return count;
582} 574}
583 575
584static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
585 577
586static void start_thread (void) 578static void start_thread (void)
… …
594 croak ("unable to allocate worker thread data"); 586 croak ("unable to allocate worker thread data");
595 587
596 pthread_attr_init (&attr); 588 pthread_attr_init (&attr);
597 pthread_attr_setstacksize (&attr, STACKSIZE); 589 pthread_attr_setstacksize (&attr, STACKSIZE);
598 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
599 594
600 sigfillset (&fullsigset); 595 sigfillset (&fullsigset);
601 596
602 LOCK (wrklock); 597 LOCK (wrklock);
603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
615 610
616 sigprocmask (SIG_SETMASK, &oldsigset, 0); 611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock); 612 UNLOCK (wrklock);
618} 613}
619 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
620static void req_send (aio_req req) 627static void req_send (aio_req req)
621{ 628{
622 while (started < wanted && nreqs >= started)
623 start_thread ();
624
625 ++nreqs; 629 ++nreqs;
626 630
627 LOCK (reqlock); 631 LOCK (reqlock);
628 ++nready; 632 ++nready;
629 reqq_push (&req_queue, req); 633 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait); 634 pthread_cond_signal (&reqwait);
631 UNLOCK (reqlock); 635 UNLOCK (reqlock);
636
637 maybe_start_thread ();
632} 638}
633 639
634static void end_thread (void) 640static void end_thread (void)
635{ 641{
636 aio_req req; 642 aio_req req;
… …
638 Newz (0, req, 1, aio_cb); 644 Newz (0, req, 1, aio_cb);
639 645
640 req->type = REQ_QUIT; 646 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS; 647 req->pri = PRI_MAX + PRI_BIAS;
642 648
643 req_send (req); 649 LOCK (reqlock);
650 reqq_push (&req_queue, req);
651 pthread_cond_signal (&reqwait);
652 UNLOCK (reqlock);
653
654 LOCK (wrklock);
655 --started;
656 UNLOCK (wrklock);
657}
658
659static void set_max_idle (int nthreads)
660{
661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
662 max_idle = nthreads <= 0 ? 1 : nthreads;
663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
644} 664}
645 665
646static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
647{ 667{
648 if (wanted < nthreads) 668 if (wanted < nthreads)
649 wanted = nthreads; 669 wanted = nthreads;
650} 670}
651 671
652static void max_parallel (int nthreads) 672static void max_parallel (int nthreads)
653{ 673{
654 int cur = started;
655
656 if (wanted > nthreads) 674 if (wanted > nthreads)
657 wanted = nthreads; 675 wanted = nthreads;
658 676
659 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)
660 { 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
661 end_thread (); 695 maybe_start_thread ();
662 cur--; 696
697 FD_ZERO(&rfd);
698 FD_SET(respipe [0], &rfd);
699
700 select (respipe [0] + 1, &rfd, 0, 0, 0);
663 } 701 }
702}
664 703
665 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 (;;)
666 { 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
667 poll_wait (); 774 poll_wait ();
668 poll_cb (0); 775
776 ++maxreqs;
669 } 777 }
778
779 return count;
670} 780}
671 781
672static void create_pipe () 782static void create_pipe ()
673{ 783{
674 if (pipe (respipe)) 784 if (pipe (respipe))
… …
889 int memofs = 0; 999 int memofs = 0;
890 int res = 0; 1000 int res = 0;
891 int errorno; 1001 int errorno;
892 1002
893 LOCK (wrklock); 1003 LOCK (wrklock);
894 self->dirp = dirp = opendir (req->dataptr); 1004 self->dirp = dirp = opendir (req->ptr1);
895 self->dbuf = u = malloc (sizeof (*u)); 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
896 req->data2ptr = names = malloc (memlen); 1007 req->ptr2 = names = malloc (memlen);
897 UNLOCK (wrklock); 1008 UNLOCK (wrklock);
898 1009
899 if (dirp && u && names) 1010 if (dirp && u && names)
900 for (;;) 1011 for (;;)
901 { 1012 {
… …
915 1026
916 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
917 { 1028 {
918 memlen *= 2; 1029 memlen *= 2;
919 LOCK (wrklock); 1030 LOCK (wrklock);
920 req->data2ptr = names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
921 UNLOCK (wrklock); 1032 UNLOCK (wrklock);
922 1033
923 if (!names) 1034 if (!names)
924 break; 1035 break;
925 } 1036 }
… …
938/*****************************************************************************/ 1049/*****************************************************************************/
939 1050
940static void *aio_proc (void *thr_arg) 1051static void *aio_proc (void *thr_arg)
941{ 1052{
942 aio_req req; 1053 aio_req req;
943 int type; 1054 struct timespec ts;
944 worker *self = (worker *)thr_arg; 1055 worker *self = (worker *)thr_arg;
945 1056
946 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 (;;)
947 { 1062 {
1063 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1064
948 LOCK (reqlock); 1065 LOCK (reqlock);
949 1066
950 for (;;) 1067 for (;;)
951 { 1068 {
952 self->req = req = reqq_shift (&req_queue); 1069 self->req = req = reqq_shift (&req_queue);
953 1070
954 if (req) 1071 if (req)
955 break; 1072 break;
956 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 */
957 pthread_cond_wait (&reqwait, &reqlock); 1090 pthread_cond_wait (&reqwait, &reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 }
1093
1094 --idle;
958 } 1095 }
959 1096
960 --nready; 1097 --nready;
961 1098
962 UNLOCK (reqlock); 1099 UNLOCK (reqlock);
963 1100
964 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
965 type = req->type; /* remember type for QUIT check */
966 1102
967 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
968 switch (type) 1104 switch (req->type)
969 { 1105 {
970 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;
971 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;
972 1108
973 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;
974 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;
975 1111
976 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;
977 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;
978 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;
979 1115
980 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;
981 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
982 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
983 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
984 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
986 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;
987 1125
988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
989 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
990 case REQ_READDIR: scandir_ (req, self); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
991 1129
992 case REQ_BUSY: 1130 case REQ_BUSY:
993 { 1131 {
994 struct timeval tv; 1132 struct timeval tv;
995 1133
996 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
997 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
998 1136
999 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
1000 } 1138 }
1001 1139
1002 case REQ_GROUP: 1140 case REQ_GROUP:
1003 case REQ_NOP: 1141 case REQ_NOP:
1142 break;
1143
1004 case REQ_QUIT: 1144 case REQ_QUIT:
1005 break; 1145 goto quit;
1006 1146
1007 default: 1147 default:
1008 req->result = ENOSYS; 1148 req->result = ENOSYS;
1009 break; 1149 break;
1010 } 1150 }
… …
1022 self->req = 0; 1162 self->req = 0;
1023 worker_clear (self); 1163 worker_clear (self);
1024 1164
1025 UNLOCK (reslock); 1165 UNLOCK (reslock);
1026 } 1166 }
1027 while (type != REQ_QUIT);
1028 1167
1168quit:
1029 LOCK (wrklock); 1169 LOCK (wrklock);
1030 worker_free (self); 1170 worker_free (self);
1031 UNLOCK (wrklock); 1171 UNLOCK (wrklock);
1032 1172
1033 return 0; 1173 return 0;
… …
1080 1220
1081 worker_clear (wrk); 1221 worker_clear (wrk);
1082 worker_free (wrk); 1222 worker_free (wrk);
1083 } 1223 }
1084 1224
1085 started = 0; 1225 started = 0;
1226 idle = 0;
1086 nreqs = 0; 1227 nreqs = 0;
1228 nready = 0;
1229 npending = 0;
1087 1230
1088 close (respipe [0]); 1231 close (respipe [0]);
1089 close (respipe [1]); 1232 close (respipe [1]);
1090 create_pipe (); 1233 create_pipe ();
1091 1234
… …
1118PROTOTYPES: ENABLE 1261PROTOTYPES: ENABLE
1119 1262
1120BOOT: 1263BOOT:
1121{ 1264{
1122 HV *stash = gv_stashpv ("IO::AIO", 1); 1265 HV *stash = gv_stashpv ("IO::AIO", 1);
1266
1123 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1124 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1125 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));
1126 1273
1127 create_pipe (); 1274 create_pipe ();
1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1129} 1276}
1130 1277
1131void 1278void
1279max_poll_reqs (int nreqs)
1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
1283
1284void
1285max_poll_time (double nseconds)
1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_time = nseconds * AIO_TICKS;
1289
1290void
1132min_parallel (int nthreads) 1291min_parallel (int nthreads)
1133 PROTOTYPE: $ 1292 PROTOTYPE: $
1134 1293
1135void 1294void
1136max_parallel (int nthreads) 1295max_parallel (int nthreads)
1137 PROTOTYPE: $ 1296 PROTOTYPE: $
1297
1298void
1299max_idle (int nthreads)
1300 PROTOTYPE: $
1301 CODE:
1302 set_max_idle (nthreads);
1138 1303
1139int 1304int
1140max_outstanding (int maxreqs) 1305max_outstanding (int maxreqs)
1141 PROTOTYPE: $ 1306 PROTOTYPE: $
1142 CODE: 1307 CODE:
… …
1145 OUTPUT: 1310 OUTPUT:
1146 RETVAL 1311 RETVAL
1147 1312
1148void 1313void
1149aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1150 SV * pathname 1315 SV8 * pathname
1151 int flags 1316 int flags
1152 int mode 1317 int mode
1153 SV * callback 1318 SV * callback
1154 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1155 PPCODE: 1320 PPCODE:
1156{ 1321{
1157 dREQ; 1322 dREQ;
1158 1323
1159 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1160 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1161 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1162 req->fd = flags; 1327 req->int1 = flags;
1163 req->mode = mode; 1328 req->mode = mode;
1164 1329
1165 REQ_SEND; 1330 REQ_SEND;
1166} 1331}
1167 1332
… …
1177 PPCODE: 1342 PPCODE:
1178{ 1343{
1179 dREQ; 1344 dREQ;
1180 1345
1181 req->type = ix; 1346 req->type = ix;
1182 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1183 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1184 1349
1185 REQ_SEND (req); 1350 REQ_SEND (req);
1186} 1351}
1187 1352
1188void 1353void
1189aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1190 SV * fh 1355 SV * fh
1191 UV offset 1356 UV offset
1192 UV length 1357 UV length
1193 SV * data 1358 SV8 * data
1194 UV dataoffset 1359 UV dataoffset
1195 SV * callback 1360 SV * callback
1196 ALIAS: 1361 ALIAS:
1197 aio_read = REQ_READ 1362 aio_read = REQ_READ
1198 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1199 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1200 PPCODE: 1365 PPCODE:
1201{ 1366{
1202 aio_req req;
1203 STRLEN svlen; 1367 STRLEN svlen;
1204 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1205 1369
1206 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1207 SvPOK_on (data); 1371 SvPOK_on (data);
… …
1229 1393
1230 { 1394 {
1231 dREQ; 1395 dREQ;
1232 1396
1233 req->type = ix; 1397 req->type = ix;
1234 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1235 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1236 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1237 req->offset = offset; 1401 req->offs = offset;
1238 req->length = length; 1402 req->size = length;
1239 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1240 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1241 1406
1242 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1243 { 1408 {
1244 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1245 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1246 } 1411 }
1247 1412
1248 REQ_SEND; 1413 REQ_SEND;
1249 } 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;
1250} 1437}
1251 1438
1252void 1439void
1253aio_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)
1254 SV * out_fh 1441 SV * out_fh
… …
1260 PPCODE: 1447 PPCODE:
1261{ 1448{
1262 dREQ; 1449 dREQ;
1263 1450
1264 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1265 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1267 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1268 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1269 req->offset = in_offset; 1456 req->offs = in_offset;
1270 req->length = length; 1457 req->size = length;
1271 1458
1272 REQ_SEND; 1459 REQ_SEND;
1273} 1460}
1274 1461
1275void 1462void
… …
1282 PPCODE: 1469 PPCODE:
1283{ 1470{
1284 dREQ; 1471 dREQ;
1285 1472
1286 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1287 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1288 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1289 req->offset = offset; 1476 req->offs = offset;
1290 req->length = length; 1477 req->size = length;
1291 1478
1292 REQ_SEND; 1479 REQ_SEND;
1293} 1480}
1294 1481
1295void 1482void
1296aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1297 SV * fh_or_path 1484 SV8 * fh_or_path
1298 SV * callback 1485 SV * callback
1299 ALIAS: 1486 ALIAS:
1300 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1301 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1302 PPCODE: 1489 PPCODE:
1303{ 1490{
1304 dREQ; 1491 dREQ;
1305 1492
1306 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1307 if (!req->statdata) 1494 if (!req->ptr2)
1308 { 1495 {
1309 req_free (req); 1496 req_free (req);
1310 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1311 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1312 1501
1313 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1314 { 1503 {
1315 req->type = ix; 1504 req->type = ix;
1316 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1317 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1318 } 1507 }
1319 else 1508 else
1320 { 1509 {
1321 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1322 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1323 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1324 } 1513 }
1325 1514
1326 REQ_SEND; 1515 REQ_SEND;
1327} 1516}
1328 1517
1329void 1518void
1330aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1331 SV * pathname 1520 SV8 * pathname
1332 SV * callback 1521 SV * callback
1333 ALIAS: 1522 ALIAS:
1334 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1335 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1336 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1337 PPCODE: 1526 PPCODE:
1338{ 1527{
1339 dREQ; 1528 dREQ;
1340 1529
1341 req->type = ix; 1530 req->type = ix;
1342 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1343 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1344 1533
1345 REQ_SEND; 1534 REQ_SEND;
1346} 1535}
1347 1536
1348void 1537void
1349aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1350 SV * oldpath 1539 SV8 * oldpath
1351 SV * newpath 1540 SV8 * newpath
1352 SV * callback 1541 SV * callback
1353 ALIAS: 1542 ALIAS:
1354 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1355 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1356 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1357 PPCODE: 1546 PPCODE:
1358{ 1547{
1359 dREQ; 1548 dREQ;
1360 1549
1361 req->type = ix; 1550 req->type = ix;
1362 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1363 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1364 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1365 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1366 1555
1367 REQ_SEND; 1556 REQ_SEND;
1368} 1557}
1369 1558
1370void 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
1371aio_busy (delay,callback=&PL_sv_undef) 1579aio_busy (delay,callback=&PL_sv_undef)
1372 double delay 1580 double delay
1373 SV * callback 1581 SV * callback
1374 PPCODE: 1582 PPCODE:
1375{ 1583{
1376 dREQ; 1584 dREQ;
1377 1585
1378 req->type = REQ_BUSY; 1586 req->type = REQ_BUSY;
1379 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1381 1589
1382 REQ_SEND; 1590 REQ_SEND;
1383} 1591}
1384 1592
1385void 1593void
… …
1389 PPCODE: 1597 PPCODE:
1390{ 1598{
1391 dREQ; 1599 dREQ;
1392 1600
1393 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1394 req_send (req); 1603 req_send (req);
1395
1396 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1397} 1605}
1398 1606
1399void 1607void
1400aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1401 SV * callback 1609 SV * callback
1402 PPCODE: 1610 PPCODE:
1403{ 1611{
1404 dREQ; 1612 dREQ;
1405 1613
1406 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
… …
1435 PROTOTYPE: 1643 PROTOTYPE:
1436 CODE: 1644 CODE:
1437 while (nreqs) 1645 while (nreqs)
1438 { 1646 {
1439 poll_wait (); 1647 poll_wait ();
1440 poll_cb (0); 1648 poll_cb ();
1441 } 1649 }
1442 1650
1443void 1651int
1444poll() 1652poll()
1445 PROTOTYPE: 1653 PROTOTYPE:
1446 CODE: 1654 CODE:
1447 if (nreqs)
1448 {
1449 poll_wait (); 1655 poll_wait ();
1450 poll_cb (0); 1656 RETVAL = poll_cb ();
1451 } 1657 OUTPUT:
1658 RETVAL
1452 1659
1453int 1660int
1454poll_fileno() 1661poll_fileno()
1455 PROTOTYPE: 1662 PROTOTYPE:
1456 CODE: 1663 CODE:
… …
1460 1667
1461int 1668int
1462poll_cb(...) 1669poll_cb(...)
1463 PROTOTYPE: 1670 PROTOTYPE:
1464 CODE: 1671 CODE:
1465 RETVAL = poll_cb (0); 1672 RETVAL = poll_cb ();
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1474 OUTPUT: 1673 OUTPUT:
1475 RETVAL 1674 RETVAL
1476 1675
1477void 1676void
1478poll_wait() 1677poll_wait()
1479 PROTOTYPE: 1678 PROTOTYPE:
1480 CODE: 1679 CODE:
1481 if (nreqs)
1482 poll_wait (); 1680 poll_wait ();
1483 1681
1484int 1682int
1485nreqs() 1683nreqs()
1486 PROTOTYPE: 1684 PROTOTYPE:
1487 CODE: 1685 CODE:
… …
1491 1689
1492int 1690int
1493nready() 1691nready()
1494 PROTOTYPE: 1692 PROTOTYPE:
1495 CODE: 1693 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready; 1694 RETVAL = get_nready ();
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT: 1695 OUTPUT:
1500 RETVAL 1696 RETVAL
1501 1697
1502int 1698int
1503npending() 1699npending()
1504 PROTOTYPE: 1700 PROTOTYPE:
1505 CODE: 1701 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending; 1702 RETVAL = get_npending ();
1703 OUTPUT:
1704 RETVAL
1705
1706int
1707nthreads()
1708 PROTOTYPE:
1709 CODE:
1710 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1711 RETVAL = started;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock); 1712 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1509 OUTPUT: 1713 OUTPUT:
1510 RETVAL 1714 RETVAL
1511 1715
1512PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1513 1717
… …
1531 PPCODE: 1735 PPCODE:
1532{ 1736{
1533 int i; 1737 int i;
1534 aio_req req; 1738 aio_req req;
1535 1739
1536 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1537 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");
1538 1742
1539 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1540 { 1744 {
1541 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
… …
1543 1747
1544 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1545 1749
1546 if (req) 1750 if (req)
1547 { 1751 {
1548 ++grp->length; 1752 ++grp->size;
1549 req->grp = grp; 1753 req->grp = grp;
1550 1754
1551 req->grp_prev = 0; 1755 req->grp_prev = 0;
1552 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1553 1757
… …
1576 av = newAV (); 1780 av = newAV ();
1577 1781
1578 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1579 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1580 1784
1581 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1582 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1583} 1787}
1584 1788
1585void 1789void
1586errno (aio_req grp, int errorno = errno) 1790errno (aio_req grp, int errorno = errno)
1587 CODE: 1791 CODE:
1588 grp->errorno = errorno; 1792 grp->errorno = errorno;
1589 1793
1590void 1794void
1591limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1592 CODE: 1796 CODE:
1593 grp->fd2 = limit; 1797 grp->int2 = limit;
1594 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1595 1799
1596void 1800void
1597feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1598 CODE: 1802 CODE:
1599{ 1803{
1600 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1601 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1602 1806
1603 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1604 grp->fd2 = 2; 1808 grp->int2 = 2;
1605 1809
1606 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1607} 1811}
1608 1812

Diff Legend

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