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.97 by root, Sun Jan 7 22:59:57 2007 UTC vs.
Revision 1.101 by root, Fri Jun 1 13:25:51 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h" 9#include "autoconf/config.h"
18
19#include <pthread.h>
20 10
21#include <stddef.h> 11#include <stddef.h>
22#include <stdlib.h> 12#include <stdlib.h>
23#include <errno.h> 13#include <errno.h>
24#include <sys/time.h> 14#include <sys/time.h>
… …
28#include <limits.h> 18#include <limits.h>
29#include <unistd.h> 19#include <unistd.h>
30#include <fcntl.h> 20#include <fcntl.h>
31#include <signal.h> 21#include <signal.h>
32#include <sched.h> 22#include <sched.h>
23#include <utime.h>
33 24
34#if HAVE_SENDFILE 25#if HAVE_SENDFILE
35# if __linux 26# if __linux
36# include <sys/sendfile.h> 27# include <sys/sendfile.h>
37# elif __freebsd 28# elif __freebsd
… …
52/* used for struct dirent, AIX doesn't provide it */ 43/* used for struct dirent, AIX doesn't provide it */
53#ifndef NAME_MAX 44#ifndef NAME_MAX
54# define NAME_MAX 4096 45# define NAME_MAX 4096
55#endif 46#endif
56 47
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 */ 48/* buffer size for various temporary buffers */
83#define AIO_BUFSIZE 65536 49#define AIO_BUFSIZE 65536
50
51/* use NV for 32 bit perls as it allows larger offsets */
52#if IVSIZE >= 8
53# define SvVAL64 SvIV
54#else
55# define SvVAL64 SvNV
56#endif
84 57
85#define dBUF \ 58#define dBUF \
86 char *aio_buf; \ 59 char *aio_buf; \
87 LOCK (wrklock); \ 60 LOCK (wrklock); \
88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 61 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
… …
93typedef SV SV8; /* byte-sv, used for argument-checking */ 66typedef SV SV8; /* byte-sv, used for argument-checking */
94 67
95enum { 68enum {
96 REQ_QUIT, 69 REQ_QUIT,
97 REQ_OPEN, REQ_CLOSE, 70 REQ_OPEN, REQ_CLOSE,
98 REQ_READ, REQ_WRITE, REQ_READAHEAD, 71 REQ_READ, REQ_WRITE,
99 REQ_SENDFILE, 72 REQ_READAHEAD, REQ_SENDFILE,
100 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 73 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
74 REQ_UTIME, REQ_FUTIME,
75 REQ_CHMOD, REQ_FCHMOD,
76 REQ_CHOWN, REQ_FCHOWN,
101 REQ_FSYNC, REQ_FDATASYNC, 77 REQ_FSYNC, REQ_FDATASYNC,
102 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME, 78 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
103 REQ_MKNOD, REQ_READDIR, 79 REQ_MKNOD, REQ_READDIR,
104 REQ_LINK, REQ_SYMLINK, REQ_READLINK, 80 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
105 REQ_GROUP, REQ_NOP, 81 REQ_GROUP, REQ_NOP,
… …
111 87
112typedef struct aio_cb 88typedef struct aio_cb
113{ 89{
114 struct aio_cb *volatile next; 90 struct aio_cb *volatile next;
115 91
116 SV *callback, *fh; 92 SV *callback;
117 SV *sv1, *sv2; 93 SV *sv1, *sv2;
118 void *ptr1, *ptr2; 94 void *ptr1, *ptr2;
119 off_t offs; 95 off_t offs;
120 size_t size; 96 size_t size;
121 ssize_t result; 97 ssize_t result;
98 double nv1, nv2;
122 99
123 STRLEN stroffset; 100 STRLEN stroffset;
124 int type; 101 int type;
125 int int1, int2; 102 int int1, int2, int3;
126 int errorno; 103 int errorno;
127 mode_t mode; /* open */ 104 mode_t mode; /* open */
128 105
129 unsigned char flags; 106 unsigned char flags;
130 unsigned char pri; 107 unsigned char pri;
… …
133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
134} aio_cb; 111} aio_cb;
135 112
136enum { 113enum {
137 FLAG_CANCELLED = 0x01, /* request was cancelled */ 114 FLAG_CANCELLED = 0x01, /* request was cancelled */
138 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ 115 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
139 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ 116 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
140}; 117};
141 118
142typedef aio_cb *aio_req; 119typedef aio_cb *aio_req;
143typedef aio_cb *aio_req_ornot; 120typedef aio_cb *aio_req_ornot;
… …
161{ 138{
162 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 139 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
163 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 140 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
164} 141}
165 142
166static pthread_t main_tid; 143static thread_t main_tid;
167static int main_sig; 144static int main_sig;
168static int block_sig_level; 145static int block_sig_level;
169 146
170void block_sig () 147void block_sig ()
171{ 148{
… …
199 176
200static int next_pri = DEFAULT_PRI + PRI_BIAS; 177static int next_pri = DEFAULT_PRI + PRI_BIAS;
201 178
202static unsigned int started, idle, wanted; 179static unsigned int started, idle, wanted;
203 180
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 */ 181/* worker threads management */
214static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 182static mutex_t wrklock = MUTEX_INIT;
215 183
216typedef struct worker { 184typedef struct worker {
217 /* locked by wrklock */ 185 /* locked by wrklock */
218 struct worker *prev, *next; 186 struct worker *prev, *next;
219 187
220 pthread_t tid; 188 thread_t tid;
221 189
222 /* locked by reslock, reqlock or wrklock */ 190 /* locked by reslock, reqlock or wrklock */
223 aio_req req; /* currently processed request */ 191 aio_req req; /* currently processed request */
224 void *dbuf; 192 void *dbuf;
225 DIR *dirp; 193 DIR *dirp;
… …
253static volatile unsigned int nreqs, nready, npending; 221static volatile unsigned int nreqs, nready, npending;
254static volatile unsigned int max_idle = 4; 222static volatile unsigned int max_idle = 4;
255static volatile unsigned int max_outstanding = 0xffffffff; 223static volatile unsigned int max_outstanding = 0xffffffff;
256static int respipe [2]; 224static int respipe [2];
257 225
258static pthread_mutex_t reslock = AIO_MUTEX_INIT; 226static mutex_t reslock = MUTEX_INIT;
259static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 227static mutex_t reqlock = MUTEX_INIT;
260static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 228static cond_t reqwait = COND_INIT;
261 229
262#if WORDACCESS_UNSAFE 230#if WORDACCESS_UNSAFE
263 231
264static unsigned int get_nready () 232static unsigned int get_nready ()
265{ 233{
… …
356 abort (); 324 abort ();
357} 325}
358 326
359static int poll_cb (); 327static int poll_cb ();
360static int req_invoke (aio_req req); 328static int req_invoke (aio_req req);
361static void req_free (aio_req req); 329static void req_destroy (aio_req req);
362static void req_cancel (aio_req req); 330static void req_cancel (aio_req req);
363 331
364/* must be called at most once */ 332/* must be called at most once */
365static SV *req_sv (aio_req req, const char *klass) 333static SV *req_sv (aio_req req, const char *klass)
366{ 334{
… …
432 { 400 {
433 block_sig (); 401 block_sig ();
434 402
435 if (!req_invoke (grp)) 403 if (!req_invoke (grp))
436 { 404 {
437 req_free (grp); 405 req_destroy (grp);
438 unblock_sig (); 406 unblock_sig ();
439 croak (0); 407 croak (0);
440 } 408 }
441 409
442 req_free (grp); 410 req_destroy (grp);
443 unblock_sig (); 411 unblock_sig ();
444 } 412 }
445} 413}
446 414
447static int req_invoke (aio_req req) 415static int req_invoke (aio_req req)
448{ 416{
449 dSP; 417 dSP;
450 418
451 if (req->flags & FLAG_SV1_RO_OFF) 419 if (req->flags & FLAG_SV2_RO_OFF)
452 SvREADONLY_off (req->sv1); 420 SvREADONLY_off (req->sv2);
453 421
454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 422 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
455 { 423 {
456 ENTER; 424 ENTER;
457 SAVETMPS; 425 SAVETMPS;
… …
522 break; 490 break;
523 491
524 case REQ_READLINK: 492 case REQ_READLINK:
525 if (req->result > 0) 493 if (req->result > 0)
526 { 494 {
527 SvCUR_set (req->sv1, req->result); 495 SvCUR_set (req->sv2, req->result);
528 *SvEND (req->sv1) = 0; 496 *SvEND (req->sv2) = 0;
529 PUSHs (req->sv1); 497 PUSHs (req->sv2);
530 } 498 }
531 break; 499 break;
532 500
533 case REQ_STAT: 501 case REQ_STAT:
534 case REQ_LSTAT: 502 case REQ_LSTAT:
… …
538 PL_statcache = *(Stat_t *)(req->ptr2); 506 PL_statcache = *(Stat_t *)(req->ptr2);
539 PUSHs (sv_2mortal (newSViv (req->result))); 507 PUSHs (sv_2mortal (newSViv (req->result)));
540 break; 508 break;
541 509
542 case REQ_READ: 510 case REQ_READ:
543 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); 511 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
544 *SvEND (req->sv1) = 0; 512 *SvEND (req->sv2) = 0;
545 PUSHs (sv_2mortal (newSViv (req->result))); 513 PUSHs (sv_2mortal (newSViv (req->result)));
546 break; 514 break;
547 515
548 default: 516 default:
549 PUSHs (sv_2mortal (newSViv (req->result))); 517 PUSHs (sv_2mortal (newSViv (req->result)));
… …
575 } 543 }
576 544
577 return !SvTRUE (ERRSV); 545 return !SvTRUE (ERRSV);
578} 546}
579 547
580static void req_free (aio_req req) 548static void req_destroy (aio_req req)
581{ 549{
582 if (req->self) 550 if (req->self)
583 { 551 {
584 sv_unmagic (req->self, PERL_MAGIC_ext); 552 sv_unmagic (req->self, PERL_MAGIC_ext);
585 SvREFCNT_dec (req->self); 553 SvREFCNT_dec (req->self);
586 } 554 }
587 555
588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1); 556 SvREFCNT_dec (req->sv1);
590 SvREFCNT_dec (req->sv2); 557 SvREFCNT_dec (req->sv2);
591 SvREFCNT_dec (req->callback); 558 SvREFCNT_dec (req->callback);
592 559
593 if (req->flags & FLAG_PTR2_FREE) 560 if (req->flags & FLAG_PTR2_FREE)
… …
615 req->flags |= FLAG_CANCELLED; 582 req->flags |= FLAG_CANCELLED;
616 583
617 req_cancel_subs (req); 584 req_cancel_subs (req);
618} 585}
619 586
620static void *aio_proc(void *arg); 587static void *aio_proc (void *arg);
621 588
622static void start_thread (void) 589static void start_thread (void)
623{ 590{
624 sigset_t fullsigset, oldsigset;
625 pthread_attr_t attr;
626
627 worker *wrk = calloc (1, sizeof (worker)); 591 worker *wrk = calloc (1, sizeof (worker));
628 592
629 if (!wrk) 593 if (!wrk)
630 croak ("unable to allocate worker thread data"); 594 croak ("unable to allocate worker thread data");
631 595
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); 596 LOCK (wrklock);
642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
643 597
644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 598 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
645 { 599 {
646 wrk->prev = &wrk_first; 600 wrk->prev = &wrk_first;
647 wrk->next = wrk_first.next; 601 wrk->next = wrk_first.next;
648 wrk_first.next->prev = wrk; 602 wrk_first.next->prev = wrk;
649 wrk_first.next = wrk; 603 wrk_first.next = wrk;
650 ++started; 604 ++started;
651 } 605 }
652 else 606 else
653 free (wrk); 607 free (wrk);
654 608
655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
656 UNLOCK (wrklock); 609 UNLOCK (wrklock);
657} 610}
658 611
659static void maybe_start_thread () 612static void maybe_start_thread ()
660{ 613{
… …
675 ++nreqs; 628 ++nreqs;
676 629
677 LOCK (reqlock); 630 LOCK (reqlock);
678 ++nready; 631 ++nready;
679 reqq_push (&req_queue, req); 632 reqq_push (&req_queue, req);
680 pthread_cond_signal (&reqwait); 633 COND_SIGNAL (reqwait);
681 UNLOCK (reqlock); 634 UNLOCK (reqlock);
682 635
683 unblock_sig (); 636 unblock_sig ();
684 637
685 maybe_start_thread (); 638 maybe_start_thread ();
… …
694 req->type = REQ_QUIT; 647 req->type = REQ_QUIT;
695 req->pri = PRI_MAX + PRI_BIAS; 648 req->pri = PRI_MAX + PRI_BIAS;
696 649
697 LOCK (reqlock); 650 LOCK (reqlock);
698 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
699 pthread_cond_signal (&reqwait); 652 COND_SIGNAL (reqwait);
700 UNLOCK (reqlock); 653 UNLOCK (reqlock);
701 654
702 LOCK (wrklock); 655 LOCK (wrklock);
703 --started; 656 --started;
704 UNLOCK (wrklock); 657 UNLOCK (wrklock);
… …
799 } 752 }
800 else 753 else
801 { 754 {
802 if (!req_invoke (req)) 755 if (!req_invoke (req))
803 { 756 {
804 req_free (req); 757 req_destroy (req);
805 unblock_sig (); 758 unblock_sig ();
806 croak (0); 759 croak (0);
807 } 760 }
808 761
809 count++; 762 count++;
810 } 763 }
811 764
812 req_free (req); 765 req_destroy (req);
813 766
814 if (maxreqs && !--maxreqs) 767 if (maxreqs && !--maxreqs)
815 break; 768 break;
816 769
817 if (max_poll_time) 770 if (max_poll_time)
… …
857/* 810/*
858 * make our pread/pwrite safe against themselves, but not against 811 * make our pread/pwrite safe against themselves, but not against
859 * normal read/write by using a mutex. slows down execution a lot, 812 * normal read/write by using a mutex. slows down execution a lot,
860 * but that's your problem, not mine. 813 * but that's your problem, not mine.
861 */ 814 */
862static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 815static mutex_t preadwritelock = MUTEX_INIT;
863 816
864static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 817static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
865{ 818{
866 ssize_t res; 819 ssize_t res;
867 off_t ooffset; 820 off_t ooffset;
… …
890 843
891 return res; 844 return res;
892} 845}
893#endif 846#endif
894 847
848#ifndef HAVE_FUTIMES
849
850# define utimes(path,times) aio_utimes (path, times)
851# define futimes(fd,times) aio_futimes (fd, times)
852
853int aio_utimes (const char *filename, const struct timeval times[2])
854{
855 if (times)
856 {
857 struct utimbuf buf;
858
859 buf.actime = times[0].tv_sec;
860 buf.modtime = times[1].tv_sec;
861
862 return utime (filename, &buf);
863 }
864 else
865 return utime (filename, 0);
866}
867
868int aio_futimes (int fd, const struct timeval tv[2])
869{
870 errno = ENOSYS;
871 return -1;
872}
873
874#endif
875
895#if !HAVE_FDATASYNC 876#if !HAVE_FDATASYNC
896# define fdatasync fsync 877# define fdatasync fsync
897#endif 878#endif
898 879
899#if !HAVE_READAHEAD 880#if !HAVE_READAHEAD
… …
918#endif 899#endif
919 900
920#if !HAVE_READDIR_R 901#if !HAVE_READDIR_R
921# define readdir_r aio_readdir_r 902# define readdir_r aio_readdir_r
922 903
923static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 904static mutex_t readdirlock = MUTEX_INIT;
924 905
925static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 906static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
926{ 907{
927 struct dirent *e; 908 struct dirent *e;
928 int errorno; 909 int errorno;
… …
1127 if (req) 1108 if (req)
1128 break; 1109 break;
1129 1110
1130 ++idle; 1111 ++idle;
1131 1112
1132 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1113 if (COND_TIMEDWAIT (reqwait, reqlock, ts)
1133 == ETIMEDOUT) 1114 == ETIMEDOUT)
1134 { 1115 {
1135 if (idle > max_idle) 1116 if (idle > max_idle)
1136 { 1117 {
1137 --idle; 1118 --idle;
… …
1141 UNLOCK (wrklock); 1122 UNLOCK (wrklock);
1142 goto quit; 1123 goto quit;
1143 } 1124 }
1144 1125
1145 /* we are allowed to idle, so do so without any timeout */ 1126 /* we are allowed to idle, so do so without any timeout */
1146 pthread_cond_wait (&reqwait, &reqlock); 1127 COND_WAIT (reqwait, reqlock);
1147 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1128 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1148 } 1129 }
1149 1130
1150 --idle; 1131 --idle;
1151 } 1132 }
… …
1157 errno = 0; /* strictly unnecessary */ 1138 errno = 0; /* strictly unnecessary */
1158 1139
1159 if (!(req->flags & FLAG_CANCELLED)) 1140 if (!(req->flags & FLAG_CANCELLED))
1160 switch (req->type) 1141 switch (req->type)
1161 { 1142 {
1162 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break; 1143 case REQ_READ: req->result = req->offs >= 0
1163 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break; 1144 ? pread (req->int1, req->ptr1, req->size, req->offs)
1145 : read (req->int1, req->ptr1, req->size); break;
1146 case REQ_WRITE: req->result = req->offs >= 0
1147 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1148 : write (req->int1, req->ptr1, req->size); break;
1164 1149
1165 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1150 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; 1151 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1167 1152
1168 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break; 1153 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; 1154 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; 1155 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1156
1157 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1158 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1159 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1160 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1171 1161
1172 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1162 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1173 case REQ_CLOSE: req->result = close (req->int1); break; 1163 case REQ_CLOSE: req->result = close (req->int1); break;
1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1164 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1165 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
… …
1186 1176
1187 case REQ_BUSY: 1177 case REQ_BUSY:
1188 { 1178 {
1189 struct timeval tv; 1179 struct timeval tv;
1190 1180
1191 tv.tv_sec = req->int1; 1181 tv.tv_sec = req->nv1;
1192 tv.tv_usec = req->int2; 1182 tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.;
1193 1183
1194 req->result = select (0, 0, 0, 0, &tv); 1184 req->result = select (0, 0, 0, 0, &tv);
1185 }
1186
1187 case REQ_UTIME:
1188 case REQ_FUTIME:
1189 {
1190 struct timeval tv[2];
1191 struct timeval *times;
1192
1193 if (req->nv1 != -1. || req->nv2 != -1.)
1194 {
1195 tv[0].tv_sec = req->nv1;
1196 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1197 tv[1].tv_sec = req->nv2;
1198 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1199
1200 times = tv;
1201 }
1202 else
1203 times = 0;
1204
1205
1206 req->result = req->type == REQ_FUTIME
1207 ? futimes (req->int1, times)
1208 : utimes (req->ptr1, times);
1195 } 1209 }
1196 1210
1197 case REQ_GROUP: 1211 case REQ_GROUP:
1198 case REQ_NOP: 1212 case REQ_NOP:
1199 break; 1213 break;
1200 1214
1201 case REQ_QUIT: 1215 case REQ_QUIT:
1202 goto quit; 1216 goto quit;
1203 1217
1204 default: 1218 default:
1205 req->result = ENOSYS; 1219 req->result = -1;
1206 break; 1220 break;
1207 } 1221 }
1208 1222
1209 req->errorno = errno; 1223 req->errorno = errno;
1210 1224
… …
1267static void atfork_child (void) 1281static void atfork_child (void)
1268{ 1282{
1269 aio_req prv; 1283 aio_req prv;
1270 1284
1271 while (prv = reqq_shift (&req_queue)) 1285 while (prv = reqq_shift (&req_queue))
1272 req_free (prv); 1286 req_destroy (prv);
1273 1287
1274 while (prv = reqq_shift (&res_queue)) 1288 while (prv = reqq_shift (&res_queue))
1275 req_free (prv); 1289 req_destroy (prv);
1276 1290
1277 while (wrk_first.next != &wrk_first) 1291 while (wrk_first.next != &wrk_first)
1278 { 1292 {
1279 worker *wrk = wrk_first.next; 1293 worker *wrk = wrk_first.next;
1280 1294
1281 if (wrk->req) 1295 if (wrk->req)
1282 req_free (wrk->req); 1296 req_destroy (wrk->req);
1283 1297
1284 worker_clear (wrk); 1298 worker_clear (wrk);
1285 worker_free (wrk); 1299 worker_free (wrk);
1286 } 1300 }
1287 1301
… …
1334 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1348 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1335 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1349 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1336 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO)); 1350 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1337 1351
1338 create_pipe (); 1352 create_pipe ();
1339 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1353 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1340} 1354}
1341 1355
1342void 1356void
1343max_poll_reqs (int nreqs) 1357max_poll_reqs (int nreqs)
1344 PROTOTYPE: $ 1358 PROTOTYPE: $
… …
1373 max_outstanding = maxreqs; 1387 max_outstanding = maxreqs;
1374 OUTPUT: 1388 OUTPUT:
1375 RETVAL 1389 RETVAL
1376 1390
1377void 1391void
1378aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1392aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1379 SV8 * pathname
1380 int flags
1381 int mode
1382 SV * callback
1383 PROTOTYPE: $$$;$ 1393 PROTOTYPE: $$$;$
1384 PPCODE: 1394 PPCODE:
1385{ 1395{
1386 dREQ; 1396 dREQ;
1387 1397
… …
1393 1403
1394 REQ_SEND; 1404 REQ_SEND;
1395} 1405}
1396 1406
1397void 1407void
1398aio_close (fh,callback=&PL_sv_undef) 1408aio_close (SV *fh, SV *callback=&PL_sv_undef)
1399 SV * fh
1400 SV * callback
1401 PROTOTYPE: $;$ 1409 PROTOTYPE: $;$
1402 ALIAS: 1410 ALIAS:
1403 aio_close = REQ_CLOSE 1411 aio_close = REQ_CLOSE
1404 aio_fsync = REQ_FSYNC 1412 aio_fsync = REQ_FSYNC
1405 aio_fdatasync = REQ_FDATASYNC 1413 aio_fdatasync = REQ_FDATASYNC
1406 PPCODE: 1414 PPCODE:
1407{ 1415{
1408 dREQ; 1416 dREQ;
1409 1417
1410 req->type = ix; 1418 req->type = ix;
1411 req->fh = newSVsv (fh); 1419 req->sv1 = newSVsv (fh);
1412 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1420 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1413 1421
1414 REQ_SEND (req); 1422 REQ_SEND (req);
1415} 1423}
1416 1424
1417void 1425void
1418aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1426aio_read (SV *fh, SV *offset, UV length, SV8 *data, UV dataoffset, SV *callback=&PL_sv_undef)
1419 SV * fh
1420 UV offset
1421 UV length
1422 SV8 * data
1423 UV dataoffset
1424 SV * callback
1425 ALIAS: 1427 ALIAS:
1426 aio_read = REQ_READ 1428 aio_read = REQ_READ
1427 aio_write = REQ_WRITE 1429 aio_write = REQ_WRITE
1428 PROTOTYPE: $$$$$;$ 1430 PROTOTYPE: $$$$$;$
1429 PPCODE: 1431 PPCODE:
… …
1457 1459
1458 { 1460 {
1459 dREQ; 1461 dREQ;
1460 1462
1461 req->type = ix; 1463 req->type = ix;
1462 req->fh = newSVsv (fh); 1464 req->sv1 = newSVsv (fh);
1463 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1465 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1464 : IoOFP (sv_2io (fh))); 1466 : IoOFP (sv_2io (fh)));
1465 req->offs = offset; 1467 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1466 req->size = length; 1468 req->size = length;
1467 req->sv1 = SvREFCNT_inc (data); 1469 req->sv2 = SvREFCNT_inc (data);
1468 req->ptr1 = (char *)svptr + dataoffset; 1470 req->ptr1 = (char *)svptr + dataoffset;
1469 req->stroffset = dataoffset; 1471 req->stroffset = dataoffset;
1470 1472
1471 if (!SvREADONLY (data)) 1473 if (!SvREADONLY (data))
1472 { 1474 {
1473 SvREADONLY_on (data); 1475 SvREADONLY_on (data);
1474 req->flags |= FLAG_SV1_RO_OFF; 1476 req->flags |= FLAG_SV2_RO_OFF;
1475 } 1477 }
1476 1478
1477 REQ_SEND; 1479 REQ_SEND;
1478 } 1480 }
1479} 1481}
1480 1482
1481void 1483void
1482aio_readlink (path,callback=&PL_sv_undef) 1484aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1483 SV8 * path
1484 SV * callback
1485 PROTOTYPE: $$;$ 1485 PROTOTYPE: $$;$
1486 PPCODE: 1486 PPCODE:
1487{ 1487{
1488 SV *data; 1488 SV *data;
1489 dREQ; 1489 dREQ;
1490 1490
1491 data = newSV (NAME_MAX); 1491 data = newSV (NAME_MAX);
1492 SvPOK_on (data); 1492 SvPOK_on (data);
1493 1493
1494 req->type = REQ_READLINK; 1494 req->type = REQ_READLINK;
1495 req->fh = newSVsv (path); 1495 req->sv1 = newSVsv (path);
1496 req->ptr2 = SvPVbyte_nolen (req->fh); 1496 req->ptr2 = SvPVbyte_nolen (req->sv1);
1497 req->sv1 = data; 1497 req->sv2 = data;
1498 req->ptr1 = SvPVbyte_nolen (data); 1498 req->ptr1 = SvPVbyte_nolen (data);
1499 1499
1500 REQ_SEND; 1500 REQ_SEND;
1501} 1501}
1502 1502
1503void 1503void
1504aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1504aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1505 SV * out_fh
1506 SV * in_fh
1507 UV in_offset
1508 UV length
1509 SV * callback
1510 PROTOTYPE: $$$$;$ 1505 PROTOTYPE: $$$$;$
1511 PPCODE: 1506 PPCODE:
1512{ 1507{
1513 dREQ; 1508 dREQ;
1514 1509
1515 req->type = REQ_SENDFILE; 1510 req->type = REQ_SENDFILE;
1516 req->fh = newSVsv (out_fh); 1511 req->sv1 = newSVsv (out_fh);
1517 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1518 req->sv2 = newSVsv (in_fh); 1513 req->sv2 = newSVsv (in_fh);
1519 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1514 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1520 req->offs = in_offset; 1515 req->offs = SvVAL64 (in_offset);
1521 req->size = length; 1516 req->size = length;
1522 1517
1523 REQ_SEND; 1518 REQ_SEND;
1524} 1519}
1525 1520
1526void 1521void
1527aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1522aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1528 SV * fh
1529 UV offset
1530 IV length
1531 SV * callback
1532 PROTOTYPE: $$$;$ 1523 PROTOTYPE: $$$;$
1533 PPCODE: 1524 PPCODE:
1534{ 1525{
1535 dREQ; 1526 dREQ;
1536 1527
1537 req->type = REQ_READAHEAD; 1528 req->type = REQ_READAHEAD;
1538 req->fh = newSVsv (fh); 1529 req->sv1 = newSVsv (fh);
1539 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1530 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1540 req->offs = offset; 1531 req->offs = SvVAL64 (offset);
1541 req->size = length; 1532 req->size = length;
1542 1533
1543 REQ_SEND; 1534 REQ_SEND;
1544} 1535}
1545 1536
1546void 1537void
1547aio_stat (fh_or_path,callback=&PL_sv_undef) 1538aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1548 SV8 * fh_or_path
1549 SV * callback
1550 ALIAS: 1539 ALIAS:
1551 aio_stat = REQ_STAT 1540 aio_stat = REQ_STAT
1552 aio_lstat = REQ_LSTAT 1541 aio_lstat = REQ_LSTAT
1553 PPCODE: 1542 PPCODE:
1554{ 1543{
1555 dREQ; 1544 dREQ;
1556 1545
1557 req->ptr2 = malloc (sizeof (Stat_t)); 1546 req->ptr2 = malloc (sizeof (Stat_t));
1558 if (!req->ptr2) 1547 if (!req->ptr2)
1559 { 1548 {
1560 req_free (req); 1549 req_destroy (req);
1561 croak ("out of memory during aio_stat statdata allocation"); 1550 croak ("out of memory during aio_stat statdata allocation");
1562 } 1551 }
1563 1552
1564 req->flags |= FLAG_PTR2_FREE; 1553 req->flags |= FLAG_PTR2_FREE;
1554 req->sv1 = newSVsv (fh_or_path);
1565 1555
1566 if (SvPOK (fh_or_path)) 1556 if (SvPOK (fh_or_path))
1567 { 1557 {
1568 req->type = ix; 1558 req->type = ix;
1569 req->sv1 = newSVsv (fh_or_path);
1570 req->ptr1 = SvPVbyte_nolen (req->sv1); 1559 req->ptr1 = SvPVbyte_nolen (req->sv1);
1571 } 1560 }
1572 else 1561 else
1573 { 1562 {
1574 req->type = REQ_FSTAT; 1563 req->type = REQ_FSTAT;
1575 req->fh = newSVsv (fh_or_path);
1576 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1564 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1577 } 1565 }
1578 1566
1579 REQ_SEND; 1567 REQ_SEND;
1580} 1568}
1581 1569
1582void 1570void
1571aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1572 PPCODE:
1573{
1574 dREQ;
1575
1576 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1577 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1578 req->sv1 = newSVsv (fh_or_path);
1579
1580 if (SvPOK (fh_or_path))
1581 {
1582 req->type = REQ_UTIME;
1583 req->ptr1 = SvPVbyte_nolen (req->sv1);
1584 }
1585 else
1586 {
1587 req->type = REQ_FUTIME;
1588 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1589 }
1590
1591 REQ_SEND;
1592}
1593
1594void
1595aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1596 PPCODE:
1597{
1598 dREQ;
1599
1600 req->mode = mode;
1601 req->sv1 = newSVsv (fh_or_path);
1602
1603 if (SvPOK (fh_or_path))
1604 {
1605 req->type = REQ_CHMOD;
1606 req->ptr1 = SvPVbyte_nolen (req->sv1);
1607 }
1608 else
1609 {
1610 req->type = REQ_FCHMOD;
1611 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1612 }
1613
1614 REQ_SEND;
1615}
1616
1617void
1618aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1619 PPCODE:
1620{
1621 dREQ;
1622
1623 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1624 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1625 req->sv1 = newSVsv (fh_or_path);
1626
1627 if (SvPOK (fh_or_path))
1628 {
1629 req->type = REQ_CHOWN;
1630 req->ptr1 = SvPVbyte_nolen (req->sv1);
1631 }
1632 else
1633 {
1634 req->type = REQ_FCHOWN;
1635 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1636 }
1637
1638 REQ_SEND;
1639}
1640
1641void
1583aio_unlink (pathname,callback=&PL_sv_undef) 1642aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1584 SV8 * pathname
1585 SV * callback
1586 ALIAS: 1643 ALIAS:
1587 aio_unlink = REQ_UNLINK 1644 aio_unlink = REQ_UNLINK
1588 aio_rmdir = REQ_RMDIR 1645 aio_rmdir = REQ_RMDIR
1589 aio_readdir = REQ_READDIR 1646 aio_readdir = REQ_READDIR
1590 PPCODE: 1647 PPCODE:
… …
1597 1654
1598 REQ_SEND; 1655 REQ_SEND;
1599} 1656}
1600 1657
1601void 1658void
1602aio_mkdir (pathname,mode,callback=&PL_sv_undef) 1659aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1603 SV8 * pathname
1604 UV mode
1605 SV * callback
1606 PPCODE: 1660 PPCODE:
1607{ 1661{
1608 dREQ; 1662 dREQ;
1609 1663
1610 req->type = REQ_MKDIR; 1664 req->type = REQ_MKDIR;
… …
1614 1668
1615 REQ_SEND; 1669 REQ_SEND;
1616} 1670}
1617 1671
1618void 1672void
1619aio_link (oldpath,newpath,callback=&PL_sv_undef) 1673aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1620 SV8 * oldpath
1621 SV8 * newpath
1622 SV * callback
1623 ALIAS: 1674 ALIAS:
1624 aio_link = REQ_LINK 1675 aio_link = REQ_LINK
1625 aio_symlink = REQ_SYMLINK 1676 aio_symlink = REQ_SYMLINK
1626 aio_rename = REQ_RENAME 1677 aio_rename = REQ_RENAME
1627 PPCODE: 1678 PPCODE:
1628{ 1679{
1629 dREQ; 1680 dREQ;
1630 1681
1631 req->type = ix; 1682 req->type = ix;
1632 req->fh = newSVsv (oldpath); 1683 req->sv2 = newSVsv (oldpath);
1633 req->ptr2 = SvPVbyte_nolen (req->fh); 1684 req->ptr2 = SvPVbyte_nolen (req->sv2);
1634 req->sv1 = newSVsv (newpath); 1685 req->sv1 = newSVsv (newpath);
1635 req->ptr1 = SvPVbyte_nolen (req->sv1); 1686 req->ptr1 = SvPVbyte_nolen (req->sv1);
1636 1687
1637 REQ_SEND; 1688 REQ_SEND;
1638} 1689}
1639 1690
1640void 1691void
1641aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1692aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1642 SV8 * pathname
1643 UV mode
1644 UV dev
1645 SV * callback
1646 PPCODE: 1693 PPCODE:
1647{ 1694{
1648 dREQ; 1695 dREQ;
1649 1696
1650 req->type = REQ_MKNOD; 1697 req->type = REQ_MKNOD;
… …
1655 1702
1656 REQ_SEND; 1703 REQ_SEND;
1657} 1704}
1658 1705
1659void 1706void
1660aio_busy (delay,callback=&PL_sv_undef) 1707aio_busy (double delay, SV *callback=&PL_sv_undef)
1661 double delay
1662 SV * callback
1663 PPCODE: 1708 PPCODE:
1664{ 1709{
1665 dREQ; 1710 dREQ;
1666 1711
1667 req->type = REQ_BUSY; 1712 req->type = REQ_BUSY;
1668 req->int1 = delay < 0. ? 0 : delay; 1713 req->nv1 = delay < 0. ? 0. : delay;
1669 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1670 1714
1671 REQ_SEND; 1715 REQ_SEND;
1672} 1716}
1673 1717
1674void 1718void
1675aio_group (callback=&PL_sv_undef) 1719aio_group (SV *callback=&PL_sv_undef)
1676 SV * callback
1677 PROTOTYPE: ;$ 1720 PROTOTYPE: ;$
1678 PPCODE: 1721 PPCODE:
1679{ 1722{
1680 dREQ; 1723 dREQ;
1681 1724
… …
1684 req_send (req); 1727 req_send (req);
1685 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1728 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1686} 1729}
1687 1730
1688void 1731void
1689aio_nop (callback=&PL_sv_undef) 1732aio_nop (SV *callback=&PL_sv_undef)
1690 SV * callback
1691 PPCODE: 1733 PPCODE:
1692{ 1734{
1693 dREQ; 1735 dREQ;
1694 1736
1695 req->type = REQ_NOP; 1737 req->type = REQ_NOP;

Diff Legend

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