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.79 by root, Thu Oct 26 16:28:33 2006 UTC vs.
Revision 1.96 by root, Sat Dec 23 04:49:37 2006 UTC

17#include "autoconf/config.h" 17#include "autoconf/config.h"
18 18
19#include <pthread.h> 19#include <pthread.h>
20 20
21#include <stddef.h> 21#include <stddef.h>
22#include <stdlib.h>
22#include <errno.h> 23#include <errno.h>
23#include <sys/time.h> 24#include <sys/time.h>
24#include <sys/select.h> 25#include <sys/select.h>
25#include <sys/types.h> 26#include <sys/types.h>
26#include <sys/stat.h> 27#include <sys/stat.h>
43# else 44# else
44# error sendfile support requested but not available 45# error sendfile support requested but not available
45# endif 46# endif
46#endif 47#endif
47 48
49/* number of seconds after which idle threads exit */
50#define IDLE_TIMEOUT 10
51
48/* used for struct dirent, AIX doesn't provide it */ 52/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 53#ifndef NAME_MAX
50# define NAME_MAX 4096 54# define NAME_MAX 4096
51#endif 55#endif
52 56
65 69
66/* wether word reads are potentially non-atomic. 70/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs 71 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes. 72 * on have atomic word read/writes.
69 */ 73 */
70#ifndef WORDREAD_UNSAFE 74#ifndef WORDACCESS_UNSAFE
71# if __i386 || __x86_64 75# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0 76# define WORDACCESS_UNSAFE 0
73# else 77# else
74# define WORDREAD_UNSAFE 1 78# define WORDACCESS_UNSAFE 1
75# endif 79# endif
76#endif 80#endif
77 81
78/* buffer size for various temporary buffers */ 82/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536 83#define AIO_BUFSIZE 65536
83 LOCK (wrklock); \ 87 LOCK (wrklock); \
84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \ 89 UNLOCK (wrklock); \
86 if (!aio_buf) \ 90 if (!aio_buf) \
87 return -1; 91 return -1;
92
93typedef SV SV8; /* byte-sv, used for argument-checking */
88 94
89enum { 95enum {
90 REQ_QUIT, 96 REQ_QUIT,
91 REQ_OPEN, REQ_CLOSE, 97 REQ_OPEN, REQ_CLOSE,
92 REQ_READ, REQ_WRITE, REQ_READAHEAD, 98 REQ_READ, REQ_WRITE, REQ_READAHEAD,
93 REQ_SENDFILE, 99 REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 100 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
95 REQ_FSYNC, REQ_FDATASYNC, 101 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 102 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
97 REQ_READDIR, 103 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 104 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 105 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 106 REQ_BUSY,
101}; 107};
102 108
103#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
105 111
106typedef struct aio_cb 112typedef struct aio_cb
107{ 113{
108 struct aio_cb *volatile next; 114 struct aio_cb *volatile next;
109 115
110 SV *data, *callback; 116 SV *callback, *fh;
111 SV *fh, *fh2; 117 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 118 void *ptr1, *ptr2;
113 Stat_t *statdata;
114 off_t offset; 119 off_t offs;
115 size_t length; 120 size_t size;
116 ssize_t result; 121 ssize_t result;
117 122
118 STRLEN dataoffset; 123 STRLEN stroffset;
119 int type; 124 int type;
120 int fd, fd2; 125 int int1, int2;
121 int errorno; 126 int errorno;
122 mode_t mode; /* open */ 127 mode_t mode; /* open */
123 128
124 unsigned char flags; 129 unsigned char flags;
125 unsigned char pri; 130 unsigned char pri;
127 SV *self; /* the perl counterpart of this request, if any */ 132 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 134} aio_cb;
130 135
131enum { 136enum {
132 FLAG_CANCELLED = 0x01, 137 FLAG_CANCELLED = 0x01, /* request was cancelled */
138 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
139 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
133}; 140};
134 141
135typedef aio_cb *aio_req; 142typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 143typedef aio_cb *aio_req_ornot;
137 144
142 DEFAULT_PRI = 0, 149 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 150 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 151 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 152};
146 153
154#define AIO_TICKS ((1000000 + 1023) >> 10)
155
156static unsigned int max_poll_time = 0;
157static unsigned int max_poll_reqs = 0;
158
159/* calculcate time difference in ~1/AIO_TICKS of a second */
160static int tvdiff (struct timeval *tv1, struct timeval *tv2)
161{
162 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
163 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
164}
165
166static pthread_t main_tid;
167static int main_sig;
168static int block_sig_level;
169
170void block_sig ()
171{
172 sigset_t ss;
173
174 if (block_sig_level++)
175 return;
176
177 if (!main_sig)
178 return;
179
180 sigemptyset (&ss);
181 sigaddset (&ss, main_sig);
182 pthread_sigmask (SIG_BLOCK, &ss, 0);
183}
184
185void unblock_sig ()
186{
187 sigset_t ss;
188
189 if (--block_sig_level)
190 return;
191
192 if (!main_sig)
193 return;
194
195 sigemptyset (&ss);
196 sigaddset (&ss, main_sig);
197 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
198}
199
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 200static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 201
149static unsigned int started, wanted; 202static unsigned int started, idle, wanted;
150static volatile unsigned int nreqs, nready, npending;
151static volatile unsigned int max_outstanding = 0xffffffff;
152static int respipe [2];
153 203
154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 204#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 205# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
156#else 206#else
157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 207# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
198 wrk->prev->next = wrk->next; 248 wrk->prev->next = wrk->next;
199 249
200 free (wrk); 250 free (wrk);
201} 251}
202 252
253static volatile unsigned int nreqs, nready, npending;
254static volatile unsigned int max_idle = 4;
255static volatile unsigned int max_outstanding = 0xffffffff;
256static int respipe [2];
257
203static pthread_mutex_t reslock = AIO_MUTEX_INIT; 258static pthread_mutex_t reslock = AIO_MUTEX_INIT;
204static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 259static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 260static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
261
262#if WORDACCESS_UNSAFE
263
264static unsigned int get_nready ()
265{
266 unsigned int retval;
267
268 LOCK (reqlock);
269 retval = nready;
270 UNLOCK (reqlock);
271
272 return retval;
273}
274
275static unsigned int get_npending ()
276{
277 unsigned int retval;
278
279 LOCK (reslock);
280 retval = npending;
281 UNLOCK (reslock);
282
283 return retval;
284}
285
286static unsigned int get_nthreads ()
287{
288 unsigned int retval;
289
290 LOCK (wrklock);
291 retval = started;
292 UNLOCK (wrklock);
293
294 return retval;
295}
296
297#else
298
299# define get_nready() nready
300# define get_npending() npending
301# define get_nthreads() started
302
303#endif
206 304
207/* 305/*
208 * a somewhat faster data structure might be nice, but 306 * a somewhat faster data structure might be nice, but
209 * with 8 priorities this actually needs <20 insns 307 * with 8 priorities this actually needs <20 insns
210 * per shift, the most expensive operation. 308 * per shift, the most expensive operation.
256 } 354 }
257 355
258 abort (); 356 abort ();
259} 357}
260 358
261static int poll_cb (int max); 359static int poll_cb ();
262static void req_invoke (aio_req req); 360static int req_invoke (aio_req req);
263static void req_free (aio_req req); 361static void req_free (aio_req req);
264static void req_cancel (aio_req req); 362static void req_cancel (aio_req req);
265 363
266/* must be called at most once */ 364/* must be called at most once */
267static SV *req_sv (aio_req req, const char *klass) 365static SV *req_sv (aio_req req, const char *klass)
287 return mg ? (aio_req)mg->mg_ptr : 0; 385 return mg ? (aio_req)mg->mg_ptr : 0;
288} 386}
289 387
290static void aio_grp_feed (aio_req grp) 388static void aio_grp_feed (aio_req grp)
291{ 389{
390 block_sig ();
391
292 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 392 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
293 { 393 {
294 int old_len = grp->length; 394 int old_len = grp->size;
295 395
296 if (grp->fh2 && SvOK (grp->fh2)) 396 if (grp->sv2 && SvOK (grp->sv2))
297 { 397 {
298 dSP; 398 dSP;
299 399
300 ENTER; 400 ENTER;
301 SAVETMPS; 401 SAVETMPS;
302 PUSHMARK (SP); 402 PUSHMARK (SP);
303 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 403 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
304 PUTBACK; 404 PUTBACK;
305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 405 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
306 SPAGAIN; 406 SPAGAIN;
307 FREETMPS; 407 FREETMPS;
308 LEAVE; 408 LEAVE;
309 } 409 }
310 410
311 /* stop if no progress has been made */ 411 /* stop if no progress has been made */
312 if (old_len == grp->length) 412 if (old_len == grp->size)
313 { 413 {
314 SvREFCNT_dec (grp->fh2); 414 SvREFCNT_dec (grp->sv2);
315 grp->fh2 = 0; 415 grp->sv2 = 0;
316 break; 416 break;
317 } 417 }
318 } 418 }
419
420 unblock_sig ();
319} 421}
320 422
321static void aio_grp_dec (aio_req grp) 423static void aio_grp_dec (aio_req grp)
322{ 424{
323 --grp->length; 425 --grp->size;
324 426
325 /* call feeder, if applicable */ 427 /* call feeder, if applicable */
326 aio_grp_feed (grp); 428 aio_grp_feed (grp);
327 429
328 /* finish, if done */ 430 /* finish, if done */
329 if (!grp->length && grp->fd) 431 if (!grp->size && grp->int1)
330 { 432 {
433 block_sig ();
434
331 req_invoke (grp); 435 if (!req_invoke (grp))
436 {
437 req_free (grp);
438 unblock_sig ();
439 croak (0);
440 }
441
332 req_free (grp); 442 req_free (grp);
443 unblock_sig ();
333 } 444 }
334} 445}
335 446
336static void poll_wait ()
337{
338 fd_set rfd;
339
340 while (nreqs)
341 {
342 int size;
343 if (WORDREAD_UNSAFE) LOCK (reslock);
344 size = res_queue.size;
345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
346
347 if (size)
348 return;
349
350 FD_ZERO(&rfd);
351 FD_SET(respipe [0], &rfd);
352
353 select (respipe [0] + 1, &rfd, 0, 0, 0);
354 }
355}
356
357static void req_invoke (aio_req req) 447static int req_invoke (aio_req req)
358{ 448{
359 dSP; 449 dSP;
450
451 if (req->flags & FLAG_SV1_RO_OFF)
452 SvREADONLY_off (req->sv1);
360 453
361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
362 { 455 {
363 ENTER; 456 ENTER;
364 SAVETMPS; 457 SAVETMPS;
372 SV *rv = &PL_sv_undef; 465 SV *rv = &PL_sv_undef;
373 466
374 if (req->result >= 0) 467 if (req->result >= 0)
375 { 468 {
376 int i; 469 int i;
377 char *buf = req->data2ptr; 470 char *buf = req->ptr2;
378 AV *av = newAV (); 471 AV *av = newAV ();
379 472
380 av_extend (av, req->result - 1); 473 av_extend (av, req->result - 1);
381 474
382 for (i = 0; i < req->result; ++i) 475 for (i = 0; i < req->result; ++i)
402 PUSHs (sv_2mortal (newSViv (req->result))); 495 PUSHs (sv_2mortal (newSViv (req->result)));
403 PUTBACK; 496 PUTBACK;
404 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 497 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
405 SPAGAIN; 498 SPAGAIN;
406 499
407 fh = SvREFCNT_inc (POPs); 500 fh = POPs;
408
409 PUSHMARK (SP); 501 PUSHMARK (SP);
410 XPUSHs (sv_2mortal (fh)); 502 XPUSHs (fh);
411 } 503 }
412 break; 504 break;
413 505
414 case REQ_GROUP: 506 case REQ_GROUP:
415 req->fd = 2; /* mark group as finished */ 507 req->int1 = 2; /* mark group as finished */
416 508
417 if (req->data) 509 if (req->sv1)
418 { 510 {
419 int i; 511 int i;
420 AV *av = (AV *)req->data; 512 AV *av = (AV *)req->sv1;
421 513
422 EXTEND (SP, AvFILL (av) + 1); 514 EXTEND (SP, AvFILL (av) + 1);
423 for (i = 0; i <= AvFILL (av); ++i) 515 for (i = 0; i <= AvFILL (av); ++i)
424 PUSHs (*av_fetch (av, i, 0)); 516 PUSHs (*av_fetch (av, i, 0));
425 } 517 }
427 519
428 case REQ_NOP: 520 case REQ_NOP:
429 case REQ_BUSY: 521 case REQ_BUSY:
430 break; 522 break;
431 523
524 case REQ_READLINK:
525 if (req->result > 0)
526 {
527 SvCUR_set (req->sv1, req->result);
528 *SvEND (req->sv1) = 0;
529 PUSHs (req->sv1);
530 }
531 break;
532
533 case REQ_STAT:
534 case REQ_LSTAT:
535 case REQ_FSTAT:
536 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
537 PL_laststatval = req->result;
538 PL_statcache = *(Stat_t *)(req->ptr2);
539 PUSHs (sv_2mortal (newSViv (req->result)));
540 break;
541
542 case REQ_READ:
543 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
544 *SvEND (req->sv1) = 0;
545 PUSHs (sv_2mortal (newSViv (req->result)));
546 break;
547
432 default: 548 default:
433 PUSHs (sv_2mortal (newSViv (req->result))); 549 PUSHs (sv_2mortal (newSViv (req->result)));
434 break; 550 break;
435 } 551 }
436 552
456 grp->grp_first = req->grp_next; 572 grp->grp_first = req->grp_next;
457 573
458 aio_grp_dec (grp); 574 aio_grp_dec (grp);
459 } 575 }
460 576
461 if (SvTRUE (ERRSV)) 577 return !SvTRUE (ERRSV);
462 {
463 req_free (req);
464 croak (0);
465 }
466} 578}
467 579
468static void req_free (aio_req req) 580static void req_free (aio_req req)
469{ 581{
470 if (req->self) 582 if (req->self)
471 { 583 {
472 sv_unmagic (req->self, PERL_MAGIC_ext); 584 sv_unmagic (req->self, PERL_MAGIC_ext);
473 SvREFCNT_dec (req->self); 585 SvREFCNT_dec (req->self);
474 } 586 }
475 587
476 SvREFCNT_dec (req->data);
477 SvREFCNT_dec (req->fh); 588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1);
478 SvREFCNT_dec (req->fh2); 590 SvREFCNT_dec (req->sv2);
479 SvREFCNT_dec (req->callback); 591 SvREFCNT_dec (req->callback);
480 Safefree (req->statdata);
481 592
482 if (req->type == REQ_READDIR) 593 if (req->flags & FLAG_PTR2_FREE)
483 free (req->data2ptr); 594 free (req->ptr2);
484 595
485 Safefree (req); 596 Safefree (req);
486} 597}
487 598
488static void req_cancel_subs (aio_req grp) 599static void req_cancel_subs (aio_req grp)
490 aio_req sub; 601 aio_req sub;
491 602
492 if (grp->type != REQ_GROUP) 603 if (grp->type != REQ_GROUP)
493 return; 604 return;
494 605
495 SvREFCNT_dec (grp->fh2); 606 SvREFCNT_dec (grp->sv2);
496 grp->fh2 = 0; 607 grp->sv2 = 0;
497 608
498 for (sub = grp->grp_first; sub; sub = sub->grp_next) 609 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub); 610 req_cancel (sub);
500} 611}
501 612
502static void req_cancel (aio_req req) 613static void req_cancel (aio_req req)
503{ 614{
504 req->flags |= FLAG_CANCELLED; 615 req->flags |= FLAG_CANCELLED;
505 616
506 req_cancel_subs (req); 617 req_cancel_subs (req);
507}
508
509static int poll_cb (int max)
510{
511 dSP;
512 int count = 0;
513 int do_croak = 0;
514 aio_req req;
515
516 for (;;)
517 {
518 while (max <= 0 || count < max)
519 {
520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
522
523 if (req)
524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
529 /* read any signals sent by the worker threads */
530 char buf [32];
531 while (read (respipe [0], buf, 32) == 32)
532 ;
533 }
534 }
535
536 UNLOCK (reslock);
537
538 if (!req)
539 break;
540
541 --nreqs;
542
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length)
546 {
547 req->fd = 1; /* mark request as delayed */
548 continue;
549 }
550 else
551 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req);
566
567 count++;
568 }
569
570 req_free (req);
571 }
572
573 if (nreqs <= max_outstanding)
574 break;
575
576 poll_wait ();
577
578 max = 0;
579 }
580
581 return count;
582} 618}
583 619
584static void *aio_proc(void *arg); 620static void *aio_proc(void *arg);
585 621
586static void start_thread (void) 622static void start_thread (void)
594 croak ("unable to allocate worker thread data"); 630 croak ("unable to allocate worker thread data");
595 631
596 pthread_attr_init (&attr); 632 pthread_attr_init (&attr);
597 pthread_attr_setstacksize (&attr, STACKSIZE); 633 pthread_attr_setstacksize (&attr, STACKSIZE);
598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 634 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
635#ifdef PTHREAD_SCOPE_PROCESS
636 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
637#endif
599 638
600 sigfillset (&fullsigset); 639 sigfillset (&fullsigset);
601 640
602 LOCK (wrklock); 641 LOCK (wrklock);
603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
604 643
605 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
606 { 645 {
607 wrk->prev = &wrk_first; 646 wrk->prev = &wrk_first;
608 wrk->next = wrk_first.next; 647 wrk->next = wrk_first.next;
611 ++started; 650 ++started;
612 } 651 }
613 else 652 else
614 free (wrk); 653 free (wrk);
615 654
616 sigprocmask (SIG_SETMASK, &oldsigset, 0); 655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock); 656 UNLOCK (wrklock);
618} 657}
619 658
659static void maybe_start_thread ()
660{
661 if (get_nthreads () >= wanted)
662 return;
663
664 /* todo: maybe use idle here, but might be less exact */
665 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
666 return;
667
668 start_thread ();
669}
670
620static void req_send (aio_req req) 671static void req_send (aio_req req)
621{ 672{
622 while (started < wanted && nreqs >= started) 673 block_sig ();
623 start_thread ();
624 674
625 ++nreqs; 675 ++nreqs;
626 676
627 LOCK (reqlock); 677 LOCK (reqlock);
628 ++nready; 678 ++nready;
629 reqq_push (&req_queue, req); 679 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait); 680 pthread_cond_signal (&reqwait);
631 UNLOCK (reqlock); 681 UNLOCK (reqlock);
682
683 unblock_sig ();
684
685 maybe_start_thread ();
632} 686}
633 687
634static void end_thread (void) 688static void end_thread (void)
635{ 689{
636 aio_req req; 690 aio_req req;
638 Newz (0, req, 1, aio_cb); 692 Newz (0, req, 1, aio_cb);
639 693
640 req->type = REQ_QUIT; 694 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS; 695 req->pri = PRI_MAX + PRI_BIAS;
642 696
643 req_send (req); 697 LOCK (reqlock);
698 reqq_push (&req_queue, req);
699 pthread_cond_signal (&reqwait);
700 UNLOCK (reqlock);
701
702 LOCK (wrklock);
703 --started;
704 UNLOCK (wrklock);
705}
706
707static void set_max_idle (int nthreads)
708{
709 if (WORDACCESS_UNSAFE) LOCK (reqlock);
710 max_idle = nthreads <= 0 ? 1 : nthreads;
711 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
644} 712}
645 713
646static void min_parallel (int nthreads) 714static void min_parallel (int nthreads)
647{ 715{
648 if (wanted < nthreads) 716 if (wanted < nthreads)
649 wanted = nthreads; 717 wanted = nthreads;
650} 718}
651 719
652static void max_parallel (int nthreads) 720static void max_parallel (int nthreads)
653{ 721{
654 int cur = started;
655
656 if (wanted > nthreads) 722 if (wanted > nthreads)
657 wanted = nthreads; 723 wanted = nthreads;
658 724
659 while (cur > wanted) 725 while (started > wanted)
726 end_thread ();
727}
728
729static void poll_wait ()
730{
731 fd_set rfd;
732
733 while (nreqs)
660 { 734 {
735 int size;
736 if (WORDACCESS_UNSAFE) LOCK (reslock);
737 size = res_queue.size;
738 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
739
740 if (size)
741 return;
742
661 end_thread (); 743 maybe_start_thread ();
662 cur--; 744
745 FD_ZERO(&rfd);
746 FD_SET(respipe [0], &rfd);
747
748 select (respipe [0] + 1, &rfd, 0, 0, 0);
663 } 749 }
750}
664 751
665 while (started > wanted) 752static int poll_cb ()
753{
754 dSP;
755 int count = 0;
756 int maxreqs = max_poll_reqs;
757 int do_croak = 0;
758 struct timeval tv_start, tv_now;
759 aio_req req;
760
761 if (max_poll_time)
762 gettimeofday (&tv_start, 0);
763
764 block_sig ();
765
766 for (;;)
666 { 767 {
768 for (;;)
769 {
770 maybe_start_thread ();
771
772 LOCK (reslock);
773 req = reqq_shift (&res_queue);
774
775 if (req)
776 {
777 --npending;
778
779 if (!res_queue.size)
780 {
781 /* read any signals sent by the worker threads */
782 char buf [4];
783 while (read (respipe [0], buf, 4) == 4)
784 ;
785 }
786 }
787
788 UNLOCK (reslock);
789
790 if (!req)
791 break;
792
793 --nreqs;
794
795 if (req->type == REQ_GROUP && req->size)
796 {
797 req->int1 = 1; /* mark request as delayed */
798 continue;
799 }
800 else
801 {
802 if (!req_invoke (req))
803 {
804 req_free (req);
805 unblock_sig ();
806 croak (0);
807 }
808
809 count++;
810 }
811
812 req_free (req);
813
814 if (maxreqs && !--maxreqs)
815 break;
816
817 if (max_poll_time)
818 {
819 gettimeofday (&tv_now, 0);
820
821 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
822 break;
823 }
824 }
825
826 if (nreqs <= max_outstanding)
827 break;
828
667 poll_wait (); 829 poll_wait ();
668 poll_cb (0); 830
831 ++maxreqs;
669 } 832 }
833
834 unblock_sig ();
835 return count;
670} 836}
671 837
672static void create_pipe () 838static void create_pipe ()
673{ 839{
674 if (pipe (respipe)) 840 if (pipe (respipe))
889 int memofs = 0; 1055 int memofs = 0;
890 int res = 0; 1056 int res = 0;
891 int errorno; 1057 int errorno;
892 1058
893 LOCK (wrklock); 1059 LOCK (wrklock);
894 self->dirp = dirp = opendir (req->dataptr); 1060 self->dirp = dirp = opendir (req->ptr1);
895 self->dbuf = u = malloc (sizeof (*u)); 1061 self->dbuf = u = malloc (sizeof (*u));
1062 req->flags |= FLAG_PTR2_FREE;
896 req->data2ptr = names = malloc (memlen); 1063 req->ptr2 = names = malloc (memlen);
897 UNLOCK (wrklock); 1064 UNLOCK (wrklock);
898 1065
899 if (dirp && u && names) 1066 if (dirp && u && names)
900 for (;;) 1067 for (;;)
901 { 1068 {
915 1082
916 while (memofs + len > memlen) 1083 while (memofs + len > memlen)
917 { 1084 {
918 memlen *= 2; 1085 memlen *= 2;
919 LOCK (wrklock); 1086 LOCK (wrklock);
920 req->data2ptr = names = realloc (names, memlen); 1087 req->ptr2 = names = realloc (names, memlen);
921 UNLOCK (wrklock); 1088 UNLOCK (wrklock);
922 1089
923 if (!names) 1090 if (!names)
924 break; 1091 break;
925 } 1092 }
938/*****************************************************************************/ 1105/*****************************************************************************/
939 1106
940static void *aio_proc (void *thr_arg) 1107static void *aio_proc (void *thr_arg)
941{ 1108{
942 aio_req req; 1109 aio_req req;
943 int type; 1110 struct timespec ts;
944 worker *self = (worker *)thr_arg; 1111 worker *self = (worker *)thr_arg;
945 1112
946 do 1113 /* try to distribute timeouts somewhat evenly */
1114 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1115 * (1000000000UL / 1024UL);
1116
1117 for (;;)
947 { 1118 {
1119 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1120
948 LOCK (reqlock); 1121 LOCK (reqlock);
949 1122
950 for (;;) 1123 for (;;)
951 { 1124 {
952 self->req = req = reqq_shift (&req_queue); 1125 self->req = req = reqq_shift (&req_queue);
953 1126
954 if (req) 1127 if (req)
955 break; 1128 break;
956 1129
1130 ++idle;
1131
1132 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1133 == ETIMEDOUT)
1134 {
1135 if (idle > max_idle)
1136 {
1137 --idle;
1138 UNLOCK (reqlock);
1139 LOCK (wrklock);
1140 --started;
1141 UNLOCK (wrklock);
1142 goto quit;
1143 }
1144
1145 /* we are allowed to idle, so do so without any timeout */
957 pthread_cond_wait (&reqwait, &reqlock); 1146 pthread_cond_wait (&reqwait, &reqlock);
1147 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1148 }
1149
1150 --idle;
958 } 1151 }
959 1152
960 --nready; 1153 --nready;
961 1154
962 UNLOCK (reqlock); 1155 UNLOCK (reqlock);
963 1156
964 errno = 0; /* strictly unnecessary */ 1157 errno = 0; /* strictly unnecessary */
965 type = req->type; /* remember type for QUIT check */
966 1158
967 if (!(req->flags & FLAG_CANCELLED)) 1159 if (!(req->flags & FLAG_CANCELLED))
968 switch (type) 1160 switch (req->type)
969 { 1161 {
970 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1162 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
971 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1163 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
972 1164
973 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1165 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
974 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1166 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
975 1167
976 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1168 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
977 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1169 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
978 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1170 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
979 1171
980 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1172 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
981 case REQ_CLOSE: req->result = close (req->fd); break; 1173 case REQ_CLOSE: req->result = close (req->int1); break;
982 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
983 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
984 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1176 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1177 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1178 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1179 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1180 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
987 1181
988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1182 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
989 case REQ_FSYNC: req->result = fsync (req->fd); break; 1183 case REQ_FSYNC: req->result = fsync (req->int1); break;
990 case REQ_READDIR: scandir_ (req, self); break; 1184 case REQ_READDIR: scandir_ (req, self); break;
991 1185
992 case REQ_BUSY: 1186 case REQ_BUSY:
993 { 1187 {
994 struct timeval tv; 1188 struct timeval tv;
995 1189
996 tv.tv_sec = req->fd; 1190 tv.tv_sec = req->int1;
997 tv.tv_usec = req->fd2; 1191 tv.tv_usec = req->int2;
998 1192
999 req->result = select (0, 0, 0, 0, &tv); 1193 req->result = select (0, 0, 0, 0, &tv);
1000 } 1194 }
1001 1195
1002 case REQ_GROUP: 1196 case REQ_GROUP:
1003 case REQ_NOP: 1197 case REQ_NOP:
1198 break;
1199
1004 case REQ_QUIT: 1200 case REQ_QUIT:
1005 break; 1201 goto quit;
1006 1202
1007 default: 1203 default:
1008 req->result = ENOSYS; 1204 req->result = ENOSYS;
1009 break; 1205 break;
1010 } 1206 }
1014 LOCK (reslock); 1210 LOCK (reslock);
1015 1211
1016 ++npending; 1212 ++npending;
1017 1213
1018 if (!reqq_push (&res_queue, req)) 1214 if (!reqq_push (&res_queue, req))
1215 {
1019 /* write a dummy byte to the pipe so fh becomes ready */ 1216 /* write a dummy byte to the pipe so fh becomes ready */
1020 write (respipe [1], &respipe, 1); 1217 write (respipe [1], &respipe, 1);
1218
1219 /* optionally signal the main thread asynchronously */
1220 if (main_sig)
1221 pthread_kill (main_tid, main_sig);
1222 }
1021 1223
1022 self->req = 0; 1224 self->req = 0;
1023 worker_clear (self); 1225 worker_clear (self);
1024 1226
1025 UNLOCK (reslock); 1227 UNLOCK (reslock);
1026 } 1228 }
1027 while (type != REQ_QUIT);
1028 1229
1230quit:
1029 LOCK (wrklock); 1231 LOCK (wrklock);
1030 worker_free (self); 1232 worker_free (self);
1031 UNLOCK (wrklock); 1233 UNLOCK (wrklock);
1032 1234
1033 return 0; 1235 return 0;
1080 1282
1081 worker_clear (wrk); 1283 worker_clear (wrk);
1082 worker_free (wrk); 1284 worker_free (wrk);
1083 } 1285 }
1084 1286
1085 started = 0; 1287 started = 0;
1288 idle = 0;
1086 nreqs = 0; 1289 nreqs = 0;
1290 nready = 0;
1291 npending = 0;
1087 1292
1088 close (respipe [0]); 1293 close (respipe [0]);
1089 close (respipe [1]); 1294 close (respipe [1]);
1090 create_pipe (); 1295 create_pipe ();
1091 1296
1118PROTOTYPES: ENABLE 1323PROTOTYPES: ENABLE
1119 1324
1120BOOT: 1325BOOT:
1121{ 1326{
1122 HV *stash = gv_stashpv ("IO::AIO", 1); 1327 HV *stash = gv_stashpv ("IO::AIO", 1);
1328
1123 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1329 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1124 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1330 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1125 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1331 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1332 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1333 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1334 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1335 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1126 1336
1127 create_pipe (); 1337 create_pipe ();
1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1338 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1129} 1339}
1130 1340
1131void 1341void
1342max_poll_reqs (int nreqs)
1343 PROTOTYPE: $
1344 CODE:
1345 max_poll_reqs = nreqs;
1346
1347void
1348max_poll_time (double nseconds)
1349 PROTOTYPE: $
1350 CODE:
1351 max_poll_time = nseconds * AIO_TICKS;
1352
1353void
1132min_parallel (int nthreads) 1354min_parallel (int nthreads)
1133 PROTOTYPE: $ 1355 PROTOTYPE: $
1134 1356
1135void 1357void
1136max_parallel (int nthreads) 1358max_parallel (int nthreads)
1137 PROTOTYPE: $ 1359 PROTOTYPE: $
1360
1361void
1362max_idle (int nthreads)
1363 PROTOTYPE: $
1364 CODE:
1365 set_max_idle (nthreads);
1138 1366
1139int 1367int
1140max_outstanding (int maxreqs) 1368max_outstanding (int maxreqs)
1141 PROTOTYPE: $ 1369 PROTOTYPE: $
1142 CODE: 1370 CODE:
1145 OUTPUT: 1373 OUTPUT:
1146 RETVAL 1374 RETVAL
1147 1375
1148void 1376void
1149aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1377aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1150 SV * pathname 1378 SV8 * pathname
1151 int flags 1379 int flags
1152 int mode 1380 int mode
1153 SV * callback 1381 SV * callback
1154 PROTOTYPE: $$$;$ 1382 PROTOTYPE: $$$;$
1155 PPCODE: 1383 PPCODE:
1156{ 1384{
1157 dREQ; 1385 dREQ;
1158 1386
1159 req->type = REQ_OPEN; 1387 req->type = REQ_OPEN;
1160 req->data = newSVsv (pathname); 1388 req->sv1 = newSVsv (pathname);
1161 req->dataptr = SvPVbyte_nolen (req->data); 1389 req->ptr1 = SvPVbyte_nolen (req->sv1);
1162 req->fd = flags; 1390 req->int1 = flags;
1163 req->mode = mode; 1391 req->mode = mode;
1164 1392
1165 REQ_SEND; 1393 REQ_SEND;
1166} 1394}
1167 1395
1177 PPCODE: 1405 PPCODE:
1178{ 1406{
1179 dREQ; 1407 dREQ;
1180 1408
1181 req->type = ix; 1409 req->type = ix;
1182 req->fh = newSVsv (fh); 1410 req->fh = newSVsv (fh);
1183 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1411 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1184 1412
1185 REQ_SEND (req); 1413 REQ_SEND (req);
1186} 1414}
1187 1415
1188void 1416void
1189aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1417aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1190 SV * fh 1418 SV * fh
1191 UV offset 1419 UV offset
1192 UV length 1420 UV length
1193 SV * data 1421 SV8 * data
1194 UV dataoffset 1422 UV dataoffset
1195 SV * callback 1423 SV * callback
1196 ALIAS: 1424 ALIAS:
1197 aio_read = REQ_READ 1425 aio_read = REQ_READ
1198 aio_write = REQ_WRITE 1426 aio_write = REQ_WRITE
1199 PROTOTYPE: $$$$$;$ 1427 PROTOTYPE: $$$$$;$
1200 PPCODE: 1428 PPCODE:
1201{ 1429{
1202 aio_req req;
1203 STRLEN svlen; 1430 STRLEN svlen;
1204 char *svptr = SvPVbyte (data, svlen); 1431 char *svptr = SvPVbyte (data, svlen);
1205 1432
1206 SvUPGRADE (data, SVt_PV); 1433 SvUPGRADE (data, SVt_PV);
1207 SvPOK_on (data); 1434 SvPOK_on (data);
1219 length = svlen - dataoffset; 1446 length = svlen - dataoffset;
1220 } 1447 }
1221 else 1448 else
1222 { 1449 {
1223 /* read: grow scalar as necessary */ 1450 /* read: grow scalar as necessary */
1224 svptr = SvGROW (data, length + dataoffset); 1451 svptr = SvGROW (data, length + dataoffset + 1);
1225 } 1452 }
1226 1453
1227 if (length < 0) 1454 if (length < 0)
1228 croak ("length must not be negative"); 1455 croak ("length must not be negative");
1229 1456
1230 { 1457 {
1231 dREQ; 1458 dREQ;
1232 1459
1233 req->type = ix; 1460 req->type = ix;
1234 req->fh = newSVsv (fh); 1461 req->fh = newSVsv (fh);
1235 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1462 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1236 : IoOFP (sv_2io (fh))); 1463 : IoOFP (sv_2io (fh)));
1237 req->offset = offset; 1464 req->offs = offset;
1238 req->length = length; 1465 req->size = length;
1239 req->data = SvREFCNT_inc (data); 1466 req->sv1 = SvREFCNT_inc (data);
1240 req->dataptr = (char *)svptr + dataoffset; 1467 req->ptr1 = (char *)svptr + dataoffset;
1468 req->stroffset = dataoffset;
1241 1469
1242 if (!SvREADONLY (data)) 1470 if (!SvREADONLY (data))
1243 { 1471 {
1244 SvREADONLY_on (data); 1472 SvREADONLY_on (data);
1245 req->data2ptr = (void *)data; 1473 req->flags |= FLAG_SV1_RO_OFF;
1246 } 1474 }
1247 1475
1248 REQ_SEND; 1476 REQ_SEND;
1249 } 1477 }
1478}
1479
1480void
1481aio_readlink (path,callback=&PL_sv_undef)
1482 SV8 * path
1483 SV * callback
1484 PROTOTYPE: $$;$
1485 PPCODE:
1486{
1487 SV *data;
1488 dREQ;
1489
1490 data = newSV (NAME_MAX);
1491 SvPOK_on (data);
1492
1493 req->type = REQ_READLINK;
1494 req->fh = newSVsv (path);
1495 req->ptr2 = SvPVbyte_nolen (req->fh);
1496 req->sv1 = data;
1497 req->ptr1 = SvPVbyte_nolen (data);
1498
1499 REQ_SEND;
1250} 1500}
1251 1501
1252void 1502void
1253aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1503aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1254 SV * out_fh 1504 SV * out_fh
1260 PPCODE: 1510 PPCODE:
1261{ 1511{
1262 dREQ; 1512 dREQ;
1263 1513
1264 req->type = REQ_SENDFILE; 1514 req->type = REQ_SENDFILE;
1265 req->fh = newSVsv (out_fh); 1515 req->fh = newSVsv (out_fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1516 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1267 req->fh2 = newSVsv (in_fh); 1517 req->sv2 = newSVsv (in_fh);
1268 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1518 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1269 req->offset = in_offset; 1519 req->offs = in_offset;
1270 req->length = length; 1520 req->size = length;
1271 1521
1272 REQ_SEND; 1522 REQ_SEND;
1273} 1523}
1274 1524
1275void 1525void
1282 PPCODE: 1532 PPCODE:
1283{ 1533{
1284 dREQ; 1534 dREQ;
1285 1535
1286 req->type = REQ_READAHEAD; 1536 req->type = REQ_READAHEAD;
1287 req->fh = newSVsv (fh); 1537 req->fh = newSVsv (fh);
1288 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1538 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1289 req->offset = offset; 1539 req->offs = offset;
1290 req->length = length; 1540 req->size = length;
1291 1541
1292 REQ_SEND; 1542 REQ_SEND;
1293} 1543}
1294 1544
1295void 1545void
1296aio_stat (fh_or_path,callback=&PL_sv_undef) 1546aio_stat (fh_or_path,callback=&PL_sv_undef)
1297 SV * fh_or_path 1547 SV8 * fh_or_path
1298 SV * callback 1548 SV * callback
1299 ALIAS: 1549 ALIAS:
1300 aio_stat = REQ_STAT 1550 aio_stat = REQ_STAT
1301 aio_lstat = REQ_LSTAT 1551 aio_lstat = REQ_LSTAT
1302 PPCODE: 1552 PPCODE:
1303{ 1553{
1304 dREQ; 1554 dREQ;
1305 1555
1306 New (0, req->statdata, 1, Stat_t); 1556 req->ptr2 = malloc (sizeof (Stat_t));
1307 if (!req->statdata) 1557 if (!req->ptr2)
1308 { 1558 {
1309 req_free (req); 1559 req_free (req);
1310 croak ("out of memory during aio_req->statdata allocation"); 1560 croak ("out of memory during aio_stat statdata allocation");
1311 } 1561 }
1562
1563 req->flags |= FLAG_PTR2_FREE;
1312 1564
1313 if (SvPOK (fh_or_path)) 1565 if (SvPOK (fh_or_path))
1314 { 1566 {
1315 req->type = ix; 1567 req->type = ix;
1316 req->data = newSVsv (fh_or_path); 1568 req->sv1 = newSVsv (fh_or_path);
1317 req->dataptr = SvPVbyte_nolen (req->data); 1569 req->ptr1 = SvPVbyte_nolen (req->sv1);
1318 } 1570 }
1319 else 1571 else
1320 { 1572 {
1321 req->type = REQ_FSTAT; 1573 req->type = REQ_FSTAT;
1322 req->fh = newSVsv (fh_or_path); 1574 req->fh = newSVsv (fh_or_path);
1323 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1575 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1324 } 1576 }
1325 1577
1326 REQ_SEND; 1578 REQ_SEND;
1327} 1579}
1328 1580
1329void 1581void
1330aio_unlink (pathname,callback=&PL_sv_undef) 1582aio_unlink (pathname,callback=&PL_sv_undef)
1331 SV * pathname 1583 SV8 * pathname
1332 SV * callback 1584 SV * callback
1333 ALIAS: 1585 ALIAS:
1334 aio_unlink = REQ_UNLINK 1586 aio_unlink = REQ_UNLINK
1335 aio_rmdir = REQ_RMDIR 1587 aio_rmdir = REQ_RMDIR
1336 aio_readdir = REQ_READDIR 1588 aio_readdir = REQ_READDIR
1337 PPCODE: 1589 PPCODE:
1338{ 1590{
1339 dREQ; 1591 dREQ;
1340 1592
1341 req->type = ix; 1593 req->type = ix;
1342 req->data = newSVsv (pathname); 1594 req->sv1 = newSVsv (pathname);
1343 req->dataptr = SvPVbyte_nolen (req->data); 1595 req->ptr1 = SvPVbyte_nolen (req->sv1);
1344 1596
1345 REQ_SEND; 1597 REQ_SEND;
1346} 1598}
1347 1599
1348void 1600void
1349aio_link (oldpath,newpath,callback=&PL_sv_undef) 1601aio_link (oldpath,newpath,callback=&PL_sv_undef)
1350 SV * oldpath 1602 SV8 * oldpath
1351 SV * newpath 1603 SV8 * newpath
1352 SV * callback 1604 SV * callback
1353 ALIAS: 1605 ALIAS:
1354 aio_link = REQ_LINK 1606 aio_link = REQ_LINK
1355 aio_symlink = REQ_SYMLINK 1607 aio_symlink = REQ_SYMLINK
1356 aio_rename = REQ_RENAME 1608 aio_rename = REQ_RENAME
1357 PPCODE: 1609 PPCODE:
1358{ 1610{
1359 dREQ; 1611 dREQ;
1360 1612
1361 req->type = ix; 1613 req->type = ix;
1362 req->fh = newSVsv (oldpath); 1614 req->fh = newSVsv (oldpath);
1363 req->data2ptr = SvPVbyte_nolen (req->fh); 1615 req->ptr2 = SvPVbyte_nolen (req->fh);
1364 req->data = newSVsv (newpath); 1616 req->sv1 = newSVsv (newpath);
1365 req->dataptr = SvPVbyte_nolen (req->data); 1617 req->ptr1 = SvPVbyte_nolen (req->sv1);
1366 1618
1367 REQ_SEND; 1619 REQ_SEND;
1368} 1620}
1369 1621
1370void 1622void
1623aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1624 SV8 * pathname
1625 SV * callback
1626 UV mode
1627 UV dev
1628 PPCODE:
1629{
1630 dREQ;
1631
1632 req->type = REQ_MKNOD;
1633 req->sv1 = newSVsv (pathname);
1634 req->ptr1 = SvPVbyte_nolen (req->sv1);
1635 req->mode = (mode_t)mode;
1636 req->offs = dev;
1637
1638 REQ_SEND;
1639}
1640
1641void
1371aio_busy (delay,callback=&PL_sv_undef) 1642aio_busy (delay,callback=&PL_sv_undef)
1372 double delay 1643 double delay
1373 SV * callback 1644 SV * callback
1374 PPCODE: 1645 PPCODE:
1375{ 1646{
1376 dREQ; 1647 dREQ;
1377 1648
1378 req->type = REQ_BUSY; 1649 req->type = REQ_BUSY;
1379 req->fd = delay < 0. ? 0 : delay; 1650 req->int1 = delay < 0. ? 0 : delay;
1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1651 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1381 1652
1382 REQ_SEND; 1653 REQ_SEND;
1383} 1654}
1384 1655
1385void 1656void
1389 PPCODE: 1660 PPCODE:
1390{ 1661{
1391 dREQ; 1662 dREQ;
1392 1663
1393 req->type = REQ_GROUP; 1664 req->type = REQ_GROUP;
1665
1394 req_send (req); 1666 req_send (req);
1395
1396 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1667 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1397} 1668}
1398 1669
1399void 1670void
1400aio_nop (callback=&PL_sv_undef) 1671aio_nop (callback=&PL_sv_undef)
1401 SV * callback 1672 SV * callback
1402 PPCODE: 1673 PPCODE:
1403{ 1674{
1404 dREQ; 1675 dREQ;
1405 1676
1406 req->type = REQ_NOP; 1677 req->type = REQ_NOP;
1435 PROTOTYPE: 1706 PROTOTYPE:
1436 CODE: 1707 CODE:
1437 while (nreqs) 1708 while (nreqs)
1438 { 1709 {
1439 poll_wait (); 1710 poll_wait ();
1440 poll_cb (0); 1711 poll_cb ();
1441 } 1712 }
1442 1713
1443void 1714int
1444poll() 1715poll()
1445 PROTOTYPE: 1716 PROTOTYPE:
1446 CODE: 1717 CODE:
1447 if (nreqs)
1448 {
1449 poll_wait (); 1718 poll_wait ();
1450 poll_cb (0); 1719 RETVAL = poll_cb ();
1451 } 1720 OUTPUT:
1721 RETVAL
1452 1722
1453int 1723int
1454poll_fileno() 1724poll_fileno()
1455 PROTOTYPE: 1725 PROTOTYPE:
1456 CODE: 1726 CODE:
1460 1730
1461int 1731int
1462poll_cb(...) 1732poll_cb(...)
1463 PROTOTYPE: 1733 PROTOTYPE:
1464 CODE: 1734 CODE:
1465 RETVAL = poll_cb (0); 1735 RETVAL = poll_cb ();
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1474 OUTPUT: 1736 OUTPUT:
1475 RETVAL 1737 RETVAL
1476 1738
1477void 1739void
1478poll_wait() 1740poll_wait()
1479 PROTOTYPE: 1741 PROTOTYPE:
1480 CODE: 1742 CODE:
1481 if (nreqs)
1482 poll_wait (); 1743 poll_wait ();
1744
1745void
1746setsig (int signum = SIGIO)
1747 PROTOTYPE: ;$
1748 CODE:
1749{
1750 if (block_sig_level)
1751 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1752
1753 LOCK (reslock);
1754 main_tid = pthread_self ();
1755 main_sig = signum;
1756 UNLOCK (reslock);
1757
1758 if (main_sig && npending)
1759 pthread_kill (main_tid, main_sig);
1760}
1761
1762void
1763aio_block (SV *cb)
1764 PROTOTYPE: &
1765 PPCODE:
1766{
1767 int count;
1768
1769 block_sig ();
1770 PUSHMARK (SP);
1771 PUTBACK;
1772 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1773 SPAGAIN;
1774 unblock_sig ();
1775
1776 if (SvTRUE (ERRSV))
1777 croak (0);
1778
1779 XSRETURN (count);
1780}
1483 1781
1484int 1782int
1485nreqs() 1783nreqs()
1486 PROTOTYPE: 1784 PROTOTYPE:
1487 CODE: 1785 CODE:
1491 1789
1492int 1790int
1493nready() 1791nready()
1494 PROTOTYPE: 1792 PROTOTYPE:
1495 CODE: 1793 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready; 1794 RETVAL = get_nready ();
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT: 1795 OUTPUT:
1500 RETVAL 1796 RETVAL
1501 1797
1502int 1798int
1503npending() 1799npending()
1504 PROTOTYPE: 1800 PROTOTYPE:
1505 CODE: 1801 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending; 1802 RETVAL = get_npending ();
1803 OUTPUT:
1804 RETVAL
1805
1806int
1807nthreads()
1808 PROTOTYPE:
1809 CODE:
1810 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1811 RETVAL = started;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock); 1812 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1509 OUTPUT: 1813 OUTPUT:
1510 RETVAL 1814 RETVAL
1511 1815
1512PROTOTYPES: DISABLE 1816PROTOTYPES: DISABLE
1513 1817
1531 PPCODE: 1835 PPCODE:
1532{ 1836{
1533 int i; 1837 int i;
1534 aio_req req; 1838 aio_req req;
1535 1839
1840 if (main_sig && !block_sig_level)
1841 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1842
1536 if (grp->fd == 2) 1843 if (grp->int1 == 2)
1537 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1844 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1538 1845
1539 for (i = 1; i < items; ++i ) 1846 for (i = 1; i < items; ++i )
1540 { 1847 {
1541 if (GIMME_V != G_VOID) 1848 if (GIMME_V != G_VOID)
1543 1850
1544 req = SvAIO_REQ (ST (i)); 1851 req = SvAIO_REQ (ST (i));
1545 1852
1546 if (req) 1853 if (req)
1547 { 1854 {
1548 ++grp->length; 1855 ++grp->size;
1549 req->grp = grp; 1856 req->grp = grp;
1550 1857
1551 req->grp_prev = 0; 1858 req->grp_prev = 0;
1552 req->grp_next = grp->grp_first; 1859 req->grp_next = grp->grp_first;
1553 1860
1576 av = newAV (); 1883 av = newAV ();
1577 1884
1578 for (i = 1; i < items; ++i ) 1885 for (i = 1; i < items; ++i )
1579 av_push (av, newSVsv (ST (i))); 1886 av_push (av, newSVsv (ST (i)));
1580 1887
1581 SvREFCNT_dec (grp->data); 1888 SvREFCNT_dec (grp->sv1);
1582 grp->data = (SV *)av; 1889 grp->sv1 = (SV *)av;
1583} 1890}
1584 1891
1585void 1892void
1586errno (aio_req grp, int errorno = errno) 1893errno (aio_req grp, int errorno = errno)
1587 CODE: 1894 CODE:
1588 grp->errorno = errorno; 1895 grp->errorno = errorno;
1589 1896
1590void 1897void
1591limit (aio_req grp, int limit) 1898limit (aio_req grp, int limit)
1592 CODE: 1899 CODE:
1593 grp->fd2 = limit; 1900 grp->int2 = limit;
1594 aio_grp_feed (grp); 1901 aio_grp_feed (grp);
1595 1902
1596void 1903void
1597feed (aio_req grp, SV *callback=&PL_sv_undef) 1904feed (aio_req grp, SV *callback=&PL_sv_undef)
1598 CODE: 1905 CODE:
1599{ 1906{
1600 SvREFCNT_dec (grp->fh2); 1907 SvREFCNT_dec (grp->sv2);
1601 grp->fh2 = newSVsv (callback); 1908 grp->sv2 = newSVsv (callback);
1602 1909
1603 if (grp->fd2 <= 0) 1910 if (grp->int2 <= 0)
1604 grp->fd2 = 2; 1911 grp->int2 = 2;
1605 1912
1606 aio_grp_feed (grp); 1913 aio_grp_feed (grp);
1607} 1914}
1608 1915

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines