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.85 by root, Sat Oct 28 23:32:29 2006 UTC vs.
Revision 1.98 by root, Wed May 9 06:45:12 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h" 9#include "autoconf/config.h"
18 10
19#include <pthread.h>
20
21#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
22#include <errno.h> 13#include <errno.h>
23#include <sys/time.h> 14#include <sys/time.h>
24#include <sys/select.h> 15#include <sys/select.h>
25#include <sys/types.h> 16#include <sys/types.h>
26#include <sys/stat.h> 17#include <sys/stat.h>
… …
51/* used for struct dirent, AIX doesn't provide it */ 42/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 43#ifndef NAME_MAX
53# define NAME_MAX 4096 44# define NAME_MAX 4096
54#endif 45#endif
55 46
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
61#if __ia64
62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
65#else
66# define STACKSIZE 16384
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 */ 47/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 48#define AIO_BUFSIZE 65536
83 49
84#define dBUF \ 50#define dBUF \
85 char *aio_buf; \ 51 char *aio_buf; \
… …
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 53 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 54 UNLOCK (wrklock); \
89 if (!aio_buf) \ 55 if (!aio_buf) \
90 return -1; 56 return -1;
91 57
58typedef SV SV8; /* byte-sv, used for argument-checking */
59
92enum { 60enum {
93 REQ_QUIT, 61 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 62 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 63 REQ_READ, REQ_WRITE, REQ_READAHEAD,
96 REQ_SENDFILE, 64 REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 65 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
98 REQ_FSYNC, REQ_FDATASYNC, 66 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 67 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 68 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 69 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 70 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 71 REQ_BUSY,
104}; 72};
105 73
106#define AIO_REQ_KLASS "IO::AIO::REQ" 74#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 76
109typedef struct aio_cb 77typedef struct aio_cb
110{ 78{
111 struct aio_cb *volatile next; 79 struct aio_cb *volatile next;
112 80
113 SV *data, *callback; 81 SV *callback, *fh;
114 SV *fh, *fh2; 82 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 83 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 84 off_t offs;
118 size_t length; 85 size_t size;
119 ssize_t result; 86 ssize_t result;
120 87
121 STRLEN dataoffset; 88 STRLEN stroffset;
122 int type; 89 int type;
123 int fd, fd2; 90 int int1, int2;
124 int errorno; 91 int errorno;
125 mode_t mode; /* open */ 92 mode_t mode; /* open */
126 93
127 unsigned char flags; 94 unsigned char flags;
128 unsigned char pri; 95 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 97 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 98 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 99} aio_cb;
133 100
134enum { 101enum {
135 FLAG_CANCELLED = 0x01, 102 FLAG_CANCELLED = 0x01, /* request was cancelled */
103 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
104 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 105};
137 106
138typedef aio_cb *aio_req; 107typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 108typedef aio_cb *aio_req_ornot;
140 109
… …
157{ 126{
158 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 127 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
159 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 128 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
160} 129}
161 130
131static thread_t main_tid;
132static int main_sig;
133static int block_sig_level;
134
135void block_sig ()
136{
137 sigset_t ss;
138
139 if (block_sig_level++)
140 return;
141
142 if (!main_sig)
143 return;
144
145 sigemptyset (&ss);
146 sigaddset (&ss, main_sig);
147 pthread_sigmask (SIG_BLOCK, &ss, 0);
148}
149
150void unblock_sig ()
151{
152 sigset_t ss;
153
154 if (--block_sig_level)
155 return;
156
157 if (!main_sig)
158 return;
159
160 sigemptyset (&ss);
161 sigaddset (&ss, main_sig);
162 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
163}
164
162static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
163 166
164static unsigned int started, idle, wanted; 167static unsigned int started, idle, wanted;
165 168
166#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
167# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
168#else
169# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
170#endif
171
172#define LOCK(mutex) pthread_mutex_lock (&(mutex))
173#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
174
175/* worker threads management */ 169/* worker threads management */
176static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 170static mutex_t wrklock = MUTEX_INIT;
177 171
178typedef struct worker { 172typedef struct worker {
179 /* locked by wrklock */ 173 /* locked by wrklock */
180 struct worker *prev, *next; 174 struct worker *prev, *next;
181 175
182 pthread_t tid; 176 thread_t tid;
183 177
184 /* locked by reslock, reqlock or wrklock */ 178 /* locked by reslock, reqlock or wrklock */
185 aio_req req; /* currently processed request */ 179 aio_req req; /* currently processed request */
186 void *dbuf; 180 void *dbuf;
187 DIR *dirp; 181 DIR *dirp;
… …
215static volatile unsigned int nreqs, nready, npending; 209static volatile unsigned int nreqs, nready, npending;
216static volatile unsigned int max_idle = 4; 210static volatile unsigned int max_idle = 4;
217static volatile unsigned int max_outstanding = 0xffffffff; 211static volatile unsigned int max_outstanding = 0xffffffff;
218static int respipe [2]; 212static int respipe [2];
219 213
220static pthread_mutex_t reslock = AIO_MUTEX_INIT; 214static mutex_t reslock = MUTEX_INIT;
221static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 215static mutex_t reqlock = MUTEX_INIT;
222static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 216static cond_t reqwait = COND_INIT;
223 217
224#if WORDACCESS_UNSAFE 218#if WORDACCESS_UNSAFE
225 219
226static unsigned int get_nready () 220static unsigned int get_nready ()
227{ 221{
… …
317 311
318 abort (); 312 abort ();
319} 313}
320 314
321static int poll_cb (); 315static int poll_cb ();
322static void req_invoke (aio_req req); 316static int req_invoke (aio_req req);
323static void req_free (aio_req req); 317static void req_free (aio_req req);
324static void req_cancel (aio_req req); 318static void req_cancel (aio_req req);
325 319
326/* must be called at most once */ 320/* must be called at most once */
327static SV *req_sv (aio_req req, const char *klass) 321static SV *req_sv (aio_req req, const char *klass)
… …
347 return mg ? (aio_req)mg->mg_ptr : 0; 341 return mg ? (aio_req)mg->mg_ptr : 0;
348} 342}
349 343
350static void aio_grp_feed (aio_req grp) 344static void aio_grp_feed (aio_req grp)
351{ 345{
346 block_sig ();
347
352 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 348 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
353 { 349 {
354 int old_len = grp->length; 350 int old_len = grp->size;
355 351
356 if (grp->fh2 && SvOK (grp->fh2)) 352 if (grp->sv2 && SvOK (grp->sv2))
357 { 353 {
358 dSP; 354 dSP;
359 355
360 ENTER; 356 ENTER;
361 SAVETMPS; 357 SAVETMPS;
362 PUSHMARK (SP); 358 PUSHMARK (SP);
363 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 359 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
364 PUTBACK; 360 PUTBACK;
365 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 361 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
366 SPAGAIN; 362 SPAGAIN;
367 FREETMPS; 363 FREETMPS;
368 LEAVE; 364 LEAVE;
369 } 365 }
370 366
371 /* stop if no progress has been made */ 367 /* stop if no progress has been made */
372 if (old_len == grp->length) 368 if (old_len == grp->size)
373 { 369 {
374 SvREFCNT_dec (grp->fh2); 370 SvREFCNT_dec (grp->sv2);
375 grp->fh2 = 0; 371 grp->sv2 = 0;
376 break; 372 break;
377 } 373 }
378 } 374 }
375
376 unblock_sig ();
379} 377}
380 378
381static void aio_grp_dec (aio_req grp) 379static void aio_grp_dec (aio_req grp)
382{ 380{
383 --grp->length; 381 --grp->size;
384 382
385 /* call feeder, if applicable */ 383 /* call feeder, if applicable */
386 aio_grp_feed (grp); 384 aio_grp_feed (grp);
387 385
388 /* finish, if done */ 386 /* finish, if done */
389 if (!grp->length && grp->fd) 387 if (!grp->size && grp->int1)
390 { 388 {
389 block_sig ();
390
391 req_invoke (grp); 391 if (!req_invoke (grp))
392 {
393 req_free (grp);
394 unblock_sig ();
395 croak (0);
396 }
397
392 req_free (grp); 398 req_free (grp);
399 unblock_sig ();
393 } 400 }
394} 401}
395 402
396static void req_invoke (aio_req req) 403static int req_invoke (aio_req req)
397{ 404{
398 dSP; 405 dSP;
406
407 if (req->flags & FLAG_SV1_RO_OFF)
408 SvREADONLY_off (req->sv1);
399 409
400 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 410 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
401 { 411 {
402 ENTER; 412 ENTER;
403 SAVETMPS; 413 SAVETMPS;
… …
411 SV *rv = &PL_sv_undef; 421 SV *rv = &PL_sv_undef;
412 422
413 if (req->result >= 0) 423 if (req->result >= 0)
414 { 424 {
415 int i; 425 int i;
416 char *buf = req->data2ptr; 426 char *buf = req->ptr2;
417 AV *av = newAV (); 427 AV *av = newAV ();
418 428
419 av_extend (av, req->result - 1); 429 av_extend (av, req->result - 1);
420 430
421 for (i = 0; i < req->result; ++i) 431 for (i = 0; i < req->result; ++i)
… …
441 PUSHs (sv_2mortal (newSViv (req->result))); 451 PUSHs (sv_2mortal (newSViv (req->result)));
442 PUTBACK; 452 PUTBACK;
443 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 453 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
444 SPAGAIN; 454 SPAGAIN;
445 455
446 fh = SvREFCNT_inc (POPs); 456 fh = POPs;
447
448 PUSHMARK (SP); 457 PUSHMARK (SP);
449 XPUSHs (sv_2mortal (fh)); 458 XPUSHs (fh);
450 } 459 }
451 break; 460 break;
452 461
453 case REQ_GROUP: 462 case REQ_GROUP:
454 req->fd = 2; /* mark group as finished */ 463 req->int1 = 2; /* mark group as finished */
455 464
456 if (req->data) 465 if (req->sv1)
457 { 466 {
458 int i; 467 int i;
459 AV *av = (AV *)req->data; 468 AV *av = (AV *)req->sv1;
460 469
461 EXTEND (SP, AvFILL (av) + 1); 470 EXTEND (SP, AvFILL (av) + 1);
462 for (i = 0; i <= AvFILL (av); ++i) 471 for (i = 0; i <= AvFILL (av); ++i)
463 PUSHs (*av_fetch (av, i, 0)); 472 PUSHs (*av_fetch (av, i, 0));
464 } 473 }
… …
466 475
467 case REQ_NOP: 476 case REQ_NOP:
468 case REQ_BUSY: 477 case REQ_BUSY:
469 break; 478 break;
470 479
480 case REQ_READLINK:
481 if (req->result > 0)
482 {
483 SvCUR_set (req->sv1, req->result);
484 *SvEND (req->sv1) = 0;
485 PUSHs (req->sv1);
486 }
487 break;
488
489 case REQ_STAT:
490 case REQ_LSTAT:
491 case REQ_FSTAT:
492 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
493 PL_laststatval = req->result;
494 PL_statcache = *(Stat_t *)(req->ptr2);
495 PUSHs (sv_2mortal (newSViv (req->result)));
496 break;
497
498 case REQ_READ:
499 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
500 *SvEND (req->sv1) = 0;
501 PUSHs (sv_2mortal (newSViv (req->result)));
502 break;
503
471 default: 504 default:
472 PUSHs (sv_2mortal (newSViv (req->result))); 505 PUSHs (sv_2mortal (newSViv (req->result)));
473 break; 506 break;
474 } 507 }
475 508
… …
495 grp->grp_first = req->grp_next; 528 grp->grp_first = req->grp_next;
496 529
497 aio_grp_dec (grp); 530 aio_grp_dec (grp);
498 } 531 }
499 532
500 if (SvTRUE (ERRSV)) 533 return !SvTRUE (ERRSV);
501 {
502 req_free (req);
503 croak (0);
504 }
505} 534}
506 535
507static void req_free (aio_req req) 536static void req_free (aio_req req)
508{ 537{
509 if (req->self) 538 if (req->self)
510 { 539 {
511 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
512 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
513 } 542 }
514 543
515 SvREFCNT_dec (req->data);
516 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
517 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
518 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
519 Safefree (req->statdata);
520 548
521 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
522 free (req->data2ptr); 550 free (req->ptr2);
523 551
524 Safefree (req); 552 Safefree (req);
525} 553}
526 554
527static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
529 aio_req sub; 557 aio_req sub;
530 558
531 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
532 return; 560 return;
533 561
534 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
535 grp->fh2 = 0; 563 grp->sv2 = 0;
536 564
537 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
538 req_cancel (sub); 566 req_cancel (sub);
539} 567}
540 568
… …
547 575
548static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
549 577
550static void start_thread (void) 578static void start_thread (void)
551{ 579{
552 sigset_t fullsigset, oldsigset;
553 pthread_attr_t attr;
554
555 worker *wrk = calloc (1, sizeof (worker)); 580 worker *wrk = calloc (1, sizeof (worker));
556 581
557 if (!wrk) 582 if (!wrk)
558 croak ("unable to allocate worker thread data"); 583 croak ("unable to allocate worker thread data");
559 584
560 pthread_attr_init (&attr);
561 pthread_attr_setstacksize (&attr, STACKSIZE);
562 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
563#ifdef PTHREAD_SCOPE_PROCESS
564 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
565#endif
566
567 sigfillset (&fullsigset);
568
569 LOCK (wrklock); 585 LOCK (wrklock);
570 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
571 586
572 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 587 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
573 { 588 {
574 wrk->prev = &wrk_first; 589 wrk->prev = &wrk_first;
575 wrk->next = wrk_first.next; 590 wrk->next = wrk_first.next;
576 wrk_first.next->prev = wrk; 591 wrk_first.next->prev = wrk;
577 wrk_first.next = wrk; 592 wrk_first.next = wrk;
578 ++started; 593 ++started;
579 } 594 }
580 else 595 else
581 free (wrk); 596 free (wrk);
582 597
583 sigprocmask (SIG_SETMASK, &oldsigset, 0);
584 UNLOCK (wrklock); 598 UNLOCK (wrklock);
585} 599}
586 600
587static void maybe_start_thread () 601static void maybe_start_thread ()
588{ 602{
… …
596 start_thread (); 610 start_thread ();
597} 611}
598 612
599static void req_send (aio_req req) 613static void req_send (aio_req req)
600{ 614{
615 block_sig ();
616
601 ++nreqs; 617 ++nreqs;
602 618
603 LOCK (reqlock); 619 LOCK (reqlock);
604 ++nready; 620 ++nready;
605 reqq_push (&req_queue, req); 621 reqq_push (&req_queue, req);
606 pthread_cond_signal (&reqwait); 622 COND_SIGNAL (reqwait);
607 UNLOCK (reqlock); 623 UNLOCK (reqlock);
624
625 unblock_sig ();
608 626
609 maybe_start_thread (); 627 maybe_start_thread ();
610} 628}
611 629
612static void end_thread (void) 630static void end_thread (void)
… …
618 req->type = REQ_QUIT; 636 req->type = REQ_QUIT;
619 req->pri = PRI_MAX + PRI_BIAS; 637 req->pri = PRI_MAX + PRI_BIAS;
620 638
621 LOCK (reqlock); 639 LOCK (reqlock);
622 reqq_push (&req_queue, req); 640 reqq_push (&req_queue, req);
623 pthread_cond_signal (&reqwait); 641 COND_SIGNAL (reqwait);
624 UNLOCK (reqlock); 642 UNLOCK (reqlock);
625 643
626 LOCK (wrklock); 644 LOCK (wrklock);
627 --started; 645 --started;
628 UNLOCK (wrklock); 646 UNLOCK (wrklock);
… …
683 aio_req req; 701 aio_req req;
684 702
685 if (max_poll_time) 703 if (max_poll_time)
686 gettimeofday (&tv_start, 0); 704 gettimeofday (&tv_start, 0);
687 705
706 block_sig ();
707
688 for (;;) 708 for (;;)
689 { 709 {
690 for (;;) 710 for (;;)
691 { 711 {
692 maybe_start_thread (); 712 maybe_start_thread ();
… …
699 --npending; 719 --npending;
700 720
701 if (!res_queue.size) 721 if (!res_queue.size)
702 { 722 {
703 /* read any signals sent by the worker threads */ 723 /* read any signals sent by the worker threads */
704 char buf [32]; 724 char buf [4];
705 while (read (respipe [0], buf, 32) == 32) 725 while (read (respipe [0], buf, 4) == 4)
706 ; 726 ;
707 } 727 }
708 } 728 }
709 729
710 UNLOCK (reslock); 730 UNLOCK (reslock);
… …
712 if (!req) 732 if (!req)
713 break; 733 break;
714 734
715 --nreqs; 735 --nreqs;
716 736
717 if (req->type == REQ_GROUP && req->length) 737 if (req->type == REQ_GROUP && req->size)
718 { 738 {
719 req->fd = 1; /* mark request as delayed */ 739 req->int1 = 1; /* mark request as delayed */
720 continue; 740 continue;
721 } 741 }
722 else 742 else
723 { 743 {
724 if (req->type == REQ_READ) 744 if (!req_invoke (req))
725 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
726
727 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
728 SvREADONLY_off (req->data);
729
730 if (req->statdata)
731 { 745 {
732 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 746 req_free (req);
733 PL_laststatval = req->result; 747 unblock_sig ();
734 PL_statcache = *(req->statdata); 748 croak (0);
735 } 749 }
736
737 req_invoke (req);
738 750
739 count++; 751 count++;
740 } 752 }
741 753
742 req_free (req); 754 req_free (req);
… …
759 poll_wait (); 771 poll_wait ();
760 772
761 ++maxreqs; 773 ++maxreqs;
762 } 774 }
763 775
776 unblock_sig ();
764 return count; 777 return count;
765} 778}
766 779
767static void create_pipe () 780static void create_pipe ()
768{ 781{
… …
786/* 799/*
787 * make our pread/pwrite safe against themselves, but not against 800 * make our pread/pwrite safe against themselves, but not against
788 * normal read/write by using a mutex. slows down execution a lot, 801 * normal read/write by using a mutex. slows down execution a lot,
789 * but that's your problem, not mine. 802 * but that's your problem, not mine.
790 */ 803 */
791static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 804static mutex_t preadwritelock = MUTEX_INIT;
792 805
793static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 806static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
794{ 807{
795 ssize_t res; 808 ssize_t res;
796 off_t ooffset; 809 off_t ooffset;
… …
847#endif 860#endif
848 861
849#if !HAVE_READDIR_R 862#if !HAVE_READDIR_R
850# define readdir_r aio_readdir_r 863# define readdir_r aio_readdir_r
851 864
852static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 865static mutex_t readdirlock = MUTEX_INIT;
853 866
854static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 867static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
855{ 868{
856 struct dirent *e; 869 struct dirent *e;
857 int errorno; 870 int errorno;
… …
984 int memofs = 0; 997 int memofs = 0;
985 int res = 0; 998 int res = 0;
986 int errorno; 999 int errorno;
987 1000
988 LOCK (wrklock); 1001 LOCK (wrklock);
989 self->dirp = dirp = opendir (req->dataptr); 1002 self->dirp = dirp = opendir (req->ptr1);
990 self->dbuf = u = malloc (sizeof (*u)); 1003 self->dbuf = u = malloc (sizeof (*u));
1004 req->flags |= FLAG_PTR2_FREE;
991 req->data2ptr = names = malloc (memlen); 1005 req->ptr2 = names = malloc (memlen);
992 UNLOCK (wrklock); 1006 UNLOCK (wrklock);
993 1007
994 if (dirp && u && names) 1008 if (dirp && u && names)
995 for (;;) 1009 for (;;)
996 { 1010 {
… …
1010 1024
1011 while (memofs + len > memlen) 1025 while (memofs + len > memlen)
1012 { 1026 {
1013 memlen *= 2; 1027 memlen *= 2;
1014 LOCK (wrklock); 1028 LOCK (wrklock);
1015 req->data2ptr = names = realloc (names, memlen); 1029 req->ptr2 = names = realloc (names, memlen);
1016 UNLOCK (wrklock); 1030 UNLOCK (wrklock);
1017 1031
1018 if (!names) 1032 if (!names)
1019 break; 1033 break;
1020 } 1034 }
… …
1055 if (req) 1069 if (req)
1056 break; 1070 break;
1057 1071
1058 ++idle; 1072 ++idle;
1059 1073
1060 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1074 if (COND_TIMEDWAIT (reqwait, reqlock, ts)
1061 == ETIMEDOUT) 1075 == ETIMEDOUT)
1062 { 1076 {
1063 if (idle > max_idle) 1077 if (idle > max_idle)
1064 { 1078 {
1065 --idle; 1079 --idle;
… …
1069 UNLOCK (wrklock); 1083 UNLOCK (wrklock);
1070 goto quit; 1084 goto quit;
1071 } 1085 }
1072 1086
1073 /* we are allowed to idle, so do so without any timeout */ 1087 /* we are allowed to idle, so do so without any timeout */
1074 pthread_cond_wait (&reqwait, &reqlock); 1088 COND_WAIT (reqwait, reqlock);
1075 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1089 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1076 } 1090 }
1077 1091
1078 --idle; 1092 --idle;
1079 } 1093 }
… …
1085 errno = 0; /* strictly unnecessary */ 1099 errno = 0; /* strictly unnecessary */
1086 1100
1087 if (!(req->flags & FLAG_CANCELLED)) 1101 if (!(req->flags & FLAG_CANCELLED))
1088 switch (req->type) 1102 switch (req->type)
1089 { 1103 {
1090 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1104 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1091 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1105 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1092 1106
1093 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1107 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1094 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1108 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1095 1109
1096 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1110 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1097 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1111 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1098 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1112 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1099 1113
1100 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1114 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1101 case REQ_CLOSE: req->result = close (req->fd); break; 1115 case REQ_CLOSE: req->result = close (req->int1); break;
1102 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1116 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1103 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1117 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1118 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1104 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1105 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1106 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1107 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1108 1124
1109 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1110 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
1111 case REQ_READDIR: scandir_ (req, self); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
1112 1128
1113 case REQ_BUSY: 1129 case REQ_BUSY:
1114 { 1130 {
1115 struct timeval tv; 1131 struct timeval tv;
1116 1132
1117 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
1118 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
1119 1135
1120 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
1121 } 1137 }
1122 1138
1123 case REQ_GROUP: 1139 case REQ_GROUP:
… …
1137 LOCK (reslock); 1153 LOCK (reslock);
1138 1154
1139 ++npending; 1155 ++npending;
1140 1156
1141 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
1158 {
1142 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
1143 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
1161
1162 /* optionally signal the main thread asynchronously */
1163 if (main_sig)
1164 pthread_kill (main_tid, main_sig);
1165 }
1144 1166
1145 self->req = 0; 1167 self->req = 0;
1146 worker_clear (self); 1168 worker_clear (self);
1147 1169
1148 UNLOCK (reslock); 1170 UNLOCK (reslock);
… …
1251 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1273 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1252 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1274 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1253 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1275 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1254 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1276 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1255 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1277 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1278 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1256 1279
1257 create_pipe (); 1280 create_pipe ();
1258 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1281 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1259} 1282}
1260 1283
1261void 1284void
1262max_poll_reqs (int nreqs) 1285max_poll_reqs (int nreqs)
1263 PROTOTYPE: $ 1286 PROTOTYPE: $
… …
1293 OUTPUT: 1316 OUTPUT:
1294 RETVAL 1317 RETVAL
1295 1318
1296void 1319void
1297aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1320aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1298 SV * pathname 1321 SV8 * pathname
1299 int flags 1322 int flags
1300 int mode 1323 int mode
1301 SV * callback 1324 SV * callback
1302 PROTOTYPE: $$$;$ 1325 PROTOTYPE: $$$;$
1303 PPCODE: 1326 PPCODE:
1304{ 1327{
1305 dREQ; 1328 dREQ;
1306 1329
1307 req->type = REQ_OPEN; 1330 req->type = REQ_OPEN;
1308 req->data = newSVsv (pathname); 1331 req->sv1 = newSVsv (pathname);
1309 req->dataptr = SvPVbyte_nolen (req->data); 1332 req->ptr1 = SvPVbyte_nolen (req->sv1);
1310 req->fd = flags; 1333 req->int1 = flags;
1311 req->mode = mode; 1334 req->mode = mode;
1312 1335
1313 REQ_SEND; 1336 REQ_SEND;
1314} 1337}
1315 1338
… …
1325 PPCODE: 1348 PPCODE:
1326{ 1349{
1327 dREQ; 1350 dREQ;
1328 1351
1329 req->type = ix; 1352 req->type = ix;
1330 req->fh = newSVsv (fh); 1353 req->fh = newSVsv (fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1354 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1332 1355
1333 REQ_SEND (req); 1356 REQ_SEND (req);
1334} 1357}
1335 1358
1336void 1359void
1337aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1360aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1338 SV * fh 1361 SV * fh
1339 UV offset 1362 UV offset
1340 UV length 1363 UV length
1341 SV * data 1364 SV8 * data
1342 UV dataoffset 1365 UV dataoffset
1343 SV * callback 1366 SV * callback
1344 ALIAS: 1367 ALIAS:
1345 aio_read = REQ_READ 1368 aio_read = REQ_READ
1346 aio_write = REQ_WRITE 1369 aio_write = REQ_WRITE
1347 PROTOTYPE: $$$$$;$ 1370 PROTOTYPE: $$$$$;$
1348 PPCODE: 1371 PPCODE:
1349{ 1372{
1350 aio_req req;
1351 STRLEN svlen; 1373 STRLEN svlen;
1352 char *svptr = SvPVbyte (data, svlen); 1374 char *svptr = SvPVbyte (data, svlen);
1353 1375
1354 SvUPGRADE (data, SVt_PV); 1376 SvUPGRADE (data, SVt_PV);
1355 SvPOK_on (data); 1377 SvPOK_on (data);
… …
1367 length = svlen - dataoffset; 1389 length = svlen - dataoffset;
1368 } 1390 }
1369 else 1391 else
1370 { 1392 {
1371 /* read: grow scalar as necessary */ 1393 /* read: grow scalar as necessary */
1372 svptr = SvGROW (data, length + dataoffset); 1394 svptr = SvGROW (data, length + dataoffset + 1);
1373 } 1395 }
1374 1396
1375 if (length < 0) 1397 if (length < 0)
1376 croak ("length must not be negative"); 1398 croak ("length must not be negative");
1377 1399
1378 { 1400 {
1379 dREQ; 1401 dREQ;
1380 1402
1381 req->type = ix; 1403 req->type = ix;
1382 req->fh = newSVsv (fh); 1404 req->fh = newSVsv (fh);
1383 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1405 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1384 : IoOFP (sv_2io (fh))); 1406 : IoOFP (sv_2io (fh)));
1385 req->offset = offset; 1407 req->offs = offset;
1386 req->length = length; 1408 req->size = length;
1387 req->data = SvREFCNT_inc (data); 1409 req->sv1 = SvREFCNT_inc (data);
1388 req->dataptr = (char *)svptr + dataoffset; 1410 req->ptr1 = (char *)svptr + dataoffset;
1411 req->stroffset = dataoffset;
1389 1412
1390 if (!SvREADONLY (data)) 1413 if (!SvREADONLY (data))
1391 { 1414 {
1392 SvREADONLY_on (data); 1415 SvREADONLY_on (data);
1393 req->data2ptr = (void *)data; 1416 req->flags |= FLAG_SV1_RO_OFF;
1394 } 1417 }
1395 1418
1396 REQ_SEND; 1419 REQ_SEND;
1397 } 1420 }
1421}
1422
1423void
1424aio_readlink (path,callback=&PL_sv_undef)
1425 SV8 * path
1426 SV * callback
1427 PROTOTYPE: $$;$
1428 PPCODE:
1429{
1430 SV *data;
1431 dREQ;
1432
1433 data = newSV (NAME_MAX);
1434 SvPOK_on (data);
1435
1436 req->type = REQ_READLINK;
1437 req->fh = newSVsv (path);
1438 req->ptr2 = SvPVbyte_nolen (req->fh);
1439 req->sv1 = data;
1440 req->ptr1 = SvPVbyte_nolen (data);
1441
1442 REQ_SEND;
1398} 1443}
1399 1444
1400void 1445void
1401aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1446aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1402 SV * out_fh 1447 SV * out_fh
… …
1408 PPCODE: 1453 PPCODE:
1409{ 1454{
1410 dREQ; 1455 dREQ;
1411 1456
1412 req->type = REQ_SENDFILE; 1457 req->type = REQ_SENDFILE;
1413 req->fh = newSVsv (out_fh); 1458 req->fh = newSVsv (out_fh);
1414 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1459 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1415 req->fh2 = newSVsv (in_fh); 1460 req->sv2 = newSVsv (in_fh);
1416 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1461 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1417 req->offset = in_offset; 1462 req->offs = in_offset;
1418 req->length = length; 1463 req->size = length;
1419 1464
1420 REQ_SEND; 1465 REQ_SEND;
1421} 1466}
1422 1467
1423void 1468void
… …
1430 PPCODE: 1475 PPCODE:
1431{ 1476{
1432 dREQ; 1477 dREQ;
1433 1478
1434 req->type = REQ_READAHEAD; 1479 req->type = REQ_READAHEAD;
1435 req->fh = newSVsv (fh); 1480 req->fh = newSVsv (fh);
1436 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1481 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1437 req->offset = offset; 1482 req->offs = offset;
1438 req->length = length; 1483 req->size = length;
1439 1484
1440 REQ_SEND; 1485 REQ_SEND;
1441} 1486}
1442 1487
1443void 1488void
1444aio_stat (fh_or_path,callback=&PL_sv_undef) 1489aio_stat (fh_or_path,callback=&PL_sv_undef)
1445 SV * fh_or_path 1490 SV8 * fh_or_path
1446 SV * callback 1491 SV * callback
1447 ALIAS: 1492 ALIAS:
1448 aio_stat = REQ_STAT 1493 aio_stat = REQ_STAT
1449 aio_lstat = REQ_LSTAT 1494 aio_lstat = REQ_LSTAT
1450 PPCODE: 1495 PPCODE:
1451{ 1496{
1452 dREQ; 1497 dREQ;
1453 1498
1454 New (0, req->statdata, 1, Stat_t); 1499 req->ptr2 = malloc (sizeof (Stat_t));
1455 if (!req->statdata) 1500 if (!req->ptr2)
1456 { 1501 {
1457 req_free (req); 1502 req_free (req);
1458 croak ("out of memory during aio_req->statdata allocation"); 1503 croak ("out of memory during aio_stat statdata allocation");
1459 } 1504 }
1505
1506 req->flags |= FLAG_PTR2_FREE;
1460 1507
1461 if (SvPOK (fh_or_path)) 1508 if (SvPOK (fh_or_path))
1462 { 1509 {
1463 req->type = ix; 1510 req->type = ix;
1464 req->data = newSVsv (fh_or_path); 1511 req->sv1 = newSVsv (fh_or_path);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1512 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 } 1513 }
1467 else 1514 else
1468 { 1515 {
1469 req->type = REQ_FSTAT; 1516 req->type = REQ_FSTAT;
1470 req->fh = newSVsv (fh_or_path); 1517 req->fh = newSVsv (fh_or_path);
1471 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1518 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1472 } 1519 }
1473 1520
1474 REQ_SEND; 1521 REQ_SEND;
1475} 1522}
1476 1523
1477void 1524void
1478aio_unlink (pathname,callback=&PL_sv_undef) 1525aio_unlink (pathname,callback=&PL_sv_undef)
1479 SV * pathname 1526 SV8 * pathname
1480 SV * callback 1527 SV * callback
1481 ALIAS: 1528 ALIAS:
1482 aio_unlink = REQ_UNLINK 1529 aio_unlink = REQ_UNLINK
1483 aio_rmdir = REQ_RMDIR 1530 aio_rmdir = REQ_RMDIR
1484 aio_readdir = REQ_READDIR 1531 aio_readdir = REQ_READDIR
1485 PPCODE: 1532 PPCODE:
1486{ 1533{
1487 dREQ; 1534 dREQ;
1488 1535
1489 req->type = ix; 1536 req->type = ix;
1490 req->data = newSVsv (pathname); 1537 req->sv1 = newSVsv (pathname);
1491 req->dataptr = SvPVbyte_nolen (req->data); 1538 req->ptr1 = SvPVbyte_nolen (req->sv1);
1539
1540 REQ_SEND;
1541}
1542
1543void
1544aio_mkdir (pathname,mode,callback=&PL_sv_undef)
1545 SV8 * pathname
1546 UV mode
1547 SV * callback
1548 PPCODE:
1549{
1550 dREQ;
1492 1551
1552 req->type = REQ_MKDIR;
1553 req->sv1 = newSVsv (pathname);
1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1555 req->mode = mode;
1556
1493 REQ_SEND; 1557 REQ_SEND;
1494} 1558}
1495 1559
1496void 1560void
1497aio_link (oldpath,newpath,callback=&PL_sv_undef) 1561aio_link (oldpath,newpath,callback=&PL_sv_undef)
1498 SV * oldpath 1562 SV8 * oldpath
1499 SV * newpath 1563 SV8 * newpath
1500 SV * callback 1564 SV * callback
1501 ALIAS: 1565 ALIAS:
1502 aio_link = REQ_LINK 1566 aio_link = REQ_LINK
1503 aio_symlink = REQ_SYMLINK 1567 aio_symlink = REQ_SYMLINK
1504 aio_rename = REQ_RENAME 1568 aio_rename = REQ_RENAME
1505 PPCODE: 1569 PPCODE:
1506{ 1570{
1507 dREQ; 1571 dREQ;
1508 1572
1509 req->type = ix; 1573 req->type = ix;
1510 req->fh = newSVsv (oldpath); 1574 req->fh = newSVsv (oldpath);
1511 req->data2ptr = SvPVbyte_nolen (req->fh); 1575 req->ptr2 = SvPVbyte_nolen (req->fh);
1512 req->data = newSVsv (newpath); 1576 req->sv1 = newSVsv (newpath);
1513 req->dataptr = SvPVbyte_nolen (req->data); 1577 req->ptr1 = SvPVbyte_nolen (req->sv1);
1514 1578
1515 REQ_SEND; 1579 REQ_SEND;
1516} 1580}
1517 1581
1518void 1582void
1519aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1583aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1520 SV * pathname 1584 SV8 * pathname
1521 SV * callback
1522 UV mode 1585 UV mode
1523 UV dev 1586 UV dev
1587 SV * callback
1524 PPCODE: 1588 PPCODE:
1525{ 1589{
1526 dREQ; 1590 dREQ;
1527 1591
1528 req->type = REQ_MKNOD; 1592 req->type = REQ_MKNOD;
1529 req->data = newSVsv (pathname); 1593 req->sv1 = newSVsv (pathname);
1530 req->dataptr = SvPVbyte_nolen (req->data); 1594 req->ptr1 = SvPVbyte_nolen (req->sv1);
1531 req->mode = (mode_t)mode; 1595 req->mode = (mode_t)mode;
1532 req->offset = dev; 1596 req->offs = dev;
1533 1597
1534 REQ_SEND; 1598 REQ_SEND;
1535} 1599}
1536 1600
1537void 1601void
1538aio_busy (delay,callback=&PL_sv_undef) 1602aio_busy (delay,callback=&PL_sv_undef)
1539 double delay 1603 double delay
1540 SV * callback 1604 SV * callback
1541 PPCODE: 1605 PPCODE:
1542{ 1606{
1543 dREQ; 1607 dREQ;
1544 1608
1545 req->type = REQ_BUSY; 1609 req->type = REQ_BUSY;
1546 req->fd = delay < 0. ? 0 : delay; 1610 req->int1 = delay < 0. ? 0 : delay;
1547 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1611 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1548 1612
1549 REQ_SEND; 1613 REQ_SEND;
1550} 1614}
1551 1615
1552void 1616void
… …
1556 PPCODE: 1620 PPCODE:
1557{ 1621{
1558 dREQ; 1622 dREQ;
1559 1623
1560 req->type = REQ_GROUP; 1624 req->type = REQ_GROUP;
1625
1561 req_send (req); 1626 req_send (req);
1562
1563 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1627 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1564} 1628}
1565 1629
1566void 1630void
1567aio_nop (callback=&PL_sv_undef) 1631aio_nop (callback=&PL_sv_undef)
1568 SV * callback 1632 SV * callback
1569 PPCODE: 1633 PPCODE:
1570{ 1634{
1571 dREQ; 1635 dREQ;
1572 1636
1573 req->type = REQ_NOP; 1637 req->type = REQ_NOP;
… …
1602 PROTOTYPE: 1666 PROTOTYPE:
1603 CODE: 1667 CODE:
1604 while (nreqs) 1668 while (nreqs)
1605 { 1669 {
1606 poll_wait (); 1670 poll_wait ();
1607 poll_cb (0); 1671 poll_cb ();
1608 } 1672 }
1609 1673
1610void 1674int
1611poll() 1675poll()
1612 PROTOTYPE: 1676 PROTOTYPE:
1613 CODE: 1677 CODE:
1614 if (nreqs)
1615 {
1616 poll_wait (); 1678 poll_wait ();
1617 poll_cb (0); 1679 RETVAL = poll_cb ();
1618 } 1680 OUTPUT:
1681 RETVAL
1619 1682
1620int 1683int
1621poll_fileno() 1684poll_fileno()
1622 PROTOTYPE: 1685 PROTOTYPE:
1623 CODE: 1686 CODE:
… …
1635 1698
1636void 1699void
1637poll_wait() 1700poll_wait()
1638 PROTOTYPE: 1701 PROTOTYPE:
1639 CODE: 1702 CODE:
1640 if (nreqs)
1641 poll_wait (); 1703 poll_wait ();
1704
1705void
1706setsig (int signum = SIGIO)
1707 PROTOTYPE: ;$
1708 CODE:
1709{
1710 if (block_sig_level)
1711 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1712
1713 LOCK (reslock);
1714 main_tid = pthread_self ();
1715 main_sig = signum;
1716 UNLOCK (reslock);
1717
1718 if (main_sig && npending)
1719 pthread_kill (main_tid, main_sig);
1720}
1721
1722void
1723aio_block (SV *cb)
1724 PROTOTYPE: &
1725 PPCODE:
1726{
1727 int count;
1728
1729 block_sig ();
1730 PUSHMARK (SP);
1731 PUTBACK;
1732 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1733 SPAGAIN;
1734 unblock_sig ();
1735
1736 if (SvTRUE (ERRSV))
1737 croak (0);
1738
1739 XSRETURN (count);
1740}
1642 1741
1643int 1742int
1644nreqs() 1743nreqs()
1645 PROTOTYPE: 1744 PROTOTYPE:
1646 CODE: 1745 CODE:
… …
1696 PPCODE: 1795 PPCODE:
1697{ 1796{
1698 int i; 1797 int i;
1699 aio_req req; 1798 aio_req req;
1700 1799
1800 if (main_sig && !block_sig_level)
1801 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1802
1701 if (grp->fd == 2) 1803 if (grp->int1 == 2)
1702 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1804 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1703 1805
1704 for (i = 1; i < items; ++i ) 1806 for (i = 1; i < items; ++i )
1705 { 1807 {
1706 if (GIMME_V != G_VOID) 1808 if (GIMME_V != G_VOID)
… …
1708 1810
1709 req = SvAIO_REQ (ST (i)); 1811 req = SvAIO_REQ (ST (i));
1710 1812
1711 if (req) 1813 if (req)
1712 { 1814 {
1713 ++grp->length; 1815 ++grp->size;
1714 req->grp = grp; 1816 req->grp = grp;
1715 1817
1716 req->grp_prev = 0; 1818 req->grp_prev = 0;
1717 req->grp_next = grp->grp_first; 1819 req->grp_next = grp->grp_first;
1718 1820
… …
1741 av = newAV (); 1843 av = newAV ();
1742 1844
1743 for (i = 1; i < items; ++i ) 1845 for (i = 1; i < items; ++i )
1744 av_push (av, newSVsv (ST (i))); 1846 av_push (av, newSVsv (ST (i)));
1745 1847
1746 SvREFCNT_dec (grp->data); 1848 SvREFCNT_dec (grp->sv1);
1747 grp->data = (SV *)av; 1849 grp->sv1 = (SV *)av;
1748} 1850}
1749 1851
1750void 1852void
1751errno (aio_req grp, int errorno = errno) 1853errno (aio_req grp, int errorno = errno)
1752 CODE: 1854 CODE:
1753 grp->errorno = errorno; 1855 grp->errorno = errorno;
1754 1856
1755void 1857void
1756limit (aio_req grp, int limit) 1858limit (aio_req grp, int limit)
1757 CODE: 1859 CODE:
1758 grp->fd2 = limit; 1860 grp->int2 = limit;
1759 aio_grp_feed (grp); 1861 aio_grp_feed (grp);
1760 1862
1761void 1863void
1762feed (aio_req grp, SV *callback=&PL_sv_undef) 1864feed (aio_req grp, SV *callback=&PL_sv_undef)
1763 CODE: 1865 CODE:
1764{ 1866{
1765 SvREFCNT_dec (grp->fh2); 1867 SvREFCNT_dec (grp->sv2);
1766 grp->fh2 = newSVsv (callback); 1868 grp->sv2 = newSVsv (callback);
1767 1869
1768 if (grp->fd2 <= 0) 1870 if (grp->int2 <= 0)
1769 grp->fd2 = 2; 1871 grp->int2 = 2;
1770 1872
1771 aio_grp_feed (grp); 1873 aio_grp_feed (grp);
1772} 1874}
1773 1875

Diff Legend

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