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.74 by root, Wed Oct 25 17:57:30 2006 UTC vs.
Revision 1.86 by root, Mon Oct 30 23:30:00 2006 UTC

1/* solaris */ 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1 2#define _POSIX_PTHREAD_SEMANTICS 1
3 3
4#if __linux 4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE 5# define _GNU_SOURCE
6#endif 6#endif
7 7
8/* just in case */
8#define _REENTRANT 1 9#define _REENTRANT 1
9 10
10#include <errno.h> 11#include <errno.h>
11 12
12#include "EXTERN.h" 13#include "EXTERN.h"
… …
42# else 43# else
43# error sendfile support requested but not available 44# error sendfile support requested but not available
44# endif 45# endif
45#endif 46#endif
46 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
47/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
48#ifndef NAME_MAX 52#ifndef NAME_MAX
49# define NAME_MAX 4096 53# define NAME_MAX 4096
54#endif
55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
50#endif 59#endif
51 60
52#if __ia64 61#if __ia64
53# define STACKSIZE 65536 62# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
56#else 65#else
57# define STACKSIZE 16384 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
58#endif 79#endif
59 80
60/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
62 83
… …
74 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
75 REQ_SENDFILE, 96 REQ_SENDFILE,
76 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
77 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
79 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
80 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
81 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
82 REQ_BUSY, 103 REQ_BUSY,
83}; 104};
84 105
85#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
87 108
88typedef struct aio_cb 109typedef struct aio_cb
89{ 110{
90 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
91 112
92 SV *data, *callback; 113 SV *callback, *fh;
93 SV *fh, *fh2; 114 SV *sv1, *sv2;
94 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
95 Stat_t *statdata; 116 Stat_t *statdata;
96 off_t offset; 117 off_t offs;
97 size_t length; 118 size_t size;
98 ssize_t result; 119 ssize_t result;
99 120
100 STRLEN dataoffset; 121 STRLEN stroffset;
101 int type; 122 int type;
102 int fd, fd2; 123 int int1, int2;
103 int errorno; 124 int errorno;
104 mode_t mode; /* open */ 125 mode_t mode; /* open */
105 126
106 unsigned char flags; 127 unsigned char flags;
107 unsigned char pri; 128 unsigned char pri;
… …
109 SV *self; /* the perl counterpart of this request, if any */ 130 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
111} aio_cb; 132} aio_cb;
112 133
113enum { 134enum {
114 FLAG_CANCELLED = 0x01, 135 FLAG_CANCELLED = 0x01,
136 FLAG_DATA_RO_OFF = 0x80, /* data was set readonly */
115}; 137};
116 138
117typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
118typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
119 141
… …
124 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
125 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
127}; 149};
128 150
151#define AIO_TICKS ((1000000 + 1023) >> 10)
152
153static unsigned int max_poll_time = 0;
154static unsigned int max_poll_reqs = 0;
155
156/* calculcate time difference in ~1/AIO_TICKS of a second */
157static int tvdiff (struct timeval *tv1, struct timeval *tv2)
158{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161}
162
129static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
130 164
131static int started, wanted; 165static unsigned int started, idle, wanted;
132static volatile int nreqs;
133static int respipe [2];
134 166
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else 169#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif 171#endif
140 172
141#define LOCK(mutex) pthread_mutex_lock (&(mutex)) 173#define LOCK(mutex) pthread_mutex_lock (&(mutex))
142#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 174#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
143 175
144/* worker threasd management */ 176/* worker threads management */
145static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 177static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
146 178
147typedef struct worker { 179typedef struct worker {
148 /* locked by wrklock */ 180 /* locked by wrklock */
149 struct worker *prev, *next; 181 struct worker *prev, *next;
… …
179 wrk->prev->next = wrk->next; 211 wrk->prev->next = wrk->next;
180 212
181 free (wrk); 213 free (wrk);
182} 214}
183 215
216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
218static volatile unsigned int max_outstanding = 0xffffffff;
219static int respipe [2];
220
184static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
185static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
186static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
224
225#if WORDACCESS_UNSAFE
226
227static unsigned int get_nready ()
228{
229 unsigned int retval;
230
231 LOCK (reqlock);
232 retval = nready;
233 UNLOCK (reqlock);
234
235 return retval;
236}
237
238static unsigned int get_npending ()
239{
240 unsigned int retval;
241
242 LOCK (reslock);
243 retval = npending;
244 UNLOCK (reslock);
245
246 return retval;
247}
248
249static unsigned int get_nthreads ()
250{
251 unsigned int retval;
252
253 LOCK (wrklock);
254 retval = started;
255 UNLOCK (wrklock);
256
257 return retval;
258}
259
260#else
261
262# define get_nready() nready
263# define get_npending() npending
264# define get_nthreads() started
265
266#endif
187 267
188/* 268/*
189 * a somewhat faster data structure might be nice, but 269 * a somewhat faster data structure might be nice, but
190 * with 8 priorities this actually needs <20 insns 270 * with 8 priorities this actually needs <20 insns
191 * per shift, the most expensive operation. 271 * per shift, the most expensive operation.
… …
268 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
269} 349}
270 350
271static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
272{ 352{
273 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
274 { 354 {
275 int old_len = grp->length; 355 int old_len = grp->size;
276 356
277 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
278 { 358 {
279 dSP; 359 dSP;
280 360
281 ENTER; 361 ENTER;
282 SAVETMPS; 362 SAVETMPS;
283 PUSHMARK (SP); 363 PUSHMARK (SP);
284 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
285 PUTBACK; 365 PUTBACK;
286 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
287 SPAGAIN; 367 SPAGAIN;
288 FREETMPS; 368 FREETMPS;
289 LEAVE; 369 LEAVE;
290 } 370 }
291 371
292 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
293 if (old_len == grp->length) 373 if (old_len == grp->size)
294 { 374 {
295 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
296 grp->fh2 = 0; 376 grp->sv2 = 0;
297 break; 377 break;
298 } 378 }
299 } 379 }
300} 380}
301 381
302static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
303{ 383{
304 --grp->length; 384 --grp->size;
305 385
306 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
307 aio_grp_feed (grp); 387 aio_grp_feed (grp);
308 388
309 /* finish, if done */ 389 /* finish, if done */
310 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
311 { 391 {
312 req_invoke (grp); 392 req_invoke (grp);
313 req_free (grp); 393 req_free (grp);
314 } 394 }
315} 395}
316 396
317static void poll_wait ()
318{
319 fd_set rfd;
320
321 while (nreqs)
322 {
323 int size;
324#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
325 LOCK (reslock);
326#endif
327 size = res_queue.size;
328#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
329 UNLOCK (reslock);
330#endif
331
332 if (size)
333 return;
334
335 FD_ZERO(&rfd);
336 FD_SET(respipe [0], &rfd);
337
338 select (respipe [0] + 1, &rfd, 0, 0, 0);
339 }
340}
341
342static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
343{ 398{
344 dSP; 399 dSP;
345 400
401 if (req->flags & FLAG_DATA_RO_OFF)
402 SvREADONLY_off (req->sv1);
403
404 if (req->statdata)
405 {
406 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
407 PL_laststatval = req->result;
408 PL_statcache = *(req->statdata);
409 }
410
346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
347 { 412 {
348 errno = req->errorno;
349
350 ENTER; 413 ENTER;
351 SAVETMPS; 414 SAVETMPS;
352 PUSHMARK (SP); 415 PUSHMARK (SP);
353 EXTEND (SP, 1); 416 EXTEND (SP, 1);
354 417
… …
359 SV *rv = &PL_sv_undef; 422 SV *rv = &PL_sv_undef;
360 423
361 if (req->result >= 0) 424 if (req->result >= 0)
362 { 425 {
363 int i; 426 int i;
364 char *buf = req->data2ptr; 427 char *buf = req->ptr2;
365 AV *av = newAV (); 428 AV *av = newAV ();
366 429
367 av_extend (av, req->result - 1); 430 av_extend (av, req->result - 1);
368 431
369 for (i = 0; i < req->result; ++i) 432 for (i = 0; i < req->result; ++i)
… …
397 XPUSHs (sv_2mortal (fh)); 460 XPUSHs (sv_2mortal (fh));
398 } 461 }
399 break; 462 break;
400 463
401 case REQ_GROUP: 464 case REQ_GROUP:
402 req->fd = 2; /* mark group as finished */ 465 req->int1 = 2; /* mark group as finished */
403 466
404 if (req->data) 467 if (req->sv1)
405 { 468 {
406 int i; 469 int i;
407 AV *av = (AV *)req->data; 470 AV *av = (AV *)req->sv1;
408 471
409 EXTEND (SP, AvFILL (av) + 1); 472 EXTEND (SP, AvFILL (av) + 1);
410 for (i = 0; i <= AvFILL (av); ++i) 473 for (i = 0; i <= AvFILL (av); ++i)
411 PUSHs (*av_fetch (av, i, 0)); 474 PUSHs (*av_fetch (av, i, 0));
412 } 475 }
… …
414 477
415 case REQ_NOP: 478 case REQ_NOP:
416 case REQ_BUSY: 479 case REQ_BUSY:
417 break; 480 break;
418 481
482 case REQ_READLINK:
483 if (req->result > 0)
484 {
485 SvCUR_set (req->sv1, req->result);
486 *SvEND (req->sv1) = 0;
487 PUSHs (req->sv1);
488 }
489 break;
490
491 case REQ_READ:
492 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
493 *SvEND (req->sv1) = 0;
494 /* fall through */
419 default: 495 default:
420 PUSHs (sv_2mortal (newSViv (req->result))); 496 PUSHs (sv_2mortal (newSViv (req->result)));
421 break; 497 break;
422 } 498 }
423 499
500 errno = req->errorno;
424 501
425 PUTBACK; 502 PUTBACK;
426 call_sv (req->callback, G_VOID | G_EVAL); 503 call_sv (req->callback, G_VOID | G_EVAL);
427 SPAGAIN; 504 SPAGAIN;
428 505
… …
457 { 534 {
458 sv_unmagic (req->self, PERL_MAGIC_ext); 535 sv_unmagic (req->self, PERL_MAGIC_ext);
459 SvREFCNT_dec (req->self); 536 SvREFCNT_dec (req->self);
460 } 537 }
461 538
462 SvREFCNT_dec (req->data);
463 SvREFCNT_dec (req->fh); 539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1);
464 SvREFCNT_dec (req->fh2); 541 SvREFCNT_dec (req->sv2);
465 SvREFCNT_dec (req->callback); 542 SvREFCNT_dec (req->callback);
466 Safefree (req->statdata); 543 Safefree (req->statdata);
467 544
468 if (req->type == REQ_READDIR) 545 if (req->type == REQ_READDIR)
469 free (req->data2ptr); 546 free (req->ptr2);
470 547
471 Safefree (req); 548 Safefree (req);
472} 549}
473 550
474static void req_cancel_subs (aio_req grp) 551static void req_cancel_subs (aio_req grp)
… …
476 aio_req sub; 553 aio_req sub;
477 554
478 if (grp->type != REQ_GROUP) 555 if (grp->type != REQ_GROUP)
479 return; 556 return;
480 557
481 SvREFCNT_dec (grp->fh2); 558 SvREFCNT_dec (grp->sv2);
482 grp->fh2 = 0; 559 grp->sv2 = 0;
483 560
484 for (sub = grp->grp_first; sub; sub = sub->grp_next) 561 for (sub = grp->grp_first; sub; sub = sub->grp_next)
485 req_cancel (sub); 562 req_cancel (sub);
486} 563}
487 564
488static void req_cancel (aio_req req) 565static void req_cancel (aio_req req)
489{ 566{
490 req->flags |= FLAG_CANCELLED; 567 req->flags |= FLAG_CANCELLED;
491 568
492 req_cancel_subs (req); 569 req_cancel_subs (req);
493}
494
495static int poll_cb ()
496{
497 dSP;
498 int count = 0;
499 int do_croak = 0;
500 aio_req req;
501
502 for (;;)
503 {
504 LOCK (reslock);
505 req = reqq_shift (&res_queue);
506
507 if (req)
508 {
509 if (!res_queue.size)
510 {
511 /* read any signals sent by the worker threads */
512 char buf [32];
513 while (read (respipe [0], buf, 32) == 32)
514 ;
515 }
516 }
517
518 UNLOCK (reslock);
519
520 if (!req)
521 break;
522
523 --nreqs;
524
525 if (req->type == REQ_QUIT)
526 started--;
527 else if (req->type == REQ_GROUP && req->length)
528 {
529 req->fd = 1; /* mark request as delayed */
530 continue;
531 }
532 else
533 {
534 if (req->type == REQ_READ)
535 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
536
537 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
538 SvREADONLY_off (req->data);
539
540 if (req->statdata)
541 {
542 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
543 PL_laststatval = req->result;
544 PL_statcache = *(req->statdata);
545 }
546
547 req_invoke (req);
548
549 count++;
550 }
551
552 req_free (req);
553 }
554
555 return count;
556} 570}
557 571
558static void *aio_proc(void *arg); 572static void *aio_proc(void *arg);
559 573
560static void start_thread (void) 574static void start_thread (void)
… …
568 croak ("unable to allocate worker thread data"); 582 croak ("unable to allocate worker thread data");
569 583
570 pthread_attr_init (&attr); 584 pthread_attr_init (&attr);
571 pthread_attr_setstacksize (&attr, STACKSIZE); 585 pthread_attr_setstacksize (&attr, STACKSIZE);
572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 586 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
587#ifdef PTHREAD_SCOPE_PROCESS
588 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
589#endif
573 590
574 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
575 592
576 LOCK (wrklock); 593 LOCK (wrklock);
577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
580 { 597 {
581 wrk->prev = &wrk_first; 598 wrk->prev = &wrk_first;
582 wrk->next = wrk_first.next; 599 wrk->next = wrk_first.next;
583 wrk_first.next->prev = wrk; 600 wrk_first.next->prev = wrk;
584 wrk_first.next = wrk; 601 wrk_first.next = wrk;
585 started++; 602 ++started;
586 } 603 }
587 else 604 else
588 free (wrk); 605 free (wrk);
589 606
590 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock); 608 UNLOCK (wrklock);
592} 609}
593 610
611static void maybe_start_thread ()
612{
613 if (get_nthreads () >= wanted)
614 return;
615
616 /* todo: maybe use idle here, but might be less exact */
617 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
618 return;
619
620 start_thread ();
621}
622
594static void req_send (aio_req req) 623static void req_send (aio_req req)
595{ 624{
596 while (started < wanted && nreqs >= started)
597 start_thread ();
598
599 ++nreqs; 625 ++nreqs;
626
627 LOCK (reqlock);
628 ++nready;
629 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait);
631 UNLOCK (reqlock);
632
633 maybe_start_thread ();
634}
635
636static void end_thread (void)
637{
638 aio_req req;
639
640 Newz (0, req, 1, aio_cb);
641
642 req->type = REQ_QUIT;
643 req->pri = PRI_MAX + PRI_BIAS;
600 644
601 LOCK (reqlock); 645 LOCK (reqlock);
602 reqq_push (&req_queue, req); 646 reqq_push (&req_queue, req);
603 pthread_cond_signal (&reqwait); 647 pthread_cond_signal (&reqwait);
604 UNLOCK (reqlock); 648 UNLOCK (reqlock);
605}
606 649
607static void end_thread (void) 650 LOCK (wrklock);
608{ 651 --started;
609 aio_req req; 652 UNLOCK (wrklock);
653}
610 654
611 Newz (0, req, 1, aio_cb); 655static void set_max_idle (int nthreads)
612 656{
613 req->type = REQ_QUIT; 657 if (WORDACCESS_UNSAFE) LOCK (reqlock);
614 req->pri = PRI_MAX + PRI_BIAS; 658 max_idle = nthreads <= 0 ? 1 : nthreads;
615 659 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
616 req_send (req);
617} 660}
618 661
619static void min_parallel (int nthreads) 662static void min_parallel (int nthreads)
620{ 663{
621 if (wanted < nthreads) 664 if (wanted < nthreads)
622 wanted = nthreads; 665 wanted = nthreads;
623} 666}
624 667
625static void max_parallel (int nthreads) 668static void max_parallel (int nthreads)
626{ 669{
627 int cur = started;
628
629 if (wanted > nthreads) 670 if (wanted > nthreads)
630 wanted = nthreads; 671 wanted = nthreads;
631 672
632 while (cur > wanted)
633 {
634 end_thread ();
635 cur--;
636 }
637
638 while (started > wanted) 673 while (started > wanted)
674 end_thread ();
675}
676
677static void poll_wait ()
678{
679 fd_set rfd;
680
681 while (nreqs)
682 {
683 int size;
684 if (WORDACCESS_UNSAFE) LOCK (reslock);
685 size = res_queue.size;
686 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
687
688 if (size)
689 return;
690
691 maybe_start_thread ();
692
693 FD_ZERO(&rfd);
694 FD_SET(respipe [0], &rfd);
695
696 select (respipe [0] + 1, &rfd, 0, 0, 0);
639 { 697 }
698}
699
700static int poll_cb ()
701{
702 dSP;
703 int count = 0;
704 int maxreqs = max_poll_reqs;
705 int do_croak = 0;
706 struct timeval tv_start, tv_now;
707 aio_req req;
708
709 if (max_poll_time)
710 gettimeofday (&tv_start, 0);
711
712 for (;;)
713 {
714 for (;;)
715 {
716 maybe_start_thread ();
717
718 LOCK (reslock);
719 req = reqq_shift (&res_queue);
720
721 if (req)
722 {
723 --npending;
724
725 if (!res_queue.size)
726 {
727 /* read any signals sent by the worker threads */
728 char buf [32];
729 while (read (respipe [0], buf, 32) == 32)
730 ;
731 }
732 }
733
734 UNLOCK (reslock);
735
736 if (!req)
737 break;
738
739 --nreqs;
740
741 if (req->type == REQ_GROUP && req->size)
742 {
743 req->int1 = 1; /* mark request as delayed */
744 continue;
745 }
746 else
747 {
748 req_invoke (req);
749
750 count++;
751 }
752
753 req_free (req);
754
755 if (maxreqs && !--maxreqs)
756 break;
757
758 if (max_poll_time)
759 {
760 gettimeofday (&tv_now, 0);
761
762 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
763 break;
764 }
765 }
766
767 if (nreqs <= max_outstanding)
768 break;
769
640 poll_wait (); 770 poll_wait ();
641 poll_cb (); 771
772 ++maxreqs;
642 } 773 }
774
775 return count;
643} 776}
644 777
645static void create_pipe () 778static void create_pipe ()
646{ 779{
647 if (pipe (respipe)) 780 if (pipe (respipe))
… …
702#if !HAVE_FDATASYNC 835#if !HAVE_FDATASYNC
703# define fdatasync fsync 836# define fdatasync fsync
704#endif 837#endif
705 838
706#if !HAVE_READAHEAD 839#if !HAVE_READAHEAD
707# define readahead aio_readahead 840# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
708 841
709static ssize_t readahead (int fd, off_t offset, size_t count) 842static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
710{ 843{
711 dBUF; 844 dBUF;
712 845
713 while (count > 0) 846 while (count > 0)
714 { 847 {
… …
719 count -= len; 852 count -= len;
720 } 853 }
721 854
722 errno = 0; 855 errno = 0;
723} 856}
857
724#endif 858#endif
725 859
726#if !HAVE_READDIR_R 860#if !HAVE_READDIR_R
727# define readdir_r aio_readdir_r 861# define readdir_r aio_readdir_r
728 862
… …
773 { 907 {
774 off_t sbytes; 908 off_t sbytes;
775 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 909 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
776 910
777 if (res < 0 && sbytes) 911 if (res < 0 && sbytes)
778 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 912 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
779 res = sbytes; 913 res = sbytes;
780 } 914 }
781 915
782# elif __hpux 916# elif __hpux
783 res = sendfile (ofd, ifd, offset, count, 0, 0); 917 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
861 int memofs = 0; 995 int memofs = 0;
862 int res = 0; 996 int res = 0;
863 int errorno; 997 int errorno;
864 998
865 LOCK (wrklock); 999 LOCK (wrklock);
866 self->dirp = dirp = opendir (req->dataptr); 1000 self->dirp = dirp = opendir (req->ptr1);
867 self->dbuf = u = malloc (sizeof (*u)); 1001 self->dbuf = u = malloc (sizeof (*u));
1002 req->ptr2 = names = malloc (memlen);
868 UNLOCK (wrklock); 1003 UNLOCK (wrklock);
869
870 req->data2ptr = names = malloc (memlen);
871 1004
872 if (dirp && u && names) 1005 if (dirp && u && names)
873 for (;;) 1006 for (;;)
874 { 1007 {
875 errno = 0; 1008 errno = 0;
… …
888 1021
889 while (memofs + len > memlen) 1022 while (memofs + len > memlen)
890 { 1023 {
891 memlen *= 2; 1024 memlen *= 2;
892 LOCK (wrklock); 1025 LOCK (wrklock);
893 req->data2ptr = names = realloc (names, memlen); 1026 req->ptr2 = names = realloc (names, memlen);
894 UNLOCK (wrklock); 1027 UNLOCK (wrklock);
895 1028
896 if (!names) 1029 if (!names)
897 break; 1030 break;
898 } 1031 }
… …
911/*****************************************************************************/ 1044/*****************************************************************************/
912 1045
913static void *aio_proc (void *thr_arg) 1046static void *aio_proc (void *thr_arg)
914{ 1047{
915 aio_req req; 1048 aio_req req;
916 int type; 1049 struct timespec ts;
917 worker *self = (worker *)thr_arg; 1050 worker *self = (worker *)thr_arg;
918 1051
919 do 1052 /* try to distribute timeouts somewhat evenly */
1053 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1054 * (1000000000UL / 1024UL);
1055
1056 for (;;)
920 { 1057 {
1058 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1059
921 LOCK (reqlock); 1060 LOCK (reqlock);
922 1061
923 for (;;) 1062 for (;;)
924 { 1063 {
925 self->req = req = reqq_shift (&req_queue); 1064 self->req = req = reqq_shift (&req_queue);
926 1065
927 if (req) 1066 if (req)
928 break; 1067 break;
929 1068
1069 ++idle;
1070
1071 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1072 == ETIMEDOUT)
1073 {
1074 if (idle > max_idle)
1075 {
1076 --idle;
1077 UNLOCK (reqlock);
1078 LOCK (wrklock);
1079 --started;
1080 UNLOCK (wrklock);
1081 goto quit;
1082 }
1083
1084 /* we are allowed to idle, so do so without any timeout */
930 pthread_cond_wait (&reqwait, &reqlock); 1085 pthread_cond_wait (&reqwait, &reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 }
1088
1089 --idle;
931 } 1090 }
1091
1092 --nready;
932 1093
933 UNLOCK (reqlock); 1094 UNLOCK (reqlock);
934 1095
935 errno = 0; /* strictly unnecessary */ 1096 errno = 0; /* strictly unnecessary */
936 type = req->type; /* remember type for QUIT check */
937 1097
938 if (!(req->flags & FLAG_CANCELLED)) 1098 if (!(req->flags & FLAG_CANCELLED))
939 switch (type) 1099 switch (req->type)
940 { 1100 {
941 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1101 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
942 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1102 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
943 1103
944 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1104 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
945 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1105 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
946 1106
947 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break;
948 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break;
949 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break;
950 1110
951 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1111 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
952 case REQ_CLOSE: req->result = close (req->fd); break; 1112 case REQ_CLOSE: req->result = close (req->int1); break;
953 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
954 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
955 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
956 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
957 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1117 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1118 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1119 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
958 1120
959 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
960 case REQ_FSYNC: req->result = fsync (req->fd); break; 1122 case REQ_FSYNC: req->result = fsync (req->int1); break;
961 case REQ_READDIR: scandir_ (req, self); break; 1123 case REQ_READDIR: scandir_ (req, self); break;
962 1124
963 case REQ_BUSY: 1125 case REQ_BUSY:
964 { 1126 {
965 struct timeval tv; 1127 struct timeval tv;
966 1128
967 tv.tv_sec = req->fd; 1129 tv.tv_sec = req->int1;
968 tv.tv_usec = req->fd2; 1130 tv.tv_usec = req->int2;
969 1131
970 req->result = select (0, 0, 0, 0, &tv); 1132 req->result = select (0, 0, 0, 0, &tv);
971 } 1133 }
972 1134
973 case REQ_GROUP: 1135 case REQ_GROUP:
974 case REQ_NOP: 1136 case REQ_NOP:
1137 break;
1138
975 case REQ_QUIT: 1139 case REQ_QUIT:
976 break; 1140 goto quit;
977 1141
978 default: 1142 default:
979 req->result = ENOSYS; 1143 req->result = ENOSYS;
980 break; 1144 break;
981 } 1145 }
982 1146
983 req->errorno = errno; 1147 req->errorno = errno;
984 1148
985 LOCK (reslock); 1149 LOCK (reslock);
986 1150
1151 ++npending;
1152
987 if (!reqq_push (&res_queue, req)) 1153 if (!reqq_push (&res_queue, req))
988 /* write a dummy byte to the pipe so fh becomes ready */ 1154 /* write a dummy byte to the pipe so fh becomes ready */
989 write (respipe [1], &respipe, 1); 1155 write (respipe [1], &respipe, 1);
990 1156
991 self->req = 0; 1157 self->req = 0;
992 worker_clear (self); 1158 worker_clear (self);
993 1159
994 UNLOCK (reslock); 1160 UNLOCK (reslock);
995 } 1161 }
996 while (type != REQ_QUIT);
997 1162
1163quit:
998 LOCK (wrklock); 1164 LOCK (wrklock);
999 worker_free (self); 1165 worker_free (self);
1000 UNLOCK (wrklock); 1166 UNLOCK (wrklock);
1001 1167
1002 return 0; 1168 return 0;
… …
1049 1215
1050 worker_clear (wrk); 1216 worker_clear (wrk);
1051 worker_free (wrk); 1217 worker_free (wrk);
1052 } 1218 }
1053 1219
1054 started = 0; 1220 started = 0;
1221 idle = 0;
1055 nreqs = 0; 1222 nreqs = 0;
1223 nready = 0;
1224 npending = 0;
1056 1225
1057 close (respipe [0]); 1226 close (respipe [0]);
1058 close (respipe [1]); 1227 close (respipe [1]);
1059 create_pipe (); 1228 create_pipe ();
1060 1229
… …
1087PROTOTYPES: ENABLE 1256PROTOTYPES: ENABLE
1088 1257
1089BOOT: 1258BOOT:
1090{ 1259{
1091 HV *stash = gv_stashpv ("IO::AIO", 1); 1260 HV *stash = gv_stashpv ("IO::AIO", 1);
1261
1092 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1262 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1093 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1094 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1264 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1265 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1266 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1267 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1095 1268
1096 create_pipe (); 1269 create_pipe ();
1097 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1098} 1271}
1099 1272
1100void 1273void
1101min_parallel (nthreads) 1274max_poll_reqs (int nreqs)
1102 int nthreads
1103 PROTOTYPE: $ 1275 PROTOTYPE: $
1276 CODE:
1277 max_poll_reqs = nreqs;
1104 1278
1105void 1279void
1106max_parallel (nthreads) 1280max_poll_time (double nseconds)
1107 int nthreads
1108 PROTOTYPE: $ 1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_time = nseconds * AIO_TICKS;
1284
1285void
1286min_parallel (int nthreads)
1287 PROTOTYPE: $
1288
1289void
1290max_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_idle (int nthreads)
1295 PROTOTYPE: $
1296 CODE:
1297 set_max_idle (nthreads);
1298
1299int
1300max_outstanding (int maxreqs)
1301 PROTOTYPE: $
1302 CODE:
1303 RETVAL = max_outstanding;
1304 max_outstanding = maxreqs;
1305 OUTPUT:
1306 RETVAL
1109 1307
1110void 1308void
1111aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1309aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1112 SV * pathname 1310 SV * pathname
1113 int flags 1311 int flags
… …
1117 PPCODE: 1315 PPCODE:
1118{ 1316{
1119 dREQ; 1317 dREQ;
1120 1318
1121 req->type = REQ_OPEN; 1319 req->type = REQ_OPEN;
1122 req->data = newSVsv (pathname); 1320 req->sv1 = newSVsv (pathname);
1123 req->dataptr = SvPVbyte_nolen (req->data); 1321 req->ptr1 = SvPVbyte_nolen (pathname);
1124 req->fd = flags; 1322 req->int1 = flags;
1125 req->mode = mode; 1323 req->mode = mode;
1126 1324
1127 REQ_SEND; 1325 REQ_SEND;
1128} 1326}
1129 1327
… …
1139 PPCODE: 1337 PPCODE:
1140{ 1338{
1141 dREQ; 1339 dREQ;
1142 1340
1143 req->type = ix; 1341 req->type = ix;
1144 req->fh = newSVsv (fh); 1342 req->fh = newSVsv (fh);
1145 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1146 1344
1147 REQ_SEND (req); 1345 REQ_SEND (req);
1148} 1346}
1149 1347
1150void 1348void
… …
1159 aio_read = REQ_READ 1357 aio_read = REQ_READ
1160 aio_write = REQ_WRITE 1358 aio_write = REQ_WRITE
1161 PROTOTYPE: $$$$$;$ 1359 PROTOTYPE: $$$$$;$
1162 PPCODE: 1360 PPCODE:
1163{ 1361{
1164 aio_req req;
1165 STRLEN svlen; 1362 STRLEN svlen;
1166 char *svptr = SvPVbyte (data, svlen); 1363 char *svptr = SvPVbyte (data, svlen);
1167 1364
1168 SvUPGRADE (data, SVt_PV); 1365 SvUPGRADE (data, SVt_PV);
1169 SvPOK_on (data); 1366 SvPOK_on (data);
… …
1191 1388
1192 { 1389 {
1193 dREQ; 1390 dREQ;
1194 1391
1195 req->type = ix; 1392 req->type = ix;
1196 req->fh = newSVsv (fh); 1393 req->fh = newSVsv (fh);
1197 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1198 : IoOFP (sv_2io (fh))); 1395 : IoOFP (sv_2io (fh)));
1199 req->offset = offset; 1396 req->offs = offset;
1200 req->length = length; 1397 req->size = length;
1201 req->data = SvREFCNT_inc (data); 1398 req->sv1 = SvREFCNT_inc (data);
1202 req->dataptr = (char *)svptr + dataoffset; 1399 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset;
1203 1401
1204 if (!SvREADONLY (data)) 1402 if (!SvREADONLY (data))
1205 { 1403 {
1206 SvREADONLY_on (data); 1404 SvREADONLY_on (data);
1207 req->data2ptr = (void *)data; 1405 req->flags |= FLAG_DATA_RO_OFF;
1208 } 1406 }
1209 1407
1210 REQ_SEND; 1408 REQ_SEND;
1211 } 1409 }
1410}
1411
1412void
1413aio_readlink (path,callback=&PL_sv_undef)
1414 SV * path
1415 SV * callback
1416 PROTOTYPE: $$;$
1417 PPCODE:
1418{
1419 SV *data;
1420 dREQ;
1421
1422 data = newSV (NAME_MAX);
1423 SvPOK_on (data);
1424
1425 req->type = REQ_READLINK;
1426 req->fh = newSVsv (path);
1427 req->ptr2 = SvPVbyte_nolen (path);
1428 req->sv1 = data;
1429 req->ptr1 = SvPVbyte_nolen (data);
1430
1431 REQ_SEND;
1212} 1432}
1213 1433
1214void 1434void
1215aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1435aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1216 SV * out_fh 1436 SV * out_fh
… …
1222 PPCODE: 1442 PPCODE:
1223{ 1443{
1224 dREQ; 1444 dREQ;
1225 1445
1226 req->type = REQ_SENDFILE; 1446 req->type = REQ_SENDFILE;
1227 req->fh = newSVsv (out_fh); 1447 req->fh = newSVsv (out_fh);
1228 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1229 req->fh2 = newSVsv (in_fh); 1449 req->sv2 = newSVsv (in_fh);
1230 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1231 req->offset = in_offset; 1451 req->offs = in_offset;
1232 req->length = length; 1452 req->size = length;
1233 1453
1234 REQ_SEND; 1454 REQ_SEND;
1235} 1455}
1236 1456
1237void 1457void
… …
1244 PPCODE: 1464 PPCODE:
1245{ 1465{
1246 dREQ; 1466 dREQ;
1247 1467
1248 req->type = REQ_READAHEAD; 1468 req->type = REQ_READAHEAD;
1249 req->fh = newSVsv (fh); 1469 req->fh = newSVsv (fh);
1250 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1251 req->offset = offset; 1471 req->offs = offset;
1252 req->length = length; 1472 req->size = length;
1253 1473
1254 REQ_SEND; 1474 REQ_SEND;
1255} 1475}
1256 1476
1257void 1477void
… …
1273 } 1493 }
1274 1494
1275 if (SvPOK (fh_or_path)) 1495 if (SvPOK (fh_or_path))
1276 { 1496 {
1277 req->type = ix; 1497 req->type = ix;
1278 req->data = newSVsv (fh_or_path); 1498 req->sv1 = newSVsv (fh_or_path);
1279 req->dataptr = SvPVbyte_nolen (req->data); 1499 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1280 } 1500 }
1281 else 1501 else
1282 { 1502 {
1283 req->type = REQ_FSTAT; 1503 req->type = REQ_FSTAT;
1284 req->fh = newSVsv (fh_or_path); 1504 req->fh = newSVsv (fh_or_path);
1285 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1286 } 1506 }
1287 1507
1288 REQ_SEND; 1508 REQ_SEND;
1289} 1509}
1290 1510
1291void 1511void
1292aio_unlink (pathname,callback=&PL_sv_undef) 1512aio_unlink (pathname,callback=&PL_sv_undef)
1293 SV * pathname 1513 SV * pathname
1294 SV * callback 1514 SV * callback
1295 ALIAS: 1515 ALIAS:
1296 aio_unlink = REQ_UNLINK 1516 aio_unlink = REQ_UNLINK
1297 aio_rmdir = REQ_RMDIR 1517 aio_rmdir = REQ_RMDIR
1298 aio_readdir = REQ_READDIR 1518 aio_readdir = REQ_READDIR
1299 PPCODE: 1519 PPCODE:
1300{ 1520{
1301 dREQ; 1521 dREQ;
1302 1522
1303 req->type = ix; 1523 req->type = ix;
1304 req->data = newSVsv (pathname); 1524 req->sv1 = newSVsv (pathname);
1305 req->dataptr = SvPVbyte_nolen (req->data); 1525 req->ptr1 = SvPVbyte_nolen (pathname);
1306 1526
1307 REQ_SEND; 1527 REQ_SEND;
1308} 1528}
1309 1529
1310void 1530void
1311aio_link (oldpath,newpath,callback=&PL_sv_undef) 1531aio_link (oldpath,newpath,callback=&PL_sv_undef)
1312 SV * oldpath 1532 SV * oldpath
1313 SV * newpath 1533 SV * newpath
1314 SV * callback 1534 SV * callback
1315 ALIAS: 1535 ALIAS:
1316 aio_link = REQ_LINK 1536 aio_link = REQ_LINK
1317 aio_symlink = REQ_SYMLINK 1537 aio_symlink = REQ_SYMLINK
1318 aio_rename = REQ_RENAME 1538 aio_rename = REQ_RENAME
1319 PPCODE: 1539 PPCODE:
1320{ 1540{
1321 dREQ; 1541 dREQ;
1322 1542
1323 req->type = ix; 1543 req->type = ix;
1324 req->fh = newSVsv (oldpath); 1544 req->fh = newSVsv (oldpath);
1325 req->data2ptr = SvPVbyte_nolen (req->fh); 1545 req->ptr2 = SvPVbyte_nolen (req->fh);
1326 req->data = newSVsv (newpath); 1546 req->sv1 = newSVsv (newpath);
1327 req->dataptr = SvPVbyte_nolen (req->data); 1547 req->ptr1 = SvPVbyte_nolen (newpath);
1328 1548
1329 REQ_SEND; 1549 REQ_SEND;
1330} 1550}
1331 1551
1332void 1552void
1553aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1554 SV * pathname
1555 SV * callback
1556 UV mode
1557 UV dev
1558 PPCODE:
1559{
1560 dREQ;
1561
1562 req->type = REQ_MKNOD;
1563 req->sv1 = newSVsv (pathname);
1564 req->ptr1 = SvPVbyte_nolen (pathname);
1565 req->mode = (mode_t)mode;
1566 req->offs = dev;
1567
1568 REQ_SEND;
1569}
1570
1571void
1333aio_busy (delay,callback=&PL_sv_undef) 1572aio_busy (delay,callback=&PL_sv_undef)
1334 double delay 1573 double delay
1335 SV * callback 1574 SV * callback
1336 PPCODE: 1575 PPCODE:
1337{ 1576{
1338 dREQ; 1577 dREQ;
1339 1578
1340 req->type = REQ_BUSY; 1579 req->type = REQ_BUSY;
1341 req->fd = delay < 0. ? 0 : delay; 1580 req->int1 = delay < 0. ? 0 : delay;
1342 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1343 1582
1344 REQ_SEND; 1583 REQ_SEND;
1345} 1584}
1346 1585
1347void 1586void
… …
1351 PPCODE: 1590 PPCODE:
1352{ 1591{
1353 dREQ; 1592 dREQ;
1354 1593
1355 req->type = REQ_GROUP; 1594 req->type = REQ_GROUP;
1595
1356 req_send (req); 1596 req_send (req);
1357
1358 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1597 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1359} 1598}
1360 1599
1361void 1600void
1362aio_nop (callback=&PL_sv_undef) 1601aio_nop (callback=&PL_sv_undef)
1363 SV * callback 1602 SV * callback
1364 PPCODE: 1603 PPCODE:
1365{ 1604{
1366 dREQ; 1605 dREQ;
1367 1606
1368 req->type = REQ_NOP; 1607 req->type = REQ_NOP;
1369 1608
1370 REQ_SEND; 1609 REQ_SEND;
1371} 1610}
1372 1611
1373void 1612int
1374aioreq_pri (int pri = DEFAULT_PRI) 1613aioreq_pri (int pri = 0)
1375 CODE: 1614 PROTOTYPE: ;$
1615 CODE:
1616 RETVAL = next_pri - PRI_BIAS;
1617 if (items > 0)
1618 {
1376 if (pri < PRI_MIN) pri = PRI_MIN; 1619 if (pri < PRI_MIN) pri = PRI_MIN;
1377 if (pri > PRI_MAX) pri = PRI_MAX; 1620 if (pri > PRI_MAX) pri = PRI_MAX;
1378 next_pri = pri + PRI_BIAS; 1621 next_pri = pri + PRI_BIAS;
1622 }
1623 OUTPUT:
1624 RETVAL
1379 1625
1380void 1626void
1381aioreq_nice (int nice = 0) 1627aioreq_nice (int nice = 0)
1382 CODE: 1628 CODE:
1383 nice = next_pri - nice; 1629 nice = next_pri - nice;
1384 if (nice < PRI_MIN) nice = PRI_MIN; 1630 if (nice < PRI_MIN) nice = PRI_MIN;
1385 if (nice > PRI_MAX) nice = PRI_MAX; 1631 if (nice > PRI_MAX) nice = PRI_MAX;
1386 next_pri = nice + PRI_BIAS; 1632 next_pri = nice + PRI_BIAS;
1387 1633
1388void 1634void
1389flush () 1635flush ()
1390 PROTOTYPE: 1636 PROTOTYPE:
1391 CODE: 1637 CODE:
1392 while (nreqs) 1638 while (nreqs)
1393 { 1639 {
1394 poll_wait (); 1640 poll_wait ();
1395 poll_cb (); 1641 poll_cb (0);
1396 } 1642 }
1397 1643
1398void 1644void
1399poll() 1645poll()
1400 PROTOTYPE: 1646 PROTOTYPE:
1401 CODE: 1647 CODE:
1402 if (nreqs) 1648 if (nreqs)
1403 { 1649 {
1404 poll_wait (); 1650 poll_wait ();
1405 poll_cb (); 1651 poll_cb (0);
1406 } 1652 }
1407 1653
1408int 1654int
1409poll_fileno() 1655poll_fileno()
1410 PROTOTYPE: 1656 PROTOTYPE:
… …
1434 CODE: 1680 CODE:
1435 RETVAL = nreqs; 1681 RETVAL = nreqs;
1436 OUTPUT: 1682 OUTPUT:
1437 RETVAL 1683 RETVAL
1438 1684
1685int
1686nready()
1687 PROTOTYPE:
1688 CODE:
1689 RETVAL = get_nready ();
1690 OUTPUT:
1691 RETVAL
1692
1693int
1694npending()
1695 PROTOTYPE:
1696 CODE:
1697 RETVAL = get_npending ();
1698 OUTPUT:
1699 RETVAL
1700
1701int
1702nthreads()
1703 PROTOTYPE:
1704 CODE:
1705 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1706 RETVAL = started;
1707 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1708 OUTPUT:
1709 RETVAL
1710
1439PROTOTYPES: DISABLE 1711PROTOTYPES: DISABLE
1440 1712
1441MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1713MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1442 1714
1443void 1715void
… …
1458 PPCODE: 1730 PPCODE:
1459{ 1731{
1460 int i; 1732 int i;
1461 aio_req req; 1733 aio_req req;
1462 1734
1463 if (grp->fd == 2) 1735 if (grp->int1 == 2)
1464 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1736 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1465 1737
1466 for (i = 1; i < items; ++i ) 1738 for (i = 1; i < items; ++i )
1467 { 1739 {
1468 if (GIMME_V != G_VOID) 1740 if (GIMME_V != G_VOID)
… …
1470 1742
1471 req = SvAIO_REQ (ST (i)); 1743 req = SvAIO_REQ (ST (i));
1472 1744
1473 if (req) 1745 if (req)
1474 { 1746 {
1475 ++grp->length; 1747 ++grp->size;
1476 req->grp = grp; 1748 req->grp = grp;
1477 1749
1478 req->grp_prev = 0; 1750 req->grp_prev = 0;
1479 req->grp_next = grp->grp_first; 1751 req->grp_next = grp->grp_first;
1480 1752
… …
1494void 1766void
1495result (aio_req grp, ...) 1767result (aio_req grp, ...)
1496 CODE: 1768 CODE:
1497{ 1769{
1498 int i; 1770 int i;
1771 AV *av;
1772
1773 grp->errorno = errno;
1774
1499 AV *av = newAV (); 1775 av = newAV ();
1500 1776
1501 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1502 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1503 1779
1504 SvREFCNT_dec (grp->data); 1780 SvREFCNT_dec (grp->sv1);
1505 grp->data = (SV *)av; 1781 grp->sv1 = (SV *)av;
1506} 1782}
1783
1784void
1785errno (aio_req grp, int errorno = errno)
1786 CODE:
1787 grp->errorno = errorno;
1507 1788
1508void 1789void
1509limit (aio_req grp, int limit) 1790limit (aio_req grp, int limit)
1510 CODE: 1791 CODE:
1511 grp->fd2 = limit; 1792 grp->int2 = limit;
1512 aio_grp_feed (grp); 1793 aio_grp_feed (grp);
1513 1794
1514void 1795void
1515feed (aio_req grp, SV *callback=&PL_sv_undef) 1796feed (aio_req grp, SV *callback=&PL_sv_undef)
1516 CODE: 1797 CODE:
1517{ 1798{
1518 SvREFCNT_dec (grp->fh2); 1799 SvREFCNT_dec (grp->sv2);
1519 grp->fh2 = newSVsv (callback); 1800 grp->sv2 = newSVsv (callback);
1520 1801
1521 if (grp->fd2 <= 0) 1802 if (grp->int2 <= 0)
1522 grp->fd2 = 2; 1803 grp->int2 = 2;
1523 1804
1524 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1525} 1806}
1526 1807

Diff Legend

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