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.98 by root, Wed May 9 06:45:12 2007 UTC vs.
Revision 1.107 by root, Wed Oct 3 21:27:51 2007 UTC

… …
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8 8
9#include "autoconf/config.h"
10
11#include <stddef.h> 9#include <stddef.h>
12#include <stdlib.h> 10#include <stdlib.h>
13#include <errno.h> 11#include <errno.h>
14#include <sys/time.h>
15#include <sys/select.h>
16#include <sys/types.h> 12#include <sys/types.h>
17#include <sys/stat.h> 13#include <sys/stat.h>
18#include <limits.h> 14#include <limits.h>
19#include <unistd.h>
20#include <fcntl.h> 15#include <fcntl.h>
21#include <signal.h>
22#include <sched.h> 16#include <sched.h>
17
18#ifdef _WIN32
19
20# define SIGIO 0
21 typedef Direntry_t X_DIRENT;
22#undef malloc
23#undef free
24
25// perl overrides all those nice win32 functions
26# undef open
27# undef read
28# undef write
29# undef send
30# undef recv
31# undef stat
32# undef fstat
33# define lstat stat
34# undef truncate
35# undef ftruncate
36# undef open
37# undef close
38# undef unlink
39# undef rmdir
40# undef rename
41# undef lseek
42
43# define chown(a,b,c) (errno = ENOSYS, -1)
44# define fchown(a,b,c) (errno = ENOSYS, -1)
45# define fchmod(a,b) (errno = ENOSYS, -1)
46# define symlink(a,b) (errno = ENOSYS, -1)
47# define readlink(a,b,c) (errno = ENOSYS, -1)
48# define mknod(a,b,c) (errno = ENOSYS, -1)
49# define truncate(a,b) (errno = ENOSYS, -1)
50# define ftruncate(fd,o) chsize ((fd), (o))
51# define fsync(fd) _commit (fd)
52# define opendir(fd) (errno = ENOSYS, 0)
53# define readdir(fd) (errno = ENOSYS, -1)
54# define closedir(fd) (errno = ENOSYS, -1)
55# define mkdir(a,b) mkdir (a)
56
57#else
58
59# include "autoconf/config.h"
60# include <sys/time.h>
61# include <sys/select.h>
62# include <unistd.h>
63# include <utime.h>
64# include <signal.h>
65 typedef struct dirent X_DIRENT;
66
67#endif
23 68
24#if HAVE_SENDFILE 69#if HAVE_SENDFILE
25# if __linux 70# if __linux
26# include <sys/sendfile.h> 71# include <sys/sendfile.h>
27# elif __freebsd 72# elif __freebsd
… …
45#endif 90#endif
46 91
47/* buffer size for various temporary buffers */ 92/* buffer size for various temporary buffers */
48#define AIO_BUFSIZE 65536 93#define AIO_BUFSIZE 65536
49 94
95/* use NV for 32 bit perls as it allows larger offsets */
96#if IVSIZE >= 8
97# define SvVAL64 SvIV
98#else
99# define SvVAL64 SvNV
100#endif
101
102static HV *stash;
103
50#define dBUF \ 104#define dBUF \
51 char *aio_buf; \ 105 char *aio_buf; \
52 LOCK (wrklock); \ 106 X_LOCK (wrklock); \
53 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 107 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
54 UNLOCK (wrklock); \ 108 X_UNLOCK (wrklock); \
55 if (!aio_buf) \ 109 if (!aio_buf) \
56 return -1; 110 return -1;
57 111
58typedef SV SV8; /* byte-sv, used for argument-checking */ 112typedef SV SV8; /* byte-sv, used for argument-checking */
59 113
60enum { 114enum {
61 REQ_QUIT, 115 REQ_QUIT,
62 REQ_OPEN, REQ_CLOSE, 116 REQ_OPEN, REQ_CLOSE,
63 REQ_READ, REQ_WRITE, REQ_READAHEAD, 117 REQ_READ, REQ_WRITE,
64 REQ_SENDFILE, 118 REQ_READAHEAD, REQ_SENDFILE,
65 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 119 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
120 REQ_TRUNCATE, REQ_FTRUNCATE,
121 REQ_UTIME, REQ_FUTIME,
122 REQ_CHMOD, REQ_FCHMOD,
123 REQ_CHOWN, REQ_FCHOWN,
66 REQ_FSYNC, REQ_FDATASYNC, 124 REQ_FSYNC, REQ_FDATASYNC,
67 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME, 125 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
68 REQ_MKNOD, REQ_READDIR, 126 REQ_MKNOD, REQ_READDIR,
69 REQ_LINK, REQ_SYMLINK, REQ_READLINK, 127 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
70 REQ_GROUP, REQ_NOP, 128 REQ_GROUP, REQ_NOP,
… …
76 134
77typedef struct aio_cb 135typedef struct aio_cb
78{ 136{
79 struct aio_cb *volatile next; 137 struct aio_cb *volatile next;
80 138
81 SV *callback, *fh; 139 SV *callback;
82 SV *sv1, *sv2; 140 SV *sv1, *sv2;
83 void *ptr1, *ptr2; 141 void *ptr1, *ptr2;
84 off_t offs; 142 off_t offs;
85 size_t size; 143 size_t size;
86 ssize_t result; 144 ssize_t result;
145 double nv1, nv2;
87 146
88 STRLEN stroffset; 147 STRLEN stroffset;
89 int type; 148 int type;
90 int int1, int2; 149 int int1, int2, int3;
91 int errorno; 150 int errorno;
92 mode_t mode; /* open */ 151 mode_t mode; /* open */
93 152
94 unsigned char flags; 153 unsigned char flags;
95 unsigned char pri; 154 unsigned char pri;
… …
98 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 157 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
99} aio_cb; 158} aio_cb;
100 159
101enum { 160enum {
102 FLAG_CANCELLED = 0x01, /* request was cancelled */ 161 FLAG_CANCELLED = 0x01, /* request was cancelled */
103 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ 162 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
104 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ 163 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
105}; 164};
106 165
107typedef aio_cb *aio_req; 166typedef aio_cb *aio_req;
108typedef aio_cb *aio_req_ornot; 167typedef aio_cb *aio_req_ornot;
… …
165static int next_pri = DEFAULT_PRI + PRI_BIAS; 224static int next_pri = DEFAULT_PRI + PRI_BIAS;
166 225
167static unsigned int started, idle, wanted; 226static unsigned int started, idle, wanted;
168 227
169/* worker threads management */ 228/* worker threads management */
170static mutex_t wrklock = MUTEX_INIT; 229static mutex_t wrklock = X_MUTEX_INIT;
171 230
172typedef struct worker { 231typedef struct worker {
173 /* locked by wrklock */ 232 /* locked by wrklock */
174 struct worker *prev, *next; 233 struct worker *prev, *next;
175 234
… …
207} 266}
208 267
209static volatile unsigned int nreqs, nready, npending; 268static volatile unsigned int nreqs, nready, npending;
210static volatile unsigned int max_idle = 4; 269static volatile unsigned int max_idle = 4;
211static volatile unsigned int max_outstanding = 0xffffffff; 270static volatile unsigned int max_outstanding = 0xffffffff;
212static int respipe [2]; 271static int respipe_osf [2], respipe [2] = { -1, -1 };
213 272
214static mutex_t reslock = MUTEX_INIT; 273static mutex_t reslock = X_MUTEX_INIT;
215static mutex_t reqlock = MUTEX_INIT; 274static mutex_t reqlock = X_MUTEX_INIT;
216static cond_t reqwait = COND_INIT; 275static cond_t reqwait = X_COND_INIT;
217 276
218#if WORDACCESS_UNSAFE 277#if WORDACCESS_UNSAFE
219 278
220static unsigned int get_nready () 279static unsigned int get_nready ()
221{ 280{
222 unsigned int retval; 281 unsigned int retval;
223 282
224 LOCK (reqlock); 283 X_LOCK (reqlock);
225 retval = nready; 284 retval = nready;
226 UNLOCK (reqlock); 285 X_UNLOCK (reqlock);
227 286
228 return retval; 287 return retval;
229} 288}
230 289
231static unsigned int get_npending () 290static unsigned int get_npending ()
232{ 291{
233 unsigned int retval; 292 unsigned int retval;
234 293
235 LOCK (reslock); 294 X_LOCK (reslock);
236 retval = npending; 295 retval = npending;
237 UNLOCK (reslock); 296 X_UNLOCK (reslock);
238 297
239 return retval; 298 return retval;
240} 299}
241 300
242static unsigned int get_nthreads () 301static unsigned int get_nthreads ()
243{ 302{
244 unsigned int retval; 303 unsigned int retval;
245 304
246 LOCK (wrklock); 305 X_LOCK (wrklock);
247 retval = started; 306 retval = started;
248 UNLOCK (wrklock); 307 X_UNLOCK (wrklock);
249 308
250 return retval; 309 return retval;
251} 310}
252 311
253#else 312#else
… …
312 abort (); 371 abort ();
313} 372}
314 373
315static int poll_cb (); 374static int poll_cb ();
316static int req_invoke (aio_req req); 375static int req_invoke (aio_req req);
317static void req_free (aio_req req); 376static void req_destroy (aio_req req);
318static void req_cancel (aio_req req); 377static void req_cancel (aio_req req);
319 378
320/* must be called at most once */ 379/* must be called at most once */
321static SV *req_sv (aio_req req, const char *klass) 380static SV *req_sv (aio_req req, const char *klass)
322{ 381{
… …
388 { 447 {
389 block_sig (); 448 block_sig ();
390 449
391 if (!req_invoke (grp)) 450 if (!req_invoke (grp))
392 { 451 {
393 req_free (grp); 452 req_destroy (grp);
394 unblock_sig (); 453 unblock_sig ();
395 croak (0); 454 croak (0);
396 } 455 }
397 456
398 req_free (grp); 457 req_destroy (grp);
399 unblock_sig (); 458 unblock_sig ();
400 } 459 }
401} 460}
402 461
403static int req_invoke (aio_req req) 462static int req_invoke (aio_req req)
404{ 463{
405 dSP; 464 dSP;
406 465
407 if (req->flags & FLAG_SV1_RO_OFF) 466 if (req->flags & FLAG_SV2_RO_OFF)
408 SvREADONLY_off (req->sv1); 467 SvREADONLY_off (req->sv2);
409 468
410 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 469 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
411 { 470 {
412 ENTER; 471 ENTER;
413 SAVETMPS; 472 SAVETMPS;
… …
444 break; 503 break;
445 504
446 case REQ_OPEN: 505 case REQ_OPEN:
447 { 506 {
448 /* convert fd to fh */ 507 /* convert fd to fh */
449 SV *fh; 508 SV *fh = &PL_sv_undef;
450 509
451 PUSHs (sv_2mortal (newSViv (req->result))); 510 if (req->result >= 0)
452 PUTBACK; 511 {
453 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 512 GV *gv = (GV *)sv_newmortal ();
454 SPAGAIN; 513 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
514 char sym [64];
515 int symlen;
516
517 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);
518 gv_init (gv, stash, sym, symlen, 0);
455 519
520 symlen = snprintf (
521 sym,
522 sizeof (sym),
523 "%s&=%d",
524 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
525 req->result
526 );
527
528 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
456 fh = POPs; 529 fh = gv;
457 PUSHMARK (SP); 530 }
531
458 XPUSHs (fh); 532 XPUSHs (fh);
459 } 533 }
460 break; 534 break;
461 535
462 case REQ_GROUP: 536 case REQ_GROUP:
… …
478 break; 552 break;
479 553
480 case REQ_READLINK: 554 case REQ_READLINK:
481 if (req->result > 0) 555 if (req->result > 0)
482 { 556 {
483 SvCUR_set (req->sv1, req->result); 557 SvCUR_set (req->sv2, req->result);
484 *SvEND (req->sv1) = 0; 558 *SvEND (req->sv2) = 0;
485 PUSHs (req->sv1); 559 PUSHs (req->sv2);
486 } 560 }
487 break; 561 break;
488 562
489 case REQ_STAT: 563 case REQ_STAT:
490 case REQ_LSTAT: 564 case REQ_LSTAT:
… …
494 PL_statcache = *(Stat_t *)(req->ptr2); 568 PL_statcache = *(Stat_t *)(req->ptr2);
495 PUSHs (sv_2mortal (newSViv (req->result))); 569 PUSHs (sv_2mortal (newSViv (req->result)));
496 break; 570 break;
497 571
498 case REQ_READ: 572 case REQ_READ:
499 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); 573 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
500 *SvEND (req->sv1) = 0; 574 *SvEND (req->sv2) = 0;
501 PUSHs (sv_2mortal (newSViv (req->result))); 575 PUSHs (sv_2mortal (newSViv (req->result)));
502 break; 576 break;
503 577
504 default: 578 default:
505 PUSHs (sv_2mortal (newSViv (req->result))); 579 PUSHs (sv_2mortal (newSViv (req->result)));
… …
531 } 605 }
532 606
533 return !SvTRUE (ERRSV); 607 return !SvTRUE (ERRSV);
534} 608}
535 609
536static void req_free (aio_req req) 610static void req_destroy (aio_req req)
537{ 611{
538 if (req->self) 612 if (req->self)
539 { 613 {
540 sv_unmagic (req->self, PERL_MAGIC_ext); 614 sv_unmagic (req->self, PERL_MAGIC_ext);
541 SvREFCNT_dec (req->self); 615 SvREFCNT_dec (req->self);
542 } 616 }
543 617
544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1); 618 SvREFCNT_dec (req->sv1);
546 SvREFCNT_dec (req->sv2); 619 SvREFCNT_dec (req->sv2);
547 SvREFCNT_dec (req->callback); 620 SvREFCNT_dec (req->callback);
548 621
549 if (req->flags & FLAG_PTR2_FREE) 622 if (req->flags & FLAG_PTR2_FREE)
… …
571 req->flags |= FLAG_CANCELLED; 644 req->flags |= FLAG_CANCELLED;
572 645
573 req_cancel_subs (req); 646 req_cancel_subs (req);
574} 647}
575 648
576static void *aio_proc(void *arg); 649#ifdef USE_SOCKETS_AS_HANDLES
650# define TO_SOCKET(x) (win32_get_osfhandle (x))
651#else
652# define TO_SOCKET(x) (x)
653#endif
654
655static void
656create_respipe ()
657{
658 int old_readfd = respipe [0];
659
660 if (respipe [1] >= 0)
661 respipe_close (TO_SOCKET (respipe [1]));
662
663#ifdef _WIN32
664 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
665#else
666 if (pipe (respipe))
667#endif
668 croak ("unable to initialize result pipe");
669
670 if (old_readfd >= 0)
671 {
672 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
673 croak ("unable to initialize result pipe(2)");
674
675 respipe_close (respipe [0]);
676 respipe [0] = old_readfd;
677 }
678
679#ifdef _WIN32
680 int arg = 1;
681 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
682 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
683#else
684 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
685 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
686#endif
687 croak ("unable to initialize result pipe(3)");
688
689 respipe_osf [0] = TO_SOCKET (respipe [0]);
690 respipe_osf [1] = TO_SOCKET (respipe [1]);
691}
692
693X_THREAD_PROC (aio_proc);
577 694
578static void start_thread (void) 695static void start_thread (void)
579{ 696{
580 worker *wrk = calloc (1, sizeof (worker)); 697 worker *wrk = calloc (1, sizeof (worker));
581 698
582 if (!wrk) 699 if (!wrk)
583 croak ("unable to allocate worker thread data"); 700 croak ("unable to allocate worker thread data");
584 701
585 LOCK (wrklock); 702 X_LOCK (wrklock);
586 703
587 if (thread_create (&wrk->tid, aio_proc, (void *)wrk)) 704 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
588 { 705 {
589 wrk->prev = &wrk_first; 706 wrk->prev = &wrk_first;
590 wrk->next = wrk_first.next; 707 wrk->next = wrk_first.next;
… …
593 ++started; 710 ++started;
594 } 711 }
595 else 712 else
596 free (wrk); 713 free (wrk);
597 714
598 UNLOCK (wrklock); 715 X_UNLOCK (wrklock);
599} 716}
600 717
601static void maybe_start_thread () 718static void maybe_start_thread ()
602{ 719{
603 if (get_nthreads () >= wanted) 720 if (get_nthreads () >= wanted)
… …
614{ 731{
615 block_sig (); 732 block_sig ();
616 733
617 ++nreqs; 734 ++nreqs;
618 735
619 LOCK (reqlock); 736 X_LOCK (reqlock);
620 ++nready; 737 ++nready;
621 reqq_push (&req_queue, req); 738 reqq_push (&req_queue, req);
622 COND_SIGNAL (reqwait); 739 X_COND_SIGNAL (reqwait);
623 UNLOCK (reqlock); 740 X_UNLOCK (reqlock);
624 741
625 unblock_sig (); 742 unblock_sig ();
626 743
627 maybe_start_thread (); 744 maybe_start_thread ();
628} 745}
… …
634 Newz (0, req, 1, aio_cb); 751 Newz (0, req, 1, aio_cb);
635 752
636 req->type = REQ_QUIT; 753 req->type = REQ_QUIT;
637 req->pri = PRI_MAX + PRI_BIAS; 754 req->pri = PRI_MAX + PRI_BIAS;
638 755
639 LOCK (reqlock); 756 X_LOCK (reqlock);
640 reqq_push (&req_queue, req); 757 reqq_push (&req_queue, req);
641 COND_SIGNAL (reqwait); 758 X_COND_SIGNAL (reqwait);
642 UNLOCK (reqlock); 759 X_UNLOCK (reqlock);
643 760
644 LOCK (wrklock); 761 X_LOCK (wrklock);
645 --started; 762 --started;
646 UNLOCK (wrklock); 763 X_UNLOCK (wrklock);
647} 764}
648 765
649static void set_max_idle (int nthreads) 766static void set_max_idle (int nthreads)
650{ 767{
651 if (WORDACCESS_UNSAFE) LOCK (reqlock); 768 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
652 max_idle = nthreads <= 0 ? 1 : nthreads; 769 max_idle = nthreads <= 0 ? 1 : nthreads;
653 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 770 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
654} 771}
655 772
656static void min_parallel (int nthreads) 773static void min_parallel (int nthreads)
657{ 774{
658 if (wanted < nthreads) 775 if (wanted < nthreads)
… …
673 fd_set rfd; 790 fd_set rfd;
674 791
675 while (nreqs) 792 while (nreqs)
676 { 793 {
677 int size; 794 int size;
678 if (WORDACCESS_UNSAFE) LOCK (reslock); 795 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
679 size = res_queue.size; 796 size = res_queue.size;
680 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 797 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
681 798
682 if (size) 799 if (size)
683 return; 800 return;
684 801
685 maybe_start_thread (); 802 maybe_start_thread ();
686 803
687 FD_ZERO(&rfd); 804 FD_ZERO (&rfd);
688 FD_SET(respipe [0], &rfd); 805 FD_SET (respipe [0], &rfd);
689 806
690 select (respipe [0] + 1, &rfd, 0, 0, 0); 807 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
691 } 808 }
692} 809}
693 810
694static int poll_cb () 811static int poll_cb ()
695{ 812{
… …
709 { 826 {
710 for (;;) 827 for (;;)
711 { 828 {
712 maybe_start_thread (); 829 maybe_start_thread ();
713 830
714 LOCK (reslock); 831 X_LOCK (reslock);
715 req = reqq_shift (&res_queue); 832 req = reqq_shift (&res_queue);
716 833
717 if (req) 834 if (req)
718 { 835 {
719 --npending; 836 --npending;
720 837
721 if (!res_queue.size) 838 if (!res_queue.size)
722 { 839 {
723 /* read any signals sent by the worker threads */ 840 /* read any signals sent by the worker threads */
724 char buf [4]; 841 char buf [4];
725 while (read (respipe [0], buf, 4) == 4) 842 while (respipe_read (respipe [0], buf, 4) == 4)
726 ; 843 ;
727 } 844 }
728 } 845 }
729 846
730 UNLOCK (reslock); 847 X_UNLOCK (reslock);
731 848
732 if (!req) 849 if (!req)
733 break; 850 break;
734 851
735 --nreqs; 852 --nreqs;
… …
741 } 858 }
742 else 859 else
743 { 860 {
744 if (!req_invoke (req)) 861 if (!req_invoke (req))
745 { 862 {
746 req_free (req); 863 req_destroy (req);
747 unblock_sig (); 864 unblock_sig ();
748 croak (0); 865 croak (0);
749 } 866 }
750 867
751 count++; 868 count++;
752 } 869 }
753 870
754 req_free (req); 871 req_destroy (req);
755 872
756 if (maxreqs && !--maxreqs) 873 if (maxreqs && !--maxreqs)
757 break; 874 break;
758 875
759 if (max_poll_time) 876 if (max_poll_time)
… …
773 ++maxreqs; 890 ++maxreqs;
774 } 891 }
775 892
776 unblock_sig (); 893 unblock_sig ();
777 return count; 894 return count;
778}
779
780static void create_pipe ()
781{
782 if (pipe (respipe))
783 croak ("unable to initialize result pipe");
784
785 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
786 croak ("cannot set result pipe to nonblocking mode");
787
788 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
789 croak ("cannot set result pipe to nonblocking mode");
790} 895}
791 896
792/*****************************************************************************/ 897/*****************************************************************************/
793/* work around various missing functions */ 898/* work around various missing functions */
794 899
… …
799/* 904/*
800 * make our pread/pwrite safe against themselves, but not against 905 * make our pread/pwrite safe against themselves, but not against
801 * normal read/write by using a mutex. slows down execution a lot, 906 * normal read/write by using a mutex. slows down execution a lot,
802 * but that's your problem, not mine. 907 * but that's your problem, not mine.
803 */ 908 */
804static mutex_t preadwritelock = MUTEX_INIT; 909static mutex_t preadwritelock = X_MUTEX_INIT;
805 910
806static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 911static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
807{ 912{
808 ssize_t res; 913 ssize_t res;
809 off_t ooffset; 914 off_t ooffset;
810 915
811 LOCK (preadwritelock); 916 X_LOCK (preadwritelock);
812 ooffset = lseek (fd, 0, SEEK_CUR); 917 ooffset = lseek (fd, 0, SEEK_CUR);
813 lseek (fd, offset, SEEK_SET); 918 lseek (fd, offset, SEEK_SET);
814 res = read (fd, buf, count); 919 res = read (fd, buf, count);
815 lseek (fd, ooffset, SEEK_SET); 920 lseek (fd, ooffset, SEEK_SET);
816 UNLOCK (preadwritelock); 921 X_UNLOCK (preadwritelock);
817 922
818 return res; 923 return res;
819} 924}
820 925
821static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 926static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
822{ 927{
823 ssize_t res; 928 ssize_t res;
824 off_t ooffset; 929 off_t ooffset;
825 930
826 LOCK (preadwritelock); 931 X_LOCK (preadwritelock);
827 ooffset = lseek (fd, 0, SEEK_CUR); 932 ooffset = lseek (fd, 0, SEEK_CUR);
828 lseek (fd, offset, SEEK_SET); 933 lseek (fd, offset, SEEK_SET);
829 res = write (fd, buf, count); 934 res = write (fd, buf, count);
830 lseek (fd, offset, SEEK_SET); 935 lseek (fd, offset, SEEK_SET);
831 UNLOCK (preadwritelock); 936 X_UNLOCK (preadwritelock);
832 937
833 return res; 938 return res;
834} 939}
940#endif
941
942#ifndef HAVE_FUTIMES
943
944# define utimes(path,times) aio_utimes (path, times)
945# define futimes(fd,times) aio_futimes (fd, times)
946
947int aio_utimes (const char *filename, const struct timeval times[2])
948{
949 if (times)
950 {
951 struct utimbuf buf;
952
953 buf.actime = times[0].tv_sec;
954 buf.modtime = times[1].tv_sec;
955
956 return utime (filename, &buf);
957 }
958 else
959 return utime (filename, 0);
960}
961
962int aio_futimes (int fd, const struct timeval tv[2])
963{
964 errno = ENOSYS;
965 return -1;
966}
967
835#endif 968#endif
836 969
837#if !HAVE_FDATASYNC 970#if !HAVE_FDATASYNC
838# define fdatasync fsync 971# define fdatasync fsync
839#endif 972#endif
… …
841#if !HAVE_READAHEAD 974#if !HAVE_READAHEAD
842# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 975# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
843 976
844static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self) 977static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
845{ 978{
979 size_t todo = count;
846 dBUF; 980 dBUF;
847 981
848 while (count > 0) 982 while (todo > 0)
849 { 983 {
850 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 984 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
851 985
852 pread (fd, aio_buf, len, offset); 986 pread (fd, aio_buf, len, offset);
853 offset += len; 987 offset += len;
854 count -= len; 988 todo -= len;
855 } 989 }
856 990
857 errno = 0; 991 errno = 0;
992 return count;
858} 993}
859 994
860#endif 995#endif
861 996
862#if !HAVE_READDIR_R 997#if !HAVE_READDIR_R
863# define readdir_r aio_readdir_r 998# define readdir_r aio_readdir_r
864 999
865static mutex_t readdirlock = MUTEX_INIT; 1000static mutex_t readdirlock = X_MUTEX_INIT;
866 1001
867static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 1002static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
868{ 1003{
869 struct dirent *e; 1004 X_DIRENT *e;
870 int errorno; 1005 int errorno;
871 1006
872 LOCK (readdirlock); 1007 X_LOCK (readdirlock);
873 1008
874 e = readdir (dirp); 1009 e = readdir (dirp);
875 errorno = errno; 1010 errorno = errno;
876 1011
877 if (e) 1012 if (e)
… …
880 strcpy (ent->d_name, e->d_name); 1015 strcpy (ent->d_name, e->d_name);
881 } 1016 }
882 else 1017 else
883 *res = 0; 1018 *res = 0;
884 1019
885 UNLOCK (readdirlock); 1020 X_UNLOCK (readdirlock);
886 1021
887 errno = errorno; 1022 errno = errorno;
888 return e ? 0 : -1; 1023 return e ? 0 : -1;
889} 1024}
890#endif 1025#endif
… …
986static void scandir_ (aio_req req, worker *self) 1121static void scandir_ (aio_req req, worker *self)
987{ 1122{
988 DIR *dirp; 1123 DIR *dirp;
989 union 1124 union
990 { 1125 {
991 struct dirent d; 1126 X_DIRENT d;
992 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1127 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
993 } *u; 1128 } *u;
994 struct dirent *entp; 1129 X_DIRENT *entp;
995 char *name, *names; 1130 char *name, *names;
996 int memlen = 4096; 1131 int memlen = 4096;
997 int memofs = 0; 1132 int memofs = 0;
998 int res = 0; 1133 int res = 0;
999 int errorno;
1000 1134
1001 LOCK (wrklock); 1135 X_LOCK (wrklock);
1002 self->dirp = dirp = opendir (req->ptr1); 1136 self->dirp = dirp = opendir (req->ptr1);
1003 self->dbuf = u = malloc (sizeof (*u)); 1137 self->dbuf = u = malloc (sizeof (*u));
1004 req->flags |= FLAG_PTR2_FREE; 1138 req->flags |= FLAG_PTR2_FREE;
1005 req->ptr2 = names = malloc (memlen); 1139 req->ptr2 = names = malloc (memlen);
1006 UNLOCK (wrklock); 1140 X_UNLOCK (wrklock);
1007 1141
1008 if (dirp && u && names) 1142 if (dirp && u && names)
1009 for (;;) 1143 for (;;)
1010 { 1144 {
1011 errno = 0; 1145 errno = 0;
… …
1023 res++; 1157 res++;
1024 1158
1025 while (memofs + len > memlen) 1159 while (memofs + len > memlen)
1026 { 1160 {
1027 memlen *= 2; 1161 memlen *= 2;
1028 LOCK (wrklock); 1162 X_LOCK (wrklock);
1029 req->ptr2 = names = realloc (names, memlen); 1163 req->ptr2 = names = realloc (names, memlen);
1030 UNLOCK (wrklock); 1164 X_UNLOCK (wrklock);
1031 1165
1032 if (!names) 1166 if (!names)
1033 break; 1167 break;
1034 } 1168 }
1035 1169
… …
1044 req->result = res; 1178 req->result = res;
1045} 1179}
1046 1180
1047/*****************************************************************************/ 1181/*****************************************************************************/
1048 1182
1049static void *aio_proc (void *thr_arg) 1183X_THREAD_PROC (aio_proc)
1050{ 1184{
1185 {//D
1051 aio_req req; 1186 aio_req req;
1052 struct timespec ts; 1187 struct timespec ts;
1053 worker *self = (worker *)thr_arg; 1188 worker *self = (worker *)thr_arg;
1054 1189
1055 /* try to distribute timeouts somewhat evenly */ 1190 /* try to distribute timeouts somewhat randomly */
1056 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 1191 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1057 * (1000000000UL / 1024UL);
1058 1192
1059 for (;;) 1193 for (;;)
1060 { 1194 {
1061 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1195 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1062 1196
1063 LOCK (reqlock); 1197 X_LOCK (reqlock);
1064 1198
1065 for (;;) 1199 for (;;)
1066 { 1200 {
1067 self->req = req = reqq_shift (&req_queue); 1201 self->req = req = reqq_shift (&req_queue);
1068 1202
1069 if (req) 1203 if (req)
1070 break; 1204 break;
1071 1205
1072 ++idle; 1206 ++idle;
1073 1207
1074 if (COND_TIMEDWAIT (reqwait, reqlock, ts) 1208 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1075 == ETIMEDOUT) 1209 == ETIMEDOUT)
1076 { 1210 {
1077 if (idle > max_idle) 1211 if (idle > max_idle)
1078 { 1212 {
1079 --idle; 1213 --idle;
1080 UNLOCK (reqlock); 1214 X_UNLOCK (reqlock);
1081 LOCK (wrklock); 1215 X_LOCK (wrklock);
1082 --started; 1216 --started;
1083 UNLOCK (wrklock); 1217 X_UNLOCK (wrklock);
1084 goto quit; 1218 goto quit;
1085 } 1219 }
1086 1220
1087 /* we are allowed to idle, so do so without any timeout */ 1221 /* we are allowed to idle, so do so without any timeout */
1088 COND_WAIT (reqwait, reqlock); 1222 X_COND_WAIT (reqwait, reqlock);
1089 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1223 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1090 } 1224 }
1091 1225
1092 --idle; 1226 --idle;
1093 } 1227 }
1094 1228
1095 --nready; 1229 --nready;
1096 1230
1097 UNLOCK (reqlock); 1231 X_UNLOCK (reqlock);
1098 1232
1099 errno = 0; /* strictly unnecessary */ 1233 errno = 0; /* strictly unnecessary */
1100 1234
1101 if (!(req->flags & FLAG_CANCELLED)) 1235 if (!(req->flags & FLAG_CANCELLED))
1102 switch (req->type) 1236 switch (req->type)
1103 { 1237 {
1104 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; 1238 case REQ_READ: req->result = req->offs >= 0
1105 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; 1239 ? pread (req->int1, req->ptr1, req->size, req->offs)
1240 : read (req->int1, req->ptr1, req->size); break;
1241 case REQ_WRITE: req->result = req->offs >= 0
1242 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1243 : write (req->int1, req->ptr1, req->size); break;
1106 1244
1107 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1245 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1108 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break; 1246 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1109 1247
1110 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; 1248 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1111 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; 1249 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1112 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; 1250 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1113 1251
1252 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1253 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1254 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1255 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1256 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1257 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1258
1114 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1259 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1115 case REQ_CLOSE: req->result = close (req->int1); break; 1260 case REQ_CLOSE: req->result = PerlIO_close ((PerlIO *)req->ptr1); break;
1116 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1261 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1117 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1262 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1118 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break; 1263 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1264 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1265 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
… …
1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; 1270 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1126 case REQ_FSYNC: req->result = fsync (req->int1); break; 1271 case REQ_FSYNC: req->result = fsync (req->int1); break;
1127 case REQ_READDIR: scandir_ (req, self); break; 1272 case REQ_READDIR: scandir_ (req, self); break;
1128 1273
1129 case REQ_BUSY: 1274 case REQ_BUSY:
1275#ifdef _WIN32
1276 Sleep (req->nv1 * 1000.);
1277#else
1130 { 1278 {
1131 struct timeval tv; 1279 struct timeval tv;
1132 1280
1133 tv.tv_sec = req->int1; 1281 tv.tv_sec = req->nv1;
1134 tv.tv_usec = req->int2; 1282 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1135 1283
1136 req->result = select (0, 0, 0, 0, &tv); 1284 req->result = select (0, 0, 0, 0, &tv);
1285 }
1286#endif
1287 break;
1288
1289 case REQ_UTIME:
1290 case REQ_FUTIME:
1291 {
1292 struct timeval tv[2];
1293 struct timeval *times;
1294
1295 if (req->nv1 != -1. || req->nv2 != -1.)
1296 {
1297 tv[0].tv_sec = req->nv1;
1298 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1299 tv[1].tv_sec = req->nv2;
1300 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1301
1302 times = tv;
1303 }
1304 else
1305 times = 0;
1306
1307
1308 req->result = req->type == REQ_FUTIME
1309 ? futimes (req->int1, times)
1310 : utimes (req->ptr1, times);
1137 } 1311 }
1138 1312
1139 case REQ_GROUP: 1313 case REQ_GROUP:
1140 case REQ_NOP: 1314 case REQ_NOP:
1141 break; 1315 break;
1142 1316
1143 case REQ_QUIT: 1317 case REQ_QUIT:
1144 goto quit; 1318 goto quit;
1145 1319
1146 default: 1320 default:
1147 req->result = ENOSYS; 1321 req->result = -1;
1148 break; 1322 break;
1149 } 1323 }
1150 1324
1151 req->errorno = errno; 1325 req->errorno = errno;
1152 1326
1153 LOCK (reslock); 1327 X_LOCK (reslock);
1154 1328
1155 ++npending; 1329 ++npending;
1156 1330
1157 if (!reqq_push (&res_queue, req)) 1331 if (!reqq_push (&res_queue, req))
1158 { 1332 {
1159 /* write a dummy byte to the pipe so fh becomes ready */ 1333 /* write a dummy byte to the pipe so fh becomes ready */
1160 write (respipe [1], &respipe, 1); 1334 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1161 1335
1162 /* optionally signal the main thread asynchronously */ 1336 /* optionally signal the main thread asynchronously */
1163 if (main_sig) 1337 if (main_sig)
1164 pthread_kill (main_tid, main_sig); 1338 pthread_kill (main_tid, main_sig);
1165 } 1339 }
1166 1340
1167 self->req = 0; 1341 self->req = 0;
1168 worker_clear (self); 1342 worker_clear (self);
1169 1343
1170 UNLOCK (reslock); 1344 X_UNLOCK (reslock);
1171 } 1345 }
1172 1346
1173quit: 1347quit:
1174 LOCK (wrklock); 1348 X_LOCK (wrklock);
1175 worker_free (self); 1349 worker_free (self);
1176 UNLOCK (wrklock); 1350 X_UNLOCK (wrklock);
1177 1351
1178 return 0; 1352 return 0;
1353 }//D
1179} 1354}
1180 1355
1181/*****************************************************************************/ 1356/*****************************************************************************/
1182 1357
1183static void atfork_prepare (void) 1358static void atfork_prepare (void)
1184{ 1359{
1185 LOCK (wrklock); 1360 X_LOCK (wrklock);
1186 LOCK (reqlock); 1361 X_LOCK (reqlock);
1187 LOCK (reslock); 1362 X_LOCK (reslock);
1188#if !HAVE_PREADWRITE 1363#if !HAVE_PREADWRITE
1189 LOCK (preadwritelock); 1364 X_LOCK (preadwritelock);
1190#endif 1365#endif
1191#if !HAVE_READDIR_R 1366#if !HAVE_READDIR_R
1192 LOCK (readdirlock); 1367 X_LOCK (readdirlock);
1193#endif 1368#endif
1194} 1369}
1195 1370
1196static void atfork_parent (void) 1371static void atfork_parent (void)
1197{ 1372{
1198#if !HAVE_READDIR_R 1373#if !HAVE_READDIR_R
1199 UNLOCK (readdirlock); 1374 X_UNLOCK (readdirlock);
1200#endif 1375#endif
1201#if !HAVE_PREADWRITE 1376#if !HAVE_PREADWRITE
1202 UNLOCK (preadwritelock); 1377 X_UNLOCK (preadwritelock);
1203#endif 1378#endif
1204 UNLOCK (reslock); 1379 X_UNLOCK (reslock);
1205 UNLOCK (reqlock); 1380 X_UNLOCK (reqlock);
1206 UNLOCK (wrklock); 1381 X_UNLOCK (wrklock);
1207} 1382}
1208 1383
1209static void atfork_child (void) 1384static void atfork_child (void)
1210{ 1385{
1211 aio_req prv; 1386 aio_req prv;
1212 1387
1213 while (prv = reqq_shift (&req_queue)) 1388 while (prv = reqq_shift (&req_queue))
1214 req_free (prv); 1389 req_destroy (prv);
1215 1390
1216 while (prv = reqq_shift (&res_queue)) 1391 while (prv = reqq_shift (&res_queue))
1217 req_free (prv); 1392 req_destroy (prv);
1218 1393
1219 while (wrk_first.next != &wrk_first) 1394 while (wrk_first.next != &wrk_first)
1220 { 1395 {
1221 worker *wrk = wrk_first.next; 1396 worker *wrk = wrk_first.next;
1222 1397
1223 if (wrk->req) 1398 if (wrk->req)
1224 req_free (wrk->req); 1399 req_destroy (wrk->req);
1225 1400
1226 worker_clear (wrk); 1401 worker_clear (wrk);
1227 worker_free (wrk); 1402 worker_free (wrk);
1228 } 1403 }
1229 1404
… …
1231 idle = 0; 1406 idle = 0;
1232 nreqs = 0; 1407 nreqs = 0;
1233 nready = 0; 1408 nready = 0;
1234 npending = 0; 1409 npending = 0;
1235 1410
1236 close (respipe [0]);
1237 close (respipe [1]);
1238 create_pipe (); 1411 create_respipe ();
1239 1412
1240 atfork_parent (); 1413 atfork_parent ();
1241} 1414}
1242 1415
1243#define dREQ \ 1416#define dREQ \
… …
1265 1438
1266PROTOTYPES: ENABLE 1439PROTOTYPES: ENABLE
1267 1440
1268BOOT: 1441BOOT:
1269{ 1442{
1270 HV *stash = gv_stashpv ("IO::AIO", 1); 1443 stash = gv_stashpv ("IO::AIO", 1);
1271 1444
1272 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1445 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1273 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1446 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1274 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1447 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1275 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1448 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1276 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1449 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1450#ifdef _WIN32
1451 X_MUTEX_CHECK (wrklock);
1452 X_MUTEX_CHECK (reslock);
1453 X_MUTEX_CHECK (reqlock);
1454 X_MUTEX_CHECK (reqwait);
1455 X_MUTEX_CHECK (preadwritelock);
1456 X_MUTEX_CHECK (readdirlock);
1457
1458 X_COND_CHECK (reqwait);
1459#else
1277 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1460 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1278 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO)); 1461 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1462#endif
1279 1463
1280 create_pipe (); 1464 create_respipe ();
1465
1281 ATFORK (atfork_prepare, atfork_parent, atfork_child); 1466 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1282} 1467}
1283 1468
1284void 1469void
1285max_poll_reqs (int nreqs) 1470max_poll_reqs (int nreqs)
1286 PROTOTYPE: $ 1471 PROTOTYPE: $
… …
1315 max_outstanding = maxreqs; 1500 max_outstanding = maxreqs;
1316 OUTPUT: 1501 OUTPUT:
1317 RETVAL 1502 RETVAL
1318 1503
1319void 1504void
1320aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1505aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1321 SV8 * pathname
1322 int flags
1323 int mode
1324 SV * callback
1325 PROTOTYPE: $$$;$ 1506 PROTOTYPE: $$$;$
1326 PPCODE: 1507 PPCODE:
1327{ 1508{
1328 dREQ; 1509 dREQ;
1329 1510
… …
1335 1516
1336 REQ_SEND; 1517 REQ_SEND;
1337} 1518}
1338 1519
1339void 1520void
1340aio_close (fh,callback=&PL_sv_undef) 1521aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1341 SV * fh
1342 SV * callback
1343 PROTOTYPE: $;$ 1522 PROTOTYPE: $;$
1344 ALIAS: 1523 ALIAS:
1345 aio_close = REQ_CLOSE
1346 aio_fsync = REQ_FSYNC 1524 aio_fsync = REQ_FSYNC
1347 aio_fdatasync = REQ_FDATASYNC 1525 aio_fdatasync = REQ_FDATASYNC
1348 PPCODE: 1526 PPCODE:
1349{ 1527{
1350 dREQ; 1528 dREQ;
1351 1529
1352 req->type = ix; 1530 req->type = ix;
1353 req->fh = newSVsv (fh); 1531 req->sv1 = newSVsv (fh);
1354 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1532 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1355 1533
1356 REQ_SEND (req); 1534 REQ_SEND (req);
1357} 1535}
1358 1536
1359void 1537void
1538aio_close (SV *fh, SV *callback=&PL_sv_undef)
1539 PROTOTYPE: $;$
1540 PPCODE:
1541{
1542 PerlIO *io = IoIFP (sv_2io (fh));
1543 int fd = PerlIO_fileno (io);
1544
1545 if (fd < 0)
1546 croak ("aio_close called with fd-less filehandle");
1547
1548 PerlIO_binmode (io, 0, 0, 0);
1549
1550 {
1551 dREQ;
1552
1553 req->type = REQ_CLOSE;
1554 req->sv1 = newSVsv (fh);
1555 req->ptr1 = (void *)io;
1556
1557 REQ_SEND (req);
1558 }
1559}
1560
1561void
1360aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1562aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1361 SV * fh
1362 UV offset
1363 UV length
1364 SV8 * data
1365 UV dataoffset
1366 SV * callback
1367 ALIAS: 1563 ALIAS:
1368 aio_read = REQ_READ 1564 aio_read = REQ_READ
1369 aio_write = REQ_WRITE 1565 aio_write = REQ_WRITE
1370 PROTOTYPE: $$$$$;$ 1566 PROTOTYPE: $$$$$;$
1371 PPCODE: 1567 PPCODE:
1372{ 1568{
1373 STRLEN svlen; 1569 STRLEN svlen;
1374 char *svptr = SvPVbyte (data, svlen); 1570 char *svptr = SvPVbyte (data, svlen);
1571 UV len = SvUV (length);
1375 1572
1376 SvUPGRADE (data, SVt_PV); 1573 SvUPGRADE (data, SVt_PV);
1377 SvPOK_on (data); 1574 SvPOK_on (data);
1378 1575
1379 if (dataoffset < 0) 1576 if (dataoffset < 0)
1380 dataoffset += svlen; 1577 dataoffset += svlen;
1381 1578
1382 if (dataoffset < 0 || dataoffset > svlen) 1579 if (dataoffset < 0 || dataoffset > svlen)
1383 croak ("data offset outside of string"); 1580 croak ("dataoffset outside of data scalar");
1384 1581
1385 if (ix == REQ_WRITE) 1582 if (ix == REQ_WRITE)
1386 { 1583 {
1387 /* write: check length and adjust. */ 1584 /* write: check length and adjust. */
1388 if (length < 0 || length + dataoffset > svlen) 1585 if (!SvOK (length) || len + dataoffset > svlen)
1389 length = svlen - dataoffset; 1586 len = svlen - dataoffset;
1390 } 1587 }
1391 else 1588 else
1392 { 1589 {
1393 /* read: grow scalar as necessary */ 1590 /* read: grow scalar as necessary */
1394 svptr = SvGROW (data, length + dataoffset + 1); 1591 svptr = SvGROW (data, len + dataoffset + 1);
1395 } 1592 }
1396 1593
1397 if (length < 0) 1594 if (len < 0)
1398 croak ("length must not be negative"); 1595 croak ("length must not be negative");
1399 1596
1400 { 1597 {
1401 dREQ; 1598 dREQ;
1402 1599
1403 req->type = ix; 1600 req->type = ix;
1404 req->fh = newSVsv (fh); 1601 req->sv1 = newSVsv (fh);
1405 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1602 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1406 : IoOFP (sv_2io (fh))); 1603 : IoOFP (sv_2io (fh)));
1407 req->offs = offset; 1604 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1408 req->size = length; 1605 req->size = len;
1409 req->sv1 = SvREFCNT_inc (data); 1606 req->sv2 = SvREFCNT_inc (data);
1410 req->ptr1 = (char *)svptr + dataoffset; 1607 req->ptr1 = (char *)svptr + dataoffset;
1411 req->stroffset = dataoffset; 1608 req->stroffset = dataoffset;
1412 1609
1413 if (!SvREADONLY (data)) 1610 if (!SvREADONLY (data))
1414 { 1611 {
1415 SvREADONLY_on (data); 1612 SvREADONLY_on (data);
1416 req->flags |= FLAG_SV1_RO_OFF; 1613 req->flags |= FLAG_SV2_RO_OFF;
1417 } 1614 }
1418 1615
1419 REQ_SEND; 1616 REQ_SEND;
1420 } 1617 }
1421} 1618}
1422 1619
1423void 1620void
1424aio_readlink (path,callback=&PL_sv_undef) 1621aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1425 SV8 * path
1426 SV * callback
1427 PROTOTYPE: $$;$ 1622 PROTOTYPE: $$;$
1428 PPCODE: 1623 PPCODE:
1429{ 1624{
1430 SV *data; 1625 SV *data;
1431 dREQ; 1626 dREQ;
1432 1627
1433 data = newSV (NAME_MAX); 1628 data = newSV (NAME_MAX);
1434 SvPOK_on (data); 1629 SvPOK_on (data);
1435 1630
1436 req->type = REQ_READLINK; 1631 req->type = REQ_READLINK;
1437 req->fh = newSVsv (path); 1632 req->sv1 = newSVsv (path);
1438 req->ptr2 = SvPVbyte_nolen (req->fh); 1633 req->ptr2 = SvPVbyte_nolen (req->sv1);
1439 req->sv1 = data; 1634 req->sv2 = data;
1440 req->ptr1 = SvPVbyte_nolen (data); 1635 req->ptr1 = SvPVbyte_nolen (data);
1441 1636
1442 REQ_SEND; 1637 REQ_SEND;
1443} 1638}
1444 1639
1445void 1640void
1446aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1641aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1447 SV * out_fh
1448 SV * in_fh
1449 UV in_offset
1450 UV length
1451 SV * callback
1452 PROTOTYPE: $$$$;$ 1642 PROTOTYPE: $$$$;$
1453 PPCODE: 1643 PPCODE:
1454{ 1644{
1455 dREQ; 1645 dREQ;
1456 1646
1457 req->type = REQ_SENDFILE; 1647 req->type = REQ_SENDFILE;
1458 req->fh = newSVsv (out_fh); 1648 req->sv1 = newSVsv (out_fh);
1459 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1649 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1460 req->sv2 = newSVsv (in_fh); 1650 req->sv2 = newSVsv (in_fh);
1461 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1651 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1462 req->offs = in_offset; 1652 req->offs = SvVAL64 (in_offset);
1463 req->size = length; 1653 req->size = length;
1464 1654
1465 REQ_SEND; 1655 REQ_SEND;
1466} 1656}
1467 1657
1468void 1658void
1469aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1659aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1470 SV * fh
1471 UV offset
1472 IV length
1473 SV * callback
1474 PROTOTYPE: $$$;$ 1660 PROTOTYPE: $$$;$
1475 PPCODE: 1661 PPCODE:
1476{ 1662{
1477 dREQ; 1663 dREQ;
1478 1664
1479 req->type = REQ_READAHEAD; 1665 req->type = REQ_READAHEAD;
1480 req->fh = newSVsv (fh); 1666 req->sv1 = newSVsv (fh);
1481 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1667 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1482 req->offs = offset; 1668 req->offs = SvVAL64 (offset);
1483 req->size = length; 1669 req->size = length;
1484 1670
1485 REQ_SEND; 1671 REQ_SEND;
1486} 1672}
1487 1673
1488void 1674void
1489aio_stat (fh_or_path,callback=&PL_sv_undef) 1675aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1490 SV8 * fh_or_path
1491 SV * callback
1492 ALIAS: 1676 ALIAS:
1493 aio_stat = REQ_STAT 1677 aio_stat = REQ_STAT
1494 aio_lstat = REQ_LSTAT 1678 aio_lstat = REQ_LSTAT
1495 PPCODE: 1679 PPCODE:
1496{ 1680{
1497 dREQ; 1681 dREQ;
1498 1682
1499 req->ptr2 = malloc (sizeof (Stat_t)); 1683 req->ptr2 = malloc (sizeof (Stat_t));
1500 if (!req->ptr2) 1684 if (!req->ptr2)
1501 { 1685 {
1502 req_free (req); 1686 req_destroy (req);
1503 croak ("out of memory during aio_stat statdata allocation"); 1687 croak ("out of memory during aio_stat statdata allocation");
1504 } 1688 }
1505 1689
1506 req->flags |= FLAG_PTR2_FREE; 1690 req->flags |= FLAG_PTR2_FREE;
1691 req->sv1 = newSVsv (fh_or_path);
1507 1692
1508 if (SvPOK (fh_or_path)) 1693 if (SvPOK (fh_or_path))
1509 { 1694 {
1510 req->type = ix; 1695 req->type = ix;
1511 req->sv1 = newSVsv (fh_or_path);
1512 req->ptr1 = SvPVbyte_nolen (req->sv1); 1696 req->ptr1 = SvPVbyte_nolen (req->sv1);
1513 } 1697 }
1514 else 1698 else
1515 { 1699 {
1516 req->type = REQ_FSTAT; 1700 req->type = REQ_FSTAT;
1517 req->fh = newSVsv (fh_or_path);
1518 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1701 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1519 } 1702 }
1520 1703
1521 REQ_SEND; 1704 REQ_SEND;
1522} 1705}
1523 1706
1524void 1707void
1708aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1709 PPCODE:
1710{
1711 dREQ;
1712
1713 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1714 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1715 req->sv1 = newSVsv (fh_or_path);
1716
1717 if (SvPOK (fh_or_path))
1718 {
1719 req->type = REQ_UTIME;
1720 req->ptr1 = SvPVbyte_nolen (req->sv1);
1721 }
1722 else
1723 {
1724 req->type = REQ_FUTIME;
1725 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1726 }
1727
1728 REQ_SEND;
1729}
1730
1731void
1732aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1733 PPCODE:
1734{
1735 dREQ;
1736
1737 req->sv1 = newSVsv (fh_or_path);
1738 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1739
1740 if (SvPOK (fh_or_path))
1741 {
1742 req->type = REQ_TRUNCATE;
1743 req->ptr1 = SvPVbyte_nolen (req->sv1);
1744 }
1745 else
1746 {
1747 req->type = REQ_FTRUNCATE;
1748 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1749 }
1750
1751 REQ_SEND;
1752}
1753
1754void
1755aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1756 PPCODE:
1757{
1758 dREQ;
1759
1760 req->mode = mode;
1761 req->sv1 = newSVsv (fh_or_path);
1762
1763 if (SvPOK (fh_or_path))
1764 {
1765 req->type = REQ_CHMOD;
1766 req->ptr1 = SvPVbyte_nolen (req->sv1);
1767 }
1768 else
1769 {
1770 req->type = REQ_FCHMOD;
1771 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1772 }
1773
1774 REQ_SEND;
1775}
1776
1777void
1778aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1779 PPCODE:
1780{
1781 dREQ;
1782
1783 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1784 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1785 req->sv1 = newSVsv (fh_or_path);
1786
1787 if (SvPOK (fh_or_path))
1788 {
1789 req->type = REQ_CHOWN;
1790 req->ptr1 = SvPVbyte_nolen (req->sv1);
1791 }
1792 else
1793 {
1794 req->type = REQ_FCHOWN;
1795 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1796 }
1797
1798 REQ_SEND;
1799}
1800
1801void
1525aio_unlink (pathname,callback=&PL_sv_undef) 1802aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1526 SV8 * pathname
1527 SV * callback
1528 ALIAS: 1803 ALIAS:
1529 aio_unlink = REQ_UNLINK 1804 aio_unlink = REQ_UNLINK
1530 aio_rmdir = REQ_RMDIR 1805 aio_rmdir = REQ_RMDIR
1531 aio_readdir = REQ_READDIR 1806 aio_readdir = REQ_READDIR
1532 PPCODE: 1807 PPCODE:
… …
1539 1814
1540 REQ_SEND; 1815 REQ_SEND;
1541} 1816}
1542 1817
1543void 1818void
1544aio_mkdir (pathname,mode,callback=&PL_sv_undef) 1819aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1545 SV8 * pathname
1546 UV mode
1547 SV * callback
1548 PPCODE: 1820 PPCODE:
1549{ 1821{
1550 dREQ; 1822 dREQ;
1551 1823
1552 req->type = REQ_MKDIR; 1824 req->type = REQ_MKDIR;
… …
1556 1828
1557 REQ_SEND; 1829 REQ_SEND;
1558} 1830}
1559 1831
1560void 1832void
1561aio_link (oldpath,newpath,callback=&PL_sv_undef) 1833aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1562 SV8 * oldpath
1563 SV8 * newpath
1564 SV * callback
1565 ALIAS: 1834 ALIAS:
1566 aio_link = REQ_LINK 1835 aio_link = REQ_LINK
1567 aio_symlink = REQ_SYMLINK 1836 aio_symlink = REQ_SYMLINK
1568 aio_rename = REQ_RENAME 1837 aio_rename = REQ_RENAME
1569 PPCODE: 1838 PPCODE:
1570{ 1839{
1571 dREQ; 1840 dREQ;
1572 1841
1573 req->type = ix; 1842 req->type = ix;
1574 req->fh = newSVsv (oldpath); 1843 req->sv2 = newSVsv (oldpath);
1575 req->ptr2 = SvPVbyte_nolen (req->fh); 1844 req->ptr2 = SvPVbyte_nolen (req->sv2);
1576 req->sv1 = newSVsv (newpath); 1845 req->sv1 = newSVsv (newpath);
1577 req->ptr1 = SvPVbyte_nolen (req->sv1); 1846 req->ptr1 = SvPVbyte_nolen (req->sv1);
1578 1847
1579 REQ_SEND; 1848 REQ_SEND;
1580} 1849}
1581 1850
1582void 1851void
1583aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1852aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1584 SV8 * pathname
1585 UV mode
1586 UV dev
1587 SV * callback
1588 PPCODE: 1853 PPCODE:
1589{ 1854{
1590 dREQ; 1855 dREQ;
1591 1856
1592 req->type = REQ_MKNOD; 1857 req->type = REQ_MKNOD;
… …
1597 1862
1598 REQ_SEND; 1863 REQ_SEND;
1599} 1864}
1600 1865
1601void 1866void
1602aio_busy (delay,callback=&PL_sv_undef) 1867aio_busy (double delay, SV *callback=&PL_sv_undef)
1603 double delay
1604 SV * callback
1605 PPCODE: 1868 PPCODE:
1606{ 1869{
1607 dREQ; 1870 dREQ;
1608 1871
1609 req->type = REQ_BUSY; 1872 req->type = REQ_BUSY;
1610 req->int1 = delay < 0. ? 0 : delay; 1873 req->nv1 = delay < 0. ? 0. : delay;
1611 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1612 1874
1613 REQ_SEND; 1875 REQ_SEND;
1614} 1876}
1615 1877
1616void 1878void
1617aio_group (callback=&PL_sv_undef) 1879aio_group (SV *callback=&PL_sv_undef)
1618 SV * callback
1619 PROTOTYPE: ;$ 1880 PROTOTYPE: ;$
1620 PPCODE: 1881 PPCODE:
1621{ 1882{
1622 dREQ; 1883 dREQ;
1623 1884
… …
1626 req_send (req); 1887 req_send (req);
1627 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1888 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1628} 1889}
1629 1890
1630void 1891void
1631aio_nop (callback=&PL_sv_undef) 1892aio_nop (SV *callback=&PL_sv_undef)
1632 SV * callback
1633 PPCODE: 1893 PPCODE:
1634{ 1894{
1635 dREQ; 1895 dREQ;
1636 1896
1637 req->type = REQ_NOP; 1897 req->type = REQ_NOP;
… …
1708 CODE: 1968 CODE:
1709{ 1969{
1710 if (block_sig_level) 1970 if (block_sig_level)
1711 croak ("cannot call IO::AIO::setsig from within aio_block/callback"); 1971 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1712 1972
1713 LOCK (reslock); 1973 X_LOCK (reslock);
1714 main_tid = pthread_self (); 1974 main_tid = pthread_self ();
1715 main_sig = signum; 1975 main_sig = signum;
1716 UNLOCK (reslock); 1976 X_UNLOCK (reslock);
1717 1977
1718 if (main_sig && npending) 1978 if (main_sig && npending)
1719 pthread_kill (main_tid, main_sig); 1979 pthread_kill (main_tid, main_sig);
1720} 1980}
1721 1981
… …
1765 2025
1766int 2026int
1767nthreads() 2027nthreads()
1768 PROTOTYPE: 2028 PROTOTYPE:
1769 CODE: 2029 CODE:
1770 if (WORDACCESS_UNSAFE) LOCK (wrklock); 2030 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1771 RETVAL = started; 2031 RETVAL = started;
1772 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 2032 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1773 OUTPUT: 2033 OUTPUT:
1774 RETVAL 2034 RETVAL
1775 2035
1776PROTOTYPES: DISABLE 2036PROTOTYPES: DISABLE
1777 2037

Diff Legend

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