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.84 by root, Sat Oct 28 01:24:19 2006 UTC vs.
Revision 1.98 by root, Wed May 9 06:45:12 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h" 9#include "autoconf/config.h"
18 10
19#include <pthread.h>
20
21#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
22#include <errno.h> 13#include <errno.h>
23#include <sys/time.h> 14#include <sys/time.h>
24#include <sys/select.h> 15#include <sys/select.h>
25#include <sys/types.h> 16#include <sys/types.h>
26#include <sys/stat.h> 17#include <sys/stat.h>
… …
51/* used for struct dirent, AIX doesn't provide it */ 42/* used for struct dirent, AIX doesn't provide it */
52#ifndef NAME_MAX 43#ifndef NAME_MAX
53# define NAME_MAX 4096 44# define NAME_MAX 4096
54#endif 45#endif
55 46
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
61#if __ia64
62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
65#else
66# define STACKSIZE 16384
67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDREAD_UNSAFE
74# if __i386 || __x86_64
75# define WORDREAD_UNSAFE 0
76# else
77# define WORDREAD_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */ 47/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536 48#define AIO_BUFSIZE 65536
83 49
84#define dBUF \ 50#define dBUF \
85 char *aio_buf; \ 51 char *aio_buf; \
… …
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 53 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 54 UNLOCK (wrklock); \
89 if (!aio_buf) \ 55 if (!aio_buf) \
90 return -1; 56 return -1;
91 57
58typedef SV SV8; /* byte-sv, used for argument-checking */
59
92enum { 60enum {
93 REQ_QUIT, 61 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 62 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 63 REQ_READ, REQ_WRITE, REQ_READAHEAD,
96 REQ_SENDFILE, 64 REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 65 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
98 REQ_FSYNC, REQ_FDATASYNC, 66 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 67 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 68 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 69 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 70 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 71 REQ_BUSY,
104}; 72};
105 73
106#define AIO_REQ_KLASS "IO::AIO::REQ" 74#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 76
109typedef struct aio_cb 77typedef struct aio_cb
110{ 78{
111 struct aio_cb *volatile next; 79 struct aio_cb *volatile next;
112 80
113 SV *data, *callback; 81 SV *callback, *fh;
114 SV *fh, *fh2; 82 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 83 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 84 off_t offs;
118 size_t length; 85 size_t size;
119 ssize_t result; 86 ssize_t result;
120 87
121 STRLEN dataoffset; 88 STRLEN stroffset;
122 int type; 89 int type;
123 int fd, fd2; 90 int int1, int2;
124 int errorno; 91 int errorno;
125 mode_t mode; /* open */ 92 mode_t mode; /* open */
126 93
127 unsigned char flags; 94 unsigned char flags;
128 unsigned char pri; 95 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 97 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 98 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 99} aio_cb;
133 100
134enum { 101enum {
135 FLAG_CANCELLED = 0x01, 102 FLAG_CANCELLED = 0x01, /* request was cancelled */
103 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
104 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 105};
137 106
138typedef aio_cb *aio_req; 107typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 108typedef aio_cb *aio_req_ornot;
140 109
… …
145 DEFAULT_PRI = 0, 114 DEFAULT_PRI = 0,
146 PRI_BIAS = -PRI_MIN, 115 PRI_BIAS = -PRI_MIN,
147 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 116 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
148}; 117};
149 118
119#define AIO_TICKS ((1000000 + 1023) >> 10)
120
121static unsigned int max_poll_time = 0;
122static unsigned int max_poll_reqs = 0;
123
124/* calculcate time difference in ~1/AIO_TICKS of a second */
125static int tvdiff (struct timeval *tv1, struct timeval *tv2)
126{
127 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
128 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
129}
130
131static thread_t main_tid;
132static int main_sig;
133static int block_sig_level;
134
135void block_sig ()
136{
137 sigset_t ss;
138
139 if (block_sig_level++)
140 return;
141
142 if (!main_sig)
143 return;
144
145 sigemptyset (&ss);
146 sigaddset (&ss, main_sig);
147 pthread_sigmask (SIG_BLOCK, &ss, 0);
148}
149
150void unblock_sig ()
151{
152 sigset_t ss;
153
154 if (--block_sig_level)
155 return;
156
157 if (!main_sig)
158 return;
159
160 sigemptyset (&ss);
161 sigaddset (&ss, main_sig);
162 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
163}
164
150static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
151 166
152static unsigned int started, idle, wanted; 167static unsigned int started, idle, wanted;
153 168
154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
156#else
157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
158#endif
159
160#define LOCK(mutex) pthread_mutex_lock (&(mutex))
161#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
162
163/* worker threads management */ 169/* worker threads management */
164static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 170static mutex_t wrklock = MUTEX_INIT;
165 171
166typedef struct worker { 172typedef struct worker {
167 /* locked by wrklock */ 173 /* locked by wrklock */
168 struct worker *prev, *next; 174 struct worker *prev, *next;
169 175
170 pthread_t tid; 176 thread_t tid;
171 177
172 /* locked by reslock, reqlock or wrklock */ 178 /* locked by reslock, reqlock or wrklock */
173 aio_req req; /* currently processed request */ 179 aio_req req; /* currently processed request */
174 void *dbuf; 180 void *dbuf;
175 DIR *dirp; 181 DIR *dirp;
… …
203static volatile unsigned int nreqs, nready, npending; 209static volatile unsigned int nreqs, nready, npending;
204static volatile unsigned int max_idle = 4; 210static volatile unsigned int max_idle = 4;
205static volatile unsigned int max_outstanding = 0xffffffff; 211static volatile unsigned int max_outstanding = 0xffffffff;
206static int respipe [2]; 212static int respipe [2];
207 213
208static pthread_mutex_t reslock = AIO_MUTEX_INIT; 214static mutex_t reslock = MUTEX_INIT;
209static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 215static mutex_t reqlock = MUTEX_INIT;
210static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 216static cond_t reqwait = COND_INIT;
211 217
212#if WORDREAD_UNSAFE 218#if WORDACCESS_UNSAFE
213 219
214static unsigned int get_nready () 220static unsigned int get_nready ()
215{ 221{
216 unsigned int retval; 222 unsigned int retval;
217 223
… …
231 UNLOCK (reslock); 237 UNLOCK (reslock);
232 238
233 return retval; 239 return retval;
234} 240}
235 241
242static unsigned int get_nthreads ()
243{
244 unsigned int retval;
245
246 LOCK (wrklock);
247 retval = started;
248 UNLOCK (wrklock);
249
250 return retval;
251}
252
236#else 253#else
237 254
238# define get_nready() nready 255# define get_nready() nready
239# define get_npending() npending 256# define get_npending() npending
257# define get_nthreads() started
240 258
241#endif 259#endif
242 260
243/* 261/*
244 * a somewhat faster data structure might be nice, but 262 * a somewhat faster data structure might be nice, but
… …
292 } 310 }
293 311
294 abort (); 312 abort ();
295} 313}
296 314
297static int poll_cb (int max); 315static int poll_cb ();
298static void req_invoke (aio_req req); 316static int req_invoke (aio_req req);
299static void req_free (aio_req req); 317static void req_free (aio_req req);
300static void req_cancel (aio_req req); 318static void req_cancel (aio_req req);
301 319
302/* must be called at most once */ 320/* must be called at most once */
303static SV *req_sv (aio_req req, const char *klass) 321static SV *req_sv (aio_req req, const char *klass)
… …
323 return mg ? (aio_req)mg->mg_ptr : 0; 341 return mg ? (aio_req)mg->mg_ptr : 0;
324} 342}
325 343
326static void aio_grp_feed (aio_req grp) 344static void aio_grp_feed (aio_req grp)
327{ 345{
346 block_sig ();
347
328 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 348 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
329 { 349 {
330 int old_len = grp->length; 350 int old_len = grp->size;
331 351
332 if (grp->fh2 && SvOK (grp->fh2)) 352 if (grp->sv2 && SvOK (grp->sv2))
333 { 353 {
334 dSP; 354 dSP;
335 355
336 ENTER; 356 ENTER;
337 SAVETMPS; 357 SAVETMPS;
338 PUSHMARK (SP); 358 PUSHMARK (SP);
339 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 359 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
340 PUTBACK; 360 PUTBACK;
341 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 361 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
342 SPAGAIN; 362 SPAGAIN;
343 FREETMPS; 363 FREETMPS;
344 LEAVE; 364 LEAVE;
345 } 365 }
346 366
347 /* stop if no progress has been made */ 367 /* stop if no progress has been made */
348 if (old_len == grp->length) 368 if (old_len == grp->size)
349 { 369 {
350 SvREFCNT_dec (grp->fh2); 370 SvREFCNT_dec (grp->sv2);
351 grp->fh2 = 0; 371 grp->sv2 = 0;
352 break; 372 break;
353 } 373 }
354 } 374 }
375
376 unblock_sig ();
355} 377}
356 378
357static void aio_grp_dec (aio_req grp) 379static void aio_grp_dec (aio_req grp)
358{ 380{
359 --grp->length; 381 --grp->size;
360 382
361 /* call feeder, if applicable */ 383 /* call feeder, if applicable */
362 aio_grp_feed (grp); 384 aio_grp_feed (grp);
363 385
364 /* finish, if done */ 386 /* finish, if done */
365 if (!grp->length && grp->fd) 387 if (!grp->size && grp->int1)
366 { 388 {
389 block_sig ();
390
367 req_invoke (grp); 391 if (!req_invoke (grp))
392 {
393 req_free (grp);
394 unblock_sig ();
395 croak (0);
396 }
397
368 req_free (grp); 398 req_free (grp);
399 unblock_sig ();
369 } 400 }
370} 401}
371 402
372static void req_invoke (aio_req req) 403static int req_invoke (aio_req req)
373{ 404{
374 dSP; 405 dSP;
406
407 if (req->flags & FLAG_SV1_RO_OFF)
408 SvREADONLY_off (req->sv1);
375 409
376 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 410 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
377 { 411 {
378 ENTER; 412 ENTER;
379 SAVETMPS; 413 SAVETMPS;
… …
387 SV *rv = &PL_sv_undef; 421 SV *rv = &PL_sv_undef;
388 422
389 if (req->result >= 0) 423 if (req->result >= 0)
390 { 424 {
391 int i; 425 int i;
392 char *buf = req->data2ptr; 426 char *buf = req->ptr2;
393 AV *av = newAV (); 427 AV *av = newAV ();
394 428
395 av_extend (av, req->result - 1); 429 av_extend (av, req->result - 1);
396 430
397 for (i = 0; i < req->result; ++i) 431 for (i = 0; i < req->result; ++i)
… …
417 PUSHs (sv_2mortal (newSViv (req->result))); 451 PUSHs (sv_2mortal (newSViv (req->result)));
418 PUTBACK; 452 PUTBACK;
419 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 453 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
420 SPAGAIN; 454 SPAGAIN;
421 455
422 fh = SvREFCNT_inc (POPs); 456 fh = POPs;
423
424 PUSHMARK (SP); 457 PUSHMARK (SP);
425 XPUSHs (sv_2mortal (fh)); 458 XPUSHs (fh);
426 } 459 }
427 break; 460 break;
428 461
429 case REQ_GROUP: 462 case REQ_GROUP:
430 req->fd = 2; /* mark group as finished */ 463 req->int1 = 2; /* mark group as finished */
431 464
432 if (req->data) 465 if (req->sv1)
433 { 466 {
434 int i; 467 int i;
435 AV *av = (AV *)req->data; 468 AV *av = (AV *)req->sv1;
436 469
437 EXTEND (SP, AvFILL (av) + 1); 470 EXTEND (SP, AvFILL (av) + 1);
438 for (i = 0; i <= AvFILL (av); ++i) 471 for (i = 0; i <= AvFILL (av); ++i)
439 PUSHs (*av_fetch (av, i, 0)); 472 PUSHs (*av_fetch (av, i, 0));
440 } 473 }
… …
442 475
443 case REQ_NOP: 476 case REQ_NOP:
444 case REQ_BUSY: 477 case REQ_BUSY:
445 break; 478 break;
446 479
480 case REQ_READLINK:
481 if (req->result > 0)
482 {
483 SvCUR_set (req->sv1, req->result);
484 *SvEND (req->sv1) = 0;
485 PUSHs (req->sv1);
486 }
487 break;
488
489 case REQ_STAT:
490 case REQ_LSTAT:
491 case REQ_FSTAT:
492 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
493 PL_laststatval = req->result;
494 PL_statcache = *(Stat_t *)(req->ptr2);
495 PUSHs (sv_2mortal (newSViv (req->result)));
496 break;
497
498 case REQ_READ:
499 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
500 *SvEND (req->sv1) = 0;
501 PUSHs (sv_2mortal (newSViv (req->result)));
502 break;
503
447 default: 504 default:
448 PUSHs (sv_2mortal (newSViv (req->result))); 505 PUSHs (sv_2mortal (newSViv (req->result)));
449 break; 506 break;
450 } 507 }
451 508
… …
471 grp->grp_first = req->grp_next; 528 grp->grp_first = req->grp_next;
472 529
473 aio_grp_dec (grp); 530 aio_grp_dec (grp);
474 } 531 }
475 532
476 if (SvTRUE (ERRSV)) 533 return !SvTRUE (ERRSV);
477 {
478 req_free (req);
479 croak (0);
480 }
481} 534}
482 535
483static void req_free (aio_req req) 536static void req_free (aio_req req)
484{ 537{
485 if (req->self) 538 if (req->self)
486 { 539 {
487 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
488 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
489 } 542 }
490 543
491 SvREFCNT_dec (req->data);
492 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
493 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
494 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
495 Safefree (req->statdata);
496 548
497 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
498 free (req->data2ptr); 550 free (req->ptr2);
499 551
500 Safefree (req); 552 Safefree (req);
501} 553}
502 554
503static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
505 aio_req sub; 557 aio_req sub;
506 558
507 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
508 return; 560 return;
509 561
510 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
511 grp->fh2 = 0; 563 grp->sv2 = 0;
512 564
513 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
514 req_cancel (sub); 566 req_cancel (sub);
515} 567}
516 568
… …
523 575
524static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
525 577
526static void start_thread (void) 578static void start_thread (void)
527{ 579{
528 sigset_t fullsigset, oldsigset;
529 pthread_attr_t attr;
530
531 worker *wrk = calloc (1, sizeof (worker)); 580 worker *wrk = calloc (1, sizeof (worker));
532 581
533 if (!wrk) 582 if (!wrk)
534 croak ("unable to allocate worker thread data"); 583 croak ("unable to allocate worker thread data");
535 584
536 pthread_attr_init (&attr);
537 pthread_attr_setstacksize (&attr, STACKSIZE);
538 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
539#ifdef PTHREAD_SCOPE_PROCESS
540 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
541#endif
542
543 sigfillset (&fullsigset);
544
545 LOCK (wrklock); 585 LOCK (wrklock);
546 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
547 586
548 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 587 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
549 { 588 {
550 wrk->prev = &wrk_first; 589 wrk->prev = &wrk_first;
551 wrk->next = wrk_first.next; 590 wrk->next = wrk_first.next;
552 wrk_first.next->prev = wrk; 591 wrk_first.next->prev = wrk;
553 wrk_first.next = wrk; 592 wrk_first.next = wrk;
554 ++started; 593 ++started;
555 } 594 }
556 else 595 else
557 free (wrk); 596 free (wrk);
558 597
559 sigprocmask (SIG_SETMASK, &oldsigset, 0);
560 UNLOCK (wrklock); 598 UNLOCK (wrklock);
561} 599}
562 600
563static void maybe_start_thread () 601static void maybe_start_thread ()
564{ 602{
565 if (started >= wanted) 603 if (get_nthreads () >= wanted)
566 return; 604 return;
567 605
568 /* todo: maybe use idle here, but might be less exact */ 606 /* todo: maybe use idle here, but might be less exact */
569 if ((int)nready <= (int)started - (int)(nreqs - get_nready () - get_npending ())) 607 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 608 return;
571 609
572 start_thread (); 610 start_thread ();
573} 611}
574 612
575static void req_send (aio_req req) 613static void req_send (aio_req req)
576{ 614{
615 block_sig ();
616
577 ++nreqs; 617 ++nreqs;
578 618
579 LOCK (reqlock); 619 LOCK (reqlock);
580 ++nready; 620 ++nready;
581 reqq_push (&req_queue, req); 621 reqq_push (&req_queue, req);
582 pthread_cond_signal (&reqwait); 622 COND_SIGNAL (reqwait);
583 UNLOCK (reqlock); 623 UNLOCK (reqlock);
624
625 unblock_sig ();
584 626
585 maybe_start_thread (); 627 maybe_start_thread ();
586} 628}
587 629
588static void end_thread (void) 630static void end_thread (void)
… …
594 req->type = REQ_QUIT; 636 req->type = REQ_QUIT;
595 req->pri = PRI_MAX + PRI_BIAS; 637 req->pri = PRI_MAX + PRI_BIAS;
596 638
597 LOCK (reqlock); 639 LOCK (reqlock);
598 reqq_push (&req_queue, req); 640 reqq_push (&req_queue, req);
599 pthread_cond_signal (&reqwait); 641 COND_SIGNAL (reqwait);
600 UNLOCK (reqlock); 642 UNLOCK (reqlock);
601 643
602 LOCK (wrklock); 644 LOCK (wrklock);
603 --started; 645 --started;
604 UNLOCK (wrklock); 646 UNLOCK (wrklock);
605} 647}
606 648
649static void set_max_idle (int nthreads)
650{
651 if (WORDACCESS_UNSAFE) LOCK (reqlock);
652 max_idle = nthreads <= 0 ? 1 : nthreads;
653 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
654}
655
607static void min_parallel (int nthreads) 656static void min_parallel (int nthreads)
608{ 657{
609 if (wanted < nthreads) 658 if (wanted < nthreads)
610 wanted = nthreads; 659 wanted = nthreads;
611} 660}
… …
624 fd_set rfd; 673 fd_set rfd;
625 674
626 while (nreqs) 675 while (nreqs)
627 { 676 {
628 int size; 677 int size;
629 if (WORDREAD_UNSAFE) LOCK (reslock); 678 if (WORDACCESS_UNSAFE) LOCK (reslock);
630 size = res_queue.size; 679 size = res_queue.size;
631 if (WORDREAD_UNSAFE) UNLOCK (reslock); 680 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
632 681
633 if (size) 682 if (size)
634 return; 683 return;
635 684
636 maybe_start_thread (); 685 maybe_start_thread ();
… …
640 689
641 select (respipe [0] + 1, &rfd, 0, 0, 0); 690 select (respipe [0] + 1, &rfd, 0, 0, 0);
642 } 691 }
643} 692}
644 693
645static int poll_cb (int max) 694static int poll_cb ()
646{ 695{
647 dSP; 696 dSP;
648 int count = 0; 697 int count = 0;
698 int maxreqs = max_poll_reqs;
649 int do_croak = 0; 699 int do_croak = 0;
700 struct timeval tv_start, tv_now;
650 aio_req req; 701 aio_req req;
702
703 if (max_poll_time)
704 gettimeofday (&tv_start, 0);
705
706 block_sig ();
651 707
652 for (;;) 708 for (;;)
653 { 709 {
654 while (max <= 0 || count < max) 710 for (;;)
655 { 711 {
656 maybe_start_thread (); 712 maybe_start_thread ();
657 713
658 LOCK (reslock); 714 LOCK (reslock);
659 req = reqq_shift (&res_queue); 715 req = reqq_shift (&res_queue);
… …
663 --npending; 719 --npending;
664 720
665 if (!res_queue.size) 721 if (!res_queue.size)
666 { 722 {
667 /* read any signals sent by the worker threads */ 723 /* read any signals sent by the worker threads */
668 char buf [32]; 724 char buf [4];
669 while (read (respipe [0], buf, 32) == 32) 725 while (read (respipe [0], buf, 4) == 4)
670 ; 726 ;
671 } 727 }
672 } 728 }
673 729
674 UNLOCK (reslock); 730 UNLOCK (reslock);
… …
676 if (!req) 732 if (!req)
677 break; 733 break;
678 734
679 --nreqs; 735 --nreqs;
680 736
681 if (req->type == REQ_GROUP && req->length) 737 if (req->type == REQ_GROUP && req->size)
682 { 738 {
683 req->fd = 1; /* mark request as delayed */ 739 req->int1 = 1; /* mark request as delayed */
684 continue; 740 continue;
685 } 741 }
686 else 742 else
687 { 743 {
688 if (req->type == REQ_READ) 744 if (!req_invoke (req))
689 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
690
691 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
692 SvREADONLY_off (req->data);
693
694 if (req->statdata)
695 { 745 {
696 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 746 req_free (req);
697 PL_laststatval = req->result; 747 unblock_sig ();
698 PL_statcache = *(req->statdata); 748 croak (0);
699 } 749 }
700
701 req_invoke (req);
702 750
703 count++; 751 count++;
704 } 752 }
705 753
706 req_free (req); 754 req_free (req);
755
756 if (maxreqs && !--maxreqs)
757 break;
758
759 if (max_poll_time)
760 {
761 gettimeofday (&tv_now, 0);
762
763 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
764 break;
765 }
707 } 766 }
708 767
709 if (nreqs <= max_outstanding) 768 if (nreqs <= max_outstanding)
710 break; 769 break;
711 770
712 poll_wait (); 771 poll_wait ();
713 772
714 max = 0; 773 ++maxreqs;
715 } 774 }
716 775
776 unblock_sig ();
717 return count; 777 return count;
718} 778}
719 779
720static void create_pipe () 780static void create_pipe ()
721{ 781{
… …
739/* 799/*
740 * make our pread/pwrite safe against themselves, but not against 800 * make our pread/pwrite safe against themselves, but not against
741 * normal read/write by using a mutex. slows down execution a lot, 801 * normal read/write by using a mutex. slows down execution a lot,
742 * but that's your problem, not mine. 802 * but that's your problem, not mine.
743 */ 803 */
744static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 804static mutex_t preadwritelock = MUTEX_INIT;
745 805
746static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 806static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
747{ 807{
748 ssize_t res; 808 ssize_t res;
749 off_t ooffset; 809 off_t ooffset;
… …
800#endif 860#endif
801 861
802#if !HAVE_READDIR_R 862#if !HAVE_READDIR_R
803# define readdir_r aio_readdir_r 863# define readdir_r aio_readdir_r
804 864
805static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 865static mutex_t readdirlock = MUTEX_INIT;
806 866
807static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 867static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
808{ 868{
809 struct dirent *e; 869 struct dirent *e;
810 int errorno; 870 int errorno;
… …
937 int memofs = 0; 997 int memofs = 0;
938 int res = 0; 998 int res = 0;
939 int errorno; 999 int errorno;
940 1000
941 LOCK (wrklock); 1001 LOCK (wrklock);
942 self->dirp = dirp = opendir (req->dataptr); 1002 self->dirp = dirp = opendir (req->ptr1);
943 self->dbuf = u = malloc (sizeof (*u)); 1003 self->dbuf = u = malloc (sizeof (*u));
1004 req->flags |= FLAG_PTR2_FREE;
944 req->data2ptr = names = malloc (memlen); 1005 req->ptr2 = names = malloc (memlen);
945 UNLOCK (wrklock); 1006 UNLOCK (wrklock);
946 1007
947 if (dirp && u && names) 1008 if (dirp && u && names)
948 for (;;) 1009 for (;;)
949 { 1010 {
… …
963 1024
964 while (memofs + len > memlen) 1025 while (memofs + len > memlen)
965 { 1026 {
966 memlen *= 2; 1027 memlen *= 2;
967 LOCK (wrklock); 1028 LOCK (wrklock);
968 req->data2ptr = names = realloc (names, memlen); 1029 req->ptr2 = names = realloc (names, memlen);
969 UNLOCK (wrklock); 1030 UNLOCK (wrklock);
970 1031
971 if (!names) 1032 if (!names)
972 break; 1033 break;
973 } 1034 }
… …
1008 if (req) 1069 if (req)
1009 break; 1070 break;
1010 1071
1011 ++idle; 1072 ++idle;
1012 1073
1013 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) 1074 if (COND_TIMEDWAIT (reqwait, reqlock, ts)
1014 == ETIMEDOUT) 1075 == ETIMEDOUT)
1015 { 1076 {
1016 if (idle > max_idle) 1077 if (idle > max_idle)
1017 { 1078 {
1018 --idle; 1079 --idle;
… …
1022 UNLOCK (wrklock); 1083 UNLOCK (wrklock);
1023 goto quit; 1084 goto quit;
1024 } 1085 }
1025 1086
1026 /* we are allowed to idle, so do so without any timeout */ 1087 /* we are allowed to idle, so do so without any timeout */
1027 pthread_cond_wait (&reqwait, &reqlock); 1088 COND_WAIT (reqwait, reqlock);
1028 ts.tv_sec = time (0) + IDLE_TIMEOUT; 1089 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1029 } 1090 }
1030 1091
1031 --idle; 1092 --idle;
1032 } 1093 }
… …
1038 errno = 0; /* strictly unnecessary */ 1099 errno = 0; /* strictly unnecessary */
1039 1100
1040 if (!(req->flags & FLAG_CANCELLED)) 1101 if (!(req->flags & FLAG_CANCELLED))
1041 switch (req->type) 1102 switch (req->type)
1042 { 1103 {
1043 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1104 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1044 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1105 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1045 1106
1046 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1107 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1047 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1108 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1048 1109
1049 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1110 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1050 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1111 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1051 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1112 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1052 1113
1053 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1114 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1054 case REQ_CLOSE: req->result = close (req->fd); break; 1115 case REQ_CLOSE: req->result = close (req->int1); break;
1055 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1116 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1056 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1117 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1118 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1057 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1058 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1059 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1060 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); 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;
1061 1124
1062 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1063 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
1064 case REQ_READDIR: scandir_ (req, self); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
1065 1128
1066 case REQ_BUSY: 1129 case REQ_BUSY:
1067 { 1130 {
1068 struct timeval tv; 1131 struct timeval tv;
1069 1132
1070 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
1071 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
1072 1135
1073 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
1074 } 1137 }
1075 1138
1076 case REQ_GROUP: 1139 case REQ_GROUP:
… …
1090 LOCK (reslock); 1153 LOCK (reslock);
1091 1154
1092 ++npending; 1155 ++npending;
1093 1156
1094 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
1158 {
1095 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
1096 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
1161
1162 /* optionally signal the main thread asynchronously */
1163 if (main_sig)
1164 pthread_kill (main_tid, main_sig);
1165 }
1097 1166
1098 self->req = 0; 1167 self->req = 0;
1099 worker_clear (self); 1168 worker_clear (self);
1100 1169
1101 UNLOCK (reslock); 1170 UNLOCK (reslock);
… …
1204 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1273 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1205 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1274 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1206 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1275 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1207 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1276 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1208 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1277 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1278 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1209 1279
1210 create_pipe (); 1280 create_pipe ();
1211 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1281 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1212} 1282}
1283
1284void
1285max_poll_reqs (int nreqs)
1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_reqs = nreqs;
1289
1290void
1291max_poll_time (double nseconds)
1292 PROTOTYPE: $
1293 CODE:
1294 max_poll_time = nseconds * AIO_TICKS;
1213 1295
1214void 1296void
1215min_parallel (int nthreads) 1297min_parallel (int nthreads)
1216 PROTOTYPE: $ 1298 PROTOTYPE: $
1217 1299
1218void 1300void
1219max_parallel (int nthreads) 1301max_parallel (int nthreads)
1220 PROTOTYPE: $ 1302 PROTOTYPE: $
1303
1304void
1305max_idle (int nthreads)
1306 PROTOTYPE: $
1307 CODE:
1308 set_max_idle (nthreads);
1221 1309
1222int 1310int
1223max_outstanding (int maxreqs) 1311max_outstanding (int maxreqs)
1224 PROTOTYPE: $ 1312 PROTOTYPE: $
1225 CODE: 1313 CODE:
… …
1228 OUTPUT: 1316 OUTPUT:
1229 RETVAL 1317 RETVAL
1230 1318
1231void 1319void
1232aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1320aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1233 SV * pathname 1321 SV8 * pathname
1234 int flags 1322 int flags
1235 int mode 1323 int mode
1236 SV * callback 1324 SV * callback
1237 PROTOTYPE: $$$;$ 1325 PROTOTYPE: $$$;$
1238 PPCODE: 1326 PPCODE:
1239{ 1327{
1240 dREQ; 1328 dREQ;
1241 1329
1242 req->type = REQ_OPEN; 1330 req->type = REQ_OPEN;
1243 req->data = newSVsv (pathname); 1331 req->sv1 = newSVsv (pathname);
1244 req->dataptr = SvPVbyte_nolen (req->data); 1332 req->ptr1 = SvPVbyte_nolen (req->sv1);
1245 req->fd = flags; 1333 req->int1 = flags;
1246 req->mode = mode; 1334 req->mode = mode;
1247 1335
1248 REQ_SEND; 1336 REQ_SEND;
1249} 1337}
1250 1338
… …
1260 PPCODE: 1348 PPCODE:
1261{ 1349{
1262 dREQ; 1350 dREQ;
1263 1351
1264 req->type = ix; 1352 req->type = ix;
1265 req->fh = newSVsv (fh); 1353 req->fh = newSVsv (fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1354 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1267 1355
1268 REQ_SEND (req); 1356 REQ_SEND (req);
1269} 1357}
1270 1358
1271void 1359void
1272aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1360aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1273 SV * fh 1361 SV * fh
1274 UV offset 1362 UV offset
1275 UV length 1363 UV length
1276 SV * data 1364 SV8 * data
1277 UV dataoffset 1365 UV dataoffset
1278 SV * callback 1366 SV * callback
1279 ALIAS: 1367 ALIAS:
1280 aio_read = REQ_READ 1368 aio_read = REQ_READ
1281 aio_write = REQ_WRITE 1369 aio_write = REQ_WRITE
1282 PROTOTYPE: $$$$$;$ 1370 PROTOTYPE: $$$$$;$
1283 PPCODE: 1371 PPCODE:
1284{ 1372{
1285 aio_req req;
1286 STRLEN svlen; 1373 STRLEN svlen;
1287 char *svptr = SvPVbyte (data, svlen); 1374 char *svptr = SvPVbyte (data, svlen);
1288 1375
1289 SvUPGRADE (data, SVt_PV); 1376 SvUPGRADE (data, SVt_PV);
1290 SvPOK_on (data); 1377 SvPOK_on (data);
… …
1302 length = svlen - dataoffset; 1389 length = svlen - dataoffset;
1303 } 1390 }
1304 else 1391 else
1305 { 1392 {
1306 /* read: grow scalar as necessary */ 1393 /* read: grow scalar as necessary */
1307 svptr = SvGROW (data, length + dataoffset); 1394 svptr = SvGROW (data, length + dataoffset + 1);
1308 } 1395 }
1309 1396
1310 if (length < 0) 1397 if (length < 0)
1311 croak ("length must not be negative"); 1398 croak ("length must not be negative");
1312 1399
1313 { 1400 {
1314 dREQ; 1401 dREQ;
1315 1402
1316 req->type = ix; 1403 req->type = ix;
1317 req->fh = newSVsv (fh); 1404 req->fh = newSVsv (fh);
1318 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1405 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1319 : IoOFP (sv_2io (fh))); 1406 : IoOFP (sv_2io (fh)));
1320 req->offset = offset; 1407 req->offs = offset;
1321 req->length = length; 1408 req->size = length;
1322 req->data = SvREFCNT_inc (data); 1409 req->sv1 = SvREFCNT_inc (data);
1323 req->dataptr = (char *)svptr + dataoffset; 1410 req->ptr1 = (char *)svptr + dataoffset;
1411 req->stroffset = dataoffset;
1324 1412
1325 if (!SvREADONLY (data)) 1413 if (!SvREADONLY (data))
1326 { 1414 {
1327 SvREADONLY_on (data); 1415 SvREADONLY_on (data);
1328 req->data2ptr = (void *)data; 1416 req->flags |= FLAG_SV1_RO_OFF;
1329 } 1417 }
1330 1418
1331 REQ_SEND; 1419 REQ_SEND;
1332 } 1420 }
1421}
1422
1423void
1424aio_readlink (path,callback=&PL_sv_undef)
1425 SV8 * path
1426 SV * callback
1427 PROTOTYPE: $$;$
1428 PPCODE:
1429{
1430 SV *data;
1431 dREQ;
1432
1433 data = newSV (NAME_MAX);
1434 SvPOK_on (data);
1435
1436 req->type = REQ_READLINK;
1437 req->fh = newSVsv (path);
1438 req->ptr2 = SvPVbyte_nolen (req->fh);
1439 req->sv1 = data;
1440 req->ptr1 = SvPVbyte_nolen (data);
1441
1442 REQ_SEND;
1333} 1443}
1334 1444
1335void 1445void
1336aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1446aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1337 SV * out_fh 1447 SV * out_fh
… …
1343 PPCODE: 1453 PPCODE:
1344{ 1454{
1345 dREQ; 1455 dREQ;
1346 1456
1347 req->type = REQ_SENDFILE; 1457 req->type = REQ_SENDFILE;
1348 req->fh = newSVsv (out_fh); 1458 req->fh = newSVsv (out_fh);
1349 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1459 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1350 req->fh2 = newSVsv (in_fh); 1460 req->sv2 = newSVsv (in_fh);
1351 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1461 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1352 req->offset = in_offset; 1462 req->offs = in_offset;
1353 req->length = length; 1463 req->size = length;
1354 1464
1355 REQ_SEND; 1465 REQ_SEND;
1356} 1466}
1357 1467
1358void 1468void
… …
1365 PPCODE: 1475 PPCODE:
1366{ 1476{
1367 dREQ; 1477 dREQ;
1368 1478
1369 req->type = REQ_READAHEAD; 1479 req->type = REQ_READAHEAD;
1370 req->fh = newSVsv (fh); 1480 req->fh = newSVsv (fh);
1371 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1481 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1372 req->offset = offset; 1482 req->offs = offset;
1373 req->length = length; 1483 req->size = length;
1374 1484
1375 REQ_SEND; 1485 REQ_SEND;
1376} 1486}
1377 1487
1378void 1488void
1379aio_stat (fh_or_path,callback=&PL_sv_undef) 1489aio_stat (fh_or_path,callback=&PL_sv_undef)
1380 SV * fh_or_path 1490 SV8 * fh_or_path
1381 SV * callback 1491 SV * callback
1382 ALIAS: 1492 ALIAS:
1383 aio_stat = REQ_STAT 1493 aio_stat = REQ_STAT
1384 aio_lstat = REQ_LSTAT 1494 aio_lstat = REQ_LSTAT
1385 PPCODE: 1495 PPCODE:
1386{ 1496{
1387 dREQ; 1497 dREQ;
1388 1498
1389 New (0, req->statdata, 1, Stat_t); 1499 req->ptr2 = malloc (sizeof (Stat_t));
1390 if (!req->statdata) 1500 if (!req->ptr2)
1391 { 1501 {
1392 req_free (req); 1502 req_free (req);
1393 croak ("out of memory during aio_req->statdata allocation"); 1503 croak ("out of memory during aio_stat statdata allocation");
1394 } 1504 }
1505
1506 req->flags |= FLAG_PTR2_FREE;
1395 1507
1396 if (SvPOK (fh_or_path)) 1508 if (SvPOK (fh_or_path))
1397 { 1509 {
1398 req->type = ix; 1510 req->type = ix;
1399 req->data = newSVsv (fh_or_path); 1511 req->sv1 = newSVsv (fh_or_path);
1400 req->dataptr = SvPVbyte_nolen (req->data); 1512 req->ptr1 = SvPVbyte_nolen (req->sv1);
1401 } 1513 }
1402 else 1514 else
1403 { 1515 {
1404 req->type = REQ_FSTAT; 1516 req->type = REQ_FSTAT;
1405 req->fh = newSVsv (fh_or_path); 1517 req->fh = newSVsv (fh_or_path);
1406 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1518 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1407 } 1519 }
1408 1520
1409 REQ_SEND; 1521 REQ_SEND;
1410} 1522}
1411 1523
1412void 1524void
1413aio_unlink (pathname,callback=&PL_sv_undef) 1525aio_unlink (pathname,callback=&PL_sv_undef)
1414 SV * pathname 1526 SV8 * pathname
1415 SV * callback 1527 SV * callback
1416 ALIAS: 1528 ALIAS:
1417 aio_unlink = REQ_UNLINK 1529 aio_unlink = REQ_UNLINK
1418 aio_rmdir = REQ_RMDIR 1530 aio_rmdir = REQ_RMDIR
1419 aio_readdir = REQ_READDIR 1531 aio_readdir = REQ_READDIR
1420 PPCODE: 1532 PPCODE:
1421{ 1533{
1422 dREQ; 1534 dREQ;
1423 1535
1424 req->type = ix; 1536 req->type = ix;
1425 req->data = newSVsv (pathname); 1537 req->sv1 = newSVsv (pathname);
1426 req->dataptr = SvPVbyte_nolen (req->data); 1538 req->ptr1 = SvPVbyte_nolen (req->sv1);
1539
1540 REQ_SEND;
1541}
1542
1543void
1544aio_mkdir (pathname,mode,callback=&PL_sv_undef)
1545 SV8 * pathname
1546 UV mode
1547 SV * callback
1548 PPCODE:
1549{
1550 dREQ;
1427 1551
1552 req->type = REQ_MKDIR;
1553 req->sv1 = newSVsv (pathname);
1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1555 req->mode = mode;
1556
1428 REQ_SEND; 1557 REQ_SEND;
1429} 1558}
1430 1559
1431void 1560void
1432aio_link (oldpath,newpath,callback=&PL_sv_undef) 1561aio_link (oldpath,newpath,callback=&PL_sv_undef)
1433 SV * oldpath 1562 SV8 * oldpath
1434 SV * newpath 1563 SV8 * newpath
1435 SV * callback 1564 SV * callback
1436 ALIAS: 1565 ALIAS:
1437 aio_link = REQ_LINK 1566 aio_link = REQ_LINK
1438 aio_symlink = REQ_SYMLINK 1567 aio_symlink = REQ_SYMLINK
1439 aio_rename = REQ_RENAME 1568 aio_rename = REQ_RENAME
1440 PPCODE: 1569 PPCODE:
1441{ 1570{
1442 dREQ; 1571 dREQ;
1443 1572
1444 req->type = ix; 1573 req->type = ix;
1445 req->fh = newSVsv (oldpath); 1574 req->fh = newSVsv (oldpath);
1446 req->data2ptr = SvPVbyte_nolen (req->fh); 1575 req->ptr2 = SvPVbyte_nolen (req->fh);
1447 req->data = newSVsv (newpath); 1576 req->sv1 = newSVsv (newpath);
1448 req->dataptr = SvPVbyte_nolen (req->data); 1577 req->ptr1 = SvPVbyte_nolen (req->sv1);
1449 1578
1450 REQ_SEND; 1579 REQ_SEND;
1451} 1580}
1452 1581
1453void 1582void
1454aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1583aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1455 SV * pathname 1584 SV8 * pathname
1456 SV * callback
1457 UV mode 1585 UV mode
1458 UV dev 1586 UV dev
1587 SV * callback
1459 PPCODE: 1588 PPCODE:
1460{ 1589{
1461 dREQ; 1590 dREQ;
1462 1591
1463 req->type = REQ_MKNOD; 1592 req->type = REQ_MKNOD;
1464 req->data = newSVsv (pathname); 1593 req->sv1 = newSVsv (pathname);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1594 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 req->mode = (mode_t)mode; 1595 req->mode = (mode_t)mode;
1467 req->offset = dev; 1596 req->offs = dev;
1468 1597
1469 REQ_SEND; 1598 REQ_SEND;
1470} 1599}
1471 1600
1472void 1601void
1473aio_busy (delay,callback=&PL_sv_undef) 1602aio_busy (delay,callback=&PL_sv_undef)
1474 double delay 1603 double delay
1475 SV * callback 1604 SV * callback
1476 PPCODE: 1605 PPCODE:
1477{ 1606{
1478 dREQ; 1607 dREQ;
1479 1608
1480 req->type = REQ_BUSY; 1609 req->type = REQ_BUSY;
1481 req->fd = delay < 0. ? 0 : delay; 1610 req->int1 = delay < 0. ? 0 : delay;
1482 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1611 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1483 1612
1484 REQ_SEND; 1613 REQ_SEND;
1485} 1614}
1486 1615
1487void 1616void
… …
1491 PPCODE: 1620 PPCODE:
1492{ 1621{
1493 dREQ; 1622 dREQ;
1494 1623
1495 req->type = REQ_GROUP; 1624 req->type = REQ_GROUP;
1625
1496 req_send (req); 1626 req_send (req);
1497
1498 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1627 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1499} 1628}
1500 1629
1501void 1630void
1502aio_nop (callback=&PL_sv_undef) 1631aio_nop (callback=&PL_sv_undef)
1503 SV * callback 1632 SV * callback
1504 PPCODE: 1633 PPCODE:
1505{ 1634{
1506 dREQ; 1635 dREQ;
1507 1636
1508 req->type = REQ_NOP; 1637 req->type = REQ_NOP;
… …
1537 PROTOTYPE: 1666 PROTOTYPE:
1538 CODE: 1667 CODE:
1539 while (nreqs) 1668 while (nreqs)
1540 { 1669 {
1541 poll_wait (); 1670 poll_wait ();
1542 poll_cb (0); 1671 poll_cb ();
1543 } 1672 }
1544 1673
1545void 1674int
1546poll() 1675poll()
1547 PROTOTYPE: 1676 PROTOTYPE:
1548 CODE: 1677 CODE:
1549 if (nreqs)
1550 {
1551 poll_wait (); 1678 poll_wait ();
1552 poll_cb (0); 1679 RETVAL = poll_cb ();
1553 } 1680 OUTPUT:
1681 RETVAL
1554 1682
1555int 1683int
1556poll_fileno() 1684poll_fileno()
1557 PROTOTYPE: 1685 PROTOTYPE:
1558 CODE: 1686 CODE:
… …
1562 1690
1563int 1691int
1564poll_cb(...) 1692poll_cb(...)
1565 PROTOTYPE: 1693 PROTOTYPE:
1566 CODE: 1694 CODE:
1567 RETVAL = poll_cb (0); 1695 RETVAL = poll_cb ();
1568 OUTPUT:
1569 RETVAL
1570
1571int
1572poll_some(int max = 0)
1573 PROTOTYPE: $
1574 CODE:
1575 RETVAL = poll_cb (max);
1576 OUTPUT: 1696 OUTPUT:
1577 RETVAL 1697 RETVAL
1578 1698
1579void 1699void
1580poll_wait() 1700poll_wait()
1581 PROTOTYPE: 1701 PROTOTYPE:
1582 CODE: 1702 CODE:
1583 if (nreqs)
1584 poll_wait (); 1703 poll_wait ();
1704
1705void
1706setsig (int signum = SIGIO)
1707 PROTOTYPE: ;$
1708 CODE:
1709{
1710 if (block_sig_level)
1711 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1712
1713 LOCK (reslock);
1714 main_tid = pthread_self ();
1715 main_sig = signum;
1716 UNLOCK (reslock);
1717
1718 if (main_sig && npending)
1719 pthread_kill (main_tid, main_sig);
1720}
1721
1722void
1723aio_block (SV *cb)
1724 PROTOTYPE: &
1725 PPCODE:
1726{
1727 int count;
1728
1729 block_sig ();
1730 PUSHMARK (SP);
1731 PUTBACK;
1732 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1733 SPAGAIN;
1734 unblock_sig ();
1735
1736 if (SvTRUE (ERRSV))
1737 croak (0);
1738
1739 XSRETURN (count);
1740}
1585 1741
1586int 1742int
1587nreqs() 1743nreqs()
1588 PROTOTYPE: 1744 PROTOTYPE:
1589 CODE: 1745 CODE:
… …
1605 CODE: 1761 CODE:
1606 RETVAL = get_npending (); 1762 RETVAL = get_npending ();
1607 OUTPUT: 1763 OUTPUT:
1608 RETVAL 1764 RETVAL
1609 1765
1766int
1767nthreads()
1768 PROTOTYPE:
1769 CODE:
1770 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1771 RETVAL = started;
1772 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1773 OUTPUT:
1774 RETVAL
1775
1610PROTOTYPES: DISABLE 1776PROTOTYPES: DISABLE
1611 1777
1612MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1778MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1613 1779
1614void 1780void
… …
1629 PPCODE: 1795 PPCODE:
1630{ 1796{
1631 int i; 1797 int i;
1632 aio_req req; 1798 aio_req req;
1633 1799
1800 if (main_sig && !block_sig_level)
1801 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1802
1634 if (grp->fd == 2) 1803 if (grp->int1 == 2)
1635 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1804 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1636 1805
1637 for (i = 1; i < items; ++i ) 1806 for (i = 1; i < items; ++i )
1638 { 1807 {
1639 if (GIMME_V != G_VOID) 1808 if (GIMME_V != G_VOID)
… …
1641 1810
1642 req = SvAIO_REQ (ST (i)); 1811 req = SvAIO_REQ (ST (i));
1643 1812
1644 if (req) 1813 if (req)
1645 { 1814 {
1646 ++grp->length; 1815 ++grp->size;
1647 req->grp = grp; 1816 req->grp = grp;
1648 1817
1649 req->grp_prev = 0; 1818 req->grp_prev = 0;
1650 req->grp_next = grp->grp_first; 1819 req->grp_next = grp->grp_first;
1651 1820
… …
1674 av = newAV (); 1843 av = newAV ();
1675 1844
1676 for (i = 1; i < items; ++i ) 1845 for (i = 1; i < items; ++i )
1677 av_push (av, newSVsv (ST (i))); 1846 av_push (av, newSVsv (ST (i)));
1678 1847
1679 SvREFCNT_dec (grp->data); 1848 SvREFCNT_dec (grp->sv1);
1680 grp->data = (SV *)av; 1849 grp->sv1 = (SV *)av;
1681} 1850}
1682 1851
1683void 1852void
1684errno (aio_req grp, int errorno = errno) 1853errno (aio_req grp, int errorno = errno)
1685 CODE: 1854 CODE:
1686 grp->errorno = errorno; 1855 grp->errorno = errorno;
1687 1856
1688void 1857void
1689limit (aio_req grp, int limit) 1858limit (aio_req grp, int limit)
1690 CODE: 1859 CODE:
1691 grp->fd2 = limit; 1860 grp->int2 = limit;
1692 aio_grp_feed (grp); 1861 aio_grp_feed (grp);
1693 1862
1694void 1863void
1695feed (aio_req grp, SV *callback=&PL_sv_undef) 1864feed (aio_req grp, SV *callback=&PL_sv_undef)
1696 CODE: 1865 CODE:
1697{ 1866{
1698 SvREFCNT_dec (grp->fh2); 1867 SvREFCNT_dec (grp->sv2);
1699 grp->fh2 = newSVsv (callback); 1868 grp->sv2 = newSVsv (callback);
1700 1869
1701 if (grp->fd2 <= 0) 1870 if (grp->int2 <= 0)
1702 grp->fd2 = 2; 1871 grp->int2 = 2;
1703 1872
1704 aio_grp_feed (grp); 1873 aio_grp_feed (grp);
1705} 1874}
1706 1875

Diff Legend

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