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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines