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.102 by root, Sun Jun 3 09:44:17 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>
27#include <limits.h> 18#include <limits.h>
28#include <unistd.h> 19#include <unistd.h>
29#include <fcntl.h> 20#include <fcntl.h>
30#include <signal.h> 21#include <signal.h>
31#include <sched.h> 22#include <sched.h>
23#include <utime.h>
32 24
33#if HAVE_SENDFILE 25#if HAVE_SENDFILE
34# if __linux 26# if __linux
35# include <sys/sendfile.h> 27# include <sys/sendfile.h>
36# elif __freebsd 28# elif __freebsd
… …
51/* used for struct dirent, AIX doesn't provide it */ 43/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 44#ifndef NAME_MAX
53# define NAME_MAX 4096 45# define NAME_MAX 4096
54#endif 46#endif
55 47
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 */ 48/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 49#define AIO_BUFSIZE 65536
50
51/* use NV for 32 bit perls as it allows larger offsets */
52#if IVSIZE >= 8
53# define SvVAL64 SvIV
54#else
55# define SvVAL64 SvNV
56#endif
83 57
84#define dBUF \ 58#define dBUF \
85 char *aio_buf; \ 59 char *aio_buf; \
86 LOCK (wrklock); \ 60 LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 61 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 62 UNLOCK (wrklock); \
89 if (!aio_buf) \ 63 if (!aio_buf) \
90 return -1; 64 return -1;
91 65
66typedef SV SV8; /* byte-sv, used for argument-checking */
67
92enum { 68enum {
93 REQ_QUIT, 69 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 70 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 71 REQ_READ, REQ_WRITE,
96 REQ_SENDFILE, 72 REQ_READAHEAD, REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 73 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
74 REQ_UTIME, REQ_FUTIME,
75 REQ_CHMOD, REQ_FCHMOD,
76 REQ_CHOWN, REQ_FCHOWN,
98 REQ_FSYNC, REQ_FDATASYNC, 77 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 78 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 79 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 80 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 81 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 82 REQ_BUSY,
104}; 83};
105 84
106#define AIO_REQ_KLASS "IO::AIO::REQ" 85#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 87
109typedef struct aio_cb 88typedef struct aio_cb
110{ 89{
111 struct aio_cb *volatile next; 90 struct aio_cb *volatile next;
112 91
113 SV *data, *callback; 92 SV *callback;
114 SV *fh, *fh2; 93 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 94 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 95 off_t offs;
118 size_t length; 96 size_t size;
119 ssize_t result; 97 ssize_t result;
98 double nv1, nv2;
120 99
121 STRLEN dataoffset; 100 STRLEN stroffset;
122 int type; 101 int type;
123 int fd, fd2; 102 int int1, int2, int3;
124 int errorno; 103 int errorno;
125 mode_t mode; /* open */ 104 mode_t mode; /* open */
126 105
127 unsigned char flags; 106 unsigned char flags;
128 unsigned char pri; 107 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 109 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 111} aio_cb;
133 112
134enum { 113enum {
135 FLAG_CANCELLED = 0x01, 114 FLAG_CANCELLED = 0x01, /* request was cancelled */
115 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
116 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 117};
137 118
138typedef aio_cb *aio_req; 119typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 120typedef aio_cb *aio_req_ornot;
140 121
… …
157{ 138{
158 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 139 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
159 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 140 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
160} 141}
161 142
143static thread_t main_tid;
144static int main_sig;
145static int block_sig_level;
146
147void block_sig ()
148{
149 sigset_t ss;
150
151 if (block_sig_level++)
152 return;
153
154 if (!main_sig)
155 return;
156
157 sigemptyset (&ss);
158 sigaddset (&ss, main_sig);
159 pthread_sigmask (SIG_BLOCK, &ss, 0);
160}
161
162void unblock_sig ()
163{
164 sigset_t ss;
165
166 if (--block_sig_level)
167 return;
168
169 if (!main_sig)
170 return;
171
172 sigemptyset (&ss);
173 sigaddset (&ss, main_sig);
174 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
175}
176
162static int next_pri = DEFAULT_PRI + PRI_BIAS; 177static int next_pri = DEFAULT_PRI + PRI_BIAS;
163 178
164static unsigned int started, idle, wanted; 179static unsigned int started, idle, wanted;
165 180
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 */ 181/* worker threads management */
176static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 182static mutex_t wrklock = MUTEX_INIT;
177 183
178typedef struct worker { 184typedef struct worker {
179 /* locked by wrklock */ 185 /* locked by wrklock */
180 struct worker *prev, *next; 186 struct worker *prev, *next;
181 187
182 pthread_t tid; 188 thread_t tid;
183 189
184 /* locked by reslock, reqlock or wrklock */ 190 /* locked by reslock, reqlock or wrklock */
185 aio_req req; /* currently processed request */ 191 aio_req req; /* currently processed request */
186 void *dbuf; 192 void *dbuf;
187 DIR *dirp; 193 DIR *dirp;
… …
215static volatile unsigned int nreqs, nready, npending; 221static volatile unsigned int nreqs, nready, npending;
216static volatile unsigned int max_idle = 4; 222static volatile unsigned int max_idle = 4;
217static volatile unsigned int max_outstanding = 0xffffffff; 223static volatile unsigned int max_outstanding = 0xffffffff;
218static int respipe [2]; 224static int respipe [2];
219 225
220static pthread_mutex_t reslock = AIO_MUTEX_INIT; 226static mutex_t reslock = MUTEX_INIT;
221static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 227static mutex_t reqlock = MUTEX_INIT;
222static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 228static cond_t reqwait = COND_INIT;
223 229
224#if WORDACCESS_UNSAFE 230#if WORDACCESS_UNSAFE
225 231
226static unsigned int get_nready () 232static unsigned int get_nready ()
227{ 233{
… …
317 323
318 abort (); 324 abort ();
319} 325}
320 326
321static int poll_cb (); 327static int poll_cb ();
322static void req_invoke (aio_req req); 328static int req_invoke (aio_req req);
323static void req_free (aio_req req); 329static void req_destroy (aio_req req);
324static void req_cancel (aio_req req); 330static void req_cancel (aio_req req);
325 331
326/* must be called at most once */ 332/* must be called at most once */
327static SV *req_sv (aio_req req, const char *klass) 333static SV *req_sv (aio_req req, const char *klass)
328{ 334{
… …
347 return mg ? (aio_req)mg->mg_ptr : 0; 353 return mg ? (aio_req)mg->mg_ptr : 0;
348} 354}
349 355
350static void aio_grp_feed (aio_req grp) 356static void aio_grp_feed (aio_req grp)
351{ 357{
358 block_sig ();
359
352 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 360 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
353 { 361 {
354 int old_len = grp->length; 362 int old_len = grp->size;
355 363
356 if (grp->fh2 && SvOK (grp->fh2)) 364 if (grp->sv2 && SvOK (grp->sv2))
357 { 365 {
358 dSP; 366 dSP;
359 367
360 ENTER; 368 ENTER;
361 SAVETMPS; 369 SAVETMPS;
362 PUSHMARK (SP); 370 PUSHMARK (SP);
363 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 371 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
364 PUTBACK; 372 PUTBACK;
365 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 373 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
366 SPAGAIN; 374 SPAGAIN;
367 FREETMPS; 375 FREETMPS;
368 LEAVE; 376 LEAVE;
369 } 377 }
370 378
371 /* stop if no progress has been made */ 379 /* stop if no progress has been made */
372 if (old_len == grp->length) 380 if (old_len == grp->size)
373 { 381 {
374 SvREFCNT_dec (grp->fh2); 382 SvREFCNT_dec (grp->sv2);
375 grp->fh2 = 0; 383 grp->sv2 = 0;
376 break; 384 break;
377 } 385 }
378 } 386 }
387
388 unblock_sig ();
379} 389}
380 390
381static void aio_grp_dec (aio_req grp) 391static void aio_grp_dec (aio_req grp)
382{ 392{
383 --grp->length; 393 --grp->size;
384 394
385 /* call feeder, if applicable */ 395 /* call feeder, if applicable */
386 aio_grp_feed (grp); 396 aio_grp_feed (grp);
387 397
388 /* finish, if done */ 398 /* finish, if done */
389 if (!grp->length && grp->fd) 399 if (!grp->size && grp->int1)
390 { 400 {
401 block_sig ();
402
391 req_invoke (grp); 403 if (!req_invoke (grp))
404 {
405 req_destroy (grp);
406 unblock_sig ();
407 croak (0);
408 }
409
392 req_free (grp); 410 req_destroy (grp);
411 unblock_sig ();
393 } 412 }
394} 413}
395 414
396static void req_invoke (aio_req req) 415static int req_invoke (aio_req req)
397{ 416{
398 dSP; 417 dSP;
418
419 if (req->flags & FLAG_SV2_RO_OFF)
420 SvREADONLY_off (req->sv2);
399 421
400 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 422 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
401 { 423 {
402 ENTER; 424 ENTER;
403 SAVETMPS; 425 SAVETMPS;
… …
411 SV *rv = &PL_sv_undef; 433 SV *rv = &PL_sv_undef;
412 434
413 if (req->result >= 0) 435 if (req->result >= 0)
414 { 436 {
415 int i; 437 int i;
416 char *buf = req->data2ptr; 438 char *buf = req->ptr2;
417 AV *av = newAV (); 439 AV *av = newAV ();
418 440
419 av_extend (av, req->result - 1); 441 av_extend (av, req->result - 1);
420 442
421 for (i = 0; i < req->result; ++i) 443 for (i = 0; i < req->result; ++i)
… …
441 PUSHs (sv_2mortal (newSViv (req->result))); 463 PUSHs (sv_2mortal (newSViv (req->result)));
442 PUTBACK; 464 PUTBACK;
443 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 465 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
444 SPAGAIN; 466 SPAGAIN;
445 467
446 fh = SvREFCNT_inc (POPs); 468 fh = POPs;
447
448 PUSHMARK (SP); 469 PUSHMARK (SP);
449 XPUSHs (sv_2mortal (fh)); 470 XPUSHs (fh);
450 } 471 }
451 break; 472 break;
452 473
453 case REQ_GROUP: 474 case REQ_GROUP:
454 req->fd = 2; /* mark group as finished */ 475 req->int1 = 2; /* mark group as finished */
455 476
456 if (req->data) 477 if (req->sv1)
457 { 478 {
458 int i; 479 int i;
459 AV *av = (AV *)req->data; 480 AV *av = (AV *)req->sv1;
460 481
461 EXTEND (SP, AvFILL (av) + 1); 482 EXTEND (SP, AvFILL (av) + 1);
462 for (i = 0; i <= AvFILL (av); ++i) 483 for (i = 0; i <= AvFILL (av); ++i)
463 PUSHs (*av_fetch (av, i, 0)); 484 PUSHs (*av_fetch (av, i, 0));
464 } 485 }
… …
466 487
467 case REQ_NOP: 488 case REQ_NOP:
468 case REQ_BUSY: 489 case REQ_BUSY:
469 break; 490 break;
470 491
492 case REQ_READLINK:
493 if (req->result > 0)
494 {
495 SvCUR_set (req->sv2, req->result);
496 *SvEND (req->sv2) = 0;
497 PUSHs (req->sv2);
498 }
499 break;
500
501 case REQ_STAT:
502 case REQ_LSTAT:
503 case REQ_FSTAT:
504 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
505 PL_laststatval = req->result;
506 PL_statcache = *(Stat_t *)(req->ptr2);
507 PUSHs (sv_2mortal (newSViv (req->result)));
508 break;
509
510 case REQ_READ:
511 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
512 *SvEND (req->sv2) = 0;
513 PUSHs (sv_2mortal (newSViv (req->result)));
514 break;
515
471 default: 516 default:
472 PUSHs (sv_2mortal (newSViv (req->result))); 517 PUSHs (sv_2mortal (newSViv (req->result)));
473 break; 518 break;
474 } 519 }
475 520
… …
495 grp->grp_first = req->grp_next; 540 grp->grp_first = req->grp_next;
496 541
497 aio_grp_dec (grp); 542 aio_grp_dec (grp);
498 } 543 }
499 544
500 if (SvTRUE (ERRSV)) 545 return !SvTRUE (ERRSV);
501 {
502 req_free (req);
503 croak (0);
504 }
505} 546}
506 547
507static void req_free (aio_req req) 548static void req_destroy (aio_req req)
508{ 549{
509 if (req->self) 550 if (req->self)
510 { 551 {
511 sv_unmagic (req->self, PERL_MAGIC_ext); 552 sv_unmagic (req->self, PERL_MAGIC_ext);
512 SvREFCNT_dec (req->self); 553 SvREFCNT_dec (req->self);
513 } 554 }
514 555
515 SvREFCNT_dec (req->data);
516 SvREFCNT_dec (req->fh); 556 SvREFCNT_dec (req->sv1);
517 SvREFCNT_dec (req->fh2); 557 SvREFCNT_dec (req->sv2);
518 SvREFCNT_dec (req->callback); 558 SvREFCNT_dec (req->callback);
519 Safefree (req->statdata);
520 559
521 if (req->type == REQ_READDIR) 560 if (req->flags & FLAG_PTR2_FREE)
522 free (req->data2ptr); 561 free (req->ptr2);
523 562
524 Safefree (req); 563 Safefree (req);
525} 564}
526 565
527static void req_cancel_subs (aio_req grp) 566static void req_cancel_subs (aio_req grp)
… …
529 aio_req sub; 568 aio_req sub;
530 569
531 if (grp->type != REQ_GROUP) 570 if (grp->type != REQ_GROUP)
532 return; 571 return;
533 572
534 SvREFCNT_dec (grp->fh2); 573 SvREFCNT_dec (grp->sv2);
535 grp->fh2 = 0; 574 grp->sv2 = 0;
536 575
537 for (sub = grp->grp_first; sub; sub = sub->grp_next) 576 for (sub = grp->grp_first; sub; sub = sub->grp_next)
538 req_cancel (sub); 577 req_cancel (sub);
539} 578}
540 579
… …
543 req->flags |= FLAG_CANCELLED; 582 req->flags |= FLAG_CANCELLED;
544 583
545 req_cancel_subs (req); 584 req_cancel_subs (req);
546} 585}
547 586
548static void *aio_proc(void *arg); 587static void *aio_proc (void *arg);
549 588
550static void start_thread (void) 589static void start_thread (void)
551{ 590{
552 sigset_t fullsigset, oldsigset;
553 pthread_attr_t attr;
554
555 worker *wrk = calloc (1, sizeof (worker)); 591 worker *wrk = calloc (1, sizeof (worker));
556 592
557 if (!wrk) 593 if (!wrk)
558 croak ("unable to allocate worker thread data"); 594 croak ("unable to allocate worker thread data");
559 595
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); 596 LOCK (wrklock);
570 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
571 597
572 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 598 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
573 { 599 {
574 wrk->prev = &wrk_first; 600 wrk->prev = &wrk_first;
575 wrk->next = wrk_first.next; 601 wrk->next = wrk_first.next;
576 wrk_first.next->prev = wrk; 602 wrk_first.next->prev = wrk;
577 wrk_first.next = wrk; 603 wrk_first.next = wrk;
578 ++started; 604 ++started;
579 } 605 }
580 else 606 else
581 free (wrk); 607 free (wrk);
582 608
583 sigprocmask (SIG_SETMASK, &oldsigset, 0);
584 UNLOCK (wrklock); 609 UNLOCK (wrklock);
585} 610}
586 611
587static void maybe_start_thread () 612static void maybe_start_thread ()
588{ 613{
… …
596 start_thread (); 621 start_thread ();
597} 622}
598 623
599static void req_send (aio_req req) 624static void req_send (aio_req req)
600{ 625{
626 block_sig ();
627
601 ++nreqs; 628 ++nreqs;
602 629
603 LOCK (reqlock); 630 LOCK (reqlock);
604 ++nready; 631 ++nready;
605 reqq_push (&req_queue, req); 632 reqq_push (&req_queue, req);
606 pthread_cond_signal (&reqwait); 633 COND_SIGNAL (reqwait);
607 UNLOCK (reqlock); 634 UNLOCK (reqlock);
635
636 unblock_sig ();
608 637
609 maybe_start_thread (); 638 maybe_start_thread ();
610} 639}
611 640
612static void end_thread (void) 641static void end_thread (void)
… …
618 req->type = REQ_QUIT; 647 req->type = REQ_QUIT;
619 req->pri = PRI_MAX + PRI_BIAS; 648 req->pri = PRI_MAX + PRI_BIAS;
620 649
621 LOCK (reqlock); 650 LOCK (reqlock);
622 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
623 pthread_cond_signal (&reqwait); 652 COND_SIGNAL (reqwait);
624 UNLOCK (reqlock); 653 UNLOCK (reqlock);
625 654
626 LOCK (wrklock); 655 LOCK (wrklock);
627 --started; 656 --started;
628 UNLOCK (wrklock); 657 UNLOCK (wrklock);
… …
683 aio_req req; 712 aio_req req;
684 713
685 if (max_poll_time) 714 if (max_poll_time)
686 gettimeofday (&tv_start, 0); 715 gettimeofday (&tv_start, 0);
687 716
717 block_sig ();
718
688 for (;;) 719 for (;;)
689 { 720 {
690 for (;;) 721 for (;;)
691 { 722 {
692 maybe_start_thread (); 723 maybe_start_thread ();
… …
699 --npending; 730 --npending;
700 731
701 if (!res_queue.size) 732 if (!res_queue.size)
702 { 733 {
703 /* read any signals sent by the worker threads */ 734 /* read any signals sent by the worker threads */
704 char buf [32]; 735 char buf [4];
705 while (read (respipe [0], buf, 32) == 32) 736 while (read (respipe [0], buf, 4) == 4)
706 ; 737 ;
707 } 738 }
708 } 739 }
709 740
710 UNLOCK (reslock); 741 UNLOCK (reslock);
… …
712 if (!req) 743 if (!req)
713 break; 744 break;
714 745
715 --nreqs; 746 --nreqs;
716 747
717 if (req->type == REQ_GROUP && req->length) 748 if (req->type == REQ_GROUP && req->size)
718 { 749 {
719 req->fd = 1; /* mark request as delayed */ 750 req->int1 = 1; /* mark request as delayed */
720 continue; 751 continue;
721 } 752 }
722 else 753 else
723 { 754 {
724 if (req->type == REQ_READ) 755 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 { 756 {
732 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 757 req_destroy (req);
733 PL_laststatval = req->result; 758 unblock_sig ();
734 PL_statcache = *(req->statdata); 759 croak (0);
735 } 760 }
736
737 req_invoke (req);
738 761
739 count++; 762 count++;
740 } 763 }
741 764
742 req_free (req); 765 req_destroy (req);
743 766
744 if (maxreqs && !--maxreqs) 767 if (maxreqs && !--maxreqs)
745 break; 768 break;
746 769
747 if (max_poll_time) 770 if (max_poll_time)
… …
759 poll_wait (); 782 poll_wait ();
760 783
761 ++maxreqs; 784 ++maxreqs;
762 } 785 }
763 786
787 unblock_sig ();
764 return count; 788 return count;
765} 789}
766 790
767static void create_pipe () 791static void create_pipe ()
768{ 792{
… …
786/* 810/*
787 * make our pread/pwrite safe against themselves, but not against 811 * make our pread/pwrite safe against themselves, but not against
788 * normal read/write by using a mutex. slows down execution a lot, 812 * normal read/write by using a mutex. slows down execution a lot,
789 * but that's your problem, not mine. 813 * but that's your problem, not mine.
790 */ 814 */
791static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 815static mutex_t preadwritelock = MUTEX_INIT;
792 816
793static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 817static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
794{ 818{
795 ssize_t res; 819 ssize_t res;
796 off_t ooffset; 820 off_t ooffset;
… …
819 843
820 return res; 844 return res;
821} 845}
822#endif 846#endif
823 847
848#ifndef HAVE_FUTIMES
849
850# define utimes(path,times) aio_utimes (path, times)
851# define futimes(fd,times) aio_futimes (fd, times)
852
853int aio_utimes (const char *filename, const struct timeval times[2])
854{
855 if (times)
856 {
857 struct utimbuf buf;
858
859 buf.actime = times[0].tv_sec;
860 buf.modtime = times[1].tv_sec;
861
862 return utime (filename, &buf);
863 }
864 else
865 return utime (filename, 0);
866}
867
868int aio_futimes (int fd, const struct timeval tv[2])
869{
870 errno = ENOSYS;
871 return -1;
872}
873
874#endif
875
824#if !HAVE_FDATASYNC 876#if !HAVE_FDATASYNC
825# define fdatasync fsync 877# define fdatasync fsync
826#endif 878#endif
827 879
828#if !HAVE_READAHEAD 880#if !HAVE_READAHEAD
… …
847#endif 899#endif
848 900
849#if !HAVE_READDIR_R 901#if !HAVE_READDIR_R
850# define readdir_r aio_readdir_r 902# define readdir_r aio_readdir_r
851 903
852static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 904static mutex_t readdirlock = MUTEX_INIT;
853 905
854static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 906static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
855{ 907{
856 struct dirent *e; 908 struct dirent *e;
857 int errorno; 909 int errorno;
… …
984 int memofs = 0; 1036 int memofs = 0;
985 int res = 0; 1037 int res = 0;
986 int errorno; 1038 int errorno;
987 1039
988 LOCK (wrklock); 1040 LOCK (wrklock);
989 self->dirp = dirp = opendir (req->dataptr); 1041 self->dirp = dirp = opendir (req->ptr1);
990 self->dbuf = u = malloc (sizeof (*u)); 1042 self->dbuf = u = malloc (sizeof (*u));
1043 req->flags |= FLAG_PTR2_FREE;
991 req->data2ptr = names = malloc (memlen); 1044 req->ptr2 = names = malloc (memlen);
992 UNLOCK (wrklock); 1045 UNLOCK (wrklock);
993 1046
994 if (dirp && u && names) 1047 if (dirp && u && names)
995 for (;;) 1048 for (;;)
996 { 1049 {
… …
1010 1063
1011 while (memofs + len > memlen) 1064 while (memofs + len > memlen)
1012 { 1065 {
1013 memlen *= 2; 1066 memlen *= 2;
1014 LOCK (wrklock); 1067 LOCK (wrklock);
1015 req->data2ptr = names = realloc (names, memlen); 1068 req->ptr2 = names = realloc (names, memlen);
1016 UNLOCK (wrklock); 1069 UNLOCK (wrklock);
1017 1070
1018 if (!names) 1071 if (!names)
1019 break; 1072 break;
1020 } 1073 }
… …
1055 if (req) 1108 if (req)
1056 break; 1109 break;
1057 1110
1058 ++idle; 1111 ++idle;
1059 1112
1060 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1113 if (COND_TIMEDWAIT (reqwait, reqlock, ts)
1061 == ETIMEDOUT) 1114 == ETIMEDOUT)
1062 { 1115 {
1063 if (idle > max_idle) 1116 if (idle > max_idle)
1064 { 1117 {
1065 --idle; 1118 --idle;
… …
1069 UNLOCK (wrklock); 1122 UNLOCK (wrklock);
1070 goto quit; 1123 goto quit;
1071 } 1124 }
1072 1125
1073 /* we are allowed to idle, so do so without any timeout */ 1126 /* we are allowed to idle, so do so without any timeout */
1074 pthread_cond_wait (&reqwait, &reqlock); 1127 COND_WAIT (reqwait, reqlock);
1075 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1128 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1076 } 1129 }
1077 1130
1078 --idle; 1131 --idle;
1079 } 1132 }
… …
1085 errno = 0; /* strictly unnecessary */ 1138 errno = 0; /* strictly unnecessary */
1086 1139
1087 if (!(req->flags & FLAG_CANCELLED)) 1140 if (!(req->flags & FLAG_CANCELLED))
1088 switch (req->type) 1141 switch (req->type)
1089 { 1142 {
1090 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1143 case REQ_READ: req->result = req->offs >= 0
1091 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1144 ? pread (req->int1, req->ptr1, req->size, req->offs)
1145 : read (req->int1, req->ptr1, req->size); break;
1146 case REQ_WRITE: req->result = req->offs >= 0
1147 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1148 : write (req->int1, req->ptr1, req->size); break;
1092 1149
1093 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1150 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; 1151 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1095 1152
1096 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1153 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; 1154 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; 1155 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1099 1156
1157 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1158 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1159 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1160 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1161
1100 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1162 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1101 case REQ_CLOSE: req->result = close (req->fd); break; 1163 case REQ_CLOSE: req->result = close (req->int1); break;
1102 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1164 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1103 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1165 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1166 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1104 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1167 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1105 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1168 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1106 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1169 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; 1170 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1171 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1108 1172
1109 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1173 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1110 case REQ_FSYNC: req->result = fsync (req->fd); break; 1174 case REQ_FSYNC: req->result = fsync (req->int1); break;
1111 case REQ_READDIR: scandir_ (req, self); break; 1175 case REQ_READDIR: scandir_ (req, self); break;
1112 1176
1113 case REQ_BUSY: 1177 case REQ_BUSY:
1114 { 1178 {
1115 struct timeval tv; 1179 struct timeval tv;
1116 1180
1117 tv.tv_sec = req->fd; 1181 tv.tv_sec = req->nv1;
1118 tv.tv_usec = req->fd2; 1182 tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.;
1119 1183
1120 req->result = select (0, 0, 0, 0, &tv); 1184 req->result = select (0, 0, 0, 0, &tv);
1185 }
1186
1187 case REQ_UTIME:
1188 case REQ_FUTIME:
1189 {
1190 struct timeval tv[2];
1191 struct timeval *times;
1192
1193 if (req->nv1 != -1. || req->nv2 != -1.)
1194 {
1195 tv[0].tv_sec = req->nv1;
1196 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1197 tv[1].tv_sec = req->nv2;
1198 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1199
1200 times = tv;
1201 }
1202 else
1203 times = 0;
1204
1205
1206 req->result = req->type == REQ_FUTIME
1207 ? futimes (req->int1, times)
1208 : utimes (req->ptr1, times);
1121 } 1209 }
1122 1210
1123 case REQ_GROUP: 1211 case REQ_GROUP:
1124 case REQ_NOP: 1212 case REQ_NOP:
1125 break; 1213 break;
1126 1214
1127 case REQ_QUIT: 1215 case REQ_QUIT:
1128 goto quit; 1216 goto quit;
1129 1217
1130 default: 1218 default:
1131 req->result = ENOSYS; 1219 req->result = -1;
1132 break; 1220 break;
1133 } 1221 }
1134 1222
1135 req->errorno = errno; 1223 req->errorno = errno;
1136 1224
1137 LOCK (reslock); 1225 LOCK (reslock);
1138 1226
1139 ++npending; 1227 ++npending;
1140 1228
1141 if (!reqq_push (&res_queue, req)) 1229 if (!reqq_push (&res_queue, req))
1230 {
1142 /* write a dummy byte to the pipe so fh becomes ready */ 1231 /* write a dummy byte to the pipe so fh becomes ready */
1143 write (respipe [1], &respipe, 1); 1232 write (respipe [1], &respipe, 1);
1233
1234 /* optionally signal the main thread asynchronously */
1235 if (main_sig)
1236 pthread_kill (main_tid, main_sig);
1237 }
1144 1238
1145 self->req = 0; 1239 self->req = 0;
1146 worker_clear (self); 1240 worker_clear (self);
1147 1241
1148 UNLOCK (reslock); 1242 UNLOCK (reslock);
… …
1187static void atfork_child (void) 1281static void atfork_child (void)
1188{ 1282{
1189 aio_req prv; 1283 aio_req prv;
1190 1284
1191 while (prv = reqq_shift (&req_queue)) 1285 while (prv = reqq_shift (&req_queue))
1192 req_free (prv); 1286 req_destroy (prv);
1193 1287
1194 while (prv = reqq_shift (&res_queue)) 1288 while (prv = reqq_shift (&res_queue))
1195 req_free (prv); 1289 req_destroy (prv);
1196 1290
1197 while (wrk_first.next != &wrk_first) 1291 while (wrk_first.next != &wrk_first)
1198 { 1292 {
1199 worker *wrk = wrk_first.next; 1293 worker *wrk = wrk_first.next;
1200 1294
1201 if (wrk->req) 1295 if (wrk->req)
1202 req_free (wrk->req); 1296 req_destroy (wrk->req);
1203 1297
1204 worker_clear (wrk); 1298 worker_clear (wrk);
1205 worker_free (wrk); 1299 worker_free (wrk);
1206 } 1300 }
1207 1301
… …
1251 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1345 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1252 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1346 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1253 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1347 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1254 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1348 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1255 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1349 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1350 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1256 1351
1257 create_pipe (); 1352 create_pipe ();
1258 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1353 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1259} 1354}
1260 1355
1261void 1356void
1262max_poll_reqs (int nreqs) 1357max_poll_reqs (int nreqs)
1263 PROTOTYPE: $ 1358 PROTOTYPE: $
… …
1292 max_outstanding = maxreqs; 1387 max_outstanding = maxreqs;
1293 OUTPUT: 1388 OUTPUT:
1294 RETVAL 1389 RETVAL
1295 1390
1296void 1391void
1297aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1392aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1298 SV * pathname
1299 int flags
1300 int mode
1301 SV * callback
1302 PROTOTYPE: $$$;$ 1393 PROTOTYPE: $$$;$
1303 PPCODE: 1394 PPCODE:
1304{ 1395{
1305 dREQ; 1396 dREQ;
1306 1397
1307 req->type = REQ_OPEN; 1398 req->type = REQ_OPEN;
1308 req->data = newSVsv (pathname); 1399 req->sv1 = newSVsv (pathname);
1309 req->dataptr = SvPVbyte_nolen (req->data); 1400 req->ptr1 = SvPVbyte_nolen (req->sv1);
1310 req->fd = flags; 1401 req->int1 = flags;
1311 req->mode = mode; 1402 req->mode = mode;
1312 1403
1313 REQ_SEND; 1404 REQ_SEND;
1314} 1405}
1315 1406
1316void 1407void
1317aio_close (fh,callback=&PL_sv_undef) 1408aio_close (SV *fh, SV *callback=&PL_sv_undef)
1318 SV * fh
1319 SV * callback
1320 PROTOTYPE: $;$ 1409 PROTOTYPE: $;$
1321 ALIAS: 1410 ALIAS:
1322 aio_close = REQ_CLOSE 1411 aio_close = REQ_CLOSE
1323 aio_fsync = REQ_FSYNC 1412 aio_fsync = REQ_FSYNC
1324 aio_fdatasync = REQ_FDATASYNC 1413 aio_fdatasync = REQ_FDATASYNC
1325 PPCODE: 1414 PPCODE:
1326{ 1415{
1327 dREQ; 1416 dREQ;
1328 1417
1329 req->type = ix; 1418 req->type = ix;
1330 req->fh = newSVsv (fh); 1419 req->sv1 = newSVsv (fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1420 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1332 1421
1333 REQ_SEND (req); 1422 REQ_SEND (req);
1334} 1423}
1335 1424
1336void 1425void
1337aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1426aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1338 SV * fh
1339 UV offset
1340 UV length
1341 SV * data
1342 UV dataoffset
1343 SV * callback
1344 ALIAS: 1427 ALIAS:
1345 aio_read = REQ_READ 1428 aio_read = REQ_READ
1346 aio_write = REQ_WRITE 1429 aio_write = REQ_WRITE
1347 PROTOTYPE: $$$$$;$ 1430 PROTOTYPE: $$$$$;$
1348 PPCODE: 1431 PPCODE:
1349{ 1432{
1350 aio_req req;
1351 STRLEN svlen; 1433 STRLEN svlen;
1352 char *svptr = SvPVbyte (data, svlen); 1434 char *svptr = SvPVbyte (data, svlen);
1435 UV len = SvUV (length);
1353 1436
1354 SvUPGRADE (data, SVt_PV); 1437 SvUPGRADE (data, SVt_PV);
1355 SvPOK_on (data); 1438 SvPOK_on (data);
1356 1439
1357 if (dataoffset < 0) 1440 if (dataoffset < 0)
1358 dataoffset += svlen; 1441 dataoffset += svlen;
1359 1442
1360 if (dataoffset < 0 || dataoffset > svlen) 1443 if (dataoffset < 0 || dataoffset > svlen)
1361 croak ("data offset outside of string"); 1444 croak ("dataoffset outside of data scalar");
1362 1445
1363 if (ix == REQ_WRITE) 1446 if (ix == REQ_WRITE)
1364 { 1447 {
1365 /* write: check length and adjust. */ 1448 /* write: check length and adjust. */
1366 if (length < 0 || length + dataoffset > svlen) 1449 if (!SvOK (length) || len + dataoffset > svlen)
1367 length = svlen - dataoffset; 1450 len = svlen - dataoffset;
1368 } 1451 }
1369 else 1452 else
1370 { 1453 {
1371 /* read: grow scalar as necessary */ 1454 /* read: grow scalar as necessary */
1372 svptr = SvGROW (data, length + dataoffset); 1455 svptr = SvGROW (data, len + dataoffset + 1);
1373 } 1456 }
1374 1457
1375 if (length < 0) 1458 if (len < 0)
1376 croak ("length must not be negative"); 1459 croak ("length must not be negative");
1377 1460
1378 { 1461 {
1379 dREQ; 1462 dREQ;
1380 1463
1381 req->type = ix; 1464 req->type = ix;
1382 req->fh = newSVsv (fh); 1465 req->sv1 = newSVsv (fh);
1383 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1466 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1384 : IoOFP (sv_2io (fh))); 1467 : IoOFP (sv_2io (fh)));
1468 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1385 req->offset = offset; 1469 req->size = len;
1386 req->length = length;
1387 req->data = SvREFCNT_inc (data); 1470 req->sv2 = SvREFCNT_inc (data);
1388 req->dataptr = (char *)svptr + dataoffset; 1471 req->ptr1 = (char *)svptr + dataoffset;
1472 req->stroffset = dataoffset;
1389 1473
1390 if (!SvREADONLY (data)) 1474 if (!SvREADONLY (data))
1391 { 1475 {
1392 SvREADONLY_on (data); 1476 SvREADONLY_on (data);
1393 req->data2ptr = (void *)data; 1477 req->flags |= FLAG_SV2_RO_OFF;
1394 } 1478 }
1395 1479
1396 REQ_SEND; 1480 REQ_SEND;
1397 } 1481 }
1398} 1482}
1399 1483
1400void 1484void
1485aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1486 PROTOTYPE: $$;$
1487 PPCODE:
1488{
1489 SV *data;
1490 dREQ;
1491
1492 data = newSV (NAME_MAX);
1493 SvPOK_on (data);
1494
1495 req->type = REQ_READLINK;
1496 req->sv1 = newSVsv (path);
1497 req->ptr2 = SvPVbyte_nolen (req->sv1);
1498 req->sv2 = data;
1499 req->ptr1 = SvPVbyte_nolen (data);
1500
1501 REQ_SEND;
1502}
1503
1504void
1401aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1505aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1402 SV * out_fh
1403 SV * in_fh
1404 UV in_offset
1405 UV length
1406 SV * callback
1407 PROTOTYPE: $$$$;$ 1506 PROTOTYPE: $$$$;$
1408 PPCODE: 1507 PPCODE:
1409{ 1508{
1410 dREQ; 1509 dREQ;
1411 1510
1412 req->type = REQ_SENDFILE; 1511 req->type = REQ_SENDFILE;
1413 req->fh = newSVsv (out_fh); 1512 req->sv1 = newSVsv (out_fh);
1414 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1415 req->fh2 = newSVsv (in_fh); 1514 req->sv2 = newSVsv (in_fh);
1416 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1515 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1417 req->offset = in_offset; 1516 req->offs = SvVAL64 (in_offset);
1418 req->length = length; 1517 req->size = length;
1419 1518
1420 REQ_SEND; 1519 REQ_SEND;
1421} 1520}
1422 1521
1423void 1522void
1424aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1523aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1425 SV * fh
1426 UV offset
1427 IV length
1428 SV * callback
1429 PROTOTYPE: $$$;$ 1524 PROTOTYPE: $$$;$
1430 PPCODE: 1525 PPCODE:
1431{ 1526{
1432 dREQ; 1527 dREQ;
1433 1528
1434 req->type = REQ_READAHEAD; 1529 req->type = REQ_READAHEAD;
1435 req->fh = newSVsv (fh); 1530 req->sv1 = newSVsv (fh);
1436 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1531 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1437 req->offset = offset; 1532 req->offs = SvVAL64 (offset);
1438 req->length = length; 1533 req->size = length;
1439 1534
1440 REQ_SEND; 1535 REQ_SEND;
1441} 1536}
1442 1537
1443void 1538void
1444aio_stat (fh_or_path,callback=&PL_sv_undef) 1539aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1445 SV * fh_or_path
1446 SV * callback
1447 ALIAS: 1540 ALIAS:
1448 aio_stat = REQ_STAT 1541 aio_stat = REQ_STAT
1449 aio_lstat = REQ_LSTAT 1542 aio_lstat = REQ_LSTAT
1450 PPCODE: 1543 PPCODE:
1451{ 1544{
1452 dREQ; 1545 dREQ;
1453 1546
1454 New (0, req->statdata, 1, Stat_t); 1547 req->ptr2 = malloc (sizeof (Stat_t));
1455 if (!req->statdata) 1548 if (!req->ptr2)
1456 { 1549 {
1457 req_free (req); 1550 req_destroy (req);
1458 croak ("out of memory during aio_req->statdata allocation"); 1551 croak ("out of memory during aio_stat statdata allocation");
1459 } 1552 }
1553
1554 req->flags |= FLAG_PTR2_FREE;
1555 req->sv1 = newSVsv (fh_or_path);
1460 1556
1461 if (SvPOK (fh_or_path)) 1557 if (SvPOK (fh_or_path))
1462 { 1558 {
1463 req->type = ix; 1559 req->type = ix;
1464 req->data = newSVsv (fh_or_path);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1560 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 } 1561 }
1467 else 1562 else
1468 { 1563 {
1469 req->type = REQ_FSTAT; 1564 req->type = REQ_FSTAT;
1470 req->fh = newSVsv (fh_or_path);
1471 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1472 } 1566 }
1473 1567
1474 REQ_SEND; 1568 REQ_SEND;
1475} 1569}
1476 1570
1477void 1571void
1572aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1573 PPCODE:
1574{
1575 dREQ;
1576
1577 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1578 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1579 req->sv1 = newSVsv (fh_or_path);
1580
1581 if (SvPOK (fh_or_path))
1582 {
1583 req->type = REQ_UTIME;
1584 req->ptr1 = SvPVbyte_nolen (req->sv1);
1585 }
1586 else
1587 {
1588 req->type = REQ_FUTIME;
1589 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1590 }
1591
1592 REQ_SEND;
1593}
1594
1595void
1596aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1597 PPCODE:
1598{
1599 dREQ;
1600
1601 req->mode = mode;
1602 req->sv1 = newSVsv (fh_or_path);
1603
1604 if (SvPOK (fh_or_path))
1605 {
1606 req->type = REQ_CHMOD;
1607 req->ptr1 = SvPVbyte_nolen (req->sv1);
1608 }
1609 else
1610 {
1611 req->type = REQ_FCHMOD;
1612 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1613 }
1614
1615 REQ_SEND;
1616}
1617
1618void
1619aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1620 PPCODE:
1621{
1622 dREQ;
1623
1624 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1625 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1626 req->sv1 = newSVsv (fh_or_path);
1627
1628 if (SvPOK (fh_or_path))
1629 {
1630 req->type = REQ_CHOWN;
1631 req->ptr1 = SvPVbyte_nolen (req->sv1);
1632 }
1633 else
1634 {
1635 req->type = REQ_FCHOWN;
1636 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1637 }
1638
1639 REQ_SEND;
1640}
1641
1642void
1478aio_unlink (pathname,callback=&PL_sv_undef) 1643aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1479 SV * pathname
1480 SV * callback
1481 ALIAS: 1644 ALIAS:
1482 aio_unlink = REQ_UNLINK 1645 aio_unlink = REQ_UNLINK
1483 aio_rmdir = REQ_RMDIR 1646 aio_rmdir = REQ_RMDIR
1484 aio_readdir = REQ_READDIR 1647 aio_readdir = REQ_READDIR
1485 PPCODE: 1648 PPCODE:
1486{ 1649{
1487 dREQ; 1650 dREQ;
1488 1651
1489 req->type = ix; 1652 req->type = ix;
1490 req->data = newSVsv (pathname); 1653 req->sv1 = newSVsv (pathname);
1491 req->dataptr = SvPVbyte_nolen (req->data); 1654 req->ptr1 = SvPVbyte_nolen (req->sv1);
1655
1656 REQ_SEND;
1657}
1658
1659void
1660aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1661 PPCODE:
1662{
1663 dREQ;
1492 1664
1665 req->type = REQ_MKDIR;
1666 req->sv1 = newSVsv (pathname);
1667 req->ptr1 = SvPVbyte_nolen (req->sv1);
1668 req->mode = mode;
1669
1493 REQ_SEND; 1670 REQ_SEND;
1494} 1671}
1495 1672
1496void 1673void
1497aio_link (oldpath,newpath,callback=&PL_sv_undef) 1674aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1498 SV * oldpath
1499 SV * newpath
1500 SV * callback
1501 ALIAS: 1675 ALIAS:
1502 aio_link = REQ_LINK 1676 aio_link = REQ_LINK
1503 aio_symlink = REQ_SYMLINK 1677 aio_symlink = REQ_SYMLINK
1504 aio_rename = REQ_RENAME 1678 aio_rename = REQ_RENAME
1505 PPCODE: 1679 PPCODE:
1506{ 1680{
1507 dREQ; 1681 dREQ;
1508 1682
1509 req->type = ix; 1683 req->type = ix;
1510 req->fh = newSVsv (oldpath); 1684 req->sv2 = newSVsv (oldpath);
1511 req->data2ptr = SvPVbyte_nolen (req->fh); 1685 req->ptr2 = SvPVbyte_nolen (req->sv2);
1512 req->data = newSVsv (newpath); 1686 req->sv1 = newSVsv (newpath);
1513 req->dataptr = SvPVbyte_nolen (req->data); 1687 req->ptr1 = SvPVbyte_nolen (req->sv1);
1514 1688
1515 REQ_SEND; 1689 REQ_SEND;
1516} 1690}
1517 1691
1518void 1692void
1519aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1693aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1520 SV * pathname
1521 SV * callback
1522 UV mode
1523 UV dev
1524 PPCODE: 1694 PPCODE:
1525{ 1695{
1526 dREQ; 1696 dREQ;
1527 1697
1528 req->type = REQ_MKNOD; 1698 req->type = REQ_MKNOD;
1529 req->data = newSVsv (pathname); 1699 req->sv1 = newSVsv (pathname);
1530 req->dataptr = SvPVbyte_nolen (req->data); 1700 req->ptr1 = SvPVbyte_nolen (req->sv1);
1531 req->mode = (mode_t)mode; 1701 req->mode = (mode_t)mode;
1532 req->offset = dev; 1702 req->offs = dev;
1533 1703
1534 REQ_SEND; 1704 REQ_SEND;
1535} 1705}
1536 1706
1537void 1707void
1538aio_busy (delay,callback=&PL_sv_undef) 1708aio_busy (double delay, SV *callback=&PL_sv_undef)
1539 double delay
1540 SV * callback
1541 PPCODE: 1709 PPCODE:
1542{ 1710{
1543 dREQ; 1711 dREQ;
1544 1712
1545 req->type = REQ_BUSY; 1713 req->type = REQ_BUSY;
1546 req->fd = delay < 0. ? 0 : delay; 1714 req->nv1 = delay < 0. ? 0. : delay;
1547 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1548 1715
1549 REQ_SEND; 1716 REQ_SEND;
1550} 1717}
1551 1718
1552void 1719void
1553aio_group (callback=&PL_sv_undef) 1720aio_group (SV *callback=&PL_sv_undef)
1554 SV * callback
1555 PROTOTYPE: ;$ 1721 PROTOTYPE: ;$
1556 PPCODE: 1722 PPCODE:
1557{ 1723{
1558 dREQ; 1724 dREQ;
1559 1725
1560 req->type = REQ_GROUP; 1726 req->type = REQ_GROUP;
1727
1561 req_send (req); 1728 req_send (req);
1562
1563 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1729 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1564} 1730}
1565 1731
1566void 1732void
1567aio_nop (callback=&PL_sv_undef) 1733aio_nop (SV *callback=&PL_sv_undef)
1568 SV * callback
1569 PPCODE: 1734 PPCODE:
1570{ 1735{
1571 dREQ; 1736 dREQ;
1572 1737
1573 req->type = REQ_NOP; 1738 req->type = REQ_NOP;
… …
1602 PROTOTYPE: 1767 PROTOTYPE:
1603 CODE: 1768 CODE:
1604 while (nreqs) 1769 while (nreqs)
1605 { 1770 {
1606 poll_wait (); 1771 poll_wait ();
1607 poll_cb (0); 1772 poll_cb ();
1608 } 1773 }
1609 1774
1610void 1775int
1611poll() 1776poll()
1612 PROTOTYPE: 1777 PROTOTYPE:
1613 CODE: 1778 CODE:
1614 if (nreqs)
1615 {
1616 poll_wait (); 1779 poll_wait ();
1617 poll_cb (0); 1780 RETVAL = poll_cb ();
1618 } 1781 OUTPUT:
1782 RETVAL
1619 1783
1620int 1784int
1621poll_fileno() 1785poll_fileno()
1622 PROTOTYPE: 1786 PROTOTYPE:
1623 CODE: 1787 CODE:
… …
1635 1799
1636void 1800void
1637poll_wait() 1801poll_wait()
1638 PROTOTYPE: 1802 PROTOTYPE:
1639 CODE: 1803 CODE:
1640 if (nreqs)
1641 poll_wait (); 1804 poll_wait ();
1805
1806void
1807setsig (int signum = SIGIO)
1808 PROTOTYPE: ;$
1809 CODE:
1810{
1811 if (block_sig_level)
1812 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1813
1814 LOCK (reslock);
1815 main_tid = pthread_self ();
1816 main_sig = signum;
1817 UNLOCK (reslock);
1818
1819 if (main_sig && npending)
1820 pthread_kill (main_tid, main_sig);
1821}
1822
1823void
1824aio_block (SV *cb)
1825 PROTOTYPE: &
1826 PPCODE:
1827{
1828 int count;
1829
1830 block_sig ();
1831 PUSHMARK (SP);
1832 PUTBACK;
1833 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1834 SPAGAIN;
1835 unblock_sig ();
1836
1837 if (SvTRUE (ERRSV))
1838 croak (0);
1839
1840 XSRETURN (count);
1841}
1642 1842
1643int 1843int
1644nreqs() 1844nreqs()
1645 PROTOTYPE: 1845 PROTOTYPE:
1646 CODE: 1846 CODE:
… …
1696 PPCODE: 1896 PPCODE:
1697{ 1897{
1698 int i; 1898 int i;
1699 aio_req req; 1899 aio_req req;
1700 1900
1901 if (main_sig && !block_sig_level)
1902 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1903
1701 if (grp->fd == 2) 1904 if (grp->int1 == 2)
1702 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1905 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1703 1906
1704 for (i = 1; i < items; ++i ) 1907 for (i = 1; i < items; ++i )
1705 { 1908 {
1706 if (GIMME_V != G_VOID) 1909 if (GIMME_V != G_VOID)
… …
1708 1911
1709 req = SvAIO_REQ (ST (i)); 1912 req = SvAIO_REQ (ST (i));
1710 1913
1711 if (req) 1914 if (req)
1712 { 1915 {
1713 ++grp->length; 1916 ++grp->size;
1714 req->grp = grp; 1917 req->grp = grp;
1715 1918
1716 req->grp_prev = 0; 1919 req->grp_prev = 0;
1717 req->grp_next = grp->grp_first; 1920 req->grp_next = grp->grp_first;
1718 1921
… …
1741 av = newAV (); 1944 av = newAV ();
1742 1945
1743 for (i = 1; i < items; ++i ) 1946 for (i = 1; i < items; ++i )
1744 av_push (av, newSVsv (ST (i))); 1947 av_push (av, newSVsv (ST (i)));
1745 1948
1746 SvREFCNT_dec (grp->data); 1949 SvREFCNT_dec (grp->sv1);
1747 grp->data = (SV *)av; 1950 grp->sv1 = (SV *)av;
1748} 1951}
1749 1952
1750void 1953void
1751errno (aio_req grp, int errorno = errno) 1954errno (aio_req grp, int errorno = errno)
1752 CODE: 1955 CODE:
1753 grp->errorno = errorno; 1956 grp->errorno = errorno;
1754 1957
1755void 1958void
1756limit (aio_req grp, int limit) 1959limit (aio_req grp, int limit)
1757 CODE: 1960 CODE:
1758 grp->fd2 = limit; 1961 grp->int2 = limit;
1759 aio_grp_feed (grp); 1962 aio_grp_feed (grp);
1760 1963
1761void 1964void
1762feed (aio_req grp, SV *callback=&PL_sv_undef) 1965feed (aio_req grp, SV *callback=&PL_sv_undef)
1763 CODE: 1966 CODE:
1764{ 1967{
1765 SvREFCNT_dec (grp->fh2); 1968 SvREFCNT_dec (grp->sv2);
1766 grp->fh2 = newSVsv (callback); 1969 grp->sv2 = newSVsv (callback);
1767 1970
1768 if (grp->fd2 <= 0) 1971 if (grp->int2 <= 0)
1769 grp->fd2 = 2; 1972 grp->int2 = 2;
1770 1973
1771 aio_grp_feed (grp); 1974 aio_grp_feed (grp);
1772} 1975}
1773 1976

Diff Legend

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