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.85 by root, Sat Oct 28 23:32:29 2006 UTC vs.
Revision 1.105 by root, Sun Jul 8 11:12:15 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;
109
110typedef SV SV8; /* byte-sv, used for argument-checking */
91 111
92enum { 112enum {
93 REQ_QUIT, 113 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 114 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 115 REQ_READ, REQ_WRITE,
96 REQ_SENDFILE, 116 REQ_READAHEAD, REQ_SENDFILE,
97 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,
98 REQ_FSYNC, REQ_FDATASYNC, 122 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 123 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 124 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 125 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 126 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 127 REQ_BUSY,
104}; 128};
105 129
106#define AIO_REQ_KLASS "IO::AIO::REQ" 130#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 132
109typedef struct aio_cb 133typedef struct aio_cb
110{ 134{
111 struct aio_cb *volatile next; 135 struct aio_cb *volatile next;
112 136
113 SV *data, *callback; 137 SV *callback;
114 SV *fh, *fh2; 138 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 139 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 140 off_t offs;
118 size_t length; 141 size_t size;
119 ssize_t result; 142 ssize_t result;
143 double nv1, nv2;
120 144
121 STRLEN dataoffset; 145 STRLEN stroffset;
122 int type; 146 int type;
123 int fd, fd2; 147 int int1, int2, int3;
124 int errorno; 148 int errorno;
125 mode_t mode; /* open */ 149 mode_t mode; /* open */
126 150
127 unsigned char flags; 151 unsigned char flags;
128 unsigned char pri; 152 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 154 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 155 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 156} aio_cb;
133 157
134enum { 158enum {
135 FLAG_CANCELLED = 0x01, 159 FLAG_CANCELLED = 0x01, /* request was cancelled */
160 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
161 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 162};
137 163
138typedef aio_cb *aio_req; 164typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 165typedef aio_cb *aio_req_ornot;
140 166
… …
157{ 183{
158 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS 184 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
159 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 185 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
160} 186}
161 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
162static int next_pri = DEFAULT_PRI + PRI_BIAS; 222static int next_pri = DEFAULT_PRI + PRI_BIAS;
163 223
164static unsigned int started, idle, wanted; 224static unsigned int started, idle, wanted;
165 225
166#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
167# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
168#else
169# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
170#endif
171
172#define LOCK(mutex) pthread_mutex_lock (&(mutex))
173#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
174
175/* worker threads management */ 226/* worker threads management */
176static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 227static mutex_t wrklock = X_MUTEX_INIT;
177 228
178typedef struct worker { 229typedef struct worker {
179 /* locked by wrklock */ 230 /* locked by wrklock */
180 struct worker *prev, *next; 231 struct worker *prev, *next;
181 232
182 pthread_t tid; 233 thread_t tid;
183 234
184 /* locked by reslock, reqlock or wrklock */ 235 /* locked by reslock, reqlock or wrklock */
185 aio_req req; /* currently processed request */ 236 aio_req req; /* currently processed request */
186 void *dbuf; 237 void *dbuf;
187 DIR *dirp; 238 DIR *dirp;
… …
213} 264}
214 265
215static volatile unsigned int nreqs, nready, npending; 266static volatile unsigned int nreqs, nready, npending;
216static volatile unsigned int max_idle = 4; 267static volatile unsigned int max_idle = 4;
217static volatile unsigned int max_outstanding = 0xffffffff; 268static volatile unsigned int max_outstanding = 0xffffffff;
218static int respipe [2]; 269static int respipe [2], respipe_osf [2];
219 270
220static pthread_mutex_t reslock = AIO_MUTEX_INIT; 271static mutex_t reslock = X_MUTEX_INIT;
221static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 272static mutex_t reqlock = X_MUTEX_INIT;
222static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 273static cond_t reqwait = X_COND_INIT;
223 274
224#if WORDACCESS_UNSAFE 275#if WORDACCESS_UNSAFE
225 276
226static unsigned int get_nready () 277static unsigned int get_nready ()
227{ 278{
228 unsigned int retval; 279 unsigned int retval;
229 280
230 LOCK (reqlock); 281 X_LOCK (reqlock);
231 retval = nready; 282 retval = nready;
232 UNLOCK (reqlock); 283 X_UNLOCK (reqlock);
233 284
234 return retval; 285 return retval;
235} 286}
236 287
237static unsigned int get_npending () 288static unsigned int get_npending ()
238{ 289{
239 unsigned int retval; 290 unsigned int retval;
240 291
241 LOCK (reslock); 292 X_LOCK (reslock);
242 retval = npending; 293 retval = npending;
243 UNLOCK (reslock); 294 X_UNLOCK (reslock);
244 295
245 return retval; 296 return retval;
246} 297}
247 298
248static unsigned int get_nthreads () 299static unsigned int get_nthreads ()
249{ 300{
250 unsigned int retval; 301 unsigned int retval;
251 302
252 LOCK (wrklock); 303 X_LOCK (wrklock);
253 retval = started; 304 retval = started;
254 UNLOCK (wrklock); 305 X_UNLOCK (wrklock);
255 306
256 return retval; 307 return retval;
257} 308}
258 309
259#else 310#else
… …
317 368
318 abort (); 369 abort ();
319} 370}
320 371
321static int poll_cb (); 372static int poll_cb ();
322static void req_invoke (aio_req req); 373static int req_invoke (aio_req req);
323static void req_free (aio_req req); 374static void req_destroy (aio_req req);
324static void req_cancel (aio_req req); 375static void req_cancel (aio_req req);
325 376
326/* must be called at most once */ 377/* must be called at most once */
327static SV *req_sv (aio_req req, const char *klass) 378static SV *req_sv (aio_req req, const char *klass)
328{ 379{
… …
347 return mg ? (aio_req)mg->mg_ptr : 0; 398 return mg ? (aio_req)mg->mg_ptr : 0;
348} 399}
349 400
350static void aio_grp_feed (aio_req grp) 401static void aio_grp_feed (aio_req grp)
351{ 402{
403 block_sig ();
404
352 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 405 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
353 { 406 {
354 int old_len = grp->length; 407 int old_len = grp->size;
355 408
356 if (grp->fh2 && SvOK (grp->fh2)) 409 if (grp->sv2 && SvOK (grp->sv2))
357 { 410 {
358 dSP; 411 dSP;
359 412
360 ENTER; 413 ENTER;
361 SAVETMPS; 414 SAVETMPS;
362 PUSHMARK (SP); 415 PUSHMARK (SP);
363 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 416 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
364 PUTBACK; 417 PUTBACK;
365 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 418 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
366 SPAGAIN; 419 SPAGAIN;
367 FREETMPS; 420 FREETMPS;
368 LEAVE; 421 LEAVE;
369 } 422 }
370 423
371 /* stop if no progress has been made */ 424 /* stop if no progress has been made */
372 if (old_len == grp->length) 425 if (old_len == grp->size)
373 { 426 {
374 SvREFCNT_dec (grp->fh2); 427 SvREFCNT_dec (grp->sv2);
375 grp->fh2 = 0; 428 grp->sv2 = 0;
376 break; 429 break;
377 } 430 }
378 } 431 }
432
433 unblock_sig ();
379} 434}
380 435
381static void aio_grp_dec (aio_req grp) 436static void aio_grp_dec (aio_req grp)
382{ 437{
383 --grp->length; 438 --grp->size;
384 439
385 /* call feeder, if applicable */ 440 /* call feeder, if applicable */
386 aio_grp_feed (grp); 441 aio_grp_feed (grp);
387 442
388 /* finish, if done */ 443 /* finish, if done */
389 if (!grp->length && grp->fd) 444 if (!grp->size && grp->int1)
390 { 445 {
446 block_sig ();
447
391 req_invoke (grp); 448 if (!req_invoke (grp))
449 {
450 req_destroy (grp);
451 unblock_sig ();
452 croak (0);
453 }
454
392 req_free (grp); 455 req_destroy (grp);
456 unblock_sig ();
393 } 457 }
394} 458}
395 459
396static void req_invoke (aio_req req) 460static int req_invoke (aio_req req)
397{ 461{
398 dSP; 462 dSP;
463
464 if (req->flags & FLAG_SV2_RO_OFF)
465 SvREADONLY_off (req->sv2);
399 466
400 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 467 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
401 { 468 {
402 ENTER; 469 ENTER;
403 SAVETMPS; 470 SAVETMPS;
… …
411 SV *rv = &PL_sv_undef; 478 SV *rv = &PL_sv_undef;
412 479
413 if (req->result >= 0) 480 if (req->result >= 0)
414 { 481 {
415 int i; 482 int i;
416 char *buf = req->data2ptr; 483 char *buf = req->ptr2;
417 AV *av = newAV (); 484 AV *av = newAV ();
418 485
419 av_extend (av, req->result - 1); 486 av_extend (av, req->result - 1);
420 487
421 for (i = 0; i < req->result; ++i) 488 for (i = 0; i < req->result; ++i)
… …
441 PUSHs (sv_2mortal (newSViv (req->result))); 508 PUSHs (sv_2mortal (newSViv (req->result)));
442 PUTBACK; 509 PUTBACK;
443 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 510 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
444 SPAGAIN; 511 SPAGAIN;
445 512
446 fh = SvREFCNT_inc (POPs); 513 fh = POPs;
447
448 PUSHMARK (SP); 514 PUSHMARK (SP);
449 XPUSHs (sv_2mortal (fh)); 515 XPUSHs (fh);
450 } 516 }
451 break; 517 break;
452 518
453 case REQ_GROUP: 519 case REQ_GROUP:
454 req->fd = 2; /* mark group as finished */ 520 req->int1 = 2; /* mark group as finished */
455 521
456 if (req->data) 522 if (req->sv1)
457 { 523 {
458 int i; 524 int i;
459 AV *av = (AV *)req->data; 525 AV *av = (AV *)req->sv1;
460 526
461 EXTEND (SP, AvFILL (av) + 1); 527 EXTEND (SP, AvFILL (av) + 1);
462 for (i = 0; i <= AvFILL (av); ++i) 528 for (i = 0; i <= AvFILL (av); ++i)
463 PUSHs (*av_fetch (av, i, 0)); 529 PUSHs (*av_fetch (av, i, 0));
464 } 530 }
… …
466 532
467 case REQ_NOP: 533 case REQ_NOP:
468 case REQ_BUSY: 534 case REQ_BUSY:
469 break; 535 break;
470 536
537 case REQ_READLINK:
538 if (req->result > 0)
539 {
540 SvCUR_set (req->sv2, req->result);
541 *SvEND (req->sv2) = 0;
542 PUSHs (req->sv2);
543 }
544 break;
545
546 case REQ_STAT:
547 case REQ_LSTAT:
548 case REQ_FSTAT:
549 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
550 PL_laststatval = req->result;
551 PL_statcache = *(Stat_t *)(req->ptr2);
552 PUSHs (sv_2mortal (newSViv (req->result)));
553 break;
554
555 case REQ_READ:
556 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
557 *SvEND (req->sv2) = 0;
558 PUSHs (sv_2mortal (newSViv (req->result)));
559 break;
560
471 default: 561 default:
472 PUSHs (sv_2mortal (newSViv (req->result))); 562 PUSHs (sv_2mortal (newSViv (req->result)));
473 break; 563 break;
474 } 564 }
475 565
… …
495 grp->grp_first = req->grp_next; 585 grp->grp_first = req->grp_next;
496 586
497 aio_grp_dec (grp); 587 aio_grp_dec (grp);
498 } 588 }
499 589
500 if (SvTRUE (ERRSV)) 590 return !SvTRUE (ERRSV);
501 {
502 req_free (req);
503 croak (0);
504 }
505} 591}
506 592
507static void req_free (aio_req req) 593static void req_destroy (aio_req req)
508{ 594{
509 if (req->self) 595 if (req->self)
510 { 596 {
511 sv_unmagic (req->self, PERL_MAGIC_ext); 597 sv_unmagic (req->self, PERL_MAGIC_ext);
512 SvREFCNT_dec (req->self); 598 SvREFCNT_dec (req->self);
513 } 599 }
514 600
515 SvREFCNT_dec (req->data);
516 SvREFCNT_dec (req->fh); 601 SvREFCNT_dec (req->sv1);
517 SvREFCNT_dec (req->fh2); 602 SvREFCNT_dec (req->sv2);
518 SvREFCNT_dec (req->callback); 603 SvREFCNT_dec (req->callback);
519 Safefree (req->statdata);
520 604
521 if (req->type == REQ_READDIR) 605 if (req->flags & FLAG_PTR2_FREE)
522 free (req->data2ptr); 606 free (req->ptr2);
523 607
524 Safefree (req); 608 Safefree (req);
525} 609}
526 610
527static void req_cancel_subs (aio_req grp) 611static void req_cancel_subs (aio_req grp)
… …
529 aio_req sub; 613 aio_req sub;
530 614
531 if (grp->type != REQ_GROUP) 615 if (grp->type != REQ_GROUP)
532 return; 616 return;
533 617
534 SvREFCNT_dec (grp->fh2); 618 SvREFCNT_dec (grp->sv2);
535 grp->fh2 = 0; 619 grp->sv2 = 0;
536 620
537 for (sub = grp->grp_first; sub; sub = sub->grp_next) 621 for (sub = grp->grp_first; sub; sub = sub->grp_next)
538 req_cancel (sub); 622 req_cancel (sub);
539} 623}
540 624
… …
543 req->flags |= FLAG_CANCELLED; 627 req->flags |= FLAG_CANCELLED;
544 628
545 req_cancel_subs (req); 629 req_cancel_subs (req);
546} 630}
547 631
548static 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);
549 658
550static void start_thread (void) 659static void start_thread (void)
551{ 660{
552 sigset_t fullsigset, oldsigset;
553 pthread_attr_t attr;
554
555 worker *wrk = calloc (1, sizeof (worker)); 661 worker *wrk = calloc (1, sizeof (worker));
556 662
557 if (!wrk) 663 if (!wrk)
558 croak ("unable to allocate worker thread data"); 664 croak ("unable to allocate worker thread data");
559 665
560 pthread_attr_init (&attr);
561 pthread_attr_setstacksize (&attr, STACKSIZE);
562 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
563#ifdef PTHREAD_SCOPE_PROCESS
564 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
565#endif
566
567 sigfillset (&fullsigset);
568
569 LOCK (wrklock); 666 X_LOCK (wrklock);
570 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
571 667
572 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 668 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
573 { 669 {
574 wrk->prev = &wrk_first; 670 wrk->prev = &wrk_first;
575 wrk->next = wrk_first.next; 671 wrk->next = wrk_first.next;
576 wrk_first.next->prev = wrk; 672 wrk_first.next->prev = wrk;
577 wrk_first.next = wrk; 673 wrk_first.next = wrk;
578 ++started; 674 ++started;
579 } 675 }
580 else 676 else
581 free (wrk); 677 free (wrk);
582 678
583 sigprocmask (SIG_SETMASK, &oldsigset, 0);
584 UNLOCK (wrklock); 679 X_UNLOCK (wrklock);
585} 680}
586 681
587static void maybe_start_thread () 682static void maybe_start_thread ()
588{ 683{
589 if (get_nthreads () >= wanted) 684 if (get_nthreads () >= wanted)
… …
596 start_thread (); 691 start_thread ();
597} 692}
598 693
599static void req_send (aio_req req) 694static void req_send (aio_req req)
600{ 695{
696 block_sig ();
697
601 ++nreqs; 698 ++nreqs;
602 699
603 LOCK (reqlock); 700 X_LOCK (reqlock);
604 ++nready; 701 ++nready;
605 reqq_push (&req_queue, req); 702 reqq_push (&req_queue, req);
606 pthread_cond_signal (&reqwait); 703 X_COND_SIGNAL (reqwait);
607 UNLOCK (reqlock); 704 X_UNLOCK (reqlock);
705
706 unblock_sig ();
608 707
609 maybe_start_thread (); 708 maybe_start_thread ();
610} 709}
611 710
612static void end_thread (void) 711static void end_thread (void)
… …
616 Newz (0, req, 1, aio_cb); 715 Newz (0, req, 1, aio_cb);
617 716
618 req->type = REQ_QUIT; 717 req->type = REQ_QUIT;
619 req->pri = PRI_MAX + PRI_BIAS; 718 req->pri = PRI_MAX + PRI_BIAS;
620 719
621 LOCK (reqlock); 720 X_LOCK (reqlock);
622 reqq_push (&req_queue, req); 721 reqq_push (&req_queue, req);
623 pthread_cond_signal (&reqwait); 722 X_COND_SIGNAL (reqwait);
624 UNLOCK (reqlock); 723 X_UNLOCK (reqlock);
625 724
626 LOCK (wrklock); 725 X_LOCK (wrklock);
627 --started; 726 --started;
628 UNLOCK (wrklock); 727 X_UNLOCK (wrklock);
629} 728}
630 729
631static void set_max_idle (int nthreads) 730static void set_max_idle (int nthreads)
632{ 731{
633 if (WORDACCESS_UNSAFE) LOCK (reqlock); 732 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
634 max_idle = nthreads <= 0 ? 1 : nthreads; 733 max_idle = nthreads <= 0 ? 1 : nthreads;
635 if (WORDACCESS_UNSAFE) UNLOCK (reqlock); 734 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
636} 735}
637 736
638static void min_parallel (int nthreads) 737static void min_parallel (int nthreads)
639{ 738{
640 if (wanted < nthreads) 739 if (wanted < nthreads)
… …
655 fd_set rfd; 754 fd_set rfd;
656 755
657 while (nreqs) 756 while (nreqs)
658 { 757 {
659 int size; 758 int size;
660 if (WORDACCESS_UNSAFE) LOCK (reslock); 759 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
661 size = res_queue.size; 760 size = res_queue.size;
662 if (WORDACCESS_UNSAFE) UNLOCK (reslock); 761 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
663 762
664 if (size) 763 if (size)
665 return; 764 return;
666 765
667 maybe_start_thread (); 766 maybe_start_thread ();
668 767
669 FD_ZERO(&rfd); 768 FD_ZERO (&rfd);
670 FD_SET(respipe [0], &rfd); 769 FD_SET (respipe [0], &rfd);
671 770
672 select (respipe [0] + 1, &rfd, 0, 0, 0); 771 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
673 } 772 }
674} 773}
675 774
676static int poll_cb () 775static int poll_cb ()
677{ 776{
… …
683 aio_req req; 782 aio_req req;
684 783
685 if (max_poll_time) 784 if (max_poll_time)
686 gettimeofday (&tv_start, 0); 785 gettimeofday (&tv_start, 0);
687 786
787 block_sig ();
788
688 for (;;) 789 for (;;)
689 { 790 {
690 for (;;) 791 for (;;)
691 { 792 {
692 maybe_start_thread (); 793 maybe_start_thread ();
693 794
694 LOCK (reslock); 795 X_LOCK (reslock);
695 req = reqq_shift (&res_queue); 796 req = reqq_shift (&res_queue);
696 797
697 if (req) 798 if (req)
698 { 799 {
699 --npending; 800 --npending;
700 801
701 if (!res_queue.size) 802 if (!res_queue.size)
702 { 803 {
703 /* read any signals sent by the worker threads */ 804 /* read any signals sent by the worker threads */
704 char buf [32]; 805 char buf [4];
705 while (read (respipe [0], buf, 32) == 32) 806 while (respipe_read (respipe [0], buf, 4) == 4)
706 ; 807 ;
707 } 808 }
708 } 809 }
709 810
710 UNLOCK (reslock); 811 X_UNLOCK (reslock);
711 812
712 if (!req) 813 if (!req)
713 break; 814 break;
714 815
715 --nreqs; 816 --nreqs;
716 817
717 if (req->type == REQ_GROUP && req->length) 818 if (req->type == REQ_GROUP && req->size)
718 { 819 {
719 req->fd = 1; /* mark request as delayed */ 820 req->int1 = 1; /* mark request as delayed */
720 continue; 821 continue;
721 } 822 }
722 else 823 else
723 { 824 {
724 if (req->type == REQ_READ) 825 if (!req_invoke (req))
725 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
726
727 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
728 SvREADONLY_off (req->data);
729
730 if (req->statdata)
731 { 826 {
732 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 827 req_destroy (req);
733 PL_laststatval = req->result; 828 unblock_sig ();
734 PL_statcache = *(req->statdata); 829 croak (0);
735 } 830 }
736
737 req_invoke (req);
738 831
739 count++; 832 count++;
740 } 833 }
741 834
742 req_free (req); 835 req_destroy (req);
743 836
744 if (maxreqs && !--maxreqs) 837 if (maxreqs && !--maxreqs)
745 break; 838 break;
746 839
747 if (max_poll_time) 840 if (max_poll_time)
… …
759 poll_wait (); 852 poll_wait ();
760 853
761 ++maxreqs; 854 ++maxreqs;
762 } 855 }
763 856
857 unblock_sig ();
764 return count; 858 return count;
765}
766
767static void create_pipe ()
768{
769 if (pipe (respipe))
770 croak ("unable to initialize result pipe");
771
772 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
773 croak ("cannot set result pipe to nonblocking mode");
774
775 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
776 croak ("cannot set result pipe to nonblocking mode");
777} 859}
778 860
779/*****************************************************************************/ 861/*****************************************************************************/
780/* work around various missing functions */ 862/* work around various missing functions */
781 863
… …
786/* 868/*
787 * make our pread/pwrite safe against themselves, but not against 869 * make our pread/pwrite safe against themselves, but not against
788 * 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,
789 * but that's your problem, not mine. 871 * but that's your problem, not mine.
790 */ 872 */
791static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 873static mutex_t preadwritelock = X_MUTEX_INIT;
792 874
793static 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)
794{ 876{
795 ssize_t res; 877 ssize_t res;
796 off_t ooffset; 878 off_t ooffset;
797 879
798 LOCK (preadwritelock); 880 X_LOCK (preadwritelock);
799 ooffset = lseek (fd, 0, SEEK_CUR); 881 ooffset = lseek (fd, 0, SEEK_CUR);
800 lseek (fd, offset, SEEK_SET); 882 lseek (fd, offset, SEEK_SET);
801 res = read (fd, buf, count); 883 res = read (fd, buf, count);
802 lseek (fd, ooffset, SEEK_SET); 884 lseek (fd, ooffset, SEEK_SET);
803 UNLOCK (preadwritelock); 885 X_UNLOCK (preadwritelock);
804 886
805 return res; 887 return res;
806} 888}
807 889
808static 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)
809{ 891{
810 ssize_t res; 892 ssize_t res;
811 off_t ooffset; 893 off_t ooffset;
812 894
813 LOCK (preadwritelock); 895 X_LOCK (preadwritelock);
814 ooffset = lseek (fd, 0, SEEK_CUR); 896 ooffset = lseek (fd, 0, SEEK_CUR);
815 lseek (fd, offset, SEEK_SET); 897 lseek (fd, offset, SEEK_SET);
816 res = write (fd, buf, count); 898 res = write (fd, buf, count);
817 lseek (fd, offset, SEEK_SET); 899 lseek (fd, offset, SEEK_SET);
818 UNLOCK (preadwritelock); 900 X_UNLOCK (preadwritelock);
819 901
820 return res; 902 return res;
821} 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
822#endif 932#endif
823 933
824#if !HAVE_FDATASYNC 934#if !HAVE_FDATASYNC
825# define fdatasync fsync 935# define fdatasync fsync
826#endif 936#endif
… …
828#if !HAVE_READAHEAD 938#if !HAVE_READAHEAD
829# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self) 939# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
830 940
831static 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)
832{ 942{
943 size_t todo = count;
833 dBUF; 944 dBUF;
834 945
835 while (count > 0) 946 while (todo > 0)
836 { 947 {
837 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE; 948 size_t len = todo < AIO_BUFSIZE ? todo : AIO_BUFSIZE;
838 949
839 pread (fd, aio_buf, len, offset); 950 pread (fd, aio_buf, len, offset);
840 offset += len; 951 offset += len;
841 count -= len; 952 todo -= len;
842 } 953 }
843 954
844 errno = 0; 955 errno = 0;
956 return count;
845} 957}
846 958
847#endif 959#endif
848 960
849#if !HAVE_READDIR_R 961#if !HAVE_READDIR_R
850# define readdir_r aio_readdir_r 962# define readdir_r aio_readdir_r
851 963
852static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 964static mutex_t readdirlock = X_MUTEX_INIT;
853 965
854static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 966static int readdir_r (DIR *dirp, X_DIRENT *ent, X_DIRENT **res)
855{ 967{
856 struct dirent *e; 968 X_DIRENT *e;
857 int errorno; 969 int errorno;
858 970
859 LOCK (readdirlock); 971 X_LOCK (readdirlock);
860 972
861 e = readdir (dirp); 973 e = readdir (dirp);
862 errorno = errno; 974 errorno = errno;
863 975
864 if (e) 976 if (e)
… …
867 strcpy (ent->d_name, e->d_name); 979 strcpy (ent->d_name, e->d_name);
868 } 980 }
869 else 981 else
870 *res = 0; 982 *res = 0;
871 983
872 UNLOCK (readdirlock); 984 X_UNLOCK (readdirlock);
873 985
874 errno = errorno; 986 errno = errorno;
875 return e ? 0 : -1; 987 return e ? 0 : -1;
876} 988}
877#endif 989#endif
… …
973static void scandir_ (aio_req req, worker *self) 1085static void scandir_ (aio_req req, worker *self)
974{ 1086{
975 DIR *dirp; 1087 DIR *dirp;
976 union 1088 union
977 { 1089 {
978 struct dirent d; 1090 X_DIRENT d;
979 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1091 char b [offsetof (X_DIRENT, d_name) + NAME_MAX + 1];
980 } *u; 1092 } *u;
981 struct dirent *entp; 1093 X_DIRENT *entp;
982 char *name, *names; 1094 char *name, *names;
983 int memlen = 4096; 1095 int memlen = 4096;
984 int memofs = 0; 1096 int memofs = 0;
985 int res = 0; 1097 int res = 0;
986 int errorno;
987 1098
988 LOCK (wrklock); 1099 X_LOCK (wrklock);
989 self->dirp = dirp = opendir (req->dataptr); 1100 self->dirp = dirp = opendir (req->ptr1);
990 self->dbuf = u = malloc (sizeof (*u)); 1101 self->dbuf = u = malloc (sizeof (*u));
1102 req->flags |= FLAG_PTR2_FREE;
991 req->data2ptr = names = malloc (memlen); 1103 req->ptr2 = names = malloc (memlen);
992 UNLOCK (wrklock); 1104 X_UNLOCK (wrklock);
993 1105
994 if (dirp && u && names) 1106 if (dirp && u && names)
995 for (;;) 1107 for (;;)
996 { 1108 {
997 errno = 0; 1109 errno = 0;
… …
1009 res++; 1121 res++;
1010 1122
1011 while (memofs + len > memlen) 1123 while (memofs + len > memlen)
1012 { 1124 {
1013 memlen *= 2; 1125 memlen *= 2;
1014 LOCK (wrklock); 1126 X_LOCK (wrklock);
1015 req->data2ptr = names = realloc (names, memlen); 1127 req->ptr2 = names = realloc (names, memlen);
1016 UNLOCK (wrklock); 1128 X_UNLOCK (wrklock);
1017 1129
1018 if (!names) 1130 if (!names)
1019 break; 1131 break;
1020 } 1132 }
1021 1133
… …
1030 req->result = res; 1142 req->result = res;
1031} 1143}
1032 1144
1033/*****************************************************************************/ 1145/*****************************************************************************/
1034 1146
1035static void *aio_proc (void *thr_arg) 1147X_THREAD_PROC (aio_proc)
1036{ 1148{
1149 {//D
1037 aio_req req; 1150 aio_req req;
1038 struct timespec ts; 1151 struct timespec ts;
1039 worker *self = (worker *)thr_arg; 1152 worker *self = (worker *)thr_arg;
1040 1153
1041 /* try to distribute timeouts somewhat evenly */ 1154 /* try to distribute timeouts somewhat randomly */
1042 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL) 1155 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1043 * (1000000000UL / 1024UL);
1044 1156
1045 for (;;) 1157 for (;;)
1046 { 1158 {
1047 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1159 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1048 1160
1049 LOCK (reqlock); 1161 X_LOCK (reqlock);
1050 1162
1051 for (;;) 1163 for (;;)
1052 { 1164 {
1053 self->req = req = reqq_shift (&req_queue); 1165 self->req = req = reqq_shift (&req_queue);
1054 1166
1055 if (req) 1167 if (req)
1056 break; 1168 break;
1057 1169
1058 ++idle; 1170 ++idle;
1059 1171
1060 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1172 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts)
1061 == ETIMEDOUT) 1173 == ETIMEDOUT)
1062 { 1174 {
1063 if (idle > max_idle) 1175 if (idle > max_idle)
1064 { 1176 {
1065 --idle; 1177 --idle;
1066 UNLOCK (reqlock); 1178 X_UNLOCK (reqlock);
1067 LOCK (wrklock); 1179 X_LOCK (wrklock);
1068 --started; 1180 --started;
1069 UNLOCK (wrklock); 1181 X_UNLOCK (wrklock);
1070 goto quit; 1182 goto quit;
1071 } 1183 }
1072 1184
1073 /* we are allowed to idle, so do so without any timeout */ 1185 /* we are allowed to idle, so do so without any timeout */
1074 pthread_cond_wait (&reqwait, &reqlock); 1186 X_COND_WAIT (reqwait, reqlock);
1075 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1187 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1076 } 1188 }
1077 1189
1078 --idle; 1190 --idle;
1079 } 1191 }
1080 1192
1081 --nready; 1193 --nready;
1082 1194
1083 UNLOCK (reqlock); 1195 X_UNLOCK (reqlock);
1084 1196
1085 errno = 0; /* strictly unnecessary */ 1197 errno = 0; /* strictly unnecessary */
1086 1198
1087 if (!(req->flags & FLAG_CANCELLED)) 1199 if (!(req->flags & FLAG_CANCELLED))
1088 switch (req->type) 1200 switch (req->type)
1089 { 1201 {
1090 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1202 case REQ_READ: req->result = req->offs >= 0
1091 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); 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;
1092 1208
1093 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1209 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1094 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1210 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1095 1211
1096 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1212 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1097 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1213 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1098 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1214 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1099 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;
1222
1100 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1223 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1101 case REQ_CLOSE: req->result = close (req->fd); break; 1224 case REQ_CLOSE: req->result = close (req->int1); break;
1102 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1225 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1103 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1226 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1227 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1104 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1228 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1105 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1229 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1106 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1230 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1107 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1231 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1232 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1108 1233
1109 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1234 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1110 case REQ_FSYNC: req->result = fsync (req->fd); break; 1235 case REQ_FSYNC: req->result = fsync (req->int1); break;
1111 case REQ_READDIR: scandir_ (req, self); break; 1236 case REQ_READDIR: scandir_ (req, self); break;
1112 1237
1113 case REQ_BUSY: 1238 case REQ_BUSY:
1239#ifdef _WIN32
1240 Sleep (req->nv1 * 1000.);
1241#else
1114 { 1242 {
1115 struct timeval tv; 1243 struct timeval tv;
1116 1244
1117 tv.tv_sec = req->fd; 1245 tv.tv_sec = req->nv1;
1118 tv.tv_usec = req->fd2; 1246 tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;
1119 1247
1120 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);
1121 } 1275 }
1122 1276
1123 case REQ_GROUP: 1277 case REQ_GROUP:
1124 case REQ_NOP: 1278 case REQ_NOP:
1125 break; 1279 break;
1126 1280
1127 case REQ_QUIT: 1281 case REQ_QUIT:
1128 goto quit; 1282 goto quit;
1129 1283
1130 default: 1284 default:
1131 req->result = ENOSYS; 1285 req->result = -1;
1132 break; 1286 break;
1133 } 1287 }
1134 1288
1135 req->errorno = errno; 1289 req->errorno = errno;
1136 1290
1137 LOCK (reslock); 1291 X_LOCK (reslock);
1138 1292
1139 ++npending; 1293 ++npending;
1140 1294
1141 if (!reqq_push (&res_queue, req)) 1295 if (!reqq_push (&res_queue, req))
1296 {
1142 /* write a dummy byte to the pipe so fh becomes ready */ 1297 /* write a dummy byte to the pipe so fh becomes ready */
1143 write (respipe [1], &respipe, 1); 1298 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
1299
1300 /* optionally signal the main thread asynchronously */
1301 if (main_sig)
1302 pthread_kill (main_tid, main_sig);
1303 }
1144 1304
1145 self->req = 0; 1305 self->req = 0;
1146 worker_clear (self); 1306 worker_clear (self);
1147 1307
1148 UNLOCK (reslock); 1308 X_UNLOCK (reslock);
1149 } 1309 }
1150 1310
1151quit: 1311quit:
1152 LOCK (wrklock); 1312 X_LOCK (wrklock);
1153 worker_free (self); 1313 worker_free (self);
1154 UNLOCK (wrklock); 1314 X_UNLOCK (wrklock);
1155 1315
1156 return 0; 1316 return 0;
1317 }//D
1157} 1318}
1158 1319
1159/*****************************************************************************/ 1320/*****************************************************************************/
1160 1321
1161static void atfork_prepare (void) 1322static void atfork_prepare (void)
1162{ 1323{
1163 LOCK (wrklock); 1324 X_LOCK (wrklock);
1164 LOCK (reqlock); 1325 X_LOCK (reqlock);
1165 LOCK (reslock); 1326 X_LOCK (reslock);
1166#if !HAVE_PREADWRITE 1327#if !HAVE_PREADWRITE
1167 LOCK (preadwritelock); 1328 X_LOCK (preadwritelock);
1168#endif 1329#endif
1169#if !HAVE_READDIR_R 1330#if !HAVE_READDIR_R
1170 LOCK (readdirlock); 1331 X_LOCK (readdirlock);
1171#endif 1332#endif
1172} 1333}
1173 1334
1174static void atfork_parent (void) 1335static void atfork_parent (void)
1175{ 1336{
1176#if !HAVE_READDIR_R 1337#if !HAVE_READDIR_R
1177 UNLOCK (readdirlock); 1338 X_UNLOCK (readdirlock);
1178#endif 1339#endif
1179#if !HAVE_PREADWRITE 1340#if !HAVE_PREADWRITE
1180 UNLOCK (preadwritelock); 1341 X_UNLOCK (preadwritelock);
1181#endif 1342#endif
1182 UNLOCK (reslock); 1343 X_UNLOCK (reslock);
1183 UNLOCK (reqlock); 1344 X_UNLOCK (reqlock);
1184 UNLOCK (wrklock); 1345 X_UNLOCK (wrklock);
1185} 1346}
1186 1347
1187static void atfork_child (void) 1348static void atfork_child (void)
1188{ 1349{
1189 aio_req prv; 1350 aio_req prv;
1190 1351
1191 while (prv = reqq_shift (&req_queue)) 1352 while (prv = reqq_shift (&req_queue))
1192 req_free (prv); 1353 req_destroy (prv);
1193 1354
1194 while (prv = reqq_shift (&res_queue)) 1355 while (prv = reqq_shift (&res_queue))
1195 req_free (prv); 1356 req_destroy (prv);
1196 1357
1197 while (wrk_first.next != &wrk_first) 1358 while (wrk_first.next != &wrk_first)
1198 { 1359 {
1199 worker *wrk = wrk_first.next; 1360 worker *wrk = wrk_first.next;
1200 1361
1201 if (wrk->req) 1362 if (wrk->req)
1202 req_free (wrk->req); 1363 req_destroy (wrk->req);
1203 1364
1204 worker_clear (wrk); 1365 worker_clear (wrk);
1205 worker_free (wrk); 1366 worker_free (wrk);
1206 } 1367 }
1207 1368
… …
1209 idle = 0; 1370 idle = 0;
1210 nreqs = 0; 1371 nreqs = 0;
1211 nready = 0; 1372 nready = 0;
1212 npending = 0; 1373 npending = 0;
1213 1374
1214 close (respipe [0]); 1375 respipe_close (respipe [0]);
1215 close (respipe [1]); 1376 respipe_close (respipe [1]);
1377
1216 create_pipe (); 1378 create_pipe (respipe);
1217 1379
1218 atfork_parent (); 1380 atfork_parent ();
1219} 1381}
1220 1382
1221#define dREQ \ 1383#define dREQ \
… …
1250 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1412 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1251 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1413 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1252 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1414 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1253 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1415 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1254 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
1255 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1427 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1428 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1429#endif
1256 1430
1257 create_pipe (); 1431 create_pipe (respipe);
1432
1258 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1433 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1259} 1434}
1260 1435
1261void 1436void
1262max_poll_reqs (int nreqs) 1437max_poll_reqs (int nreqs)
1263 PROTOTYPE: $ 1438 PROTOTYPE: $
… …
1292 max_outstanding = maxreqs; 1467 max_outstanding = maxreqs;
1293 OUTPUT: 1468 OUTPUT:
1294 RETVAL 1469 RETVAL
1295 1470
1296void 1471void
1297aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1472aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1298 SV * pathname
1299 int flags
1300 int mode
1301 SV * callback
1302 PROTOTYPE: $$$;$ 1473 PROTOTYPE: $$$;$
1303 PPCODE: 1474 PPCODE:
1304{ 1475{
1305 dREQ; 1476 dREQ;
1306 1477
1307 req->type = REQ_OPEN; 1478 req->type = REQ_OPEN;
1308 req->data = newSVsv (pathname); 1479 req->sv1 = newSVsv (pathname);
1309 req->dataptr = SvPVbyte_nolen (req->data); 1480 req->ptr1 = SvPVbyte_nolen (req->sv1);
1310 req->fd = flags; 1481 req->int1 = flags;
1311 req->mode = mode; 1482 req->mode = mode;
1312 1483
1313 REQ_SEND; 1484 REQ_SEND;
1314} 1485}
1315 1486
1316void 1487void
1317aio_close (fh,callback=&PL_sv_undef) 1488aio_close (SV *fh, SV *callback=&PL_sv_undef)
1318 SV * fh
1319 SV * callback
1320 PROTOTYPE: $;$ 1489 PROTOTYPE: $;$
1321 ALIAS: 1490 ALIAS:
1322 aio_close = REQ_CLOSE 1491 aio_close = REQ_CLOSE
1323 aio_fsync = REQ_FSYNC 1492 aio_fsync = REQ_FSYNC
1324 aio_fdatasync = REQ_FDATASYNC 1493 aio_fdatasync = REQ_FDATASYNC
1325 PPCODE: 1494 PPCODE:
1326{ 1495{
1327 dREQ; 1496 dREQ;
1328 1497
1329 req->type = ix; 1498 req->type = ix;
1330 req->fh = newSVsv (fh); 1499 req->sv1 = newSVsv (fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1500 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1332 1501
1333 REQ_SEND (req); 1502 REQ_SEND (req);
1334} 1503}
1335 1504
1336void 1505void
1337aio_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)
1338 SV * fh
1339 UV offset
1340 UV length
1341 SV * data
1342 UV dataoffset
1343 SV * callback
1344 ALIAS: 1507 ALIAS:
1345 aio_read = REQ_READ 1508 aio_read = REQ_READ
1346 aio_write = REQ_WRITE 1509 aio_write = REQ_WRITE
1347 PROTOTYPE: $$$$$;$ 1510 PROTOTYPE: $$$$$;$
1348 PPCODE: 1511 PPCODE:
1349{ 1512{
1350 aio_req req;
1351 STRLEN svlen; 1513 STRLEN svlen;
1352 char *svptr = SvPVbyte (data, svlen); 1514 char *svptr = SvPVbyte (data, svlen);
1515 UV len = SvUV (length);
1353 1516
1354 SvUPGRADE (data, SVt_PV); 1517 SvUPGRADE (data, SVt_PV);
1355 SvPOK_on (data); 1518 SvPOK_on (data);
1356 1519
1357 if (dataoffset < 0) 1520 if (dataoffset < 0)
1358 dataoffset += svlen; 1521 dataoffset += svlen;
1359 1522
1360 if (dataoffset < 0 || dataoffset > svlen) 1523 if (dataoffset < 0 || dataoffset > svlen)
1361 croak ("data offset outside of string"); 1524 croak ("dataoffset outside of data scalar");
1362 1525
1363 if (ix == REQ_WRITE) 1526 if (ix == REQ_WRITE)
1364 { 1527 {
1365 /* write: check length and adjust. */ 1528 /* write: check length and adjust. */
1366 if (length < 0 || length + dataoffset > svlen) 1529 if (!SvOK (length) || len + dataoffset > svlen)
1367 length = svlen - dataoffset; 1530 len = svlen - dataoffset;
1368 } 1531 }
1369 else 1532 else
1370 { 1533 {
1371 /* read: grow scalar as necessary */ 1534 /* read: grow scalar as necessary */
1372 svptr = SvGROW (data, length + dataoffset); 1535 svptr = SvGROW (data, len + dataoffset + 1);
1373 } 1536 }
1374 1537
1375 if (length < 0) 1538 if (len < 0)
1376 croak ("length must not be negative"); 1539 croak ("length must not be negative");
1377 1540
1378 { 1541 {
1379 dREQ; 1542 dREQ;
1380 1543
1381 req->type = ix; 1544 req->type = ix;
1382 req->fh = newSVsv (fh); 1545 req->sv1 = newSVsv (fh);
1383 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1546 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1384 : IoOFP (sv_2io (fh))); 1547 : IoOFP (sv_2io (fh)));
1548 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1385 req->offset = offset; 1549 req->size = len;
1386 req->length = length;
1387 req->data = SvREFCNT_inc (data); 1550 req->sv2 = SvREFCNT_inc (data);
1388 req->dataptr = (char *)svptr + dataoffset; 1551 req->ptr1 = (char *)svptr + dataoffset;
1552 req->stroffset = dataoffset;
1389 1553
1390 if (!SvREADONLY (data)) 1554 if (!SvREADONLY (data))
1391 { 1555 {
1392 SvREADONLY_on (data); 1556 SvREADONLY_on (data);
1393 req->data2ptr = (void *)data; 1557 req->flags |= FLAG_SV2_RO_OFF;
1394 } 1558 }
1395 1559
1396 REQ_SEND; 1560 REQ_SEND;
1397 } 1561 }
1398} 1562}
1399 1563
1400void 1564void
1565aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1566 PROTOTYPE: $$;$
1567 PPCODE:
1568{
1569 SV *data;
1570 dREQ;
1571
1572 data = newSV (NAME_MAX);
1573 SvPOK_on (data);
1574
1575 req->type = REQ_READLINK;
1576 req->sv1 = newSVsv (path);
1577 req->ptr2 = SvPVbyte_nolen (req->sv1);
1578 req->sv2 = data;
1579 req->ptr1 = SvPVbyte_nolen (data);
1580
1581 REQ_SEND;
1582}
1583
1584void
1401aio_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)
1402 SV * out_fh
1403 SV * in_fh
1404 UV in_offset
1405 UV length
1406 SV * callback
1407 PROTOTYPE: $$$$;$ 1586 PROTOTYPE: $$$$;$
1408 PPCODE: 1587 PPCODE:
1409{ 1588{
1410 dREQ; 1589 dREQ;
1411 1590
1412 req->type = REQ_SENDFILE; 1591 req->type = REQ_SENDFILE;
1413 req->fh = newSVsv (out_fh); 1592 req->sv1 = newSVsv (out_fh);
1414 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1593 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1415 req->fh2 = newSVsv (in_fh); 1594 req->sv2 = newSVsv (in_fh);
1416 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1595 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1417 req->offset = in_offset; 1596 req->offs = SvVAL64 (in_offset);
1418 req->length = length; 1597 req->size = length;
1419 1598
1420 REQ_SEND; 1599 REQ_SEND;
1421} 1600}
1422 1601
1423void 1602void
1424aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1603aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1425 SV * fh
1426 UV offset
1427 IV length
1428 SV * callback
1429 PROTOTYPE: $$$;$ 1604 PROTOTYPE: $$$;$
1430 PPCODE: 1605 PPCODE:
1431{ 1606{
1432 dREQ; 1607 dREQ;
1433 1608
1434 req->type = REQ_READAHEAD; 1609 req->type = REQ_READAHEAD;
1435 req->fh = newSVsv (fh); 1610 req->sv1 = newSVsv (fh);
1436 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1611 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1437 req->offset = offset; 1612 req->offs = SvVAL64 (offset);
1438 req->length = length; 1613 req->size = length;
1439 1614
1440 REQ_SEND; 1615 REQ_SEND;
1441} 1616}
1442 1617
1443void 1618void
1444aio_stat (fh_or_path,callback=&PL_sv_undef) 1619aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1445 SV * fh_or_path
1446 SV * callback
1447 ALIAS: 1620 ALIAS:
1448 aio_stat = REQ_STAT 1621 aio_stat = REQ_STAT
1449 aio_lstat = REQ_LSTAT 1622 aio_lstat = REQ_LSTAT
1450 PPCODE: 1623 PPCODE:
1451{ 1624{
1452 dREQ; 1625 dREQ;
1453 1626
1454 New (0, req->statdata, 1, Stat_t); 1627 req->ptr2 = malloc (sizeof (Stat_t));
1455 if (!req->statdata) 1628 if (!req->ptr2)
1456 { 1629 {
1457 req_free (req); 1630 req_destroy (req);
1458 croak ("out of memory during aio_req->statdata allocation"); 1631 croak ("out of memory during aio_stat statdata allocation");
1459 } 1632 }
1633
1634 req->flags |= FLAG_PTR2_FREE;
1635 req->sv1 = newSVsv (fh_or_path);
1460 1636
1461 if (SvPOK (fh_or_path)) 1637 if (SvPOK (fh_or_path))
1462 { 1638 {
1463 req->type = ix; 1639 req->type = ix;
1464 req->data = newSVsv (fh_or_path);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1640 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 } 1641 }
1467 else 1642 else
1468 { 1643 {
1469 req->type = REQ_FSTAT; 1644 req->type = REQ_FSTAT;
1470 req->fh = newSVsv (fh_or_path);
1471 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1645 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1472 } 1646 }
1473 1647
1474 REQ_SEND; 1648 REQ_SEND;
1475} 1649}
1476 1650
1477void 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
1478aio_unlink (pathname,callback=&PL_sv_undef) 1746aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1479 SV * pathname
1480 SV * callback
1481 ALIAS: 1747 ALIAS:
1482 aio_unlink = REQ_UNLINK 1748 aio_unlink = REQ_UNLINK
1483 aio_rmdir = REQ_RMDIR 1749 aio_rmdir = REQ_RMDIR
1484 aio_readdir = REQ_READDIR 1750 aio_readdir = REQ_READDIR
1485 PPCODE: 1751 PPCODE:
1486{ 1752{
1487 dREQ; 1753 dREQ;
1488 1754
1489 req->type = ix; 1755 req->type = ix;
1490 req->data = newSVsv (pathname); 1756 req->sv1 = newSVsv (pathname);
1491 req->dataptr = SvPVbyte_nolen (req->data); 1757 req->ptr1 = SvPVbyte_nolen (req->sv1);
1758
1759 REQ_SEND;
1760}
1761
1762void
1763aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1764 PPCODE:
1765{
1766 dREQ;
1492 1767
1768 req->type = REQ_MKDIR;
1769 req->sv1 = newSVsv (pathname);
1770 req->ptr1 = SvPVbyte_nolen (req->sv1);
1771 req->mode = mode;
1772
1493 REQ_SEND; 1773 REQ_SEND;
1494} 1774}
1495 1775
1496void 1776void
1497aio_link (oldpath,newpath,callback=&PL_sv_undef) 1777aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1498 SV * oldpath
1499 SV * newpath
1500 SV * callback
1501 ALIAS: 1778 ALIAS:
1502 aio_link = REQ_LINK 1779 aio_link = REQ_LINK
1503 aio_symlink = REQ_SYMLINK 1780 aio_symlink = REQ_SYMLINK
1504 aio_rename = REQ_RENAME 1781 aio_rename = REQ_RENAME
1505 PPCODE: 1782 PPCODE:
1506{ 1783{
1507 dREQ; 1784 dREQ;
1508 1785
1509 req->type = ix; 1786 req->type = ix;
1510 req->fh = newSVsv (oldpath); 1787 req->sv2 = newSVsv (oldpath);
1511 req->data2ptr = SvPVbyte_nolen (req->fh); 1788 req->ptr2 = SvPVbyte_nolen (req->sv2);
1512 req->data = newSVsv (newpath); 1789 req->sv1 = newSVsv (newpath);
1513 req->dataptr = SvPVbyte_nolen (req->data); 1790 req->ptr1 = SvPVbyte_nolen (req->sv1);
1514 1791
1515 REQ_SEND; 1792 REQ_SEND;
1516} 1793}
1517 1794
1518void 1795void
1519aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1796aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1520 SV * pathname
1521 SV * callback
1522 UV mode
1523 UV dev
1524 PPCODE: 1797 PPCODE:
1525{ 1798{
1526 dREQ; 1799 dREQ;
1527 1800
1528 req->type = REQ_MKNOD; 1801 req->type = REQ_MKNOD;
1529 req->data = newSVsv (pathname); 1802 req->sv1 = newSVsv (pathname);
1530 req->dataptr = SvPVbyte_nolen (req->data); 1803 req->ptr1 = SvPVbyte_nolen (req->sv1);
1531 req->mode = (mode_t)mode; 1804 req->mode = (mode_t)mode;
1532 req->offset = dev; 1805 req->offs = dev;
1533 1806
1534 REQ_SEND; 1807 REQ_SEND;
1535} 1808}
1536 1809
1537void 1810void
1538aio_busy (delay,callback=&PL_sv_undef) 1811aio_busy (double delay, SV *callback=&PL_sv_undef)
1539 double delay
1540 SV * callback
1541 PPCODE: 1812 PPCODE:
1542{ 1813{
1543 dREQ; 1814 dREQ;
1544 1815
1545 req->type = REQ_BUSY; 1816 req->type = REQ_BUSY;
1546 req->fd = delay < 0. ? 0 : delay; 1817 req->nv1 = delay < 0. ? 0. : delay;
1547 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1548 1818
1549 REQ_SEND; 1819 REQ_SEND;
1550} 1820}
1551 1821
1552void 1822void
1553aio_group (callback=&PL_sv_undef) 1823aio_group (SV *callback=&PL_sv_undef)
1554 SV * callback
1555 PROTOTYPE: ;$ 1824 PROTOTYPE: ;$
1556 PPCODE: 1825 PPCODE:
1557{ 1826{
1558 dREQ; 1827 dREQ;
1559 1828
1560 req->type = REQ_GROUP; 1829 req->type = REQ_GROUP;
1830
1561 req_send (req); 1831 req_send (req);
1562
1563 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1832 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1564} 1833}
1565 1834
1566void 1835void
1567aio_nop (callback=&PL_sv_undef) 1836aio_nop (SV *callback=&PL_sv_undef)
1568 SV * callback
1569 PPCODE: 1837 PPCODE:
1570{ 1838{
1571 dREQ; 1839 dREQ;
1572 1840
1573 req->type = REQ_NOP; 1841 req->type = REQ_NOP;
… …
1602 PROTOTYPE: 1870 PROTOTYPE:
1603 CODE: 1871 CODE:
1604 while (nreqs) 1872 while (nreqs)
1605 { 1873 {
1606 poll_wait (); 1874 poll_wait ();
1607 poll_cb (0); 1875 poll_cb ();
1608 } 1876 }
1609 1877
1610void 1878int
1611poll() 1879poll()
1612 PROTOTYPE: 1880 PROTOTYPE:
1613 CODE: 1881 CODE:
1614 if (nreqs)
1615 {
1616 poll_wait (); 1882 poll_wait ();
1617 poll_cb (0); 1883 RETVAL = poll_cb ();
1618 } 1884 OUTPUT:
1885 RETVAL
1619 1886
1620int 1887int
1621poll_fileno() 1888poll_fileno()
1622 PROTOTYPE: 1889 PROTOTYPE:
1623 CODE: 1890 CODE:
… …
1635 1902
1636void 1903void
1637poll_wait() 1904poll_wait()
1638 PROTOTYPE: 1905 PROTOTYPE:
1639 CODE: 1906 CODE:
1640 if (nreqs)
1641 poll_wait (); 1907 poll_wait ();
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}
1642 1945
1643int 1946int
1644nreqs() 1947nreqs()
1645 PROTOTYPE: 1948 PROTOTYPE:
1646 CODE: 1949 CODE:
… …
1666 1969
1667int 1970int
1668nthreads() 1971nthreads()
1669 PROTOTYPE: 1972 PROTOTYPE:
1670 CODE: 1973 CODE:
1671 if (WORDACCESS_UNSAFE) LOCK (wrklock); 1974 if (WORDACCESS_UNSAFE) X_LOCK (wrklock);
1672 RETVAL = started; 1975 RETVAL = started;
1673 if (WORDACCESS_UNSAFE) UNLOCK (wrklock); 1976 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1674 OUTPUT: 1977 OUTPUT:
1675 RETVAL 1978 RETVAL
1676 1979
1677PROTOTYPES: DISABLE 1980PROTOTYPES: DISABLE
1678 1981
… …
1696 PPCODE: 1999 PPCODE:
1697{ 2000{
1698 int i; 2001 int i;
1699 aio_req req; 2002 aio_req req;
1700 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
1701 if (grp->fd == 2) 2007 if (grp->int1 == 2)
1702 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");
1703 2009
1704 for (i = 1; i < items; ++i ) 2010 for (i = 1; i < items; ++i )
1705 { 2011 {
1706 if (GIMME_V != G_VOID) 2012 if (GIMME_V != G_VOID)
… …
1708 2014
1709 req = SvAIO_REQ (ST (i)); 2015 req = SvAIO_REQ (ST (i));
1710 2016
1711 if (req) 2017 if (req)
1712 { 2018 {
1713 ++grp->length; 2019 ++grp->size;
1714 req->grp = grp; 2020 req->grp = grp;
1715 2021
1716 req->grp_prev = 0; 2022 req->grp_prev = 0;
1717 req->grp_next = grp->grp_first; 2023 req->grp_next = grp->grp_first;
1718 2024
… …
1741 av = newAV (); 2047 av = newAV ();
1742 2048
1743 for (i = 1; i < items; ++i ) 2049 for (i = 1; i < items; ++i )
1744 av_push (av, newSVsv (ST (i))); 2050 av_push (av, newSVsv (ST (i)));
1745 2051
1746 SvREFCNT_dec (grp->data); 2052 SvREFCNT_dec (grp->sv1);
1747 grp->data = (SV *)av; 2053 grp->sv1 = (SV *)av;
1748} 2054}
1749 2055
1750void 2056void
1751errno (aio_req grp, int errorno = errno) 2057errno (aio_req grp, int errorno = errno)
1752 CODE: 2058 CODE:
1753 grp->errorno = errorno; 2059 grp->errorno = errorno;
1754 2060
1755void 2061void
1756limit (aio_req grp, int limit) 2062limit (aio_req grp, int limit)
1757 CODE: 2063 CODE:
1758 grp->fd2 = limit; 2064 grp->int2 = limit;
1759 aio_grp_feed (grp); 2065 aio_grp_feed (grp);
1760 2066
1761void 2067void
1762feed (aio_req grp, SV *callback=&PL_sv_undef) 2068feed (aio_req grp, SV *callback=&PL_sv_undef)
1763 CODE: 2069 CODE:
1764{ 2070{
1765 SvREFCNT_dec (grp->fh2); 2071 SvREFCNT_dec (grp->sv2);
1766 grp->fh2 = newSVsv (callback); 2072 grp->sv2 = newSVsv (callback);
1767 2073
1768 if (grp->fd2 <= 0) 2074 if (grp->int2 <= 0)
1769 grp->fd2 = 2; 2075 grp->int2 = 2;
1770 2076
1771 aio_grp_feed (grp); 2077 aio_grp_feed (grp);
1772} 2078}
1773 2079

Diff Legend

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