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.71 by root, Tue Oct 24 16:35:04 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 max_outstanding = 1<<30;
134static int respipe [2];
135 166
136#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
137# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
138#else 169#else
139# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
140#endif 171#endif
141 172
142#define LOCK(mutex) pthread_mutex_lock (&(mutex)) 173#define LOCK(mutex) pthread_mutex_lock (&(mutex))
143#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 174#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
144 175
145/* worker threasd management */ 176/* worker threads management */
146static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 177static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
147 178
148typedef struct worker { 179typedef struct worker {
149 /* locked by wrklock */ 180 /* locked by wrklock */
150 struct worker *prev, *next; 181 struct worker *prev, *next;
… …
180 wrk->prev->next = wrk->next; 211 wrk->prev->next = wrk->next;
181 212
182 free (wrk); 213 free (wrk);
183} 214}
184 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
185static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
186static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
187static 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
188 267
189/* 268/*
190 * a somewhat faster data structure might be nice, but 269 * a somewhat faster data structure might be nice, but
191 * with 8 priorities this actually needs <20 insns 270 * with 8 priorities this actually needs <20 insns
192 * per shift, the most expensive operation. 271 * per shift, the most expensive operation.
… …
238 } 317 }
239 318
240 abort (); 319 abort ();
241} 320}
242 321
322static int poll_cb ();
243static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
244static void req_free (aio_req req); 324static void req_free (aio_req req);
325static void req_cancel (aio_req req);
245 326
246/* must be called at most once */ 327/* must be called at most once */
247static SV *req_sv (aio_req req, const char *klass) 328static SV *req_sv (aio_req req, const char *klass)
248{ 329{
249 if (!req->self) 330 if (!req->self)
… …
267 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
268} 349}
269 350
270static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
271{ 352{
272 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
273 { 354 {
274 int old_len = grp->length; 355 int old_len = grp->size;
275 356
276 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
277 { 358 {
278 dSP; 359 dSP;
279 360
280 ENTER; 361 ENTER;
281 SAVETMPS; 362 SAVETMPS;
282 PUSHMARK (SP); 363 PUSHMARK (SP);
283 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
284 PUTBACK; 365 PUTBACK;
285 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
286 SPAGAIN; 367 SPAGAIN;
287 FREETMPS; 368 FREETMPS;
288 LEAVE; 369 LEAVE;
289 } 370 }
290 371
291 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
292 if (old_len == grp->length) 373 if (old_len == grp->size)
293 { 374 {
294 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
295 grp->fh2 = 0; 376 grp->sv2 = 0;
296 break; 377 break;
297 } 378 }
298 } 379 }
299} 380}
300 381
301static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
302{ 383{
303 --grp->length; 384 --grp->size;
304 385
305 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
306 aio_grp_feed (grp); 387 aio_grp_feed (grp);
307 388
308 /* finish, if done */ 389 /* finish, if done */
309 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
310 { 391 {
311 req_invoke (grp); 392 req_invoke (grp);
312 req_free (grp); 393 req_free (grp);
313 } 394 }
314} 395}
315 396
316static void poll_wait ()
317{
318 fd_set rfd;
319
320 while (nreqs)
321 {
322 int size;
323#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
324 LOCK (reslock);
325#endif
326 size = res_queue.size;
327#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
328 UNLOCK (reslock);
329#endif
330
331 if (size)
332 return;
333
334 FD_ZERO(&rfd);
335 FD_SET(respipe [0], &rfd);
336
337 select (respipe [0] + 1, &rfd, 0, 0, 0);
338 }
339}
340
341static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
342{ 398{
343 dSP; 399 dSP;
344 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
345 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 411 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
346 { 412 {
347 errno = req->errorno;
348
349 ENTER; 413 ENTER;
350 SAVETMPS; 414 SAVETMPS;
351 PUSHMARK (SP); 415 PUSHMARK (SP);
352 EXTEND (SP, 1); 416 EXTEND (SP, 1);
353 417
… …
358 SV *rv = &PL_sv_undef; 422 SV *rv = &PL_sv_undef;
359 423
360 if (req->result >= 0) 424 if (req->result >= 0)
361 { 425 {
362 int i; 426 int i;
363 char *buf = req->data2ptr; 427 char *buf = req->ptr2;
364 AV *av = newAV (); 428 AV *av = newAV ();
365 429
366 av_extend (av, req->result - 1); 430 av_extend (av, req->result - 1);
367 431
368 for (i = 0; i < req->result; ++i) 432 for (i = 0; i < req->result; ++i)
… …
396 XPUSHs (sv_2mortal (fh)); 460 XPUSHs (sv_2mortal (fh));
397 } 461 }
398 break; 462 break;
399 463
400 case REQ_GROUP: 464 case REQ_GROUP:
401 req->fd = 2; /* mark group as finished */ 465 req->int1 = 2; /* mark group as finished */
402 466
403 if (req->data) 467 if (req->sv1)
404 { 468 {
405 int i; 469 int i;
406 AV *av = (AV *)req->data; 470 AV *av = (AV *)req->sv1;
407 471
408 EXTEND (SP, AvFILL (av) + 1); 472 EXTEND (SP, AvFILL (av) + 1);
409 for (i = 0; i <= AvFILL (av); ++i) 473 for (i = 0; i <= AvFILL (av); ++i)
410 PUSHs (*av_fetch (av, i, 0)); 474 PUSHs (*av_fetch (av, i, 0));
411 } 475 }
… …
413 477
414 case REQ_NOP: 478 case REQ_NOP:
415 case REQ_BUSY: 479 case REQ_BUSY:
416 break; 480 break;
417 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 */
418 default: 495 default:
419 PUSHs (sv_2mortal (newSViv (req->result))); 496 PUSHs (sv_2mortal (newSViv (req->result)));
420 break; 497 break;
421 } 498 }
422 499
500 errno = req->errorno;
423 501
424 PUTBACK; 502 PUTBACK;
425 call_sv (req->callback, G_VOID | G_EVAL); 503 call_sv (req->callback, G_VOID | G_EVAL);
426 SPAGAIN; 504 SPAGAIN;
427 505
… …
456 { 534 {
457 sv_unmagic (req->self, PERL_MAGIC_ext); 535 sv_unmagic (req->self, PERL_MAGIC_ext);
458 SvREFCNT_dec (req->self); 536 SvREFCNT_dec (req->self);
459 } 537 }
460 538
461 SvREFCNT_dec (req->data);
462 SvREFCNT_dec (req->fh); 539 SvREFCNT_dec (req->fh);
540 SvREFCNT_dec (req->sv1);
463 SvREFCNT_dec (req->fh2); 541 SvREFCNT_dec (req->sv2);
464 SvREFCNT_dec (req->callback); 542 SvREFCNT_dec (req->callback);
465 Safefree (req->statdata); 543 Safefree (req->statdata);
466 544
467 if (req->type == REQ_READDIR) 545 if (req->type == REQ_READDIR)
468 free (req->data2ptr); 546 free (req->ptr2);
469 547
470 Safefree (req); 548 Safefree (req);
471} 549}
472 550
551static void req_cancel_subs (aio_req grp)
552{
553 aio_req sub;
554
555 if (grp->type != REQ_GROUP)
556 return;
557
558 SvREFCNT_dec (grp->sv2);
559 grp->sv2 = 0;
560
561 for (sub = grp->grp_first; sub; sub = sub->grp_next)
562 req_cancel (sub);
563}
564
473static void req_cancel (aio_req req) 565static void req_cancel (aio_req req)
474{ 566{
475 req->flags |= FLAG_CANCELLED; 567 req->flags |= FLAG_CANCELLED;
476 568
477 if (req->type == REQ_GROUP) 569 req_cancel_subs (req);
478 {
479 aio_req sub;
480
481 for (sub = req->grp_first; sub; sub = sub->grp_next)
482 req_cancel (sub);
483 }
484}
485
486static int poll_cb ()
487{
488 dSP;
489 int count = 0;
490 int do_croak = 0;
491 aio_req req;
492
493 for (;;)
494 {
495 LOCK (reslock);
496 req = reqq_shift (&res_queue);
497
498 if (req)
499 {
500 if (!res_queue.size)
501 {
502 /* read any signals sent by the worker threads */
503 char buf [32];
504 while (read (respipe [0], buf, 32) == 32)
505 ;
506 }
507 }
508
509 UNLOCK (reslock);
510
511 if (!req)
512 break;
513
514 --nreqs;
515
516 if (req->type == REQ_QUIT)
517 started--;
518 else if (req->type == REQ_GROUP && req->length)
519 {
520 req->fd = 1; /* mark request as delayed */
521 continue;
522 }
523 else
524 {
525 if (req->type == REQ_READ)
526 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
527
528 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
529 SvREADONLY_off (req->data);
530
531 if (req->statdata)
532 {
533 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
534 PL_laststatval = req->result;
535 PL_statcache = *(req->statdata);
536 }
537
538 req_invoke (req);
539
540 count++;
541 }
542
543 req_free (req);
544 }
545
546 return count;
547} 570}
548 571
549static void *aio_proc(void *arg); 572static void *aio_proc(void *arg);
550 573
551static void start_thread (void) 574static void start_thread (void)
552{ 575{
576 sigset_t fullsigset, oldsigset;
577 pthread_attr_t attr;
578
553 worker *wrk = calloc (1, sizeof (worker)); 579 worker *wrk = calloc (1, sizeof (worker));
554 580
555 if (!wrk) 581 if (!wrk)
556 croak ("unable to allocate worker thread data"); 582 croak ("unable to allocate worker thread data");
557
558 sigset_t fullsigset, oldsigset;
559 pthread_attr_t attr;
560 583
561 pthread_attr_init (&attr); 584 pthread_attr_init (&attr);
562 pthread_attr_setstacksize (&attr, STACKSIZE); 585 pthread_attr_setstacksize (&attr, STACKSIZE);
563 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
564 590
565 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
566 592
567 LOCK (wrklock); 593 LOCK (wrklock);
568 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
571 { 597 {
572 wrk->prev = &wrk_first; 598 wrk->prev = &wrk_first;
573 wrk->next = wrk_first.next; 599 wrk->next = wrk_first.next;
574 wrk_first.next->prev = wrk; 600 wrk_first.next->prev = wrk;
575 wrk_first.next = wrk; 601 wrk_first.next = wrk;
576 started++; 602 ++started;
577 } 603 }
578 else 604 else
579 free (wrk); 605 free (wrk);
580 606
581 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
582 UNLOCK (wrklock); 608 UNLOCK (wrklock);
583} 609}
584 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
585static void req_send (aio_req req) 623static void req_send (aio_req req)
586{ 624{
587 while (started < wanted && nreqs >= started)
588 start_thread ();
589
590 ++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;
591 644
592 LOCK (reqlock); 645 LOCK (reqlock);
593 reqq_push (&req_queue, req); 646 reqq_push (&req_queue, req);
594 pthread_cond_signal (&reqwait); 647 pthread_cond_signal (&reqwait);
595 UNLOCK (reqlock); 648 UNLOCK (reqlock);
596 649
597 if (nreqs > max_outstanding) 650 LOCK (wrklock);
598 for (;;) 651 --started;
599 { 652 UNLOCK (wrklock);
600 poll_cb ();
601
602 if (nreqs <= max_outstanding)
603 break;
604
605 poll_wait ();
606 }
607} 653}
608 654
609static void end_thread (void) 655static void set_max_idle (int nthreads)
610{ 656{
611 aio_req req; 657 if (WORDACCESS_UNSAFE) LOCK (reqlock);
612 658 max_idle = nthreads <= 0 ? 1 : nthreads;
613 Newz (0, req, 1, aio_cb); 659 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
614
615 req->type = REQ_QUIT;
616 req->pri = PRI_MAX + PRI_BIAS;
617
618 req_send (req);
619} 660}
620 661
621static void min_parallel (int nthreads) 662static void min_parallel (int nthreads)
622{ 663{
623 if (wanted < nthreads) 664 if (wanted < nthreads)
624 wanted = nthreads; 665 wanted = nthreads;
625} 666}
626 667
627static void max_parallel (int nthreads) 668static void max_parallel (int nthreads)
628{ 669{
629 int cur = started;
630
631 if (wanted > nthreads) 670 if (wanted > nthreads)
632 wanted = nthreads; 671 wanted = nthreads;
633 672
634 while (cur > wanted)
635 {
636 end_thread ();
637 cur--;
638 }
639
640 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);
641 { 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
642 poll_wait (); 770 poll_wait ();
643 poll_cb (); 771
772 ++maxreqs;
644 } 773 }
774
775 return count;
645} 776}
646 777
647static void create_pipe () 778static void create_pipe ()
648{ 779{
649 if (pipe (respipe)) 780 if (pipe (respipe))
… …
704#if !HAVE_FDATASYNC 835#if !HAVE_FDATASYNC
705# define fdatasync fsync 836# define fdatasync fsync
706#endif 837#endif
707 838
708#if !HAVE_READAHEAD 839#if !HAVE_READAHEAD
709# define readahead aio_readahead 840# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
710 841
711static 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)
712{ 843{
713 dBUF; 844 dBUF;
714 845
715 while (count > 0) 846 while (count > 0)
716 { 847 {
… …
721 count -= len; 852 count -= len;
722 } 853 }
723 854
724 errno = 0; 855 errno = 0;
725} 856}
857
726#endif 858#endif
727 859
728#if !HAVE_READDIR_R 860#if !HAVE_READDIR_R
729# define readdir_r aio_readdir_r 861# define readdir_r aio_readdir_r
730 862
… …
775 { 907 {
776 off_t sbytes; 908 off_t sbytes;
777 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 909 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
778 910
779 if (res < 0 && sbytes) 911 if (res < 0 && sbytes)
780 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 912 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
781 res = sbytes; 913 res = sbytes;
782 } 914 }
783 915
784# elif __hpux 916# elif __hpux
785 res = sendfile (ofd, ifd, offset, count, 0, 0); 917 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
863 int memofs = 0; 995 int memofs = 0;
864 int res = 0; 996 int res = 0;
865 int errorno; 997 int errorno;
866 998
867 LOCK (wrklock); 999 LOCK (wrklock);
868 self->dirp = dirp = opendir (req->dataptr); 1000 self->dirp = dirp = opendir (req->ptr1);
869 self->dbuf = u = malloc (sizeof (*u)); 1001 self->dbuf = u = malloc (sizeof (*u));
1002 req->ptr2 = names = malloc (memlen);
870 UNLOCK (wrklock); 1003 UNLOCK (wrklock);
871
872 req->data2ptr = names = malloc (memlen);
873 1004
874 if (dirp && u && names) 1005 if (dirp && u && names)
875 for (;;) 1006 for (;;)
876 { 1007 {
877 errno = 0; 1008 errno = 0;
… …
890 1021
891 while (memofs + len > memlen) 1022 while (memofs + len > memlen)
892 { 1023 {
893 memlen *= 2; 1024 memlen *= 2;
894 LOCK (wrklock); 1025 LOCK (wrklock);
895 req->data2ptr = names = realloc (names, memlen); 1026 req->ptr2 = names = realloc (names, memlen);
896 UNLOCK (wrklock); 1027 UNLOCK (wrklock);
897 1028
898 if (!names) 1029 if (!names)
899 break; 1030 break;
900 } 1031 }
… …
913/*****************************************************************************/ 1044/*****************************************************************************/
914 1045
915static void *aio_proc (void *thr_arg) 1046static void *aio_proc (void *thr_arg)
916{ 1047{
917 aio_req req; 1048 aio_req req;
918 int type; 1049 struct timespec ts;
919 worker *self = (worker *)thr_arg; 1050 worker *self = (worker *)thr_arg;
920 1051
921 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 (;;)
922 { 1057 {
1058 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1059
923 LOCK (reqlock); 1060 LOCK (reqlock);
924 1061
925 for (;;) 1062 for (;;)
926 { 1063 {
927 self->req = req = reqq_shift (&req_queue); 1064 self->req = req = reqq_shift (&req_queue);
928 1065
929 if (req) 1066 if (req)
930 break; 1067 break;
931 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 */
932 pthread_cond_wait (&reqwait, &reqlock); 1085 pthread_cond_wait (&reqwait, &reqlock);
1086 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1087 }
1088
1089 --idle;
933 } 1090 }
1091
1092 --nready;
934 1093
935 UNLOCK (reqlock); 1094 UNLOCK (reqlock);
936 1095
937 errno = 0; /* strictly unnecessary */ 1096 errno = 0; /* strictly unnecessary */
938 type = req->type; /* remember type for QUIT check */
939 1097
940 if (!(req->flags & FLAG_CANCELLED)) 1098 if (!(req->flags & FLAG_CANCELLED))
941 switch (type) 1099 switch (req->type)
942 { 1100 {
943 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;
944 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;
945 1103
946 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;
947 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;
948 1106
949 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1107 case REQ_STAT: req->result = stat (req->ptr1, req->statdata); break;
950 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1108 case REQ_LSTAT: req->result = lstat (req->ptr1, req->statdata); break;
951 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1109 case REQ_FSTAT: req->result = fstat (req->int1, req->statdata); break;
952 1110
953 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;
954 case REQ_CLOSE: req->result = close (req->fd); break; 1112 case REQ_CLOSE: req->result = close (req->int1); break;
955 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1113 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
956 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1114 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
957 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1115 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
958 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1116 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
959 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;
960 1120
961 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1121 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
962 case REQ_FSYNC: req->result = fsync (req->fd); break; 1122 case REQ_FSYNC: req->result = fsync (req->int1); break;
963 case REQ_READDIR: scandir_ (req, self); break; 1123 case REQ_READDIR: scandir_ (req, self); break;
964 1124
965 case REQ_BUSY: 1125 case REQ_BUSY:
966 { 1126 {
967 struct timeval tv; 1127 struct timeval tv;
968 1128
969 tv.tv_sec = req->fd; 1129 tv.tv_sec = req->int1;
970 tv.tv_usec = req->fd2; 1130 tv.tv_usec = req->int2;
971 1131
972 req->result = select (0, 0, 0, 0, &tv); 1132 req->result = select (0, 0, 0, 0, &tv);
973 } 1133 }
974 1134
975 case REQ_GROUP: 1135 case REQ_GROUP:
976 case REQ_NOP: 1136 case REQ_NOP:
1137 break;
1138
977 case REQ_QUIT: 1139 case REQ_QUIT:
978 break; 1140 goto quit;
979 1141
980 default: 1142 default:
981 req->result = ENOSYS; 1143 req->result = ENOSYS;
982 break; 1144 break;
983 } 1145 }
984 1146
985 req->errorno = errno; 1147 req->errorno = errno;
986 1148
987 LOCK (reslock); 1149 LOCK (reslock);
988 1150
1151 ++npending;
1152
989 if (!reqq_push (&res_queue, req)) 1153 if (!reqq_push (&res_queue, req))
990 /* write a dummy byte to the pipe so fh becomes ready */ 1154 /* write a dummy byte to the pipe so fh becomes ready */
991 write (respipe [1], &respipe, 1); 1155 write (respipe [1], &respipe, 1);
992 1156
993 self->req = 0; 1157 self->req = 0;
994 worker_clear (self); 1158 worker_clear (self);
995 1159
996 UNLOCK (reslock); 1160 UNLOCK (reslock);
997 } 1161 }
998 while (type != REQ_QUIT);
999 1162
1163quit:
1000 LOCK (wrklock); 1164 LOCK (wrklock);
1001 worker_free (self); 1165 worker_free (self);
1002 UNLOCK (wrklock); 1166 UNLOCK (wrklock);
1003 1167
1004 return 0; 1168 return 0;
… …
1051 1215
1052 worker_clear (wrk); 1216 worker_clear (wrk);
1053 worker_free (wrk); 1217 worker_free (wrk);
1054 } 1218 }
1055 1219
1056 started = 0; 1220 started = 0;
1221 idle = 0;
1057 nreqs = 0; 1222 nreqs = 0;
1223 nready = 0;
1224 npending = 0;
1058 1225
1059 close (respipe [0]); 1226 close (respipe [0]);
1060 close (respipe [1]); 1227 close (respipe [1]);
1061 create_pipe (); 1228 create_pipe ();
1062 1229
… …
1089PROTOTYPES: ENABLE 1256PROTOTYPES: ENABLE
1090 1257
1091BOOT: 1258BOOT:
1092{ 1259{
1093 HV *stash = gv_stashpv ("IO::AIO", 1); 1260 HV *stash = gv_stashpv ("IO::AIO", 1);
1261
1094 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1262 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1095 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1263 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1096 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));
1097 1268
1098 create_pipe (); 1269 create_pipe ();
1099 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1270 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1100} 1271}
1101 1272
1102void 1273void
1103min_parallel (nthreads) 1274max_poll_reqs (int nreqs)
1104 int nthreads
1105 PROTOTYPE: $ 1275 PROTOTYPE: $
1276 CODE:
1277 max_poll_reqs = nreqs;
1106 1278
1107void 1279void
1108max_parallel (nthreads) 1280max_poll_time (double nseconds)
1109 int nthreads
1110 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);
1111 1298
1112int 1299int
1113max_outstanding (nreqs) 1300max_outstanding (int maxreqs)
1114 int nreqs 1301 PROTOTYPE: $
1115 PROTOTYPE: $
1116 CODE: 1302 CODE:
1117 RETVAL = max_outstanding; 1303 RETVAL = max_outstanding;
1118 max_outstanding = nreqs; 1304 max_outstanding = maxreqs;
1305 OUTPUT:
1306 RETVAL
1119 1307
1120void 1308void
1121aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1309aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1122 SV * pathname 1310 SV * pathname
1123 int flags 1311 int flags
… …
1127 PPCODE: 1315 PPCODE:
1128{ 1316{
1129 dREQ; 1317 dREQ;
1130 1318
1131 req->type = REQ_OPEN; 1319 req->type = REQ_OPEN;
1132 req->data = newSVsv (pathname); 1320 req->sv1 = newSVsv (pathname);
1133 req->dataptr = SvPVbyte_nolen (req->data); 1321 req->ptr1 = SvPVbyte_nolen (pathname);
1134 req->fd = flags; 1322 req->int1 = flags;
1135 req->mode = mode; 1323 req->mode = mode;
1136 1324
1137 REQ_SEND; 1325 REQ_SEND;
1138} 1326}
1139 1327
… …
1149 PPCODE: 1337 PPCODE:
1150{ 1338{
1151 dREQ; 1339 dREQ;
1152 1340
1153 req->type = ix; 1341 req->type = ix;
1154 req->fh = newSVsv (fh); 1342 req->fh = newSVsv (fh);
1155 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1343 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1156 1344
1157 REQ_SEND (req); 1345 REQ_SEND (req);
1158} 1346}
1159 1347
1160void 1348void
… …
1169 aio_read = REQ_READ 1357 aio_read = REQ_READ
1170 aio_write = REQ_WRITE 1358 aio_write = REQ_WRITE
1171 PROTOTYPE: $$$$$;$ 1359 PROTOTYPE: $$$$$;$
1172 PPCODE: 1360 PPCODE:
1173{ 1361{
1174 aio_req req;
1175 STRLEN svlen; 1362 STRLEN svlen;
1176 char *svptr = SvPVbyte (data, svlen); 1363 char *svptr = SvPVbyte (data, svlen);
1177 1364
1178 SvUPGRADE (data, SVt_PV); 1365 SvUPGRADE (data, SVt_PV);
1179 SvPOK_on (data); 1366 SvPOK_on (data);
… …
1201 1388
1202 { 1389 {
1203 dREQ; 1390 dREQ;
1204 1391
1205 req->type = ix; 1392 req->type = ix;
1206 req->fh = newSVsv (fh); 1393 req->fh = newSVsv (fh);
1207 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1394 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1208 : IoOFP (sv_2io (fh))); 1395 : IoOFP (sv_2io (fh)));
1209 req->offset = offset; 1396 req->offs = offset;
1210 req->length = length; 1397 req->size = length;
1211 req->data = SvREFCNT_inc (data); 1398 req->sv1 = SvREFCNT_inc (data);
1212 req->dataptr = (char *)svptr + dataoffset; 1399 req->ptr1 = (char *)svptr + dataoffset;
1400 req->stroffset = dataoffset;
1213 1401
1214 if (!SvREADONLY (data)) 1402 if (!SvREADONLY (data))
1215 { 1403 {
1216 SvREADONLY_on (data); 1404 SvREADONLY_on (data);
1217 req->data2ptr = (void *)data; 1405 req->flags |= FLAG_DATA_RO_OFF;
1218 } 1406 }
1219 1407
1220 REQ_SEND; 1408 REQ_SEND;
1221 } 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;
1222} 1432}
1223 1433
1224void 1434void
1225aio_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)
1226 SV * out_fh 1436 SV * out_fh
… …
1232 PPCODE: 1442 PPCODE:
1233{ 1443{
1234 dREQ; 1444 dREQ;
1235 1445
1236 req->type = REQ_SENDFILE; 1446 req->type = REQ_SENDFILE;
1237 req->fh = newSVsv (out_fh); 1447 req->fh = newSVsv (out_fh);
1238 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1448 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1239 req->fh2 = newSVsv (in_fh); 1449 req->sv2 = newSVsv (in_fh);
1240 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1450 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1241 req->offset = in_offset; 1451 req->offs = in_offset;
1242 req->length = length; 1452 req->size = length;
1243 1453
1244 REQ_SEND; 1454 REQ_SEND;
1245} 1455}
1246 1456
1247void 1457void
… …
1254 PPCODE: 1464 PPCODE:
1255{ 1465{
1256 dREQ; 1466 dREQ;
1257 1467
1258 req->type = REQ_READAHEAD; 1468 req->type = REQ_READAHEAD;
1259 req->fh = newSVsv (fh); 1469 req->fh = newSVsv (fh);
1260 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1470 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1261 req->offset = offset; 1471 req->offs = offset;
1262 req->length = length; 1472 req->size = length;
1263 1473
1264 REQ_SEND; 1474 REQ_SEND;
1265} 1475}
1266 1476
1267void 1477void
… …
1283 } 1493 }
1284 1494
1285 if (SvPOK (fh_or_path)) 1495 if (SvPOK (fh_or_path))
1286 { 1496 {
1287 req->type = ix; 1497 req->type = ix;
1288 req->data = newSVsv (fh_or_path); 1498 req->sv1 = newSVsv (fh_or_path);
1289 req->dataptr = SvPVbyte_nolen (req->data); 1499 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1290 } 1500 }
1291 else 1501 else
1292 { 1502 {
1293 req->type = REQ_FSTAT; 1503 req->type = REQ_FSTAT;
1294 req->fh = newSVsv (fh_or_path); 1504 req->fh = newSVsv (fh_or_path);
1295 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1505 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1296 } 1506 }
1297 1507
1298 REQ_SEND; 1508 REQ_SEND;
1299} 1509}
1300 1510
1301void 1511void
1302aio_unlink (pathname,callback=&PL_sv_undef) 1512aio_unlink (pathname,callback=&PL_sv_undef)
1303 SV * pathname 1513 SV * pathname
1304 SV * callback 1514 SV * callback
1305 ALIAS: 1515 ALIAS:
1306 aio_unlink = REQ_UNLINK 1516 aio_unlink = REQ_UNLINK
1307 aio_rmdir = REQ_RMDIR 1517 aio_rmdir = REQ_RMDIR
1308 aio_readdir = REQ_READDIR 1518 aio_readdir = REQ_READDIR
1309 PPCODE: 1519 PPCODE:
1310{ 1520{
1311 dREQ; 1521 dREQ;
1312 1522
1313 req->type = ix; 1523 req->type = ix;
1314 req->data = newSVsv (pathname); 1524 req->sv1 = newSVsv (pathname);
1315 req->dataptr = SvPVbyte_nolen (req->data); 1525 req->ptr1 = SvPVbyte_nolen (pathname);
1316 1526
1317 REQ_SEND; 1527 REQ_SEND;
1318} 1528}
1319 1529
1320void 1530void
1321aio_link (oldpath,newpath,callback=&PL_sv_undef) 1531aio_link (oldpath,newpath,callback=&PL_sv_undef)
1322 SV * oldpath 1532 SV * oldpath
1323 SV * newpath 1533 SV * newpath
1324 SV * callback 1534 SV * callback
1325 ALIAS: 1535 ALIAS:
1326 aio_link = REQ_LINK 1536 aio_link = REQ_LINK
1327 aio_symlink = REQ_SYMLINK 1537 aio_symlink = REQ_SYMLINK
1328 aio_rename = REQ_RENAME 1538 aio_rename = REQ_RENAME
1329 PPCODE: 1539 PPCODE:
1330{ 1540{
1331 dREQ; 1541 dREQ;
1332 1542
1333 req->type = ix; 1543 req->type = ix;
1334 req->fh = newSVsv (oldpath); 1544 req->fh = newSVsv (oldpath);
1335 req->data2ptr = SvPVbyte_nolen (req->fh); 1545 req->ptr2 = SvPVbyte_nolen (req->fh);
1336 req->data = newSVsv (newpath); 1546 req->sv1 = newSVsv (newpath);
1337 req->dataptr = SvPVbyte_nolen (req->data); 1547 req->ptr1 = SvPVbyte_nolen (newpath);
1338 1548
1339 REQ_SEND; 1549 REQ_SEND;
1340} 1550}
1341 1551
1342void 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
1343aio_busy (delay,callback=&PL_sv_undef) 1572aio_busy (delay,callback=&PL_sv_undef)
1344 double delay 1573 double delay
1345 SV * callback 1574 SV * callback
1346 PPCODE: 1575 PPCODE:
1347{ 1576{
1348 dREQ; 1577 dREQ;
1349 1578
1350 req->type = REQ_BUSY; 1579 req->type = REQ_BUSY;
1351 req->fd = delay < 0. ? 0 : delay; 1580 req->int1 = delay < 0. ? 0 : delay;
1352 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1581 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1353 1582
1354 REQ_SEND; 1583 REQ_SEND;
1355} 1584}
1356 1585
1357void 1586void
… …
1361 PPCODE: 1590 PPCODE:
1362{ 1591{
1363 dREQ; 1592 dREQ;
1364 1593
1365 req->type = REQ_GROUP; 1594 req->type = REQ_GROUP;
1595
1366 req_send (req); 1596 req_send (req);
1367
1368 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1597 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1369} 1598}
1370 1599
1371void 1600void
1372aio_nop (callback=&PL_sv_undef) 1601aio_nop (callback=&PL_sv_undef)
1373 SV * callback 1602 SV * callback
1374 PPCODE: 1603 PPCODE:
1375{ 1604{
1376 dREQ; 1605 dREQ;
1377 1606
1378 req->type = REQ_NOP; 1607 req->type = REQ_NOP;
1379 1608
1380 REQ_SEND; 1609 REQ_SEND;
1381} 1610}
1382 1611
1383void 1612int
1384aioreq_pri (int pri = DEFAULT_PRI) 1613aioreq_pri (int pri = 0)
1385 CODE: 1614 PROTOTYPE: ;$
1615 CODE:
1616 RETVAL = next_pri - PRI_BIAS;
1617 if (items > 0)
1618 {
1386 if (pri < PRI_MIN) pri = PRI_MIN; 1619 if (pri < PRI_MIN) pri = PRI_MIN;
1387 if (pri > PRI_MAX) pri = PRI_MAX; 1620 if (pri > PRI_MAX) pri = PRI_MAX;
1388 next_pri = pri + PRI_BIAS; 1621 next_pri = pri + PRI_BIAS;
1622 }
1623 OUTPUT:
1624 RETVAL
1389 1625
1390void 1626void
1391aioreq_nice (int nice = 0) 1627aioreq_nice (int nice = 0)
1392 CODE: 1628 CODE:
1393 nice = next_pri - nice; 1629 nice = next_pri - nice;
1394 if (nice < PRI_MIN) nice = PRI_MIN; 1630 if (nice < PRI_MIN) nice = PRI_MIN;
1395 if (nice > PRI_MAX) nice = PRI_MAX; 1631 if (nice > PRI_MAX) nice = PRI_MAX;
1396 next_pri = nice + PRI_BIAS; 1632 next_pri = nice + PRI_BIAS;
1397 1633
1398void 1634void
1399flush () 1635flush ()
1400 PROTOTYPE: 1636 PROTOTYPE:
1401 CODE: 1637 CODE:
1402 while (nreqs) 1638 while (nreqs)
1403 { 1639 {
1404 poll_wait (); 1640 poll_wait ();
1405 poll_cb (); 1641 poll_cb (0);
1406 } 1642 }
1407 1643
1408void 1644void
1409poll() 1645poll()
1410 PROTOTYPE: 1646 PROTOTYPE:
1411 CODE: 1647 CODE:
1412 if (nreqs) 1648 if (nreqs)
1413 { 1649 {
1414 poll_wait (); 1650 poll_wait ();
1415 poll_cb (); 1651 poll_cb (0);
1416 } 1652 }
1417 1653
1418int 1654int
1419poll_fileno() 1655poll_fileno()
1420 PROTOTYPE: 1656 PROTOTYPE:
… …
1444 CODE: 1680 CODE:
1445 RETVAL = nreqs; 1681 RETVAL = nreqs;
1446 OUTPUT: 1682 OUTPUT:
1447 RETVAL 1683 RETVAL
1448 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
1449PROTOTYPES: DISABLE 1711PROTOTYPES: DISABLE
1450 1712
1451MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1713MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1452 1714
1453void 1715void
… …
1468 PPCODE: 1730 PPCODE:
1469{ 1731{
1470 int i; 1732 int i;
1471 aio_req req; 1733 aio_req req;
1472 1734
1473 if (grp->fd == 2) 1735 if (grp->int1 == 2)
1474 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");
1475 1737
1476 for (i = 1; i < items; ++i ) 1738 for (i = 1; i < items; ++i )
1477 { 1739 {
1478 if (GIMME_V != G_VOID) 1740 if (GIMME_V != G_VOID)
… …
1480 1742
1481 req = SvAIO_REQ (ST (i)); 1743 req = SvAIO_REQ (ST (i));
1482 1744
1483 if (req) 1745 if (req)
1484 { 1746 {
1485 ++grp->length; 1747 ++grp->size;
1486 req->grp = grp; 1748 req->grp = grp;
1487 1749
1488 req->grp_prev = 0; 1750 req->grp_prev = 0;
1489 req->grp_next = grp->grp_first; 1751 req->grp_next = grp->grp_first;
1490 1752
… …
1495 } 1757 }
1496 } 1758 }
1497} 1759}
1498 1760
1499void 1761void
1762cancel_subs (aio_req_ornot req)
1763 CODE:
1764 req_cancel_subs (req);
1765
1766void
1500result (aio_req grp, ...) 1767result (aio_req grp, ...)
1501 CODE: 1768 CODE:
1502{ 1769{
1503 int i; 1770 int i;
1771 AV *av;
1772
1773 grp->errorno = errno;
1774
1504 AV *av = newAV (); 1775 av = newAV ();
1505 1776
1506 for (i = 1; i < items; ++i ) 1777 for (i = 1; i < items; ++i )
1507 av_push (av, newSVsv (ST (i))); 1778 av_push (av, newSVsv (ST (i)));
1508 1779
1509 SvREFCNT_dec (grp->data); 1780 SvREFCNT_dec (grp->sv1);
1510 grp->data = (SV *)av; 1781 grp->sv1 = (SV *)av;
1511} 1782}
1783
1784void
1785errno (aio_req grp, int errorno = errno)
1786 CODE:
1787 grp->errorno = errorno;
1512 1788
1513void 1789void
1514limit (aio_req grp, int limit) 1790limit (aio_req grp, int limit)
1515 CODE: 1791 CODE:
1516 grp->fd2 = limit; 1792 grp->int2 = limit;
1517 aio_grp_feed (grp); 1793 aio_grp_feed (grp);
1518 1794
1519void 1795void
1520feed (aio_req grp, SV *callback=&PL_sv_undef) 1796feed (aio_req grp, SV *callback=&PL_sv_undef)
1521 CODE: 1797 CODE:
1522{ 1798{
1523 SvREFCNT_dec (grp->fh2); 1799 SvREFCNT_dec (grp->sv2);
1524 grp->fh2 = newSVsv (callback); 1800 grp->sv2 = newSVsv (callback);
1525 1801
1526 if (grp->fd2 <= 0) 1802 if (grp->int2 <= 0)
1527 grp->fd2 = 2; 1803 grp->int2 = 2;
1528 1804
1529 aio_grp_feed (grp); 1805 aio_grp_feed (grp);
1530} 1806}
1531 1807

Diff Legend

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