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.94 by root, Sun Nov 26 18:28:37 2006 UTC vs.
Revision 1.103 by root, Sun Jul 8 09:09:34 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h"
18
19#include <pthread.h>
20
21#include <stddef.h> 9#include <stddef.h>
22#include <stdlib.h> 10#include <stdlib.h>
23#include <errno.h> 11#include <errno.h>
24#include <sys/time.h>
25#include <sys/select.h>
26#include <sys/types.h> 12#include <sys/types.h>
27#include <sys/stat.h> 13#include <sys/stat.h>
28#include <limits.h> 14#include <limits.h>
29#include <unistd.h>
30#include <fcntl.h> 15#include <fcntl.h>
31#include <signal.h>
32#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
33 66
34#if HAVE_SENDFILE 67#if HAVE_SENDFILE
35# if __linux 68# if __linux
36# include <sys/sendfile.h> 69# include <sys/sendfile.h>
37# elif __freebsd 70# elif __freebsd
52/* used for struct dirent, AIX doesn't provide it */ 85/* used for struct dirent, AIX doesn't provide it */
53#ifndef NAME_MAX 86#ifndef NAME_MAX
54# define NAME_MAX 4096 87# define NAME_MAX 4096
55#endif 88#endif
56 89
57#ifndef PTHREAD_STACK_MIN
58/* care for broken platforms, e.g. windows */
59# define PTHREAD_STACK_MIN 16384
60#endif
61
62#if __ia64
63# define STACKSIZE 65536
64#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
65# define STACKSIZE PTHREAD_STACK_MIN
66#else
67# define STACKSIZE 16384
68#endif
69
70/* wether word reads are potentially non-atomic.
71 * this is conservatice, likely most arches this runs
72 * on have atomic word read/writes.
73 */
74#ifndef WORDACCESS_UNSAFE
75# if __i386 || __x86_64
76# define WORDACCESS_UNSAFE 0
77# else
78# define WORDACCESS_UNSAFE 1
79# endif
80#endif
81
82/* buffer size for various temporary buffers */ 90/* buffer size for various temporary buffers */
83#define AIO_BUFSIZE 65536 91#define AIO_BUFSIZE 65536
84 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
85#define dBUF \ 100#define dBUF \
86 char *aio_buf; \ 101 char *aio_buf; \
87 LOCK (wrklock); \ 102 X_LOCK (wrklock); \
88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 103 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
89 UNLOCK (wrklock); \ 104 X_UNLOCK (wrklock); \
90 if (!aio_buf) \ 105 if (!aio_buf) \
91 return -1; 106 return -1;
92 107
93typedef SV SV8; /* byte-sv, used for argument-checking */ 108typedef SV SV8; /* byte-sv, used for argument-checking */
94 109
95enum { 110enum {
96 REQ_QUIT, 111 REQ_QUIT,
97 REQ_OPEN, REQ_CLOSE, 112 REQ_OPEN, REQ_CLOSE,
98 REQ_READ, REQ_WRITE, REQ_READAHEAD, 113 REQ_READ, REQ_WRITE,
99 REQ_SENDFILE, 114 REQ_READAHEAD, REQ_SENDFILE,
100 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,
101 REQ_FSYNC, REQ_FDATASYNC, 120 REQ_FSYNC, REQ_FDATASYNC,
102 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 121 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
103 REQ_MKNOD, REQ_READDIR, 122 REQ_MKNOD, REQ_READDIR,
104 REQ_LINK, REQ_SYMLINK, REQ_READLINK, 123 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
105 REQ_GROUP, REQ_NOP, 124 REQ_GROUP, REQ_NOP,
106 REQ_BUSY, 125 REQ_BUSY,
107}; 126};
111 130
112typedef struct aio_cb 131typedef struct aio_cb
113{ 132{
114 struct aio_cb *volatile next; 133 struct aio_cb *volatile next;
115 134
116 SV *callback, *fh; 135 SV *callback;
117 SV *sv1, *sv2; 136 SV *sv1, *sv2;
118 void *ptr1, *ptr2; 137 void *ptr1, *ptr2;
119 off_t offs; 138 off_t offs;
120 size_t size; 139 size_t size;
121 ssize_t result; 140 ssize_t result;
141 double nv1, nv2;
122 142
123 STRLEN stroffset; 143 STRLEN stroffset;
124 int type; 144 int type;
125 int int1, int2; 145 int int1, int2, int3;
126 int errorno; 146 int errorno;
127 mode_t mode; /* open */ 147 mode_t mode; /* open */
128 148
129 unsigned char flags; 149 unsigned char flags;
130 unsigned char pri; 150 unsigned char pri;
133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 153 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
134} aio_cb; 154} aio_cb;
135 155
136enum { 156enum {
137 FLAG_CANCELLED = 0x01, /* request was cancelled */ 157 FLAG_CANCELLED = 0x01, /* request was cancelled */
138 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ 158 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
139 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ 159 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
140}; 160};
141 161
142typedef aio_cb *aio_req; 162typedef aio_cb *aio_req;
143typedef aio_cb *aio_req_ornot; 163typedef aio_cb *aio_req_ornot;
161{ 181{
162 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 182 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
163 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 183 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
164} 184}
165 185
166static pthread_t main_tid; 186static thread_t main_tid;
167static int main_sig; 187static int main_sig;
168static int block_sig_level; 188static int block_sig_level;
169 189
170void block_sig () 190void block_sig ()
171{ 191{
199 219
200static int next_pri = DEFAULT_PRI + PRI_BIAS; 220static int next_pri = DEFAULT_PRI + PRI_BIAS;
201 221
202static unsigned int started, idle, wanted; 222static unsigned int started, idle, wanted;
203 223
204#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
205# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
206#else
207# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
208#endif
209
210#define LOCK(mutex) pthread_mutex_lock (&(mutex))
211#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
212
213/* worker threads management */ 224/* worker threads management */
214static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 225static mutex_t wrklock = X_MUTEX_INIT;
215 226
216typedef struct worker { 227typedef struct worker {
217 /* locked by wrklock */ 228 /* locked by wrklock */
218 struct worker *prev, *next; 229 struct worker *prev, *next;
219 230
220 pthread_t tid; 231 thread_t tid;
221 232
222 /* locked by reslock, reqlock or wrklock */ 233 /* locked by reslock, reqlock or wrklock */
223 aio_req req; /* currently processed request */ 234 aio_req req; /* currently processed request */
224 void *dbuf; 235 void *dbuf;
225 DIR *dirp; 236 DIR *dirp;
253static volatile unsigned int nreqs, nready, npending; 264static volatile unsigned int nreqs, nready, npending;
254static volatile unsigned int max_idle = 4; 265static volatile unsigned int max_idle = 4;
255static volatile unsigned int max_outstanding = 0xffffffff; 266static volatile unsigned int max_outstanding = 0xffffffff;
256static int respipe [2]; 267static int respipe [2];
257 268
258static pthread_mutex_t reslock = AIO_MUTEX_INIT; 269static mutex_t reslock = X_MUTEX_INIT;
259static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 270static mutex_t reqlock = X_MUTEX_INIT;
260static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 271static cond_t reqwait = X_COND_INIT;
261 272
262#if WORDACCESS_UNSAFE 273#if WORDACCESS_UNSAFE
263 274
264static unsigned int get_nready () 275static unsigned int get_nready ()
265{ 276{
266 unsigned int retval; 277 unsigned int retval;
267 278
268 LOCK (reqlock); 279 X_LOCK (reqlock);
269 retval = nready; 280 retval = nready;
270 UNLOCK (reqlock); 281 X_UNLOCK (reqlock);
271 282
272 return retval; 283 return retval;
273} 284}
274 285
275static unsigned int get_npending () 286static unsigned int get_npending ()
276{ 287{
277 unsigned int retval; 288 unsigned int retval;
278 289
279 LOCK (reslock); 290 X_LOCK (reslock);
280 retval = npending; 291 retval = npending;
281 UNLOCK (reslock); 292 X_UNLOCK (reslock);
282 293
283 return retval; 294 return retval;
284} 295}
285 296
286static unsigned int get_nthreads () 297static unsigned int get_nthreads ()
287{ 298{
288 unsigned int retval; 299 unsigned int retval;
289 300
290 LOCK (wrklock); 301 X_LOCK (wrklock);
291 retval = started; 302 retval = started;
292 UNLOCK (wrklock); 303 X_UNLOCK (wrklock);
293 304
294 return retval; 305 return retval;
295} 306}
296 307
297#else 308#else
356 abort (); 367 abort ();
357} 368}
358 369
359static int poll_cb (); 370static int poll_cb ();
360static int req_invoke (aio_req req); 371static int req_invoke (aio_req req);
361static void req_free (aio_req req); 372static void req_destroy (aio_req req);
362static void req_cancel (aio_req req); 373static void req_cancel (aio_req req);
363 374
364/* must be called at most once */ 375/* must be called at most once */
365static SV *req_sv (aio_req req, const char *klass) 376static SV *req_sv (aio_req req, const char *klass)
366{ 377{
432 { 443 {
433 block_sig (); 444 block_sig ();
434 445
435 if (!req_invoke (grp)) 446 if (!req_invoke (grp))
436 { 447 {
437 req_free (grp); 448 req_destroy (grp);
438 unblock_sig (); 449 unblock_sig ();
439 croak (0); 450 croak (0);
440 } 451 }
441 452
442 req_free (grp); 453 req_destroy (grp);
443 unblock_sig (); 454 unblock_sig ();
444 } 455 }
445} 456}
446 457
447static int req_invoke (aio_req req) 458static int req_invoke (aio_req req)
448{ 459{
449 dSP; 460 dSP;
450 461
451 if (req->flags & FLAG_SV1_RO_OFF) 462 if (req->flags & FLAG_SV2_RO_OFF)
452 SvREADONLY_off (req->sv1); 463 SvREADONLY_off (req->sv2);
453 464
454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 465 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
455 { 466 {
456 ENTER; 467 ENTER;
457 SAVETMPS; 468 SAVETMPS;
522 break; 533 break;
523 534
524 case REQ_READLINK: 535 case REQ_READLINK:
525 if (req->result > 0) 536 if (req->result > 0)
526 { 537 {
527 SvCUR_set (req->sv1, req->result); 538 SvCUR_set (req->sv2, req->result);
528 *SvEND (req->sv1) = 0; 539 *SvEND (req->sv2) = 0;
529 PUSHs (req->sv1); 540 PUSHs (req->sv2);
530 } 541 }
531 break; 542 break;
532 543
533 case REQ_STAT: 544 case REQ_STAT:
534 case REQ_LSTAT: 545 case REQ_LSTAT:
538 PL_statcache = *(Stat_t *)(req->ptr2); 549 PL_statcache = *(Stat_t *)(req->ptr2);
539 PUSHs (sv_2mortal (newSViv (req->result))); 550 PUSHs (sv_2mortal (newSViv (req->result)));
540 break; 551 break;
541 552
542 case REQ_READ: 553 case REQ_READ:
543 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));
544 *SvEND (req->sv1) = 0; 555 *SvEND (req->sv2) = 0;
545 PUSHs (sv_2mortal (newSViv (req->result))); 556 PUSHs (sv_2mortal (newSViv (req->result)));
546 break; 557 break;
547 558
548 default: 559 default:
549 PUSHs (sv_2mortal (newSViv (req->result))); 560 PUSHs (sv_2mortal (newSViv (req->result)));
575 } 586 }
576 587
577 return !SvTRUE (ERRSV); 588 return !SvTRUE (ERRSV);
578} 589}
579 590
580static void req_free (aio_req req) 591static void req_destroy (aio_req req)
581{ 592{
582 if (req->self) 593 if (req->self)
583 { 594 {
584 sv_unmagic (req->self, PERL_MAGIC_ext); 595 sv_unmagic (req->self, PERL_MAGIC_ext);
585 SvREFCNT_dec (req->self); 596 SvREFCNT_dec (req->self);
586 } 597 }
587 598
588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1); 599 SvREFCNT_dec (req->sv1);
590 SvREFCNT_dec (req->sv2); 600 SvREFCNT_dec (req->sv2);
591 SvREFCNT_dec (req->callback); 601 SvREFCNT_dec (req->callback);
592 602
593 if (req->flags & FLAG_PTR2_FREE) 603 if (req->flags & FLAG_PTR2_FREE)
615 req->flags |= FLAG_CANCELLED; 625 req->flags |= FLAG_CANCELLED;
616 626
617 req_cancel_subs (req); 627 req_cancel_subs (req);
618} 628}
619 629
620static void *aio_proc(void *arg); 630X_THREAD_PROC (aio_proc);
621 631
622static void start_thread (void) 632static void start_thread (void)
623{ 633{
624 sigset_t fullsigset, oldsigset;
625 pthread_attr_t attr;
626
627 worker *wrk = calloc (1, sizeof (worker)); 634 worker *wrk = calloc (1, sizeof (worker));
628 635
629 if (!wrk) 636 if (!wrk)
630 croak ("unable to allocate worker thread data"); 637 croak ("unable to allocate worker thread data");
631 638
632 pthread_attr_init (&attr);
633 pthread_attr_setstacksize (&attr, STACKSIZE);
634 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
635#ifdef PTHREAD_SCOPE_PROCESS
636 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
637#endif
638
639 sigfillset (&fullsigset);
640
641 LOCK (wrklock); 639 X_LOCK (wrklock);
642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
643 640
644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 641 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
645 { 642 {
646 wrk->prev = &wrk_first; 643 wrk->prev = &wrk_first;
647 wrk->next = wrk_first.next; 644 wrk->next = wrk_first.next;
648 wrk_first.next->prev = wrk; 645 wrk_first.next->prev = wrk;
649 wrk_first.next = wrk; 646 wrk_first.next = wrk;
650 ++started; 647 ++started;
651 } 648 }
652 else 649 else
653 free (wrk); 650 free (wrk);
654 651
655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
656 UNLOCK (wrklock); 652 X_UNLOCK (wrklock);
657} 653}
658 654
659static void maybe_start_thread () 655static void maybe_start_thread ()
660{ 656{
661 if (get_nthreads () >= wanted) 657 if (get_nthreads () >= wanted)
672{ 668{
673 block_sig (); 669 block_sig ();
674 670
675 ++nreqs; 671 ++nreqs;
676 672
677 LOCK (reqlock); 673 X_LOCK (reqlock);
678 ++nready; 674 ++nready;
679 reqq_push (&req_queue, req); 675 reqq_push (&req_queue, req);
680 pthread_cond_signal (&reqwait); 676 X_COND_SIGNAL (reqwait);
681 UNLOCK (reqlock); 677 X_UNLOCK (reqlock);
682 678
683 unblock_sig (); 679 unblock_sig ();
684 680
685 maybe_start_thread (); 681 maybe_start_thread ();
686} 682}
692 Newz (0, req, 1, aio_cb); 688 Newz (0, req, 1, aio_cb);
693 689
694 req->type = REQ_QUIT; 690 req->type = REQ_QUIT;
695 req->pri = PRI_MAX + PRI_BIAS; 691 req->pri = PRI_MAX + PRI_BIAS;
696 692
697 LOCK (reqlock); 693 X_LOCK (reqlock);
698 reqq_push (&req_queue, req); 694 reqq_push (&req_queue, req);
699 pthread_cond_signal (&reqwait); 695 X_COND_SIGNAL (reqwait);
700 UNLOCK (reqlock); 696 X_UNLOCK (reqlock);
701 697
702 LOCK (wrklock); 698 X_LOCK (wrklock);
703 --started; 699 --started;
704 UNLOCK (wrklock); 700 X_UNLOCK (wrklock);
705} 701}
706 702
707static void set_max_idle (int nthreads) 703static void set_max_idle (int nthreads)
708{ 704{
709 if (WORDACCESS_UNSAFE) LOCK (reqlock); 705 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
710 max_idle = nthreads <= 0 ? 1 : nthreads; 706 max_idle = nthreads <= 0 ? 1 : nthreads;
711 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 707 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
712} 708}
713 709
714static void min_parallel (int nthreads) 710static void min_parallel (int nthreads)
715{ 711{
716 if (wanted < nthreads) 712 if (wanted < nthreads)
731 fd_set rfd; 727 fd_set rfd;
732 728
733 while (nreqs) 729 while (nreqs)
734 { 730 {
735 int size; 731 int size;
736 if (WORDACCESS_UNSAFE) LOCK (reslock); 732 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
737 size = res_queue.size; 733 size = res_queue.size;
738 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 734 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
739 735
740 if (size) 736 if (size)
741 return; 737 return;
742 738
743 maybe_start_thread (); 739 maybe_start_thread ();
767 { 763 {
768 for (;;) 764 for (;;)
769 { 765 {
770 maybe_start_thread (); 766 maybe_start_thread ();
771 767
772 LOCK (reslock); 768 X_LOCK (reslock);
773 req = reqq_shift (&res_queue); 769 req = reqq_shift (&res_queue);
774 770
775 if (req) 771 if (req)
776 { 772 {
777 --npending; 773 --npending;
778 774
779 if (!res_queue.size) 775 if (!res_queue.size)
780 { 776 {
781 /* read any signals sent by the worker threads */ 777 /* read any signals sent by the worker threads */
782 char buf [32]; 778 char buf [4];
783 while (read (respipe [0], buf, 32) == 32) 779 while (read (respipe [0], buf, 4) == 4)
784 ; 780 ;
785 } 781 }
786 } 782 }
787 783
788 UNLOCK (reslock); 784 X_UNLOCK (reslock);
789 785
790 if (!req) 786 if (!req)
791 break; 787 break;
792 788
793 --nreqs; 789 --nreqs;
799 } 795 }
800 else 796 else
801 { 797 {
802 if (!req_invoke (req)) 798 if (!req_invoke (req))
803 { 799 {
804 req_free (req); 800 req_destroy (req);
805 unblock_sig (); 801 unblock_sig ();
806 croak (0); 802 croak (0);
807 } 803 }
808 804
809 count++; 805 count++;
810 } 806 }
811 807
812 req_free (req); 808 req_destroy (req);
813 809
814 if (maxreqs && !--maxreqs) 810 if (maxreqs && !--maxreqs)
815 break; 811 break;
816 812
817 if (max_poll_time) 813 if (max_poll_time)
831 ++maxreqs; 827 ++maxreqs;
832 } 828 }
833 829
834 unblock_sig (); 830 unblock_sig ();
835 return count; 831 return count;
836}
837
838static void create_pipe ()
839{
840 if (pipe (respipe))
841 croak ("unable to initialize result pipe");
842
843 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
844 croak ("cannot set result pipe to nonblocking mode");
845
846 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
847 croak ("cannot set result pipe to nonblocking mode");
848} 832}
849 833
850/*****************************************************************************/ 834/*****************************************************************************/
851/* work around various missing functions */ 835/* work around various missing functions */
852 836
857/* 841/*
858 * make our pread/pwrite safe against themselves, but not against 842 * make our pread/pwrite safe against themselves, but not against
859 * 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,
860 * but that's your problem, not mine. 844 * but that's your problem, not mine.
861 */ 845 */
862static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 846static mutex_t preadwritelock = X_MUTEX_INIT;
863 847
864static 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)
865{ 849{
866 ssize_t res; 850 ssize_t res;
867 off_t ooffset; 851 off_t ooffset;
868 852
869 LOCK (preadwritelock); 853 X_LOCK (preadwritelock);
870 ooffset = lseek (fd, 0, SEEK_CUR); 854 ooffset = lseek (fd, 0, SEEK_CUR);
871 lseek (fd, offset, SEEK_SET); 855 lseek (fd, offset, SEEK_SET);
872 res = read (fd, buf, count); 856 res = read (fd, buf, count);
873 lseek (fd, ooffset, SEEK_SET); 857 lseek (fd, ooffset, SEEK_SET);
874 UNLOCK (preadwritelock); 858 X_UNLOCK (preadwritelock);
875 859
876 return res; 860 return res;
877} 861}
878 862
879static 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)
880{ 864{
881 ssize_t res; 865 ssize_t res;
882 off_t ooffset; 866 off_t ooffset;
883 867
884 LOCK (preadwritelock); 868 X_LOCK (preadwritelock);
885 ooffset = lseek (fd, 0, SEEK_CUR); 869 ooffset = lseek (fd, 0, SEEK_CUR);
886 lseek (fd, offset, SEEK_SET); 870 lseek (fd, offset, SEEK_SET);
887 res = write (fd, buf, count); 871 res = write (fd, buf, count);
888 lseek (fd, offset, SEEK_SET); 872 lseek (fd, offset, SEEK_SET);
889 UNLOCK (preadwritelock); 873 X_UNLOCK (preadwritelock);
890 874
891 return res; 875 return res;
892} 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
893#endif 905#endif
894 906
895#if !HAVE_FDATASYNC 907#if !HAVE_FDATASYNC
896# define fdatasync fsync 908# define fdatasync fsync
897#endif 909#endif
899#if !HAVE_READAHEAD 911#if !HAVE_READAHEAD
900# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 912# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
901 913
902static 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)
903{ 915{
916 size_t todo = count;
904 dBUF; 917 dBUF;
905 918
906 while (count > 0) 919 while (todo > 0)
907 { 920 {
908 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 921 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
909 922
910 pread (fd, aio_buf, len, offset); 923 pread (fd, aio_buf, len, offset);
911 offset += len; 924 offset += len;
912 count -= len; 925 todo -= len;
913 } 926 }
914 927
915 errno = 0; 928 errno = 0;
929 return count;
916} 930}
917 931
918#endif 932#endif
919 933
920#if !HAVE_READDIR_R 934#if !HAVE_READDIR_R
921# define readdir_r aio_readdir_r 935# define readdir_r aio_readdir_r
922 936
923static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 937static mutex_t readdirlock = X_MUTEX_INIT;
924 938
925static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 939static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
926{ 940{
927 struct dirent *e; 941 X_DIRENT *e;
928 int errorno; 942 int errorno;
929 943
930 LOCK (readdirlock); 944 X_LOCK (readdirlock);
931 945
932 e = readdir (dirp); 946 e = readdir (dirp);
933 errorno = errno; 947 errorno = errno;
934 948
935 if (e) 949 if (e)
938 strcpy (ent->d_name, e->d_name); 952 strcpy (ent->d_name, e->d_name);
939 } 953 }
940 else 954 else
941 *res = 0; 955 *res = 0;
942 956
943 UNLOCK (readdirlock); 957 X_UNLOCK (readdirlock);
944 958
945 errno = errorno; 959 errno = errorno;
946 return e ? 0 : -1; 960 return e ? 0 : -1;
947} 961}
948#endif 962#endif
1044static void scandir_ (aio_req req, worker *self) 1058static void scandir_ (aio_req req, worker *self)
1045{ 1059{
1046 DIR *dirp; 1060 DIR *dirp;
1047 union 1061 union
1048 { 1062 {
1049 struct dirent d; 1063 X_DIRENT d;
1050 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1064 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
1051 } *u; 1065 } *u;
1052 struct dirent *entp; 1066 X_DIRENT *entp;
1053 char *name, *names; 1067 char *name, *names;
1054 int memlen = 4096; 1068 int memlen = 4096;
1055 int memofs = 0; 1069 int memofs = 0;
1056 int res = 0; 1070 int res = 0;
1057 int errorno;
1058 1071
1059 LOCK (wrklock); 1072 X_LOCK (wrklock);
1060 self->dirp = dirp = opendir (req->ptr1); 1073 self->dirp = dirp = opendir (req->ptr1);
1061 self->dbuf = u = malloc (sizeof (*u)); 1074 self->dbuf = u = malloc (sizeof (*u));
1062 req->flags |= FLAG_PTR2_FREE; 1075 req->flags |= FLAG_PTR2_FREE;
1063 req->ptr2 = names = malloc (memlen); 1076 req->ptr2 = names = malloc (memlen);
1064 UNLOCK (wrklock); 1077 X_UNLOCK (wrklock);
1065 1078
1066 if (dirp && u && names) 1079 if (dirp && u && names)
1067 for (;;) 1080 for (;;)
1068 { 1081 {
1069 errno = 0; 1082 errno = 0;
1081 res++; 1094 res++;
1082 1095
1083 while (memofs + len > memlen) 1096 while (memofs + len > memlen)
1084 { 1097 {
1085 memlen *= 2; 1098 memlen *= 2;
1086 LOCK (wrklock); 1099 X_LOCK (wrklock);
1087 req->ptr2 = names = realloc (names, memlen); 1100 req->ptr2 = names = realloc (names, memlen);
1088 UNLOCK (wrklock); 1101 X_UNLOCK (wrklock);
1089 1102
1090 if (!names) 1103 if (!names)
1091 break; 1104 break;
1092 } 1105 }
1093 1106
1102 req->result = res; 1115 req->result = res;
1103} 1116}
1104 1117
1105/*****************************************************************************/ 1118/*****************************************************************************/
1106 1119
1107static void *aio_proc (void *thr_arg) 1120X_THREAD_PROC (aio_proc)
1108{ 1121{
1122 {//D
1109 aio_req req; 1123 aio_req req;
1110 struct timespec ts; 1124 struct timespec ts;
1111 worker *self = (worker *)thr_arg; 1125 worker *self = (worker *)thr_arg;
1112 1126
1113 /* try to distribute timeouts somewhat evenly */ 1127 /* try to distribute timeouts somewhat randomly */
1114 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 1128 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1115 * (1000000000UL / 1024UL);
1116 1129
1117 for (;;) 1130 for (;;)
1118 { 1131 {
1119 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1132 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1120 1133
1121 LOCK (reqlock); 1134 X_LOCK (reqlock);
1122 1135
1123 for (;;) 1136 for (;;)
1124 { 1137 {
1125 self->req = req = reqq_shift (&req_queue); 1138 self->req = req = reqq_shift (&req_queue);
1126 1139
1127 if (req) 1140 if (req)
1128 break; 1141 break;
1129 1142
1130 ++idle; 1143 ++idle;
1131 1144
1132 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1145 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1133 == ETIMEDOUT) 1146 == ETIMEDOUT)
1134 { 1147 {
1135 if (idle > max_idle) 1148 if (idle > max_idle)
1136 { 1149 {
1137 --idle; 1150 --idle;
1138 UNLOCK (reqlock); 1151 X_UNLOCK (reqlock);
1139 LOCK (wrklock); 1152 X_LOCK (wrklock);
1140 --started; 1153 --started;
1141 UNLOCK (wrklock); 1154 X_UNLOCK (wrklock);
1142 goto quit; 1155 goto quit;
1143 } 1156 }
1144 1157
1145 /* we are allowed to idle, so do so without any timeout */ 1158 /* we are allowed to idle, so do so without any timeout */
1146 pthread_cond_wait (&reqwait, &reqlock); 1159 X_COND_WAIT (reqwait, reqlock);
1147 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1160 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1148 } 1161 }
1149 1162
1150 --idle; 1163 --idle;
1151 } 1164 }
1152 1165
1153 --nready; 1166 --nready;
1154 1167
1155 UNLOCK (reqlock); 1168 X_UNLOCK (reqlock);
1156 1169
1157 errno = 0; /* strictly unnecessary */ 1170 errno = 0; /* strictly unnecessary */
1158 1171
1159 if (!(req->flags & FLAG_CANCELLED)) 1172 if (!(req->flags & FLAG_CANCELLED))
1160 switch (req->type) 1173 switch (req->type)
1161 { 1174 {
1162 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; 1175 case REQ_READ: req->result = req->offs >= 0
1163 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;
1164 1181
1165 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;
1166 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;
1167 1184
1168 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;
1169 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;
1170 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;
1171 1195
1172 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;
1173 case REQ_CLOSE: req->result = close (req->int1); break; 1197 case REQ_CLOSE: req->result = close (req->int1); break;
1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1198 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1199 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1200 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1176 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1201 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1177 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1202 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1178 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; 1203 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1179 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break; 1204 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1180 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break; 1205 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1182 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break; 1207 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1183 case REQ_FSYNC: req->result = fsync (req->int1); break; 1208 case REQ_FSYNC: req->result = fsync (req->int1); break;
1184 case REQ_READDIR: scandir_ (req, self); break; 1209 case REQ_READDIR: scandir_ (req, self); break;
1185 1210
1186 case REQ_BUSY: 1211 case REQ_BUSY:
1212#ifdef _WIN32
1213 Sleep (req->nv1 * 1000.);
1214#else
1187 { 1215 {
1188 struct timeval tv; 1216 struct timeval tv;
1189 1217
1190 tv.tv_sec = req->int1; 1218 tv.tv_sec = req->nv1;
1191 tv.tv_usec = req->int2; 1219 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1192 1220
1193 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);
1194 } 1248 }
1195 1249
1196 case REQ_GROUP: 1250 case REQ_GROUP:
1197 case REQ_NOP: 1251 case REQ_NOP:
1198 break; 1252 break;
1199 1253
1200 case REQ_QUIT: 1254 case REQ_QUIT:
1201 goto quit; 1255 goto quit;
1202 1256
1203 default: 1257 default:
1204 req->result = ENOSYS; 1258 req->result = -1;
1205 break; 1259 break;
1206 } 1260 }
1207 1261
1208 req->errorno = errno; 1262 req->errorno = errno;
1209 1263
1210 LOCK (reslock); 1264 X_LOCK (reslock);
1211 1265
1212 ++npending; 1266 ++npending;
1213 1267
1214 if (!reqq_push (&res_queue, req)) 1268 if (!reqq_push (&res_queue, req))
1215 { 1269 {
1222 } 1276 }
1223 1277
1224 self->req = 0; 1278 self->req = 0;
1225 worker_clear (self); 1279 worker_clear (self);
1226 1280
1227 UNLOCK (reslock); 1281 X_UNLOCK (reslock);
1228 } 1282 }
1229 1283
1230quit: 1284quit:
1231 LOCK (wrklock); 1285 X_LOCK (wrklock);
1232 worker_free (self); 1286 worker_free (self);
1233 UNLOCK (wrklock); 1287 X_UNLOCK (wrklock);
1234 1288
1235 return 0; 1289 return 0;
1290 }//D
1236} 1291}
1237 1292
1238/*****************************************************************************/ 1293/*****************************************************************************/
1239 1294
1240static void atfork_prepare (void) 1295static void atfork_prepare (void)
1241{ 1296{
1242 LOCK (wrklock); 1297 X_LOCK (wrklock);
1243 LOCK (reqlock); 1298 X_LOCK (reqlock);
1244 LOCK (reslock); 1299 X_LOCK (reslock);
1245#if !HAVE_PREADWRITE 1300#if !HAVE_PREADWRITE
1246 LOCK (preadwritelock); 1301 X_LOCK (preadwritelock);
1247#endif 1302#endif
1248#if !HAVE_READDIR_R 1303#if !HAVE_READDIR_R
1249 LOCK (readdirlock); 1304 X_LOCK (readdirlock);
1250#endif 1305#endif
1251} 1306}
1252 1307
1253static void atfork_parent (void) 1308static void atfork_parent (void)
1254{ 1309{
1255#if !HAVE_READDIR_R 1310#if !HAVE_READDIR_R
1256 UNLOCK (readdirlock); 1311 X_UNLOCK (readdirlock);
1257#endif 1312#endif
1258#if !HAVE_PREADWRITE 1313#if !HAVE_PREADWRITE
1259 UNLOCK (preadwritelock); 1314 X_UNLOCK (preadwritelock);
1260#endif 1315#endif
1261 UNLOCK (reslock); 1316 X_UNLOCK (reslock);
1262 UNLOCK (reqlock); 1317 X_UNLOCK (reqlock);
1263 UNLOCK (wrklock); 1318 X_UNLOCK (wrklock);
1264} 1319}
1265 1320
1266static void atfork_child (void) 1321static void atfork_child (void)
1267{ 1322{
1268 aio_req prv; 1323 aio_req prv;
1269 1324
1270 while (prv = reqq_shift (&req_queue)) 1325 while (prv = reqq_shift (&req_queue))
1271 req_free (prv); 1326 req_destroy (prv);
1272 1327
1273 while (prv = reqq_shift (&res_queue)) 1328 while (prv = reqq_shift (&res_queue))
1274 req_free (prv); 1329 req_destroy (prv);
1275 1330
1276 while (wrk_first.next != &wrk_first) 1331 while (wrk_first.next != &wrk_first)
1277 { 1332 {
1278 worker *wrk = wrk_first.next; 1333 worker *wrk = wrk_first.next;
1279 1334
1280 if (wrk->req) 1335 if (wrk->req)
1281 req_free (wrk->req); 1336 req_destroy (wrk->req);
1282 1337
1283 worker_clear (wrk); 1338 worker_clear (wrk);
1284 worker_free (wrk); 1339 worker_free (wrk);
1285 } 1340 }
1286 1341
1290 nready = 0; 1345 nready = 0;
1291 npending = 0; 1346 npending = 0;
1292 1347
1293 close (respipe [0]); 1348 close (respipe [0]);
1294 close (respipe [1]); 1349 close (respipe [1]);
1295 create_pipe (); 1350
1351 if (!create_pipe (respipe))
1352 croak ("cannot set result pipe to nonblocking mode");
1296 1353
1297 atfork_parent (); 1354 atfork_parent ();
1298} 1355}
1299 1356
1300#define dREQ \ 1357#define dREQ \
1329 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1386 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1330 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1387 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1331 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1388 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1332 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1389 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1333 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
1334 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1399 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1335 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO)); 1400 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1401#endif
1336 1402
1337 create_pipe (); 1403 if (!create_pipe (respipe))
1404 croak ("cannot set result pipe to nonblocking mode");
1405
1338 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1406 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1339} 1407}
1340 1408
1341void 1409void
1342max_poll_reqs (int nreqs) 1410max_poll_reqs (int nreqs)
1343 PROTOTYPE: $ 1411 PROTOTYPE: $
1372 max_outstanding = maxreqs; 1440 max_outstanding = maxreqs;
1373 OUTPUT: 1441 OUTPUT:
1374 RETVAL 1442 RETVAL
1375 1443
1376void 1444void
1377aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1445aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1378 SV8 * pathname
1379 int flags
1380 int mode
1381 SV * callback
1382 PROTOTYPE: $$$;$ 1446 PROTOTYPE: $$$;$
1383 PPCODE: 1447 PPCODE:
1384{ 1448{
1385 dREQ; 1449 dREQ;
1386 1450
1392 1456
1393 REQ_SEND; 1457 REQ_SEND;
1394} 1458}
1395 1459
1396void 1460void
1397aio_close (fh,callback=&PL_sv_undef) 1461aio_close (SV *fh, SV *callback=&PL_sv_undef)
1398 SV * fh
1399 SV * callback
1400 PROTOTYPE: $;$ 1462 PROTOTYPE: $;$
1401 ALIAS: 1463 ALIAS:
1402 aio_close = REQ_CLOSE 1464 aio_close = REQ_CLOSE
1403 aio_fsync = REQ_FSYNC 1465 aio_fsync = REQ_FSYNC
1404 aio_fdatasync = REQ_FDATASYNC 1466 aio_fdatasync = REQ_FDATASYNC
1405 PPCODE: 1467 PPCODE:
1406{ 1468{
1407 dREQ; 1469 dREQ;
1408 1470
1409 req->type = ix; 1471 req->type = ix;
1410 req->fh = newSVsv (fh); 1472 req->sv1 = newSVsv (fh);
1411 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1473 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1412 1474
1413 REQ_SEND (req); 1475 REQ_SEND (req);
1414} 1476}
1415 1477
1416void 1478void
1417aio_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)
1418 SV * fh
1419 UV offset
1420 UV length
1421 SV8 * data
1422 UV dataoffset
1423 SV * callback
1424 ALIAS: 1480 ALIAS:
1425 aio_read = REQ_READ 1481 aio_read = REQ_READ
1426 aio_write = REQ_WRITE 1482 aio_write = REQ_WRITE
1427 PROTOTYPE: $$$$$;$ 1483 PROTOTYPE: $$$$$;$
1428 PPCODE: 1484 PPCODE:
1429{ 1485{
1430 STRLEN svlen; 1486 STRLEN svlen;
1431 char *svptr = SvPVbyte (data, svlen); 1487 char *svptr = SvPVbyte (data, svlen);
1488 UV len = SvUV (length);
1432 1489
1433 SvUPGRADE (data, SVt_PV); 1490 SvUPGRADE (data, SVt_PV);
1434 SvPOK_on (data); 1491 SvPOK_on (data);
1435 1492
1436 if (dataoffset < 0) 1493 if (dataoffset < 0)
1437 dataoffset += svlen; 1494 dataoffset += svlen;
1438 1495
1439 if (dataoffset < 0 || dataoffset > svlen) 1496 if (dataoffset < 0 || dataoffset > svlen)
1440 croak ("data offset outside of string"); 1497 croak ("dataoffset outside of data scalar");
1441 1498
1442 if (ix == REQ_WRITE) 1499 if (ix == REQ_WRITE)
1443 { 1500 {
1444 /* write: check length and adjust. */ 1501 /* write: check length and adjust. */
1445 if (length < 0 || length + dataoffset > svlen) 1502 if (!SvOK (length) || len + dataoffset > svlen)
1446 length = svlen - dataoffset; 1503 len = svlen - dataoffset;
1447 } 1504 }
1448 else 1505 else
1449 { 1506 {
1450 /* read: grow scalar as necessary */ 1507 /* read: grow scalar as necessary */
1451 svptr = SvGROW (data, length + dataoffset); 1508 svptr = SvGROW (data, len + dataoffset + 1);
1452 } 1509 }
1453 1510
1454 if (length < 0) 1511 if (len < 0)
1455 croak ("length must not be negative"); 1512 croak ("length must not be negative");
1456 1513
1457 { 1514 {
1458 dREQ; 1515 dREQ;
1459 1516
1460 req->type = ix; 1517 req->type = ix;
1461 req->fh = newSVsv (fh); 1518 req->sv1 = newSVsv (fh);
1462 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1519 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1463 : IoOFP (sv_2io (fh))); 1520 : IoOFP (sv_2io (fh)));
1464 req->offs = offset; 1521 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1465 req->size = length; 1522 req->size = len;
1466 req->sv1 = SvREFCNT_inc (data); 1523 req->sv2 = SvREFCNT_inc (data);
1467 req->ptr1 = (char *)svptr + dataoffset; 1524 req->ptr1 = (char *)svptr + dataoffset;
1468 req->stroffset = dataoffset; 1525 req->stroffset = dataoffset;
1469 1526
1470 if (!SvREADONLY (data)) 1527 if (!SvREADONLY (data))
1471 { 1528 {
1472 SvREADONLY_on (data); 1529 SvREADONLY_on (data);
1473 req->flags |= FLAG_SV1_RO_OFF; 1530 req->flags |= FLAG_SV2_RO_OFF;
1474 } 1531 }
1475 1532
1476 REQ_SEND; 1533 REQ_SEND;
1477 } 1534 }
1478} 1535}
1479 1536
1480void 1537void
1481aio_readlink (path,callback=&PL_sv_undef) 1538aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1482 SV8 * path
1483 SV * callback
1484 PROTOTYPE: $$;$ 1539 PROTOTYPE: $$;$
1485 PPCODE: 1540 PPCODE:
1486{ 1541{
1487 SV *data; 1542 SV *data;
1488 dREQ; 1543 dREQ;
1489 1544
1490 data = newSV (NAME_MAX); 1545 data = newSV (NAME_MAX);
1491 SvPOK_on (data); 1546 SvPOK_on (data);
1492 1547
1493 req->type = REQ_READLINK; 1548 req->type = REQ_READLINK;
1494 req->fh = newSVsv (path); 1549 req->sv1 = newSVsv (path);
1495 req->ptr2 = SvPVbyte_nolen (req->fh); 1550 req->ptr2 = SvPVbyte_nolen (req->sv1);
1496 req->sv1 = data; 1551 req->sv2 = data;
1497 req->ptr1 = SvPVbyte_nolen (data); 1552 req->ptr1 = SvPVbyte_nolen (data);
1498 1553
1499 REQ_SEND; 1554 REQ_SEND;
1500} 1555}
1501 1556
1502void 1557void
1503aio_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)
1504 SV * out_fh
1505 SV * in_fh
1506 UV in_offset
1507 UV length
1508 SV * callback
1509 PROTOTYPE: $$$$;$ 1559 PROTOTYPE: $$$$;$
1510 PPCODE: 1560 PPCODE:
1511{ 1561{
1512 dREQ; 1562 dREQ;
1513 1563
1514 req->type = REQ_SENDFILE; 1564 req->type = REQ_SENDFILE;
1515 req->fh = newSVsv (out_fh); 1565 req->sv1 = newSVsv (out_fh);
1516 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1566 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1517 req->sv2 = newSVsv (in_fh); 1567 req->sv2 = newSVsv (in_fh);
1518 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1568 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1519 req->offs = in_offset; 1569 req->offs = SvVAL64 (in_offset);
1520 req->size = length; 1570 req->size = length;
1521 1571
1522 REQ_SEND; 1572 REQ_SEND;
1523} 1573}
1524 1574
1525void 1575void
1526aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1576aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1527 SV * fh
1528 UV offset
1529 IV length
1530 SV * callback
1531 PROTOTYPE: $$$;$ 1577 PROTOTYPE: $$$;$
1532 PPCODE: 1578 PPCODE:
1533{ 1579{
1534 dREQ; 1580 dREQ;
1535 1581
1536 req->type = REQ_READAHEAD; 1582 req->type = REQ_READAHEAD;
1537 req->fh = newSVsv (fh); 1583 req->sv1 = newSVsv (fh);
1538 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1584 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1539 req->offs = offset; 1585 req->offs = SvVAL64 (offset);
1540 req->size = length; 1586 req->size = length;
1541 1587
1542 REQ_SEND; 1588 REQ_SEND;
1543} 1589}
1544 1590
1545void 1591void
1546aio_stat (fh_or_path,callback=&PL_sv_undef) 1592aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1547 SV8 * fh_or_path
1548 SV * callback
1549 ALIAS: 1593 ALIAS:
1550 aio_stat = REQ_STAT 1594 aio_stat = REQ_STAT
1551 aio_lstat = REQ_LSTAT 1595 aio_lstat = REQ_LSTAT
1552 PPCODE: 1596 PPCODE:
1553{ 1597{
1554 dREQ; 1598 dREQ;
1555 1599
1556 req->ptr2 = malloc (sizeof (Stat_t)); 1600 req->ptr2 = malloc (sizeof (Stat_t));
1557 if (!req->ptr2) 1601 if (!req->ptr2)
1558 { 1602 {
1559 req_free (req); 1603 req_destroy (req);
1560 croak ("out of memory during aio_stat statdata allocation"); 1604 croak ("out of memory during aio_stat statdata allocation");
1561 } 1605 }
1562 1606
1563 req->flags |= FLAG_PTR2_FREE; 1607 req->flags |= FLAG_PTR2_FREE;
1608 req->sv1 = newSVsv (fh_or_path);
1564 1609
1565 if (SvPOK (fh_or_path)) 1610 if (SvPOK (fh_or_path))
1566 { 1611 {
1567 req->type = ix; 1612 req->type = ix;
1568 req->sv1 = newSVsv (fh_or_path);
1569 req->ptr1 = SvPVbyte_nolen (req->sv1); 1613 req->ptr1 = SvPVbyte_nolen (req->sv1);
1570 } 1614 }
1571 else 1615 else
1572 { 1616 {
1573 req->type = REQ_FSTAT; 1617 req->type = REQ_FSTAT;
1574 req->fh = newSVsv (fh_or_path);
1575 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1618 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1576 } 1619 }
1577 1620
1578 REQ_SEND; 1621 REQ_SEND;
1579} 1622}
1580 1623
1581void 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
1582aio_unlink (pathname,callback=&PL_sv_undef) 1719aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1583 SV8 * pathname
1584 SV * callback
1585 ALIAS: 1720 ALIAS:
1586 aio_unlink = REQ_UNLINK 1721 aio_unlink = REQ_UNLINK
1587 aio_rmdir = REQ_RMDIR 1722 aio_rmdir = REQ_RMDIR
1588 aio_readdir = REQ_READDIR 1723 aio_readdir = REQ_READDIR
1589 PPCODE: 1724 PPCODE:
1596 1731
1597 REQ_SEND; 1732 REQ_SEND;
1598} 1733}
1599 1734
1600void 1735void
1736aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1737 PPCODE:
1738{
1739 dREQ;
1740
1741 req->type = REQ_MKDIR;
1742 req->sv1 = newSVsv (pathname);
1743 req->ptr1 = SvPVbyte_nolen (req->sv1);
1744 req->mode = mode;
1745
1746 REQ_SEND;
1747}
1748
1749void
1601aio_link (oldpath,newpath,callback=&PL_sv_undef) 1750aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1602 SV8 * oldpath
1603 SV8 * newpath
1604 SV * callback
1605 ALIAS: 1751 ALIAS:
1606 aio_link = REQ_LINK 1752 aio_link = REQ_LINK
1607 aio_symlink = REQ_SYMLINK 1753 aio_symlink = REQ_SYMLINK
1608 aio_rename = REQ_RENAME 1754 aio_rename = REQ_RENAME
1609 PPCODE: 1755 PPCODE:
1610{ 1756{
1611 dREQ; 1757 dREQ;
1612 1758
1613 req->type = ix; 1759 req->type = ix;
1614 req->fh = newSVsv (oldpath); 1760 req->sv2 = newSVsv (oldpath);
1615 req->ptr2 = SvPVbyte_nolen (req->fh); 1761 req->ptr2 = SvPVbyte_nolen (req->sv2);
1616 req->sv1 = newSVsv (newpath); 1762 req->sv1 = newSVsv (newpath);
1617 req->ptr1 = SvPVbyte_nolen (req->sv1); 1763 req->ptr1 = SvPVbyte_nolen (req->sv1);
1618 1764
1619 REQ_SEND; 1765 REQ_SEND;
1620} 1766}
1621 1767
1622void 1768void
1623aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1769aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1624 SV8 * pathname
1625 SV * callback
1626 UV mode
1627 UV dev
1628 PPCODE: 1770 PPCODE:
1629{ 1771{
1630 dREQ; 1772 dREQ;
1631 1773
1632 req->type = REQ_MKNOD; 1774 req->type = REQ_MKNOD;
1637 1779
1638 REQ_SEND; 1780 REQ_SEND;
1639} 1781}
1640 1782
1641void 1783void
1642aio_busy (delay,callback=&PL_sv_undef) 1784aio_busy (double delay, SV *callback=&PL_sv_undef)
1643 double delay
1644 SV * callback
1645 PPCODE: 1785 PPCODE:
1646{ 1786{
1647 dREQ; 1787 dREQ;
1648 1788
1649 req->type = REQ_BUSY; 1789 req->type = REQ_BUSY;
1650 req->int1 = delay < 0. ? 0 : delay; 1790 req->nv1 = delay < 0. ? 0. : delay;
1651 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1652 1791
1653 REQ_SEND; 1792 REQ_SEND;
1654} 1793}
1655 1794
1656void 1795void
1657aio_group (callback=&PL_sv_undef) 1796aio_group (SV *callback=&PL_sv_undef)
1658 SV * callback
1659 PROTOTYPE: ;$ 1797 PROTOTYPE: ;$
1660 PPCODE: 1798 PPCODE:
1661{ 1799{
1662 dREQ; 1800 dREQ;
1663 1801
1666 req_send (req); 1804 req_send (req);
1667 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1805 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1668} 1806}
1669 1807
1670void 1808void
1671aio_nop (callback=&PL_sv_undef) 1809aio_nop (SV *callback=&PL_sv_undef)
1672 SV * callback
1673 PPCODE: 1810 PPCODE:
1674{ 1811{
1675 dREQ; 1812 dREQ;
1676 1813
1677 req->type = REQ_NOP; 1814 req->type = REQ_NOP;
1748 CODE: 1885 CODE:
1749{ 1886{
1750 if (block_sig_level) 1887 if (block_sig_level)
1751 croak ("cannot call IO::AIO::setsig from within aio_block/callback"); 1888 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1752 1889
1753 LOCK (reslock); 1890 X_LOCK (reslock);
1754 main_tid = pthread_self (); 1891 main_tid = pthread_self ();
1755 main_sig = signum; 1892 main_sig = signum;
1756 UNLOCK (reslock); 1893 X_UNLOCK (reslock);
1757 1894
1758 if (main_sig && npending) 1895 if (main_sig && npending)
1759 pthread_kill (main_tid, main_sig); 1896 pthread_kill (main_tid, main_sig);
1760} 1897}
1761 1898
1805 1942
1806int 1943int
1807nthreads() 1944nthreads()
1808 PROTOTYPE: 1945 PROTOTYPE:
1809 CODE: 1946 CODE:
1810 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1947 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1811 RETVAL = started; 1948 RETVAL = started;
1812 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1949 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1813 OUTPUT: 1950 OUTPUT:
1814 RETVAL 1951 RETVAL
1815 1952
1816PROTOTYPES: DISABLE 1953PROTOTYPES: DISABLE
1817 1954

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines