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.79 by root, Thu Oct 26 16:28:33 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_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;
150static volatile unsigned int nreqs, nready, npending;
151static volatile unsigned int max_outstanding = 0xffffffff;
152static int respipe [2];
153
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 168
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;
198 wrk->prev->next = wrk->next; 204 wrk->prev->next = wrk->next;
199 205
200 free (wrk); 206 free (wrk);
201} 207}
202 208
209static volatile unsigned int nreqs, nready, npending;
210static volatile unsigned int max_idle = 4;
211static volatile unsigned int max_outstanding = 0xffffffff;
212static int respipe [2];
213
203static pthread_mutex_t reslock = AIO_MUTEX_INIT; 214static mutex_t reslock = MUTEX_INIT;
204static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 215static mutex_t reqlock = MUTEX_INIT;
205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 216static cond_t reqwait = COND_INIT;
217
218#if WORDACCESS_UNSAFE
219
220static unsigned int get_nready ()
221{
222 unsigned int retval;
223
224 LOCK (reqlock);
225 retval = nready;
226 UNLOCK (reqlock);
227
228 return retval;
229}
230
231static unsigned int get_npending ()
232{
233 unsigned int retval;
234
235 LOCK (reslock);
236 retval = npending;
237 UNLOCK (reslock);
238
239 return retval;
240}
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
253#else
254
255# define get_nready() nready
256# define get_npending() npending
257# define get_nthreads() started
258
259#endif
206 260
207/* 261/*
208 * a somewhat faster data structure might be nice, but 262 * a somewhat faster data structure might be nice, but
209 * with 8 priorities this actually needs <20 insns 263 * with 8 priorities this actually needs <20 insns
210 * per shift, the most expensive operation. 264 * per shift, the most expensive operation.
256 } 310 }
257 311
258 abort (); 312 abort ();
259} 313}
260 314
261static int poll_cb (int max); 315static int poll_cb ();
262static void req_invoke (aio_req req); 316static int req_invoke (aio_req req);
263static void req_free (aio_req req); 317static void req_free (aio_req req);
264static void req_cancel (aio_req req); 318static void req_cancel (aio_req req);
265 319
266/* must be called at most once */ 320/* must be called at most once */
267static SV *req_sv (aio_req req, const char *klass) 321static SV *req_sv (aio_req req, const char *klass)
287 return mg ? (aio_req)mg->mg_ptr : 0; 341 return mg ? (aio_req)mg->mg_ptr : 0;
288} 342}
289 343
290static void aio_grp_feed (aio_req grp) 344static void aio_grp_feed (aio_req grp)
291{ 345{
346 block_sig ();
347
292 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 348 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
293 { 349 {
294 int old_len = grp->length; 350 int old_len = grp->size;
295 351
296 if (grp->fh2 && SvOK (grp->fh2)) 352 if (grp->sv2 && SvOK (grp->sv2))
297 { 353 {
298 dSP; 354 dSP;
299 355
300 ENTER; 356 ENTER;
301 SAVETMPS; 357 SAVETMPS;
302 PUSHMARK (SP); 358 PUSHMARK (SP);
303 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 359 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
304 PUTBACK; 360 PUTBACK;
305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 361 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
306 SPAGAIN; 362 SPAGAIN;
307 FREETMPS; 363 FREETMPS;
308 LEAVE; 364 LEAVE;
309 } 365 }
310 366
311 /* stop if no progress has been made */ 367 /* stop if no progress has been made */
312 if (old_len == grp->length) 368 if (old_len == grp->size)
313 { 369 {
314 SvREFCNT_dec (grp->fh2); 370 SvREFCNT_dec (grp->sv2);
315 grp->fh2 = 0; 371 grp->sv2 = 0;
316 break; 372 break;
317 } 373 }
318 } 374 }
375
376 unblock_sig ();
319} 377}
320 378
321static void aio_grp_dec (aio_req grp) 379static void aio_grp_dec (aio_req grp)
322{ 380{
323 --grp->length; 381 --grp->size;
324 382
325 /* call feeder, if applicable */ 383 /* call feeder, if applicable */
326 aio_grp_feed (grp); 384 aio_grp_feed (grp);
327 385
328 /* finish, if done */ 386 /* finish, if done */
329 if (!grp->length && grp->fd) 387 if (!grp->size && grp->int1)
330 { 388 {
389 block_sig ();
390
331 req_invoke (grp); 391 if (!req_invoke (grp))
392 {
393 req_free (grp);
394 unblock_sig ();
395 croak (0);
396 }
397
332 req_free (grp); 398 req_free (grp);
399 unblock_sig ();
333 } 400 }
334} 401}
335 402
336static void poll_wait ()
337{
338 fd_set rfd;
339
340 while (nreqs)
341 {
342 int size;
343 if (WORDREAD_UNSAFE) LOCK (reslock);
344 size = res_queue.size;
345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
346
347 if (size)
348 return;
349
350 FD_ZERO(&rfd);
351 FD_SET(respipe [0], &rfd);
352
353 select (respipe [0] + 1, &rfd, 0, 0, 0);
354 }
355}
356
357static void req_invoke (aio_req req) 403static int req_invoke (aio_req req)
358{ 404{
359 dSP; 405 dSP;
406
407 if (req->flags & FLAG_SV1_RO_OFF)
408 SvREADONLY_off (req->sv1);
360 409
361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 410 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
362 { 411 {
363 ENTER; 412 ENTER;
364 SAVETMPS; 413 SAVETMPS;
372 SV *rv = &PL_sv_undef; 421 SV *rv = &PL_sv_undef;
373 422
374 if (req->result >= 0) 423 if (req->result >= 0)
375 { 424 {
376 int i; 425 int i;
377 char *buf = req->data2ptr; 426 char *buf = req->ptr2;
378 AV *av = newAV (); 427 AV *av = newAV ();
379 428
380 av_extend (av, req->result - 1); 429 av_extend (av, req->result - 1);
381 430
382 for (i = 0; i < req->result; ++i) 431 for (i = 0; i < req->result; ++i)
402 PUSHs (sv_2mortal (newSViv (req->result))); 451 PUSHs (sv_2mortal (newSViv (req->result)));
403 PUTBACK; 452 PUTBACK;
404 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 453 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
405 SPAGAIN; 454 SPAGAIN;
406 455
407 fh = SvREFCNT_inc (POPs); 456 fh = POPs;
408
409 PUSHMARK (SP); 457 PUSHMARK (SP);
410 XPUSHs (sv_2mortal (fh)); 458 XPUSHs (fh);
411 } 459 }
412 break; 460 break;
413 461
414 case REQ_GROUP: 462 case REQ_GROUP:
415 req->fd = 2; /* mark group as finished */ 463 req->int1 = 2; /* mark group as finished */
416 464
417 if (req->data) 465 if (req->sv1)
418 { 466 {
419 int i; 467 int i;
420 AV *av = (AV *)req->data; 468 AV *av = (AV *)req->sv1;
421 469
422 EXTEND (SP, AvFILL (av) + 1); 470 EXTEND (SP, AvFILL (av) + 1);
423 for (i = 0; i <= AvFILL (av); ++i) 471 for (i = 0; i <= AvFILL (av); ++i)
424 PUSHs (*av_fetch (av, i, 0)); 472 PUSHs (*av_fetch (av, i, 0));
425 } 473 }
427 475
428 case REQ_NOP: 476 case REQ_NOP:
429 case REQ_BUSY: 477 case REQ_BUSY:
430 break; 478 break;
431 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
432 default: 504 default:
433 PUSHs (sv_2mortal (newSViv (req->result))); 505 PUSHs (sv_2mortal (newSViv (req->result)));
434 break; 506 break;
435 } 507 }
436 508
456 grp->grp_first = req->grp_next; 528 grp->grp_first = req->grp_next;
457 529
458 aio_grp_dec (grp); 530 aio_grp_dec (grp);
459 } 531 }
460 532
461 if (SvTRUE (ERRSV)) 533 return !SvTRUE (ERRSV);
462 {
463 req_free (req);
464 croak (0);
465 }
466} 534}
467 535
468static void req_free (aio_req req) 536static void req_free (aio_req req)
469{ 537{
470 if (req->self) 538 if (req->self)
471 { 539 {
472 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
473 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
474 } 542 }
475 543
476 SvREFCNT_dec (req->data);
477 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
478 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
479 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
480 Safefree (req->statdata);
481 548
482 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
483 free (req->data2ptr); 550 free (req->ptr2);
484 551
485 Safefree (req); 552 Safefree (req);
486} 553}
487 554
488static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
490 aio_req sub; 557 aio_req sub;
491 558
492 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
493 return; 560 return;
494 561
495 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
496 grp->fh2 = 0; 563 grp->sv2 = 0;
497 564
498 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub); 566 req_cancel (sub);
500} 567}
501 568
504 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
505 572
506 req_cancel_subs (req); 573 req_cancel_subs (req);
507} 574}
508 575
509static int poll_cb (int max)
510{
511 dSP;
512 int count = 0;
513 int do_croak = 0;
514 aio_req req;
515
516 for (;;)
517 {
518 while (max <= 0 || count < max)
519 {
520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
522
523 if (req)
524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
529 /* read any signals sent by the worker threads */
530 char buf [32];
531 while (read (respipe [0], buf, 32) == 32)
532 ;
533 }
534 }
535
536 UNLOCK (reslock);
537
538 if (!req)
539 break;
540
541 --nreqs;
542
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length)
546 {
547 req->fd = 1; /* mark request as delayed */
548 continue;
549 }
550 else
551 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req);
566
567 count++;
568 }
569
570 req_free (req);
571 }
572
573 if (nreqs <= max_outstanding)
574 break;
575
576 poll_wait ();
577
578 max = 0;
579 }
580
581 return count;
582}
583
584static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
585 577
586static void start_thread (void) 578static void start_thread (void)
587{ 579{
588 sigset_t fullsigset, oldsigset;
589 pthread_attr_t attr;
590
591 worker *wrk = calloc (1, sizeof (worker)); 580 worker *wrk = calloc (1, sizeof (worker));
592 581
593 if (!wrk) 582 if (!wrk)
594 croak ("unable to allocate worker thread data"); 583 croak ("unable to allocate worker thread data");
595 584
596 pthread_attr_init (&attr);
597 pthread_attr_setstacksize (&attr, STACKSIZE);
598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
599
600 sigfillset (&fullsigset);
601
602 LOCK (wrklock); 585 LOCK (wrklock);
603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
604 586
605 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 587 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
606 { 588 {
607 wrk->prev = &wrk_first; 589 wrk->prev = &wrk_first;
608 wrk->next = wrk_first.next; 590 wrk->next = wrk_first.next;
609 wrk_first.next->prev = wrk; 591 wrk_first.next->prev = wrk;
610 wrk_first.next = wrk; 592 wrk_first.next = wrk;
611 ++started; 593 ++started;
612 } 594 }
613 else 595 else
614 free (wrk); 596 free (wrk);
615 597
616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock); 598 UNLOCK (wrklock);
618} 599}
619 600
601static void maybe_start_thread ()
602{
603 if (get_nthreads () >= wanted)
604 return;
605
606 /* todo: maybe use idle here, but might be less exact */
607 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
608 return;
609
610 start_thread ();
611}
612
620static void req_send (aio_req req) 613static void req_send (aio_req req)
621{ 614{
622 while (started < wanted && nreqs >= started) 615 block_sig ();
623 start_thread ();
624 616
625 ++nreqs; 617 ++nreqs;
626 618
627 LOCK (reqlock); 619 LOCK (reqlock);
628 ++nready; 620 ++nready;
629 reqq_push (&req_queue, req); 621 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait); 622 COND_SIGNAL (reqwait);
631 UNLOCK (reqlock); 623 UNLOCK (reqlock);
624
625 unblock_sig ();
626
627 maybe_start_thread ();
632} 628}
633 629
634static void end_thread (void) 630static void end_thread (void)
635{ 631{
636 aio_req req; 632 aio_req req;
638 Newz (0, req, 1, aio_cb); 634 Newz (0, req, 1, aio_cb);
639 635
640 req->type = REQ_QUIT; 636 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS; 637 req->pri = PRI_MAX + PRI_BIAS;
642 638
643 req_send (req); 639 LOCK (reqlock);
640 reqq_push (&req_queue, req);
641 COND_SIGNAL (reqwait);
642 UNLOCK (reqlock);
643
644 LOCK (wrklock);
645 --started;
646 UNLOCK (wrklock);
647}
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);
644} 654}
645 655
646static void min_parallel (int nthreads) 656static void min_parallel (int nthreads)
647{ 657{
648 if (wanted < nthreads) 658 if (wanted < nthreads)
649 wanted = nthreads; 659 wanted = nthreads;
650} 660}
651 661
652static void max_parallel (int nthreads) 662static void max_parallel (int nthreads)
653{ 663{
654 int cur = started;
655
656 if (wanted > nthreads) 664 if (wanted > nthreads)
657 wanted = nthreads; 665 wanted = nthreads;
658 666
659 while (cur > wanted) 667 while (started > wanted)
668 end_thread ();
669}
670
671static void poll_wait ()
672{
673 fd_set rfd;
674
675 while (nreqs)
660 { 676 {
677 int size;
678 if (WORDACCESS_UNSAFE) LOCK (reslock);
679 size = res_queue.size;
680 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
681
682 if (size)
683 return;
684
661 end_thread (); 685 maybe_start_thread ();
662 cur--; 686
687 FD_ZERO(&rfd);
688 FD_SET(respipe [0], &rfd);
689
690 select (respipe [0] + 1, &rfd, 0, 0, 0);
663 } 691 }
692}
664 693
665 while (started > wanted) 694static int poll_cb ()
695{
696 dSP;
697 int count = 0;
698 int maxreqs = max_poll_reqs;
699 int do_croak = 0;
700 struct timeval tv_start, tv_now;
701 aio_req req;
702
703 if (max_poll_time)
704 gettimeofday (&tv_start, 0);
705
706 block_sig ();
707
708 for (;;)
666 { 709 {
710 for (;;)
711 {
712 maybe_start_thread ();
713
714 LOCK (reslock);
715 req = reqq_shift (&res_queue);
716
717 if (req)
718 {
719 --npending;
720
721 if (!res_queue.size)
722 {
723 /* read any signals sent by the worker threads */
724 char buf [4];
725 while (read (respipe [0], buf, 4) == 4)
726 ;
727 }
728 }
729
730 UNLOCK (reslock);
731
732 if (!req)
733 break;
734
735 --nreqs;
736
737 if (req->type == REQ_GROUP && req->size)
738 {
739 req->int1 = 1; /* mark request as delayed */
740 continue;
741 }
742 else
743 {
744 if (!req_invoke (req))
745 {
746 req_free (req);
747 unblock_sig ();
748 croak (0);
749 }
750
751 count++;
752 }
753
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 }
766 }
767
768 if (nreqs <= max_outstanding)
769 break;
770
667 poll_wait (); 771 poll_wait ();
668 poll_cb (0); 772
773 ++maxreqs;
669 } 774 }
775
776 unblock_sig ();
777 return count;
670} 778}
671 779
672static void create_pipe () 780static void create_pipe ()
673{ 781{
674 if (pipe (respipe)) 782 if (pipe (respipe))
691/* 799/*
692 * make our pread/pwrite safe against themselves, but not against 800 * make our pread/pwrite safe against themselves, but not against
693 * 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,
694 * but that's your problem, not mine. 802 * but that's your problem, not mine.
695 */ 803 */
696static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 804static mutex_t preadwritelock = MUTEX_INIT;
697 805
698static 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)
699{ 807{
700 ssize_t res; 808 ssize_t res;
701 off_t ooffset; 809 off_t ooffset;
752#endif 860#endif
753 861
754#if !HAVE_READDIR_R 862#if !HAVE_READDIR_R
755# define readdir_r aio_readdir_r 863# define readdir_r aio_readdir_r
756 864
757static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 865static mutex_t readdirlock = MUTEX_INIT;
758 866
759static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 867static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
760{ 868{
761 struct dirent *e; 869 struct dirent *e;
762 int errorno; 870 int errorno;
889 int memofs = 0; 997 int memofs = 0;
890 int res = 0; 998 int res = 0;
891 int errorno; 999 int errorno;
892 1000
893 LOCK (wrklock); 1001 LOCK (wrklock);
894 self->dirp = dirp = opendir (req->dataptr); 1002 self->dirp = dirp = opendir (req->ptr1);
895 self->dbuf = u = malloc (sizeof (*u)); 1003 self->dbuf = u = malloc (sizeof (*u));
1004 req->flags |= FLAG_PTR2_FREE;
896 req->data2ptr = names = malloc (memlen); 1005 req->ptr2 = names = malloc (memlen);
897 UNLOCK (wrklock); 1006 UNLOCK (wrklock);
898 1007
899 if (dirp && u && names) 1008 if (dirp && u && names)
900 for (;;) 1009 for (;;)
901 { 1010 {
915 1024
916 while (memofs + len > memlen) 1025 while (memofs + len > memlen)
917 { 1026 {
918 memlen *= 2; 1027 memlen *= 2;
919 LOCK (wrklock); 1028 LOCK (wrklock);
920 req->data2ptr = names = realloc (names, memlen); 1029 req->ptr2 = names = realloc (names, memlen);
921 UNLOCK (wrklock); 1030 UNLOCK (wrklock);
922 1031
923 if (!names) 1032 if (!names)
924 break; 1033 break;
925 } 1034 }
938/*****************************************************************************/ 1047/*****************************************************************************/
939 1048
940static void *aio_proc (void *thr_arg) 1049static void *aio_proc (void *thr_arg)
941{ 1050{
942 aio_req req; 1051 aio_req req;
943 int type; 1052 struct timespec ts;
944 worker *self = (worker *)thr_arg; 1053 worker *self = (worker *)thr_arg;
945 1054
946 do 1055 /* try to distribute timeouts somewhat evenly */
1056 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1057 * (1000000000UL / 1024UL);
1058
1059 for (;;)
947 { 1060 {
1061 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1062
948 LOCK (reqlock); 1063 LOCK (reqlock);
949 1064
950 for (;;) 1065 for (;;)
951 { 1066 {
952 self->req = req = reqq_shift (&req_queue); 1067 self->req = req = reqq_shift (&req_queue);
953 1068
954 if (req) 1069 if (req)
955 break; 1070 break;
956 1071
957 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;
958 } 1093 }
959 1094
960 --nready; 1095 --nready;
961 1096
962 UNLOCK (reqlock); 1097 UNLOCK (reqlock);
963 1098
964 errno = 0; /* strictly unnecessary */ 1099 errno = 0; /* strictly unnecessary */
965 type = req->type; /* remember type for QUIT check */
966 1100
967 if (!(req->flags & FLAG_CANCELLED)) 1101 if (!(req->flags & FLAG_CANCELLED))
968 switch (type) 1102 switch (req->type)
969 { 1103 {
970 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;
971 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;
972 1106
973 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;
974 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;
975 1109
976 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;
977 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;
978 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;
979 1113
980 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;
981 case REQ_CLOSE: req->result = close (req->fd); break; 1115 case REQ_CLOSE: req->result = close (req->int1); break;
982 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1116 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
983 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;
984 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
987 1124
988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
989 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
990 case REQ_READDIR: scandir_ (req, self); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
991 1128
992 case REQ_BUSY: 1129 case REQ_BUSY:
993 { 1130 {
994 struct timeval tv; 1131 struct timeval tv;
995 1132
996 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
997 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
998 1135
999 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
1000 } 1137 }
1001 1138
1002 case REQ_GROUP: 1139 case REQ_GROUP:
1003 case REQ_NOP: 1140 case REQ_NOP:
1141 break;
1142
1004 case REQ_QUIT: 1143 case REQ_QUIT:
1005 break; 1144 goto quit;
1006 1145
1007 default: 1146 default:
1008 req->result = ENOSYS; 1147 req->result = ENOSYS;
1009 break; 1148 break;
1010 } 1149 }
1014 LOCK (reslock); 1153 LOCK (reslock);
1015 1154
1016 ++npending; 1155 ++npending;
1017 1156
1018 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
1158 {
1019 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
1020 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 }
1021 1166
1022 self->req = 0; 1167 self->req = 0;
1023 worker_clear (self); 1168 worker_clear (self);
1024 1169
1025 UNLOCK (reslock); 1170 UNLOCK (reslock);
1026 } 1171 }
1027 while (type != REQ_QUIT);
1028 1172
1173quit:
1029 LOCK (wrklock); 1174 LOCK (wrklock);
1030 worker_free (self); 1175 worker_free (self);
1031 UNLOCK (wrklock); 1176 UNLOCK (wrklock);
1032 1177
1033 return 0; 1178 return 0;
1080 1225
1081 worker_clear (wrk); 1226 worker_clear (wrk);
1082 worker_free (wrk); 1227 worker_free (wrk);
1083 } 1228 }
1084 1229
1085 started = 0; 1230 started = 0;
1231 idle = 0;
1086 nreqs = 0; 1232 nreqs = 0;
1233 nready = 0;
1234 npending = 0;
1087 1235
1088 close (respipe [0]); 1236 close (respipe [0]);
1089 close (respipe [1]); 1237 close (respipe [1]);
1090 create_pipe (); 1238 create_pipe ();
1091 1239
1118PROTOTYPES: ENABLE 1266PROTOTYPES: ENABLE
1119 1267
1120BOOT: 1268BOOT:
1121{ 1269{
1122 HV *stash = gv_stashpv ("IO::AIO", 1); 1270 HV *stash = gv_stashpv ("IO::AIO", 1);
1271
1123 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1272 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1124 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1273 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1125 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1274 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1275 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1276 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1277 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1278 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1126 1279
1127 create_pipe (); 1280 create_pipe ();
1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1281 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1129} 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;
1130 1295
1131void 1296void
1132min_parallel (int nthreads) 1297min_parallel (int nthreads)
1133 PROTOTYPE: $ 1298 PROTOTYPE: $
1134 1299
1135void 1300void
1136max_parallel (int nthreads) 1301max_parallel (int nthreads)
1137 PROTOTYPE: $ 1302 PROTOTYPE: $
1303
1304void
1305max_idle (int nthreads)
1306 PROTOTYPE: $
1307 CODE:
1308 set_max_idle (nthreads);
1138 1309
1139int 1310int
1140max_outstanding (int maxreqs) 1311max_outstanding (int maxreqs)
1141 PROTOTYPE: $ 1312 PROTOTYPE: $
1142 CODE: 1313 CODE:
1145 OUTPUT: 1316 OUTPUT:
1146 RETVAL 1317 RETVAL
1147 1318
1148void 1319void
1149aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1320aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1150 SV * pathname 1321 SV8 * pathname
1151 int flags 1322 int flags
1152 int mode 1323 int mode
1153 SV * callback 1324 SV * callback
1154 PROTOTYPE: $$$;$ 1325 PROTOTYPE: $$$;$
1155 PPCODE: 1326 PPCODE:
1156{ 1327{
1157 dREQ; 1328 dREQ;
1158 1329
1159 req->type = REQ_OPEN; 1330 req->type = REQ_OPEN;
1160 req->data = newSVsv (pathname); 1331 req->sv1 = newSVsv (pathname);
1161 req->dataptr = SvPVbyte_nolen (req->data); 1332 req->ptr1 = SvPVbyte_nolen (req->sv1);
1162 req->fd = flags; 1333 req->int1 = flags;
1163 req->mode = mode; 1334 req->mode = mode;
1164 1335
1165 REQ_SEND; 1336 REQ_SEND;
1166} 1337}
1167 1338
1177 PPCODE: 1348 PPCODE:
1178{ 1349{
1179 dREQ; 1350 dREQ;
1180 1351
1181 req->type = ix; 1352 req->type = ix;
1182 req->fh = newSVsv (fh); 1353 req->fh = newSVsv (fh);
1183 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1354 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1184 1355
1185 REQ_SEND (req); 1356 REQ_SEND (req);
1186} 1357}
1187 1358
1188void 1359void
1189aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1360aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1190 SV * fh 1361 SV * fh
1191 UV offset 1362 UV offset
1192 UV length 1363 UV length
1193 SV * data 1364 SV8 * data
1194 UV dataoffset 1365 UV dataoffset
1195 SV * callback 1366 SV * callback
1196 ALIAS: 1367 ALIAS:
1197 aio_read = REQ_READ 1368 aio_read = REQ_READ
1198 aio_write = REQ_WRITE 1369 aio_write = REQ_WRITE
1199 PROTOTYPE: $$$$$;$ 1370 PROTOTYPE: $$$$$;$
1200 PPCODE: 1371 PPCODE:
1201{ 1372{
1202 aio_req req;
1203 STRLEN svlen; 1373 STRLEN svlen;
1204 char *svptr = SvPVbyte (data, svlen); 1374 char *svptr = SvPVbyte (data, svlen);
1205 1375
1206 SvUPGRADE (data, SVt_PV); 1376 SvUPGRADE (data, SVt_PV);
1207 SvPOK_on (data); 1377 SvPOK_on (data);
1219 length = svlen - dataoffset; 1389 length = svlen - dataoffset;
1220 } 1390 }
1221 else 1391 else
1222 { 1392 {
1223 /* read: grow scalar as necessary */ 1393 /* read: grow scalar as necessary */
1224 svptr = SvGROW (data, length + dataoffset); 1394 svptr = SvGROW (data, length + dataoffset + 1);
1225 } 1395 }
1226 1396
1227 if (length < 0) 1397 if (length < 0)
1228 croak ("length must not be negative"); 1398 croak ("length must not be negative");
1229 1399
1230 { 1400 {
1231 dREQ; 1401 dREQ;
1232 1402
1233 req->type = ix; 1403 req->type = ix;
1234 req->fh = newSVsv (fh); 1404 req->fh = newSVsv (fh);
1235 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1405 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1236 : IoOFP (sv_2io (fh))); 1406 : IoOFP (sv_2io (fh)));
1237 req->offset = offset; 1407 req->offs = offset;
1238 req->length = length; 1408 req->size = length;
1239 req->data = SvREFCNT_inc (data); 1409 req->sv1 = SvREFCNT_inc (data);
1240 req->dataptr = (char *)svptr + dataoffset; 1410 req->ptr1 = (char *)svptr + dataoffset;
1411 req->stroffset = dataoffset;
1241 1412
1242 if (!SvREADONLY (data)) 1413 if (!SvREADONLY (data))
1243 { 1414 {
1244 SvREADONLY_on (data); 1415 SvREADONLY_on (data);
1245 req->data2ptr = (void *)data; 1416 req->flags |= FLAG_SV1_RO_OFF;
1246 } 1417 }
1247 1418
1248 REQ_SEND; 1419 REQ_SEND;
1249 } 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;
1250} 1443}
1251 1444
1252void 1445void
1253aio_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)
1254 SV * out_fh 1447 SV * out_fh
1260 PPCODE: 1453 PPCODE:
1261{ 1454{
1262 dREQ; 1455 dREQ;
1263 1456
1264 req->type = REQ_SENDFILE; 1457 req->type = REQ_SENDFILE;
1265 req->fh = newSVsv (out_fh); 1458 req->fh = newSVsv (out_fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1459 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1267 req->fh2 = newSVsv (in_fh); 1460 req->sv2 = newSVsv (in_fh);
1268 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1461 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1269 req->offset = in_offset; 1462 req->offs = in_offset;
1270 req->length = length; 1463 req->size = length;
1271 1464
1272 REQ_SEND; 1465 REQ_SEND;
1273} 1466}
1274 1467
1275void 1468void
1282 PPCODE: 1475 PPCODE:
1283{ 1476{
1284 dREQ; 1477 dREQ;
1285 1478
1286 req->type = REQ_READAHEAD; 1479 req->type = REQ_READAHEAD;
1287 req->fh = newSVsv (fh); 1480 req->fh = newSVsv (fh);
1288 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1481 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1289 req->offset = offset; 1482 req->offs = offset;
1290 req->length = length; 1483 req->size = length;
1291 1484
1292 REQ_SEND; 1485 REQ_SEND;
1293} 1486}
1294 1487
1295void 1488void
1296aio_stat (fh_or_path,callback=&PL_sv_undef) 1489aio_stat (fh_or_path,callback=&PL_sv_undef)
1297 SV * fh_or_path 1490 SV8 * fh_or_path
1298 SV * callback 1491 SV * callback
1299 ALIAS: 1492 ALIAS:
1300 aio_stat = REQ_STAT 1493 aio_stat = REQ_STAT
1301 aio_lstat = REQ_LSTAT 1494 aio_lstat = REQ_LSTAT
1302 PPCODE: 1495 PPCODE:
1303{ 1496{
1304 dREQ; 1497 dREQ;
1305 1498
1306 New (0, req->statdata, 1, Stat_t); 1499 req->ptr2 = malloc (sizeof (Stat_t));
1307 if (!req->statdata) 1500 if (!req->ptr2)
1308 { 1501 {
1309 req_free (req); 1502 req_free (req);
1310 croak ("out of memory during aio_req->statdata allocation"); 1503 croak ("out of memory during aio_stat statdata allocation");
1311 } 1504 }
1505
1506 req->flags |= FLAG_PTR2_FREE;
1312 1507
1313 if (SvPOK (fh_or_path)) 1508 if (SvPOK (fh_or_path))
1314 { 1509 {
1315 req->type = ix; 1510 req->type = ix;
1316 req->data = newSVsv (fh_or_path); 1511 req->sv1 = newSVsv (fh_or_path);
1317 req->dataptr = SvPVbyte_nolen (req->data); 1512 req->ptr1 = SvPVbyte_nolen (req->sv1);
1318 } 1513 }
1319 else 1514 else
1320 { 1515 {
1321 req->type = REQ_FSTAT; 1516 req->type = REQ_FSTAT;
1322 req->fh = newSVsv (fh_or_path); 1517 req->fh = newSVsv (fh_or_path);
1323 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1518 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1324 } 1519 }
1325 1520
1326 REQ_SEND; 1521 REQ_SEND;
1327} 1522}
1328 1523
1329void 1524void
1330aio_unlink (pathname,callback=&PL_sv_undef) 1525aio_unlink (pathname,callback=&PL_sv_undef)
1331 SV * pathname 1526 SV8 * pathname
1332 SV * callback 1527 SV * callback
1333 ALIAS: 1528 ALIAS:
1334 aio_unlink = REQ_UNLINK 1529 aio_unlink = REQ_UNLINK
1335 aio_rmdir = REQ_RMDIR 1530 aio_rmdir = REQ_RMDIR
1336 aio_readdir = REQ_READDIR 1531 aio_readdir = REQ_READDIR
1337 PPCODE: 1532 PPCODE:
1338{ 1533{
1339 dREQ; 1534 dREQ;
1340 1535
1341 req->type = ix; 1536 req->type = ix;
1342 req->data = newSVsv (pathname); 1537 req->sv1 = newSVsv (pathname);
1343 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;
1344 1551
1552 req->type = REQ_MKDIR;
1553 req->sv1 = newSVsv (pathname);
1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1555 req->mode = mode;
1556
1345 REQ_SEND; 1557 REQ_SEND;
1346} 1558}
1347 1559
1348void 1560void
1349aio_link (oldpath,newpath,callback=&PL_sv_undef) 1561aio_link (oldpath,newpath,callback=&PL_sv_undef)
1350 SV * oldpath 1562 SV8 * oldpath
1351 SV * newpath 1563 SV8 * newpath
1352 SV * callback 1564 SV * callback
1353 ALIAS: 1565 ALIAS:
1354 aio_link = REQ_LINK 1566 aio_link = REQ_LINK
1355 aio_symlink = REQ_SYMLINK 1567 aio_symlink = REQ_SYMLINK
1356 aio_rename = REQ_RENAME 1568 aio_rename = REQ_RENAME
1357 PPCODE: 1569 PPCODE:
1358{ 1570{
1359 dREQ; 1571 dREQ;
1360 1572
1361 req->type = ix; 1573 req->type = ix;
1362 req->fh = newSVsv (oldpath); 1574 req->fh = newSVsv (oldpath);
1363 req->data2ptr = SvPVbyte_nolen (req->fh); 1575 req->ptr2 = SvPVbyte_nolen (req->fh);
1364 req->data = newSVsv (newpath); 1576 req->sv1 = newSVsv (newpath);
1365 req->dataptr = SvPVbyte_nolen (req->data); 1577 req->ptr1 = SvPVbyte_nolen (req->sv1);
1366 1578
1367 REQ_SEND; 1579 REQ_SEND;
1368} 1580}
1369 1581
1370void 1582void
1583aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1584 SV8 * pathname
1585 UV mode
1586 UV dev
1587 SV * callback
1588 PPCODE:
1589{
1590 dREQ;
1591
1592 req->type = REQ_MKNOD;
1593 req->sv1 = newSVsv (pathname);
1594 req->ptr1 = SvPVbyte_nolen (req->sv1);
1595 req->mode = (mode_t)mode;
1596 req->offs = dev;
1597
1598 REQ_SEND;
1599}
1600
1601void
1371aio_busy (delay,callback=&PL_sv_undef) 1602aio_busy (delay,callback=&PL_sv_undef)
1372 double delay 1603 double delay
1373 SV * callback 1604 SV * callback
1374 PPCODE: 1605 PPCODE:
1375{ 1606{
1376 dREQ; 1607 dREQ;
1377 1608
1378 req->type = REQ_BUSY; 1609 req->type = REQ_BUSY;
1379 req->fd = delay < 0. ? 0 : delay; 1610 req->int1 = delay < 0. ? 0 : delay;
1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1611 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1381 1612
1382 REQ_SEND; 1613 REQ_SEND;
1383} 1614}
1384 1615
1385void 1616void
1389 PPCODE: 1620 PPCODE:
1390{ 1621{
1391 dREQ; 1622 dREQ;
1392 1623
1393 req->type = REQ_GROUP; 1624 req->type = REQ_GROUP;
1625
1394 req_send (req); 1626 req_send (req);
1395
1396 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1627 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1397} 1628}
1398 1629
1399void 1630void
1400aio_nop (callback=&PL_sv_undef) 1631aio_nop (callback=&PL_sv_undef)
1401 SV * callback 1632 SV * callback
1402 PPCODE: 1633 PPCODE:
1403{ 1634{
1404 dREQ; 1635 dREQ;
1405 1636
1406 req->type = REQ_NOP; 1637 req->type = REQ_NOP;
1435 PROTOTYPE: 1666 PROTOTYPE:
1436 CODE: 1667 CODE:
1437 while (nreqs) 1668 while (nreqs)
1438 { 1669 {
1439 poll_wait (); 1670 poll_wait ();
1440 poll_cb (0); 1671 poll_cb ();
1441 } 1672 }
1442 1673
1443void 1674int
1444poll() 1675poll()
1445 PROTOTYPE: 1676 PROTOTYPE:
1446 CODE: 1677 CODE:
1447 if (nreqs)
1448 {
1449 poll_wait (); 1678 poll_wait ();
1450 poll_cb (0); 1679 RETVAL = poll_cb ();
1451 } 1680 OUTPUT:
1681 RETVAL
1452 1682
1453int 1683int
1454poll_fileno() 1684poll_fileno()
1455 PROTOTYPE: 1685 PROTOTYPE:
1456 CODE: 1686 CODE:
1460 1690
1461int 1691int
1462poll_cb(...) 1692poll_cb(...)
1463 PROTOTYPE: 1693 PROTOTYPE:
1464 CODE: 1694 CODE:
1465 RETVAL = poll_cb (0); 1695 RETVAL = poll_cb ();
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1474 OUTPUT: 1696 OUTPUT:
1475 RETVAL 1697 RETVAL
1476 1698
1477void 1699void
1478poll_wait() 1700poll_wait()
1479 PROTOTYPE: 1701 PROTOTYPE:
1480 CODE: 1702 CODE:
1481 if (nreqs)
1482 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}
1483 1741
1484int 1742int
1485nreqs() 1743nreqs()
1486 PROTOTYPE: 1744 PROTOTYPE:
1487 CODE: 1745 CODE:
1491 1749
1492int 1750int
1493nready() 1751nready()
1494 PROTOTYPE: 1752 PROTOTYPE:
1495 CODE: 1753 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready; 1754 RETVAL = get_nready ();
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT: 1755 OUTPUT:
1500 RETVAL 1756 RETVAL
1501 1757
1502int 1758int
1503npending() 1759npending()
1504 PROTOTYPE: 1760 PROTOTYPE:
1505 CODE: 1761 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending; 1762 RETVAL = get_npending ();
1763 OUTPUT:
1764 RETVAL
1765
1766int
1767nthreads()
1768 PROTOTYPE:
1769 CODE:
1770 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1771 RETVAL = started;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock); 1772 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1509 OUTPUT: 1773 OUTPUT:
1510 RETVAL 1774 RETVAL
1511 1775
1512PROTOTYPES: DISABLE 1776PROTOTYPES: DISABLE
1513 1777
1531 PPCODE: 1795 PPCODE:
1532{ 1796{
1533 int i; 1797 int i;
1534 aio_req req; 1798 aio_req req;
1535 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
1536 if (grp->fd == 2) 1803 if (grp->int1 == 2)
1537 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");
1538 1805
1539 for (i = 1; i < items; ++i ) 1806 for (i = 1; i < items; ++i )
1540 { 1807 {
1541 if (GIMME_V != G_VOID) 1808 if (GIMME_V != G_VOID)
1543 1810
1544 req = SvAIO_REQ (ST (i)); 1811 req = SvAIO_REQ (ST (i));
1545 1812
1546 if (req) 1813 if (req)
1547 { 1814 {
1548 ++grp->length; 1815 ++grp->size;
1549 req->grp = grp; 1816 req->grp = grp;
1550 1817
1551 req->grp_prev = 0; 1818 req->grp_prev = 0;
1552 req->grp_next = grp->grp_first; 1819 req->grp_next = grp->grp_first;
1553 1820
1576 av = newAV (); 1843 av = newAV ();
1577 1844
1578 for (i = 1; i < items; ++i ) 1845 for (i = 1; i < items; ++i )
1579 av_push (av, newSVsv (ST (i))); 1846 av_push (av, newSVsv (ST (i)));
1580 1847
1581 SvREFCNT_dec (grp->data); 1848 SvREFCNT_dec (grp->sv1);
1582 grp->data = (SV *)av; 1849 grp->sv1 = (SV *)av;
1583} 1850}
1584 1851
1585void 1852void
1586errno (aio_req grp, int errorno = errno) 1853errno (aio_req grp, int errorno = errno)
1587 CODE: 1854 CODE:
1588 grp->errorno = errorno; 1855 grp->errorno = errorno;
1589 1856
1590void 1857void
1591limit (aio_req grp, int limit) 1858limit (aio_req grp, int limit)
1592 CODE: 1859 CODE:
1593 grp->fd2 = limit; 1860 grp->int2 = limit;
1594 aio_grp_feed (grp); 1861 aio_grp_feed (grp);
1595 1862
1596void 1863void
1597feed (aio_req grp, SV *callback=&PL_sv_undef) 1864feed (aio_req grp, SV *callback=&PL_sv_undef)
1598 CODE: 1865 CODE:
1599{ 1866{
1600 SvREFCNT_dec (grp->fh2); 1867 SvREFCNT_dec (grp->sv2);
1601 grp->fh2 = newSVsv (callback); 1868 grp->sv2 = newSVsv (callback);
1602 1869
1603 if (grp->fd2 <= 0) 1870 if (grp->int2 <= 0)
1604 grp->fd2 = 2; 1871 grp->int2 = 2;
1605 1872
1606 aio_grp_feed (grp); 1873 aio_grp_feed (grp);
1607} 1874}
1608 1875

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines