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.107 by root, Wed Oct 3 21:27:51 2007 UTC

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

Diff Legend

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