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

Diff Legend

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