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.73 by root, Tue Oct 24 21:26:30 2006 UTC vs.
Revision 1.87 by root, Mon Oct 30 23:42:27 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;
96 off_t offset; 116 off_t offs;
97 size_t length; 117 size_t size;
98 ssize_t result; 118 ssize_t result;
99 119
100 STRLEN dataoffset; 120 STRLEN stroffset;
101 int type; 121 int type;
102 int fd, fd2; 122 int int1, int2;
103 int errorno; 123 int errorno;
104 mode_t mode; /* open */ 124 mode_t mode; /* open */
105 125
106 unsigned char flags; 126 unsigned char flags;
107 unsigned char pri; 127 unsigned char pri;
… …
109 SV *self; /* the perl counterpart of this request, if any */ 129 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 130 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
111} aio_cb; 131} aio_cb;
112 132
113enum { 133enum {
114 FLAG_CANCELLED = 0x01, 134 FLAG_CANCELLED = 0x01,
135 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
136 FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */
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);
245static void req_cancel (aio_req req); 325static void req_cancel (aio_req req);
246 326
247/* must be called at most once */ 327/* must be called at most once */
… …
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;
400
401 if (req->flags & FLAG_SV1_RO_OFF)
402 SvREADONLY_off (req->sv1);
345 403
346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 404 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
347 { 405 {
348 errno = req->errorno;
349
350 ENTER; 406 ENTER;
351 SAVETMPS; 407 SAVETMPS;
352 PUSHMARK (SP); 408 PUSHMARK (SP);
353 EXTEND (SP, 1); 409 EXTEND (SP, 1);
354 410
… …
359 SV *rv = &PL_sv_undef; 415 SV *rv = &PL_sv_undef;
360 416
361 if (req->result >= 0) 417 if (req->result >= 0)
362 { 418 {
363 int i; 419 int i;
364 char *buf = req->data2ptr; 420 char *buf = req->ptr2;
365 AV *av = newAV (); 421 AV *av = newAV ();
366 422
367 av_extend (av, req->result - 1); 423 av_extend (av, req->result - 1);
368 424
369 for (i = 0; i < req->result; ++i) 425 for (i = 0; i < req->result; ++i)
… …
397 XPUSHs (sv_2mortal (fh)); 453 XPUSHs (sv_2mortal (fh));
398 } 454 }
399 break; 455 break;
400 456
401 case REQ_GROUP: 457 case REQ_GROUP:
402 req->fd = 2; /* mark group as finished */ 458 req->int1 = 2; /* mark group as finished */
403 459
404 if (req->data) 460 if (req->sv1)
405 { 461 {
406 int i; 462 int i;
407 AV *av = (AV *)req->data; 463 AV *av = (AV *)req->sv1;
408 464
409 EXTEND (SP, AvFILL (av) + 1); 465 EXTEND (SP, AvFILL (av) + 1);
410 for (i = 0; i <= AvFILL (av); ++i) 466 for (i = 0; i <= AvFILL (av); ++i)
411 PUSHs (*av_fetch (av, i, 0)); 467 PUSHs (*av_fetch (av, i, 0));
412 } 468 }
… …
414 470
415 case REQ_NOP: 471 case REQ_NOP:
416 case REQ_BUSY: 472 case REQ_BUSY:
417 break; 473 break;
418 474
475 case REQ_READLINK:
476 if (req->result > 0)
477 {
478 SvCUR_set (req->sv1, req->result);
479 *SvEND (req->sv1) = 0;
480 PUSHs (req->sv1);
481 }
482 break;
483
484 case REQ_STAT:
485 case REQ_LSTAT:
486 case REQ_FSTAT:
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(Stat_t *)(req->ptr2);
490 PUSHs (sv_2mortal (newSViv (req->result)));
491 break;
492
493 case REQ_READ:
494 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
495 *SvEND (req->sv1) = 0;
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
498
419 default: 499 default:
420 PUSHs (sv_2mortal (newSViv (req->result))); 500 PUSHs (sv_2mortal (newSViv (req->result)));
421 break; 501 break;
422 } 502 }
423 503
504 errno = req->errorno;
424 505
425 PUTBACK; 506 PUTBACK;
426 call_sv (req->callback, G_VOID | G_EVAL); 507 call_sv (req->callback, G_VOID | G_EVAL);
427 SPAGAIN; 508 SPAGAIN;
428 509
… …
457 { 538 {
458 sv_unmagic (req->self, PERL_MAGIC_ext); 539 sv_unmagic (req->self, PERL_MAGIC_ext);
459 SvREFCNT_dec (req->self); 540 SvREFCNT_dec (req->self);
460 } 541 }
461 542
462 SvREFCNT_dec (req->data);
463 SvREFCNT_dec (req->fh); 543 SvREFCNT_dec (req->fh);
544 SvREFCNT_dec (req->sv1);
464 SvREFCNT_dec (req->fh2); 545 SvREFCNT_dec (req->sv2);
465 SvREFCNT_dec (req->callback); 546 SvREFCNT_dec (req->callback);
466 Safefree (req->statdata);
467 547
468 if (req->type == REQ_READDIR) 548 if (req->flags & FLAG_PTR2_FREE)
469 free (req->data2ptr); 549 free (req->ptr2);
470 550
471 Safefree (req); 551 Safefree (req);
472} 552}
473 553
474static void req_cancel_subs (aio_req grp) 554static void req_cancel_subs (aio_req grp)
… …
476 aio_req sub; 556 aio_req sub;
477 557
478 if (grp->type != REQ_GROUP) 558 if (grp->type != REQ_GROUP)
479 return; 559 return;
480 560
481 SvREFCNT_dec (grp->fh2); 561 SvREFCNT_dec (grp->sv2);
482 grp->fh2 = 0; 562 grp->sv2 = 0;
483 563
484 for (sub = grp->grp_first; sub; sub = sub->grp_next) 564 for (sub = grp->grp_first; sub; sub = sub->grp_next)
485 req_cancel (sub); 565 req_cancel (sub);
486} 566}
487 567
488static void req_cancel (aio_req req) 568static void req_cancel (aio_req req)
489{ 569{
490 req->flags |= FLAG_CANCELLED; 570 req->flags |= FLAG_CANCELLED;
491 571
492 req_cancel_subs (req); 572 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} 573}
557 574
558static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
559 576
560static void start_thread (void) 577static void start_thread (void)
… …
568 croak ("unable to allocate worker thread data"); 585 croak ("unable to allocate worker thread data");
569 586
570 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
571 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
590#ifdef PTHREAD_SCOPE_PROCESS
591 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
592#endif
573 593
574 sigfillset (&fullsigset); 594 sigfillset (&fullsigset);
575 595
576 LOCK (wrklock); 596 LOCK (wrklock);
577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 597 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
580 { 600 {
581 wrk->prev = &wrk_first; 601 wrk->prev = &wrk_first;
582 wrk->next = wrk_first.next; 602 wrk->next = wrk_first.next;
583 wrk_first.next->prev = wrk; 603 wrk_first.next->prev = wrk;
584 wrk_first.next = wrk; 604 wrk_first.next = wrk;
585 started++; 605 ++started;
586 } 606 }
587 else 607 else
588 free (wrk); 608 free (wrk);
589 609
590 sigprocmask (SIG_SETMASK, &oldsigset, 0); 610 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock); 611 UNLOCK (wrklock);
592} 612}
593 613
614static void maybe_start_thread ()
615{
616 if (get_nthreads () >= wanted)
617 return;
618
619 /* todo: maybe use idle here, but might be less exact */
620 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
621 return;
622
623 start_thread ();
624}
625
594static void req_send (aio_req req) 626static void req_send (aio_req req)
595{ 627{
596 while (started < wanted && nreqs >= started)
597 start_thread ();
598
599 ++nreqs; 628 ++nreqs;
629
630 LOCK (reqlock);
631 ++nready;
632 reqq_push (&req_queue, req);
633 pthread_cond_signal (&reqwait);
634 UNLOCK (reqlock);
635
636 maybe_start_thread ();
637}
638
639static void end_thread (void)
640{
641 aio_req req;
642
643 Newz (0, req, 1, aio_cb);
644
645 req->type = REQ_QUIT;
646 req->pri = PRI_MAX + PRI_BIAS;
600 647
601 LOCK (reqlock); 648 LOCK (reqlock);
602 reqq_push (&req_queue, req); 649 reqq_push (&req_queue, req);
603 pthread_cond_signal (&reqwait); 650 pthread_cond_signal (&reqwait);
604 UNLOCK (reqlock); 651 UNLOCK (reqlock);
605 652
606 if (nreqs > max_outstanding) 653 LOCK (wrklock);
607 for (;;) 654 --started;
608 { 655 UNLOCK (wrklock);
609 poll_cb ();
610
611 if (nreqs <= max_outstanding)
612 break;
613
614 poll_wait ();
615 }
616} 656}
617 657
618static void end_thread (void) 658static void set_max_idle (int nthreads)
619{ 659{
620 aio_req req; 660 if (WORDACCESS_UNSAFE) LOCK (reqlock);
621 661 max_idle = nthreads <= 0 ? 1 : nthreads;
622 Newz (0, req, 1, aio_cb); 662 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
623
624 req->type = REQ_QUIT;
625 req->pri = PRI_MAX + PRI_BIAS;
626
627 req_send (req);
628} 663}
629 664
630static void min_parallel (int nthreads) 665static void min_parallel (int nthreads)
631{ 666{
632 if (wanted < nthreads) 667 if (wanted < nthreads)
633 wanted = nthreads; 668 wanted = nthreads;
634} 669}
635 670
636static void max_parallel (int nthreads) 671static void max_parallel (int nthreads)
637{ 672{
638 int cur = started;
639
640 if (wanted > nthreads) 673 if (wanted > nthreads)
641 wanted = nthreads; 674 wanted = nthreads;
642 675
643 while (cur > wanted) 676 while (started > wanted)
677 end_thread ();
678}
679
680static void poll_wait ()
681{
682 fd_set rfd;
683
684 while (nreqs)
644 { 685 {
686 int size;
687 if (WORDACCESS_UNSAFE) LOCK (reslock);
688 size = res_queue.size;
689 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
690
691 if (size)
692 return;
693
645 end_thread (); 694 maybe_start_thread ();
646 cur--; 695
696 FD_ZERO(&rfd);
697 FD_SET(respipe [0], &rfd);
698
699 select (respipe [0] + 1, &rfd, 0, 0, 0);
647 } 700 }
701}
648 702
649 while (started > wanted) 703static int poll_cb ()
704{
705 dSP;
706 int count = 0;
707 int maxreqs = max_poll_reqs;
708 int do_croak = 0;
709 struct timeval tv_start, tv_now;
710 aio_req req;
711
712 if (max_poll_time)
713 gettimeofday (&tv_start, 0);
714
715 for (;;)
650 { 716 {
717 for (;;)
718 {
719 maybe_start_thread ();
720
721 LOCK (reslock);
722 req = reqq_shift (&res_queue);
723
724 if (req)
725 {
726 --npending;
727
728 if (!res_queue.size)
729 {
730 /* read any signals sent by the worker threads */
731 char buf [32];
732 while (read (respipe [0], buf, 32) == 32)
733 ;
734 }
735 }
736
737 UNLOCK (reslock);
738
739 if (!req)
740 break;
741
742 --nreqs;
743
744 if (req->type == REQ_GROUP && req->size)
745 {
746 req->int1 = 1; /* mark request as delayed */
747 continue;
748 }
749 else
750 {
751 req_invoke (req);
752
753 count++;
754 }
755
756 req_free (req);
757
758 if (maxreqs && !--maxreqs)
759 break;
760
761 if (max_poll_time)
762 {
763 gettimeofday (&tv_now, 0);
764
765 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
766 break;
767 }
768 }
769
770 if (nreqs <= max_outstanding)
771 break;
772
651 poll_wait (); 773 poll_wait ();
652 poll_cb (); 774
775 ++maxreqs;
653 } 776 }
777
778 return count;
654} 779}
655 780
656static void create_pipe () 781static void create_pipe ()
657{ 782{
658 if (pipe (respipe)) 783 if (pipe (respipe))
… …
713#if !HAVE_FDATASYNC 838#if !HAVE_FDATASYNC
714# define fdatasync fsync 839# define fdatasync fsync
715#endif 840#endif
716 841
717#if !HAVE_READAHEAD 842#if !HAVE_READAHEAD
718# define readahead aio_readahead 843# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
719 844
720static ssize_t readahead (int fd, off_t offset, size_t count) 845static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
721{ 846{
722 dBUF; 847 dBUF;
723 848
724 while (count > 0) 849 while (count > 0)
725 { 850 {
… …
730 count -= len; 855 count -= len;
731 } 856 }
732 857
733 errno = 0; 858 errno = 0;
734} 859}
860
735#endif 861#endif
736 862
737#if !HAVE_READDIR_R 863#if !HAVE_READDIR_R
738# define readdir_r aio_readdir_r 864# define readdir_r aio_readdir_r
739 865
… …
784 { 910 {
785 off_t sbytes; 911 off_t sbytes;
786 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 912 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
787 913
788 if (res < 0 && sbytes) 914 if (res < 0 && sbytes)
789 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 915 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
790 res = sbytes; 916 res = sbytes;
791 } 917 }
792 918
793# elif __hpux 919# elif __hpux
794 res = sendfile (ofd, ifd, offset, count, 0, 0); 920 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
872 int memofs = 0; 998 int memofs = 0;
873 int res = 0; 999 int res = 0;
874 int errorno; 1000 int errorno;
875 1001
876 LOCK (wrklock); 1002 LOCK (wrklock);
877 self->dirp = dirp = opendir (req->dataptr); 1003 self->dirp = dirp = opendir (req->ptr1);
878 self->dbuf = u = malloc (sizeof (*u)); 1004 self->dbuf = u = malloc (sizeof (*u));
1005 req->flags |= FLAG_PTR2_FREE;
1006 req->ptr2 = names = malloc (memlen);
879 UNLOCK (wrklock); 1007 UNLOCK (wrklock);
880
881 req->data2ptr = names = malloc (memlen);
882 1008
883 if (dirp && u && names) 1009 if (dirp && u && names)
884 for (;;) 1010 for (;;)
885 { 1011 {
886 errno = 0; 1012 errno = 0;
… …
899 1025
900 while (memofs + len > memlen) 1026 while (memofs + len > memlen)
901 { 1027 {
902 memlen *= 2; 1028 memlen *= 2;
903 LOCK (wrklock); 1029 LOCK (wrklock);
904 req->data2ptr = names = realloc (names, memlen); 1030 req->ptr2 = names = realloc (names, memlen);
905 UNLOCK (wrklock); 1031 UNLOCK (wrklock);
906 1032
907 if (!names) 1033 if (!names)
908 break; 1034 break;
909 } 1035 }
… …
922/*****************************************************************************/ 1048/*****************************************************************************/
923 1049
924static void *aio_proc (void *thr_arg) 1050static void *aio_proc (void *thr_arg)
925{ 1051{
926 aio_req req; 1052 aio_req req;
927 int type; 1053 struct timespec ts;
928 worker *self = (worker *)thr_arg; 1054 worker *self = (worker *)thr_arg;
929 1055
930 do 1056 /* try to distribute timeouts somewhat evenly */
1057 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1058 * (1000000000UL / 1024UL);
1059
1060 for (;;)
931 { 1061 {
1062 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1063
932 LOCK (reqlock); 1064 LOCK (reqlock);
933 1065
934 for (;;) 1066 for (;;)
935 { 1067 {
936 self->req = req = reqq_shift (&req_queue); 1068 self->req = req = reqq_shift (&req_queue);
937 1069
938 if (req) 1070 if (req)
939 break; 1071 break;
940 1072
1073 ++idle;
1074
1075 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1076 == ETIMEDOUT)
1077 {
1078 if (idle > max_idle)
1079 {
1080 --idle;
1081 UNLOCK (reqlock);
1082 LOCK (wrklock);
1083 --started;
1084 UNLOCK (wrklock);
1085 goto quit;
1086 }
1087
1088 /* we are allowed to idle, so do so without any timeout */
941 pthread_cond_wait (&reqwait, &reqlock); 1089 pthread_cond_wait (&reqwait, &reqlock);
1090 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1091 }
1092
1093 --idle;
942 } 1094 }
1095
1096 --nready;
943 1097
944 UNLOCK (reqlock); 1098 UNLOCK (reqlock);
945 1099
946 errno = 0; /* strictly unnecessary */ 1100 errno = 0; /* strictly unnecessary */
947 type = req->type; /* remember type for QUIT check */
948 1101
949 if (!(req->flags & FLAG_CANCELLED)) 1102 if (!(req->flags & FLAG_CANCELLED))
950 switch (type) 1103 switch (req->type)
951 { 1104 {
952 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1105 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
953 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
954 1107
955 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1108 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
956 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1109 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
957 1110
958 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1111 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
959 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1112 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
960 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1113 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
961 1114
962 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1115 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
963 case REQ_CLOSE: req->result = close (req->fd); break; 1116 case REQ_CLOSE: req->result = close (req->int1); break;
964 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1117 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
965 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1118 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
966 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
967 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
968 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
969 1124
970 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
971 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
972 case REQ_READDIR: scandir_ (req, self); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
973 1128
974 case REQ_BUSY: 1129 case REQ_BUSY:
975 { 1130 {
976 struct timeval tv; 1131 struct timeval tv;
977 1132
978 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
979 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
980 1135
981 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
982 } 1137 }
983 1138
984 case REQ_GROUP: 1139 case REQ_GROUP:
985 case REQ_NOP: 1140 case REQ_NOP:
1141 break;
1142
986 case REQ_QUIT: 1143 case REQ_QUIT:
987 break; 1144 goto quit;
988 1145
989 default: 1146 default:
990 req->result = ENOSYS; 1147 req->result = ENOSYS;
991 break; 1148 break;
992 } 1149 }
993 1150
994 req->errorno = errno; 1151 req->errorno = errno;
995 1152
996 LOCK (reslock); 1153 LOCK (reslock);
997 1154
1155 ++npending;
1156
998 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
999 /* write a dummy byte to the pipe so fh becomes ready */ 1158 /* write a dummy byte to the pipe so fh becomes ready */
1000 write (respipe [1], &respipe, 1); 1159 write (respipe [1], &respipe, 1);
1001 1160
1002 self->req = 0; 1161 self->req = 0;
1003 worker_clear (self); 1162 worker_clear (self);
1004 1163
1005 UNLOCK (reslock); 1164 UNLOCK (reslock);
1006 } 1165 }
1007 while (type != REQ_QUIT);
1008 1166
1167quit:
1009 LOCK (wrklock); 1168 LOCK (wrklock);
1010 worker_free (self); 1169 worker_free (self);
1011 UNLOCK (wrklock); 1170 UNLOCK (wrklock);
1012 1171
1013 return 0; 1172 return 0;
… …
1060 1219
1061 worker_clear (wrk); 1220 worker_clear (wrk);
1062 worker_free (wrk); 1221 worker_free (wrk);
1063 } 1222 }
1064 1223
1065 started = 0; 1224 started = 0;
1225 idle = 0;
1066 nreqs = 0; 1226 nreqs = 0;
1227 nready = 0;
1228 npending = 0;
1067 1229
1068 close (respipe [0]); 1230 close (respipe [0]);
1069 close (respipe [1]); 1231 close (respipe [1]);
1070 create_pipe (); 1232 create_pipe ();
1071 1233
… …
1098PROTOTYPES: ENABLE 1260PROTOTYPES: ENABLE
1099 1261
1100BOOT: 1262BOOT:
1101{ 1263{
1102 HV *stash = gv_stashpv ("IO::AIO", 1); 1264 HV *stash = gv_stashpv ("IO::AIO", 1);
1265
1103 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1266 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1104 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1267 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1105 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1268 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1269 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1270 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1271 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1106 1272
1107 create_pipe (); 1273 create_pipe ();
1108 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1274 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1109} 1275}
1110 1276
1111void 1277void
1112min_parallel (nthreads) 1278max_poll_reqs (int nreqs)
1113 int nthreads
1114 PROTOTYPE: $ 1279 PROTOTYPE: $
1280 CODE:
1281 max_poll_reqs = nreqs;
1115 1282
1116void 1283void
1117max_parallel (nthreads) 1284max_poll_time (double nseconds)
1118 int nthreads
1119 PROTOTYPE: $ 1285 PROTOTYPE: $
1286 CODE:
1287 max_poll_time = nseconds * AIO_TICKS;
1288
1289void
1290min_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_parallel (int nthreads)
1295 PROTOTYPE: $
1296
1297void
1298max_idle (int nthreads)
1299 PROTOTYPE: $
1300 CODE:
1301 set_max_idle (nthreads);
1120 1302
1121int 1303int
1122max_outstanding (nreqs) 1304max_outstanding (int maxreqs)
1123 int nreqs 1305 PROTOTYPE: $
1124 PROTOTYPE: $
1125 CODE: 1306 CODE:
1126 RETVAL = max_outstanding; 1307 RETVAL = max_outstanding;
1127 max_outstanding = nreqs; 1308 max_outstanding = maxreqs;
1309 OUTPUT:
1310 RETVAL
1128 1311
1129void 1312void
1130aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1313aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1131 SV * pathname 1314 SV * pathname
1132 int flags 1315 int flags
… …
1136 PPCODE: 1319 PPCODE:
1137{ 1320{
1138 dREQ; 1321 dREQ;
1139 1322
1140 req->type = REQ_OPEN; 1323 req->type = REQ_OPEN;
1141 req->data = newSVsv (pathname); 1324 req->sv1 = newSVsv (pathname);
1142 req->dataptr = SvPVbyte_nolen (req->data); 1325 req->ptr1 = SvPVbyte_nolen (pathname);
1143 req->fd = flags; 1326 req->int1 = flags;
1144 req->mode = mode; 1327 req->mode = mode;
1145 1328
1146 REQ_SEND; 1329 REQ_SEND;
1147} 1330}
1148 1331
… …
1158 PPCODE: 1341 PPCODE:
1159{ 1342{
1160 dREQ; 1343 dREQ;
1161 1344
1162 req->type = ix; 1345 req->type = ix;
1163 req->fh = newSVsv (fh); 1346 req->fh = newSVsv (fh);
1164 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1347 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1165 1348
1166 REQ_SEND (req); 1349 REQ_SEND (req);
1167} 1350}
1168 1351
1169void 1352void
… …
1178 aio_read = REQ_READ 1361 aio_read = REQ_READ
1179 aio_write = REQ_WRITE 1362 aio_write = REQ_WRITE
1180 PROTOTYPE: $$$$$;$ 1363 PROTOTYPE: $$$$$;$
1181 PPCODE: 1364 PPCODE:
1182{ 1365{
1183 aio_req req;
1184 STRLEN svlen; 1366 STRLEN svlen;
1185 char *svptr = SvPVbyte (data, svlen); 1367 char *svptr = SvPVbyte (data, svlen);
1186 1368
1187 SvUPGRADE (data, SVt_PV); 1369 SvUPGRADE (data, SVt_PV);
1188 SvPOK_on (data); 1370 SvPOK_on (data);
… …
1210 1392
1211 { 1393 {
1212 dREQ; 1394 dREQ;
1213 1395
1214 req->type = ix; 1396 req->type = ix;
1215 req->fh = newSVsv (fh); 1397 req->fh = newSVsv (fh);
1216 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1398 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1217 : IoOFP (sv_2io (fh))); 1399 : IoOFP (sv_2io (fh)));
1218 req->offset = offset; 1400 req->offs = offset;
1219 req->length = length; 1401 req->size = length;
1220 req->data = SvREFCNT_inc (data); 1402 req->sv1 = SvREFCNT_inc (data);
1221 req->dataptr = (char *)svptr + dataoffset; 1403 req->ptr1 = (char *)svptr + dataoffset;
1404 req->stroffset = dataoffset;
1222 1405
1223 if (!SvREADONLY (data)) 1406 if (!SvREADONLY (data))
1224 { 1407 {
1225 SvREADONLY_on (data); 1408 SvREADONLY_on (data);
1226 req->data2ptr = (void *)data; 1409 req->flags |= FLAG_SV1_RO_OFF;
1227 } 1410 }
1228 1411
1229 REQ_SEND; 1412 REQ_SEND;
1230 } 1413 }
1414}
1415
1416void
1417aio_readlink (path,callback=&PL_sv_undef)
1418 SV * path
1419 SV * callback
1420 PROTOTYPE: $$;$
1421 PPCODE:
1422{
1423 SV *data;
1424 dREQ;
1425
1426 data = newSV (NAME_MAX);
1427 SvPOK_on (data);
1428
1429 req->type = REQ_READLINK;
1430 req->fh = newSVsv (path);
1431 req->ptr2 = SvPVbyte_nolen (path);
1432 req->sv1 = data;
1433 req->ptr1 = SvPVbyte_nolen (data);
1434
1435 REQ_SEND;
1231} 1436}
1232 1437
1233void 1438void
1234aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1439aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1235 SV * out_fh 1440 SV * out_fh
… …
1241 PPCODE: 1446 PPCODE:
1242{ 1447{
1243 dREQ; 1448 dREQ;
1244 1449
1245 req->type = REQ_SENDFILE; 1450 req->type = REQ_SENDFILE;
1246 req->fh = newSVsv (out_fh); 1451 req->fh = newSVsv (out_fh);
1247 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1452 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1248 req->fh2 = newSVsv (in_fh); 1453 req->sv2 = newSVsv (in_fh);
1249 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1454 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1250 req->offset = in_offset; 1455 req->offs = in_offset;
1251 req->length = length; 1456 req->size = length;
1252 1457
1253 REQ_SEND; 1458 REQ_SEND;
1254} 1459}
1255 1460
1256void 1461void
… …
1263 PPCODE: 1468 PPCODE:
1264{ 1469{
1265 dREQ; 1470 dREQ;
1266 1471
1267 req->type = REQ_READAHEAD; 1472 req->type = REQ_READAHEAD;
1268 req->fh = newSVsv (fh); 1473 req->fh = newSVsv (fh);
1269 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1474 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1270 req->offset = offset; 1475 req->offs = offset;
1271 req->length = length; 1476 req->size = length;
1272 1477
1273 REQ_SEND; 1478 REQ_SEND;
1274} 1479}
1275 1480
1276void 1481void
… …
1282 aio_lstat = REQ_LSTAT 1487 aio_lstat = REQ_LSTAT
1283 PPCODE: 1488 PPCODE:
1284{ 1489{
1285 dREQ; 1490 dREQ;
1286 1491
1287 New (0, req->statdata, 1, Stat_t); 1492 req->ptr2 = malloc (sizeof (Stat_t));
1288 if (!req->statdata) 1493 if (!req->ptr2)
1289 { 1494 {
1290 req_free (req); 1495 req_free (req);
1291 croak ("out of memory during aio_req->statdata allocation"); 1496 croak ("out of memory during aio_req statdata allocation");
1292 } 1497 }
1498
1499 req->flags |= FLAG_PTR2_FREE;
1293 1500
1294 if (SvPOK (fh_or_path)) 1501 if (SvPOK (fh_or_path))
1295 { 1502 {
1296 req->type = ix; 1503 req->type = ix;
1297 req->data = newSVsv (fh_or_path); 1504 req->sv1 = newSVsv (fh_or_path);
1298 req->dataptr = SvPVbyte_nolen (req->data); 1505 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1299 } 1506 }
1300 else 1507 else
1301 { 1508 {
1302 req->type = REQ_FSTAT; 1509 req->type = REQ_FSTAT;
1303 req->fh = newSVsv (fh_or_path); 1510 req->fh = newSVsv (fh_or_path);
1304 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1511 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1305 } 1512 }
1306 1513
1307 REQ_SEND; 1514 REQ_SEND;
1308} 1515}
1309 1516
1310void 1517void
1311aio_unlink (pathname,callback=&PL_sv_undef) 1518aio_unlink (pathname,callback=&PL_sv_undef)
1312 SV * pathname 1519 SV * pathname
1313 SV * callback 1520 SV * callback
1314 ALIAS: 1521 ALIAS:
1315 aio_unlink = REQ_UNLINK 1522 aio_unlink = REQ_UNLINK
1316 aio_rmdir = REQ_RMDIR 1523 aio_rmdir = REQ_RMDIR
1317 aio_readdir = REQ_READDIR 1524 aio_readdir = REQ_READDIR
1318 PPCODE: 1525 PPCODE:
1319{ 1526{
1320 dREQ; 1527 dREQ;
1321 1528
1322 req->type = ix; 1529 req->type = ix;
1323 req->data = newSVsv (pathname); 1530 req->sv1 = newSVsv (pathname);
1324 req->dataptr = SvPVbyte_nolen (req->data); 1531 req->ptr1 = SvPVbyte_nolen (pathname);
1325 1532
1326 REQ_SEND; 1533 REQ_SEND;
1327} 1534}
1328 1535
1329void 1536void
1330aio_link (oldpath,newpath,callback=&PL_sv_undef) 1537aio_link (oldpath,newpath,callback=&PL_sv_undef)
1331 SV * oldpath 1538 SV * oldpath
1332 SV * newpath 1539 SV * newpath
1333 SV * callback 1540 SV * callback
1334 ALIAS: 1541 ALIAS:
1335 aio_link = REQ_LINK 1542 aio_link = REQ_LINK
1336 aio_symlink = REQ_SYMLINK 1543 aio_symlink = REQ_SYMLINK
1337 aio_rename = REQ_RENAME 1544 aio_rename = REQ_RENAME
1338 PPCODE: 1545 PPCODE:
1339{ 1546{
1340 dREQ; 1547 dREQ;
1341 1548
1342 req->type = ix; 1549 req->type = ix;
1343 req->fh = newSVsv (oldpath); 1550 req->fh = newSVsv (oldpath);
1344 req->data2ptr = SvPVbyte_nolen (req->fh); 1551 req->ptr2 = SvPVbyte_nolen (req->fh);
1345 req->data = newSVsv (newpath); 1552 req->sv1 = newSVsv (newpath);
1346 req->dataptr = SvPVbyte_nolen (req->data); 1553 req->ptr1 = SvPVbyte_nolen (newpath);
1347 1554
1348 REQ_SEND; 1555 REQ_SEND;
1349} 1556}
1350 1557
1351void 1558void
1559aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1560 SV * pathname
1561 SV * callback
1562 UV mode
1563 UV dev
1564 PPCODE:
1565{
1566 dREQ;
1567
1568 req->type = REQ_MKNOD;
1569 req->sv1 = newSVsv (pathname);
1570 req->ptr1 = SvPVbyte_nolen (pathname);
1571 req->mode = (mode_t)mode;
1572 req->offs = dev;
1573
1574 REQ_SEND;
1575}
1576
1577void
1352aio_busy (delay,callback=&PL_sv_undef) 1578aio_busy (delay,callback=&PL_sv_undef)
1353 double delay 1579 double delay
1354 SV * callback 1580 SV * callback
1355 PPCODE: 1581 PPCODE:
1356{ 1582{
1357 dREQ; 1583 dREQ;
1358 1584
1359 req->type = REQ_BUSY; 1585 req->type = REQ_BUSY;
1360 req->fd = delay < 0. ? 0 : delay; 1586 req->int1 = delay < 0. ? 0 : delay;
1361 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1587 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1362 1588
1363 REQ_SEND; 1589 REQ_SEND;
1364} 1590}
1365 1591
1366void 1592void
… …
1370 PPCODE: 1596 PPCODE:
1371{ 1597{
1372 dREQ; 1598 dREQ;
1373 1599
1374 req->type = REQ_GROUP; 1600 req->type = REQ_GROUP;
1601
1375 req_send (req); 1602 req_send (req);
1376
1377 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1603 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1378} 1604}
1379 1605
1380void 1606void
1381aio_nop (callback=&PL_sv_undef) 1607aio_nop (callback=&PL_sv_undef)
1382 SV * callback 1608 SV * callback
1383 PPCODE: 1609 PPCODE:
1384{ 1610{
1385 dREQ; 1611 dREQ;
1386 1612
1387 req->type = REQ_NOP; 1613 req->type = REQ_NOP;
1388 1614
1389 REQ_SEND; 1615 REQ_SEND;
1390} 1616}
1391 1617
1392void 1618int
1393aioreq_pri (int pri = DEFAULT_PRI) 1619aioreq_pri (int pri = 0)
1394 CODE: 1620 PROTOTYPE: ;$
1621 CODE:
1622 RETVAL = next_pri - PRI_BIAS;
1623 if (items > 0)
1624 {
1395 if (pri < PRI_MIN) pri = PRI_MIN; 1625 if (pri < PRI_MIN) pri = PRI_MIN;
1396 if (pri > PRI_MAX) pri = PRI_MAX; 1626 if (pri > PRI_MAX) pri = PRI_MAX;
1397 next_pri = pri + PRI_BIAS; 1627 next_pri = pri + PRI_BIAS;
1628 }
1629 OUTPUT:
1630 RETVAL
1398 1631
1399void 1632void
1400aioreq_nice (int nice = 0) 1633aioreq_nice (int nice = 0)
1401 CODE: 1634 CODE:
1402 nice = next_pri - nice; 1635 nice = next_pri - nice;
1403 if (nice < PRI_MIN) nice = PRI_MIN; 1636 if (nice < PRI_MIN) nice = PRI_MIN;
1404 if (nice > PRI_MAX) nice = PRI_MAX; 1637 if (nice > PRI_MAX) nice = PRI_MAX;
1405 next_pri = nice + PRI_BIAS; 1638 next_pri = nice + PRI_BIAS;
1406 1639
1407void 1640void
1408flush () 1641flush ()
1409 PROTOTYPE: 1642 PROTOTYPE:
1410 CODE: 1643 CODE:
1411 while (nreqs) 1644 while (nreqs)
1412 { 1645 {
1413 poll_wait (); 1646 poll_wait ();
1414 poll_cb (); 1647 poll_cb (0);
1415 } 1648 }
1416 1649
1417void 1650void
1418poll() 1651poll()
1419 PROTOTYPE: 1652 PROTOTYPE:
1420 CODE: 1653 CODE:
1421 if (nreqs) 1654 if (nreqs)
1422 { 1655 {
1423 poll_wait (); 1656 poll_wait ();
1424 poll_cb (); 1657 poll_cb (0);
1425 } 1658 }
1426 1659
1427int 1660int
1428poll_fileno() 1661poll_fileno()
1429 PROTOTYPE: 1662 PROTOTYPE:
… …
1453 CODE: 1686 CODE:
1454 RETVAL = nreqs; 1687 RETVAL = nreqs;
1455 OUTPUT: 1688 OUTPUT:
1456 RETVAL 1689 RETVAL
1457 1690
1691int
1692nready()
1693 PROTOTYPE:
1694 CODE:
1695 RETVAL = get_nready ();
1696 OUTPUT:
1697 RETVAL
1698
1699int
1700npending()
1701 PROTOTYPE:
1702 CODE:
1703 RETVAL = get_npending ();
1704 OUTPUT:
1705 RETVAL
1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1458PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1459 1718
1460MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1461 1720
1462void 1721void
… …
1477 PPCODE: 1736 PPCODE:
1478{ 1737{
1479 int i; 1738 int i;
1480 aio_req req; 1739 aio_req req;
1481 1740
1482 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1483 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1484 1743
1485 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1486 { 1745 {
1487 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
… …
1489 1748
1490 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1491 1750
1492 if (req) 1751 if (req)
1493 { 1752 {
1494 ++grp->length; 1753 ++grp->size;
1495 req->grp = grp; 1754 req->grp = grp;
1496 1755
1497 req->grp_prev = 0; 1756 req->grp_prev = 0;
1498 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1499 1758
… …
1513void 1772void
1514result (aio_req grp, ...) 1773result (aio_req grp, ...)
1515 CODE: 1774 CODE:
1516{ 1775{
1517 int i; 1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1518 AV *av = newAV (); 1781 av = newAV ();
1519 1782
1520 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1521 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1522 1785
1523 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1524 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1525} 1788}
1789
1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1526 1794
1527void 1795void
1528limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1529 CODE: 1797 CODE:
1530 grp->fd2 = limit; 1798 grp->int2 = limit;
1531 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1532 1800
1533void 1801void
1534feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1535 CODE: 1803 CODE:
1536{ 1804{
1537 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1538 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1539 1807
1540 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1541 grp->fd2 = 2; 1809 grp->int2 = 2;
1542 1810
1543 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1544} 1812}
1545 1813

Diff Legend

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