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

Diff Legend

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