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

Diff Legend

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