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

Diff Legend

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