ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC vs.
Revision 1.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
5# define _GNU_SOURCE
6#endif
7
8#define _REENTRANT 1
9 2
10#include <errno.h> 3#include <errno.h>
11 4
12#include "EXTERN.h" 5#include "EXTERN.h"
13#include "perl.h" 6#include "perl.h"
14#include "XSUB.h" 7#include "XSUB.h"
15 8
16#include "autoconf/config.h" 9#include "autoconf/config.h"
17 10
18#include <pthread.h>
19
20#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
21#include <errno.h> 13#include <errno.h>
22#include <sys/time.h> 14#include <sys/time.h>
23#include <sys/select.h> 15#include <sys/select.h>
24#include <sys/types.h> 16#include <sys/types.h>
25#include <sys/stat.h> 17#include <sys/stat.h>
42# else 34# else
43# error sendfile support requested but not available 35# error sendfile support requested but not available
44# endif 36# endif
45#endif 37#endif
46 38
39/* number of seconds after which idle threads exit */
40#define IDLE_TIMEOUT 10
41
47/* used for struct dirent, AIX doesn't provide it */ 42/* used for struct dirent, AIX doesn't provide it */
48#ifndef NAME_MAX 43#ifndef NAME_MAX
49# define NAME_MAX 4096 44# define NAME_MAX 4096
50#endif
51
52#if __ia64
53# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN
56#else
57# define STACKSIZE 16384
58#endif 45#endif
59 46
60/* buffer size for various temporary buffers */ 47/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 48#define AIO_BUFSIZE 65536
62 49
66 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 53 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
67 UNLOCK (wrklock); \ 54 UNLOCK (wrklock); \
68 if (!aio_buf) \ 55 if (!aio_buf) \
69 return -1; 56 return -1;
70 57
58typedef SV SV8; /* byte-sv, used for argument-checking */
59
71enum { 60enum {
72 REQ_QUIT, 61 REQ_QUIT,
73 REQ_OPEN, REQ_CLOSE, 62 REQ_OPEN, REQ_CLOSE,
74 REQ_READ, REQ_WRITE, REQ_READAHEAD, 63 REQ_READ, REQ_WRITE, REQ_READAHEAD,
75 REQ_SENDFILE, 64 REQ_SENDFILE,
76 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 65 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
77 REQ_FSYNC, REQ_FDATASYNC, 66 REQ_FSYNC, REQ_FDATASYNC,
78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 67 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
79 REQ_READDIR, 68 REQ_MKNOD, REQ_READDIR,
80 REQ_LINK, REQ_SYMLINK, 69 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
81 REQ_GROUP, REQ_NOP, 70 REQ_GROUP, REQ_NOP,
82 REQ_BUSY, 71 REQ_BUSY,
83}; 72};
84 73
85#define AIO_REQ_KLASS "IO::AIO::REQ" 74#define AIO_REQ_KLASS "IO::AIO::REQ"
87 76
88typedef struct aio_cb 77typedef struct aio_cb
89{ 78{
90 struct aio_cb *volatile next; 79 struct aio_cb *volatile next;
91 80
92 SV *data, *callback; 81 SV *callback, *fh;
93 SV *fh, *fh2; 82 SV *sv1, *sv2;
94 void *dataptr, *data2ptr; 83 void *ptr1, *ptr2;
95 Stat_t *statdata;
96 off_t offset; 84 off_t offs;
97 size_t length; 85 size_t size;
98 ssize_t result; 86 ssize_t result;
99 87
100 STRLEN dataoffset; 88 STRLEN stroffset;
101 int type; 89 int type;
102 int fd, fd2; 90 int int1, int2;
103 int errorno; 91 int errorno;
104 mode_t mode; /* open */ 92 mode_t mode; /* open */
105 93
106 unsigned char flags; 94 unsigned char flags;
107 unsigned char pri; 95 unsigned char pri;
109 SV *self; /* the perl counterpart of this request, if any */ 97 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 98 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
111} aio_cb; 99} aio_cb;
112 100
113enum { 101enum {
114 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) */
115}; 105};
116 106
117typedef aio_cb *aio_req; 107typedef aio_cb *aio_req;
118typedef aio_cb *aio_req_ornot; 108typedef aio_cb *aio_req_ornot;
119 109
124 DEFAULT_PRI = 0, 114 DEFAULT_PRI = 0,
125 PRI_BIAS = -PRI_MIN, 115 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 116 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
127}; 117};
128 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
129static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
130 166
131static int started, wanted; 167static unsigned int started, idle, wanted;
132static volatile int nreqs;
133static int max_outstanding = 1<<30;
134static int respipe [2];
135 168
136#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
137# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
138#else
139# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
140#endif
141
142#define LOCK(mutex) pthread_mutex_lock (&(mutex))
143#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
144
145/* worker threasd management */ 169/* worker threads management */
146static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 170static mutex_t wrklock = MUTEX_INIT;
147 171
148typedef struct worker { 172typedef struct worker {
149 /* locked by wrklock */ 173 /* locked by wrklock */
150 struct worker *prev, *next; 174 struct worker *prev, *next;
151 175
152 pthread_t tid; 176 thread_t tid;
153 177
154 /* locked by reslock, reqlock or wrklock */ 178 /* locked by reslock, reqlock or wrklock */
155 aio_req req; /* currently processed request */ 179 aio_req req; /* currently processed request */
156 void *dbuf; 180 void *dbuf;
157 DIR *dirp; 181 DIR *dirp;
180 wrk->prev->next = wrk->next; 204 wrk->prev->next = wrk->next;
181 205
182 free (wrk); 206 free (wrk);
183} 207}
184 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
185static pthread_mutex_t reslock = AIO_MUTEX_INIT; 214static mutex_t reslock = MUTEX_INIT;
186static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 215static mutex_t reqlock = MUTEX_INIT;
187static 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
188 260
189/* 261/*
190 * a somewhat faster data structure might be nice, but 262 * a somewhat faster data structure might be nice, but
191 * with 8 priorities this actually needs <20 insns 263 * with 8 priorities this actually needs <20 insns
192 * per shift, the most expensive operation. 264 * per shift, the most expensive operation.
238 } 310 }
239 311
240 abort (); 312 abort ();
241} 313}
242 314
315static int poll_cb ();
243static void req_invoke (aio_req req); 316static int req_invoke (aio_req req);
244static void req_free (aio_req req); 317static void req_free (aio_req req);
318static void req_cancel (aio_req req);
245 319
246/* must be called at most once */ 320/* must be called at most once */
247static SV *req_sv (aio_req req, const char *klass) 321static SV *req_sv (aio_req req, const char *klass)
248{ 322{
249 if (!req->self) 323 if (!req->self)
267 return mg ? (aio_req)mg->mg_ptr : 0; 341 return mg ? (aio_req)mg->mg_ptr : 0;
268} 342}
269 343
270static void aio_grp_feed (aio_req grp) 344static void aio_grp_feed (aio_req grp)
271{ 345{
346 block_sig ();
347
272 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 348 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
273 { 349 {
274 int old_len = grp->length; 350 int old_len = grp->size;
275 351
276 if (grp->fh2 && SvOK (grp->fh2)) 352 if (grp->sv2 && SvOK (grp->sv2))
277 { 353 {
278 dSP; 354 dSP;
279 355
280 ENTER; 356 ENTER;
281 SAVETMPS; 357 SAVETMPS;
282 PUSHMARK (SP); 358 PUSHMARK (SP);
283 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 359 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
284 PUTBACK; 360 PUTBACK;
285 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 361 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
286 SPAGAIN; 362 SPAGAIN;
287 FREETMPS; 363 FREETMPS;
288 LEAVE; 364 LEAVE;
289 } 365 }
290 366
291 /* stop if no progress has been made */ 367 /* stop if no progress has been made */
292 if (old_len == grp->length) 368 if (old_len == grp->size)
293 { 369 {
294 SvREFCNT_dec (grp->fh2); 370 SvREFCNT_dec (grp->sv2);
295 grp->fh2 = 0; 371 grp->sv2 = 0;
296 break; 372 break;
297 } 373 }
298 } 374 }
375
376 unblock_sig ();
299} 377}
300 378
301static void aio_grp_dec (aio_req grp) 379static void aio_grp_dec (aio_req grp)
302{ 380{
303 --grp->length; 381 --grp->size;
304 382
305 /* call feeder, if applicable */ 383 /* call feeder, if applicable */
306 aio_grp_feed (grp); 384 aio_grp_feed (grp);
307 385
308 /* finish, if done */ 386 /* finish, if done */
309 if (!grp->length && grp->fd) 387 if (!grp->size && grp->int1)
310 { 388 {
389 block_sig ();
390
311 req_invoke (grp); 391 if (!req_invoke (grp))
392 {
393 req_free (grp);
394 unblock_sig ();
395 croak (0);
396 }
397
312 req_free (grp); 398 req_free (grp);
399 unblock_sig ();
313 } 400 }
314} 401}
315 402
316static void poll_wait ()
317{
318 fd_set rfd;
319
320 while (nreqs)
321 {
322 int size;
323#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
324 LOCK (reslock);
325#endif
326 size = res_queue.size;
327#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
328 UNLOCK (reslock);
329#endif
330
331 if (size)
332 return;
333
334 FD_ZERO(&rfd);
335 FD_SET(respipe [0], &rfd);
336
337 select (respipe [0] + 1, &rfd, 0, 0, 0);
338 }
339}
340
341static void req_invoke (aio_req req) 403static int req_invoke (aio_req req)
342{ 404{
343 dSP; 405 dSP;
406
407 if (req->flags & FLAG_SV1_RO_OFF)
408 SvREADONLY_off (req->sv1);
344 409
345 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 410 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
346 { 411 {
347 errno = req->errorno;
348
349 ENTER; 412 ENTER;
350 SAVETMPS; 413 SAVETMPS;
351 PUSHMARK (SP); 414 PUSHMARK (SP);
352 EXTEND (SP, 1); 415 EXTEND (SP, 1);
353 416
358 SV *rv = &PL_sv_undef; 421 SV *rv = &PL_sv_undef;
359 422
360 if (req->result >= 0) 423 if (req->result >= 0)
361 { 424 {
362 int i; 425 int i;
363 char *buf = req->data2ptr; 426 char *buf = req->ptr2;
364 AV *av = newAV (); 427 AV *av = newAV ();
365 428
366 av_extend (av, req->result - 1); 429 av_extend (av, req->result - 1);
367 430
368 for (i = 0; i < req->result; ++i) 431 for (i = 0; i < req->result; ++i)
388 PUSHs (sv_2mortal (newSViv (req->result))); 451 PUSHs (sv_2mortal (newSViv (req->result)));
389 PUTBACK; 452 PUTBACK;
390 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 453 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
391 SPAGAIN; 454 SPAGAIN;
392 455
393 fh = SvREFCNT_inc (POPs); 456 fh = POPs;
394
395 PUSHMARK (SP); 457 PUSHMARK (SP);
396 XPUSHs (sv_2mortal (fh)); 458 XPUSHs (fh);
397 } 459 }
398 break; 460 break;
399 461
400 case REQ_GROUP: 462 case REQ_GROUP:
401 req->fd = 2; /* mark group as finished */ 463 req->int1 = 2; /* mark group as finished */
402 464
403 if (req->data) 465 if (req->sv1)
404 { 466 {
405 int i; 467 int i;
406 AV *av = (AV *)req->data; 468 AV *av = (AV *)req->sv1;
407 469
408 EXTEND (SP, AvFILL (av) + 1); 470 EXTEND (SP, AvFILL (av) + 1);
409 for (i = 0; i <= AvFILL (av); ++i) 471 for (i = 0; i <= AvFILL (av); ++i)
410 PUSHs (*av_fetch (av, i, 0)); 472 PUSHs (*av_fetch (av, i, 0));
411 } 473 }
413 475
414 case REQ_NOP: 476 case REQ_NOP:
415 case REQ_BUSY: 477 case REQ_BUSY:
416 break; 478 break;
417 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
418 default: 504 default:
419 PUSHs (sv_2mortal (newSViv (req->result))); 505 PUSHs (sv_2mortal (newSViv (req->result)));
420 break; 506 break;
421 } 507 }
422 508
509 errno = req->errorno;
423 510
424 PUTBACK; 511 PUTBACK;
425 call_sv (req->callback, G_VOID | G_EVAL); 512 call_sv (req->callback, G_VOID | G_EVAL);
426 SPAGAIN; 513 SPAGAIN;
427 514
441 grp->grp_first = req->grp_next; 528 grp->grp_first = req->grp_next;
442 529
443 aio_grp_dec (grp); 530 aio_grp_dec (grp);
444 } 531 }
445 532
446 if (SvTRUE (ERRSV)) 533 return !SvTRUE (ERRSV);
447 {
448 req_free (req);
449 croak (0);
450 }
451} 534}
452 535
453static void req_free (aio_req req) 536static void req_free (aio_req req)
454{ 537{
455 if (req->self) 538 if (req->self)
456 { 539 {
457 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
458 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
459 } 542 }
460 543
461 SvREFCNT_dec (req->data);
462 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
463 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
464 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
465 Safefree (req->statdata);
466 548
467 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
468 free (req->data2ptr); 550 free (req->ptr2);
469 551
470 Safefree (req); 552 Safefree (req);
471} 553}
472 554
555static void req_cancel_subs (aio_req grp)
556{
557 aio_req sub;
558
559 if (grp->type != REQ_GROUP)
560 return;
561
562 SvREFCNT_dec (grp->sv2);
563 grp->sv2 = 0;
564
565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
566 req_cancel (sub);
567}
568
473static void req_cancel (aio_req req) 569static void req_cancel (aio_req req)
474{ 570{
475 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
476 572
477 if (req->type == REQ_GROUP) 573 req_cancel_subs (req);
478 {
479 aio_req sub;
480
481 for (sub = req->grp_first; sub; sub = sub->grp_next)
482 req_cancel (sub);
483 }
484}
485
486static int poll_cb ()
487{
488 dSP;
489 int count = 0;
490 int do_croak = 0;
491 aio_req req;
492
493 for (;;)
494 {
495 LOCK (reslock);
496 req = reqq_shift (&res_queue);
497
498 if (req)
499 {
500 if (!res_queue.size)
501 {
502 /* read any signals sent by the worker threads */
503 char buf [32];
504 while (read (respipe [0], buf, 32) == 32)
505 ;
506 }
507 }
508
509 UNLOCK (reslock);
510
511 if (!req)
512 break;
513
514 --nreqs;
515
516 if (req->type == REQ_QUIT)
517 started--;
518 else if (req->type == REQ_GROUP && req->length)
519 {
520 req->fd = 1; /* mark request as delayed */
521 continue;
522 }
523 else
524 {
525 if (req->type == REQ_READ)
526 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
527
528 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
529 SvREADONLY_off (req->data);
530
531 if (req->statdata)
532 {
533 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
534 PL_laststatval = req->result;
535 PL_statcache = *(req->statdata);
536 }
537
538 req_invoke (req);
539
540 count++;
541 }
542
543 req_free (req);
544 }
545
546 return count;
547} 574}
548 575
549static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
550 577
551static void start_thread (void) 578static void start_thread (void)
553 worker *wrk = calloc (1, sizeof (worker)); 580 worker *wrk = calloc (1, sizeof (worker));
554 581
555 if (!wrk) 582 if (!wrk)
556 croak ("unable to allocate worker thread data"); 583 croak ("unable to allocate worker thread data");
557 584
558 sigset_t fullsigset, oldsigset;
559 pthread_attr_t attr;
560
561 pthread_attr_init (&attr);
562 pthread_attr_setstacksize (&attr, STACKSIZE);
563 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
564
565 sigfillset (&fullsigset);
566
567 LOCK (wrklock); 585 LOCK (wrklock);
568 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
569 586
570 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 587 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
571 { 588 {
572 wrk->prev = &wrk_first; 589 wrk->prev = &wrk_first;
573 wrk->next = wrk_first.next; 590 wrk->next = wrk_first.next;
574 wrk_first.next->prev = wrk; 591 wrk_first.next->prev = wrk;
575 wrk_first.next = wrk; 592 wrk_first.next = wrk;
576 started++; 593 ++started;
577 } 594 }
578 else 595 else
579 free (wrk); 596 free (wrk);
580 597
581 sigprocmask (SIG_SETMASK, &oldsigset, 0);
582 UNLOCK (wrklock); 598 UNLOCK (wrklock);
583} 599}
584 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
585static void req_send (aio_req req) 613static void req_send (aio_req req)
586{ 614{
587 while (started < wanted && nreqs >= started) 615 block_sig ();
588 start_thread ();
589 616
590 ++nreqs; 617 ++nreqs;
618
619 LOCK (reqlock);
620 ++nready;
621 reqq_push (&req_queue, req);
622 COND_SIGNAL (reqwait);
623 UNLOCK (reqlock);
624
625 unblock_sig ();
626
627 maybe_start_thread ();
628}
629
630static void end_thread (void)
631{
632 aio_req req;
633
634 Newz (0, req, 1, aio_cb);
635
636 req->type = REQ_QUIT;
637 req->pri = PRI_MAX + PRI_BIAS;
591 638
592 LOCK (reqlock); 639 LOCK (reqlock);
593 reqq_push (&req_queue, req); 640 reqq_push (&req_queue, req);
594 pthread_cond_signal (&reqwait); 641 COND_SIGNAL (reqwait);
595 UNLOCK (reqlock); 642 UNLOCK (reqlock);
596 643
597 if (nreqs > max_outstanding) 644 LOCK (wrklock);
598 for (;;) 645 --started;
599 { 646 UNLOCK (wrklock);
600 poll_cb ();
601
602 if (nreqs <= max_outstanding)
603 break;
604
605 poll_wait ();
606 }
607} 647}
608 648
609static void end_thread (void) 649static void set_max_idle (int nthreads)
610{ 650{
611 aio_req req; 651 if (WORDACCESS_UNSAFE) LOCK (reqlock);
612 652 max_idle = nthreads <= 0 ? 1 : nthreads;
613 Newz (0, req, 1, aio_cb); 653 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
614
615 req->type = REQ_QUIT;
616 req->pri = PRI_MAX + PRI_BIAS;
617
618 req_send (req);
619} 654}
620 655
621static void min_parallel (int nthreads) 656static void min_parallel (int nthreads)
622{ 657{
623 if (wanted < nthreads) 658 if (wanted < nthreads)
624 wanted = nthreads; 659 wanted = nthreads;
625} 660}
626 661
627static void max_parallel (int nthreads) 662static void max_parallel (int nthreads)
628{ 663{
629 int cur = started;
630
631 if (wanted > nthreads) 664 if (wanted > nthreads)
632 wanted = nthreads; 665 wanted = nthreads;
633 666
634 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)
635 { 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
636 end_thread (); 685 maybe_start_thread ();
637 cur--; 686
687 FD_ZERO(&rfd);
688 FD_SET(respipe [0], &rfd);
689
690 select (respipe [0] + 1, &rfd, 0, 0, 0);
638 } 691 }
692}
639 693
640 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 (;;)
641 { 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
642 poll_wait (); 771 poll_wait ();
643 poll_cb (); 772
773 ++maxreqs;
644 } 774 }
775
776 unblock_sig ();
777 return count;
645} 778}
646 779
647static void create_pipe () 780static void create_pipe ()
648{ 781{
649 if (pipe (respipe)) 782 if (pipe (respipe))
666/* 799/*
667 * make our pread/pwrite safe against themselves, but not against 800 * make our pread/pwrite safe against themselves, but not against
668 * 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,
669 * but that's your problem, not mine. 802 * but that's your problem, not mine.
670 */ 803 */
671static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 804static mutex_t preadwritelock = MUTEX_INIT;
672 805
673static 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)
674{ 807{
675 ssize_t res; 808 ssize_t res;
676 off_t ooffset; 809 off_t ooffset;
704#if !HAVE_FDATASYNC 837#if !HAVE_FDATASYNC
705# define fdatasync fsync 838# define fdatasync fsync
706#endif 839#endif
707 840
708#if !HAVE_READAHEAD 841#if !HAVE_READAHEAD
709# define readahead aio_readahead 842# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
710 843
711static ssize_t readahead (int fd, off_t offset, size_t count) 844static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
712{ 845{
713 dBUF; 846 dBUF;
714 847
715 while (count > 0) 848 while (count > 0)
716 { 849 {
721 count -= len; 854 count -= len;
722 } 855 }
723 856
724 errno = 0; 857 errno = 0;
725} 858}
859
726#endif 860#endif
727 861
728#if !HAVE_READDIR_R 862#if !HAVE_READDIR_R
729# define readdir_r aio_readdir_r 863# define readdir_r aio_readdir_r
730 864
731static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 865static mutex_t readdirlock = MUTEX_INIT;
732 866
733static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 867static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
734{ 868{
735 struct dirent *e; 869 struct dirent *e;
736 int errorno; 870 int errorno;
775 { 909 {
776 off_t sbytes; 910 off_t sbytes;
777 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 911 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
778 912
779 if (res < 0 && sbytes) 913 if (res < 0 && sbytes)
780 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 914 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
781 res = sbytes; 915 res = sbytes;
782 } 916 }
783 917
784# elif __hpux 918# elif __hpux
785 res = sendfile (ofd, ifd, offset, count, 0, 0); 919 res = sendfile (ofd, ifd, offset, count, 0, 0);
863 int memofs = 0; 997 int memofs = 0;
864 int res = 0; 998 int res = 0;
865 int errorno; 999 int errorno;
866 1000
867 LOCK (wrklock); 1001 LOCK (wrklock);
868 self->dirp = dirp = opendir (req->dataptr); 1002 self->dirp = dirp = opendir (req->ptr1);
869 self->dbuf = u = malloc (sizeof (*u)); 1003 self->dbuf = u = malloc (sizeof (*u));
1004 req->flags |= FLAG_PTR2_FREE;
1005 req->ptr2 = names = malloc (memlen);
870 UNLOCK (wrklock); 1006 UNLOCK (wrklock);
871
872 req->data2ptr = names = malloc (memlen);
873 1007
874 if (dirp && u && names) 1008 if (dirp && u && names)
875 for (;;) 1009 for (;;)
876 { 1010 {
877 errno = 0; 1011 errno = 0;
890 1024
891 while (memofs + len > memlen) 1025 while (memofs + len > memlen)
892 { 1026 {
893 memlen *= 2; 1027 memlen *= 2;
894 LOCK (wrklock); 1028 LOCK (wrklock);
895 req->data2ptr = names = realloc (names, memlen); 1029 req->ptr2 = names = realloc (names, memlen);
896 UNLOCK (wrklock); 1030 UNLOCK (wrklock);
897 1031
898 if (!names) 1032 if (!names)
899 break; 1033 break;
900 } 1034 }
913/*****************************************************************************/ 1047/*****************************************************************************/
914 1048
915static void *aio_proc (void *thr_arg) 1049static void *aio_proc (void *thr_arg)
916{ 1050{
917 aio_req req; 1051 aio_req req;
918 int type; 1052 struct timespec ts;
919 worker *self = (worker *)thr_arg; 1053 worker *self = (worker *)thr_arg;
920 1054
921 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 (;;)
922 { 1060 {
1061 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1062
923 LOCK (reqlock); 1063 LOCK (reqlock);
924 1064
925 for (;;) 1065 for (;;)
926 { 1066 {
927 self->req = req = reqq_shift (&req_queue); 1067 self->req = req = reqq_shift (&req_queue);
928 1068
929 if (req) 1069 if (req)
930 break; 1070 break;
931 1071
932 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;
933 } 1093 }
1094
1095 --nready;
934 1096
935 UNLOCK (reqlock); 1097 UNLOCK (reqlock);
936 1098
937 errno = 0; /* strictly unnecessary */ 1099 errno = 0; /* strictly unnecessary */
938 type = req->type; /* remember type for QUIT check */
939 1100
940 if (!(req->flags & FLAG_CANCELLED)) 1101 if (!(req->flags & FLAG_CANCELLED))
941 switch (type) 1102 switch (req->type)
942 { 1103 {
943 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;
944 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;
945 1106
946 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;
947 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;
948 1109
949 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;
950 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;
951 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;
952 1113
953 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;
954 case REQ_CLOSE: req->result = close (req->fd); break; 1115 case REQ_CLOSE: req->result = close (req->int1); break;
955 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1116 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
956 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;
957 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
958 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
959 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;
960 1124
961 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
962 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
963 case REQ_READDIR: scandir_ (req, self); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
964 1128
965 case REQ_BUSY: 1129 case REQ_BUSY:
966 { 1130 {
967 struct timeval tv; 1131 struct timeval tv;
968 1132
969 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
970 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
971 1135
972 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
973 } 1137 }
974 1138
975 case REQ_GROUP: 1139 case REQ_GROUP:
976 case REQ_NOP: 1140 case REQ_NOP:
1141 break;
1142
977 case REQ_QUIT: 1143 case REQ_QUIT:
978 break; 1144 goto quit;
979 1145
980 default: 1146 default:
981 req->result = ENOSYS; 1147 req->result = ENOSYS;
982 break; 1148 break;
983 } 1149 }
984 1150
985 req->errorno = errno; 1151 req->errorno = errno;
986 1152
987 LOCK (reslock); 1153 LOCK (reslock);
988 1154
1155 ++npending;
1156
989 if (!reqq_push (&res_queue, req)) 1157 if (!reqq_push (&res_queue, req))
1158 {
990 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
991 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 }
992 1166
993 self->req = 0; 1167 self->req = 0;
994 worker_clear (self); 1168 worker_clear (self);
995 1169
996 UNLOCK (reslock); 1170 UNLOCK (reslock);
997 } 1171 }
998 while (type != REQ_QUIT);
999 1172
1173quit:
1000 LOCK (wrklock); 1174 LOCK (wrklock);
1001 worker_free (self); 1175 worker_free (self);
1002 UNLOCK (wrklock); 1176 UNLOCK (wrklock);
1003 1177
1004 return 0; 1178 return 0;
1051 1225
1052 worker_clear (wrk); 1226 worker_clear (wrk);
1053 worker_free (wrk); 1227 worker_free (wrk);
1054 } 1228 }
1055 1229
1056 started = 0; 1230 started = 0;
1231 idle = 0;
1057 nreqs = 0; 1232 nreqs = 0;
1233 nready = 0;
1234 npending = 0;
1058 1235
1059 close (respipe [0]); 1236 close (respipe [0]);
1060 close (respipe [1]); 1237 close (respipe [1]);
1061 create_pipe (); 1238 create_pipe ();
1062 1239
1089PROTOTYPES: ENABLE 1266PROTOTYPES: ENABLE
1090 1267
1091BOOT: 1268BOOT:
1092{ 1269{
1093 HV *stash = gv_stashpv ("IO::AIO", 1); 1270 HV *stash = gv_stashpv ("IO::AIO", 1);
1271
1094 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1272 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1095 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1273 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1096 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));
1097 1279
1098 create_pipe (); 1280 create_pipe ();
1099 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1281 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1100} 1282}
1101 1283
1102void 1284void
1103min_parallel (nthreads) 1285max_poll_reqs (int nreqs)
1104 int nthreads
1105 PROTOTYPE: $ 1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_reqs = nreqs;
1106 1289
1107void 1290void
1108max_parallel (nthreads) 1291max_poll_time (double nseconds)
1109 int nthreads
1110 PROTOTYPE: $ 1292 PROTOTYPE: $
1293 CODE:
1294 max_poll_time = nseconds * AIO_TICKS;
1295
1296void
1297min_parallel (int nthreads)
1298 PROTOTYPE: $
1299
1300void
1301max_parallel (int nthreads)
1302 PROTOTYPE: $
1303
1304void
1305max_idle (int nthreads)
1306 PROTOTYPE: $
1307 CODE:
1308 set_max_idle (nthreads);
1111 1309
1112int 1310int
1113max_outstanding (nreqs) 1311max_outstanding (int maxreqs)
1114 int nreqs 1312 PROTOTYPE: $
1115 PROTOTYPE: $
1116 CODE: 1313 CODE:
1117 RETVAL = max_outstanding; 1314 RETVAL = max_outstanding;
1118 max_outstanding = nreqs; 1315 max_outstanding = maxreqs;
1316 OUTPUT:
1317 RETVAL
1119 1318
1120void 1319void
1121aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1320aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1122 SV * pathname 1321 SV8 * pathname
1123 int flags 1322 int flags
1124 int mode 1323 int mode
1125 SV * callback 1324 SV * callback
1126 PROTOTYPE: $$$;$ 1325 PROTOTYPE: $$$;$
1127 PPCODE: 1326 PPCODE:
1128{ 1327{
1129 dREQ; 1328 dREQ;
1130 1329
1131 req->type = REQ_OPEN; 1330 req->type = REQ_OPEN;
1132 req->data = newSVsv (pathname); 1331 req->sv1 = newSVsv (pathname);
1133 req->dataptr = SvPVbyte_nolen (req->data); 1332 req->ptr1 = SvPVbyte_nolen (req->sv1);
1134 req->fd = flags; 1333 req->int1 = flags;
1135 req->mode = mode; 1334 req->mode = mode;
1136 1335
1137 REQ_SEND; 1336 REQ_SEND;
1138} 1337}
1139 1338
1149 PPCODE: 1348 PPCODE:
1150{ 1349{
1151 dREQ; 1350 dREQ;
1152 1351
1153 req->type = ix; 1352 req->type = ix;
1154 req->fh = newSVsv (fh); 1353 req->fh = newSVsv (fh);
1155 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1354 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1156 1355
1157 REQ_SEND (req); 1356 REQ_SEND (req);
1158} 1357}
1159 1358
1160void 1359void
1161aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1360aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1162 SV * fh 1361 SV * fh
1163 UV offset 1362 UV offset
1164 UV length 1363 UV length
1165 SV * data 1364 SV8 * data
1166 UV dataoffset 1365 UV dataoffset
1167 SV * callback 1366 SV * callback
1168 ALIAS: 1367 ALIAS:
1169 aio_read = REQ_READ 1368 aio_read = REQ_READ
1170 aio_write = REQ_WRITE 1369 aio_write = REQ_WRITE
1171 PROTOTYPE: $$$$$;$ 1370 PROTOTYPE: $$$$$;$
1172 PPCODE: 1371 PPCODE:
1173{ 1372{
1174 aio_req req;
1175 STRLEN svlen; 1373 STRLEN svlen;
1176 char *svptr = SvPVbyte (data, svlen); 1374 char *svptr = SvPVbyte (data, svlen);
1177 1375
1178 SvUPGRADE (data, SVt_PV); 1376 SvUPGRADE (data, SVt_PV);
1179 SvPOK_on (data); 1377 SvPOK_on (data);
1191 length = svlen - dataoffset; 1389 length = svlen - dataoffset;
1192 } 1390 }
1193 else 1391 else
1194 { 1392 {
1195 /* read: grow scalar as necessary */ 1393 /* read: grow scalar as necessary */
1196 svptr = SvGROW (data, length + dataoffset); 1394 svptr = SvGROW (data, length + dataoffset + 1);
1197 } 1395 }
1198 1396
1199 if (length < 0) 1397 if (length < 0)
1200 croak ("length must not be negative"); 1398 croak ("length must not be negative");
1201 1399
1202 { 1400 {
1203 dREQ; 1401 dREQ;
1204 1402
1205 req->type = ix; 1403 req->type = ix;
1206 req->fh = newSVsv (fh); 1404 req->fh = newSVsv (fh);
1207 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1405 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1208 : IoOFP (sv_2io (fh))); 1406 : IoOFP (sv_2io (fh)));
1209 req->offset = offset; 1407 req->offs = offset;
1210 req->length = length; 1408 req->size = length;
1211 req->data = SvREFCNT_inc (data); 1409 req->sv1 = SvREFCNT_inc (data);
1212 req->dataptr = (char *)svptr + dataoffset; 1410 req->ptr1 = (char *)svptr + dataoffset;
1411 req->stroffset = dataoffset;
1213 1412
1214 if (!SvREADONLY (data)) 1413 if (!SvREADONLY (data))
1215 { 1414 {
1216 SvREADONLY_on (data); 1415 SvREADONLY_on (data);
1217 req->data2ptr = (void *)data; 1416 req->flags |= FLAG_SV1_RO_OFF;
1218 } 1417 }
1219 1418
1220 REQ_SEND; 1419 REQ_SEND;
1221 } 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;
1222} 1443}
1223 1444
1224void 1445void
1225aio_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)
1226 SV * out_fh 1447 SV * out_fh
1232 PPCODE: 1453 PPCODE:
1233{ 1454{
1234 dREQ; 1455 dREQ;
1235 1456
1236 req->type = REQ_SENDFILE; 1457 req->type = REQ_SENDFILE;
1237 req->fh = newSVsv (out_fh); 1458 req->fh = newSVsv (out_fh);
1238 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1459 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1239 req->fh2 = newSVsv (in_fh); 1460 req->sv2 = newSVsv (in_fh);
1240 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1461 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1241 req->offset = in_offset; 1462 req->offs = in_offset;
1242 req->length = length; 1463 req->size = length;
1243 1464
1244 REQ_SEND; 1465 REQ_SEND;
1245} 1466}
1246 1467
1247void 1468void
1254 PPCODE: 1475 PPCODE:
1255{ 1476{
1256 dREQ; 1477 dREQ;
1257 1478
1258 req->type = REQ_READAHEAD; 1479 req->type = REQ_READAHEAD;
1259 req->fh = newSVsv (fh); 1480 req->fh = newSVsv (fh);
1260 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1481 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1261 req->offset = offset; 1482 req->offs = offset;
1262 req->length = length; 1483 req->size = length;
1263 1484
1264 REQ_SEND; 1485 REQ_SEND;
1265} 1486}
1266 1487
1267void 1488void
1268aio_stat (fh_or_path,callback=&PL_sv_undef) 1489aio_stat (fh_or_path,callback=&PL_sv_undef)
1269 SV * fh_or_path 1490 SV8 * fh_or_path
1270 SV * callback 1491 SV * callback
1271 ALIAS: 1492 ALIAS:
1272 aio_stat = REQ_STAT 1493 aio_stat = REQ_STAT
1273 aio_lstat = REQ_LSTAT 1494 aio_lstat = REQ_LSTAT
1274 PPCODE: 1495 PPCODE:
1275{ 1496{
1276 dREQ; 1497 dREQ;
1277 1498
1278 New (0, req->statdata, 1, Stat_t); 1499 req->ptr2 = malloc (sizeof (Stat_t));
1279 if (!req->statdata) 1500 if (!req->ptr2)
1280 { 1501 {
1281 req_free (req); 1502 req_free (req);
1282 croak ("out of memory during aio_req->statdata allocation"); 1503 croak ("out of memory during aio_stat statdata allocation");
1283 } 1504 }
1505
1506 req->flags |= FLAG_PTR2_FREE;
1284 1507
1285 if (SvPOK (fh_or_path)) 1508 if (SvPOK (fh_or_path))
1286 { 1509 {
1287 req->type = ix; 1510 req->type = ix;
1288 req->data = newSVsv (fh_or_path); 1511 req->sv1 = newSVsv (fh_or_path);
1289 req->dataptr = SvPVbyte_nolen (req->data); 1512 req->ptr1 = SvPVbyte_nolen (req->sv1);
1290 } 1513 }
1291 else 1514 else
1292 { 1515 {
1293 req->type = REQ_FSTAT; 1516 req->type = REQ_FSTAT;
1294 req->fh = newSVsv (fh_or_path); 1517 req->fh = newSVsv (fh_or_path);
1295 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1518 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1296 } 1519 }
1297 1520
1298 REQ_SEND; 1521 REQ_SEND;
1299} 1522}
1300 1523
1301void 1524void
1302aio_unlink (pathname,callback=&PL_sv_undef) 1525aio_unlink (pathname,callback=&PL_sv_undef)
1303 SV * pathname 1526 SV8 * pathname
1304 SV * callback 1527 SV * callback
1305 ALIAS: 1528 ALIAS:
1306 aio_unlink = REQ_UNLINK 1529 aio_unlink = REQ_UNLINK
1307 aio_rmdir = REQ_RMDIR 1530 aio_rmdir = REQ_RMDIR
1308 aio_readdir = REQ_READDIR 1531 aio_readdir = REQ_READDIR
1309 PPCODE: 1532 PPCODE:
1310{ 1533{
1311 dREQ; 1534 dREQ;
1312 1535
1313 req->type = ix; 1536 req->type = ix;
1314 req->data = newSVsv (pathname); 1537 req->sv1 = newSVsv (pathname);
1315 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;
1316 1551
1552 req->type = REQ_MKDIR;
1553 req->sv1 = newSVsv (pathname);
1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1555 req->mode = mode;
1556
1317 REQ_SEND; 1557 REQ_SEND;
1318} 1558}
1319 1559
1320void 1560void
1321aio_link (oldpath,newpath,callback=&PL_sv_undef) 1561aio_link (oldpath,newpath,callback=&PL_sv_undef)
1322 SV * oldpath 1562 SV8 * oldpath
1323 SV * newpath 1563 SV8 * newpath
1324 SV * callback 1564 SV * callback
1325 ALIAS: 1565 ALIAS:
1326 aio_link = REQ_LINK 1566 aio_link = REQ_LINK
1327 aio_symlink = REQ_SYMLINK 1567 aio_symlink = REQ_SYMLINK
1328 aio_rename = REQ_RENAME 1568 aio_rename = REQ_RENAME
1329 PPCODE: 1569 PPCODE:
1330{ 1570{
1331 dREQ; 1571 dREQ;
1332 1572
1333 req->type = ix; 1573 req->type = ix;
1334 req->fh = newSVsv (oldpath); 1574 req->fh = newSVsv (oldpath);
1335 req->data2ptr = SvPVbyte_nolen (req->fh); 1575 req->ptr2 = SvPVbyte_nolen (req->fh);
1336 req->data = newSVsv (newpath); 1576 req->sv1 = newSVsv (newpath);
1337 req->dataptr = SvPVbyte_nolen (req->data); 1577 req->ptr1 = SvPVbyte_nolen (req->sv1);
1338 1578
1339 REQ_SEND; 1579 REQ_SEND;
1340} 1580}
1341 1581
1342void 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
1343aio_busy (delay,callback=&PL_sv_undef) 1602aio_busy (delay,callback=&PL_sv_undef)
1344 double delay 1603 double delay
1345 SV * callback 1604 SV * callback
1346 PPCODE: 1605 PPCODE:
1347{ 1606{
1348 dREQ; 1607 dREQ;
1349 1608
1350 req->type = REQ_BUSY; 1609 req->type = REQ_BUSY;
1351 req->fd = delay < 0. ? 0 : delay; 1610 req->int1 = delay < 0. ? 0 : delay;
1352 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1611 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1353 1612
1354 REQ_SEND; 1613 REQ_SEND;
1355} 1614}
1356 1615
1357void 1616void
1361 PPCODE: 1620 PPCODE:
1362{ 1621{
1363 dREQ; 1622 dREQ;
1364 1623
1365 req->type = REQ_GROUP; 1624 req->type = REQ_GROUP;
1625
1366 req_send (req); 1626 req_send (req);
1367
1368 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1627 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1369} 1628}
1370 1629
1371void 1630void
1372aio_nop (callback=&PL_sv_undef) 1631aio_nop (callback=&PL_sv_undef)
1373 SV * callback 1632 SV * callback
1374 PPCODE: 1633 PPCODE:
1375{ 1634{
1376 dREQ; 1635 dREQ;
1377 1636
1378 req->type = REQ_NOP; 1637 req->type = REQ_NOP;
1379 1638
1380 REQ_SEND; 1639 REQ_SEND;
1381} 1640}
1382 1641
1383void 1642int
1384aioreq_pri (int pri = DEFAULT_PRI) 1643aioreq_pri (int pri = 0)
1385 CODE: 1644 PROTOTYPE: ;$
1645 CODE:
1646 RETVAL = next_pri - PRI_BIAS;
1647 if (items > 0)
1648 {
1386 if (pri < PRI_MIN) pri = PRI_MIN; 1649 if (pri < PRI_MIN) pri = PRI_MIN;
1387 if (pri > PRI_MAX) pri = PRI_MAX; 1650 if (pri > PRI_MAX) pri = PRI_MAX;
1388 next_pri = pri + PRI_BIAS; 1651 next_pri = pri + PRI_BIAS;
1652 }
1653 OUTPUT:
1654 RETVAL
1389 1655
1390void 1656void
1391aioreq_nice (int nice = 0) 1657aioreq_nice (int nice = 0)
1392 CODE: 1658 CODE:
1393 nice = next_pri - nice; 1659 nice = next_pri - nice;
1394 if (nice < PRI_MIN) nice = PRI_MIN; 1660 if (nice < PRI_MIN) nice = PRI_MIN;
1395 if (nice > PRI_MAX) nice = PRI_MAX; 1661 if (nice > PRI_MAX) nice = PRI_MAX;
1396 next_pri = nice + PRI_BIAS; 1662 next_pri = nice + PRI_BIAS;
1397 1663
1398void 1664void
1399flush () 1665flush ()
1400 PROTOTYPE: 1666 PROTOTYPE:
1401 CODE: 1667 CODE:
1403 { 1669 {
1404 poll_wait (); 1670 poll_wait ();
1405 poll_cb (); 1671 poll_cb ();
1406 } 1672 }
1407 1673
1408void 1674int
1409poll() 1675poll()
1410 PROTOTYPE: 1676 PROTOTYPE:
1411 CODE: 1677 CODE:
1412 if (nreqs)
1413 {
1414 poll_wait (); 1678 poll_wait ();
1415 poll_cb (); 1679 RETVAL = poll_cb ();
1416 } 1680 OUTPUT:
1681 RETVAL
1417 1682
1418int 1683int
1419poll_fileno() 1684poll_fileno()
1420 PROTOTYPE: 1685 PROTOTYPE:
1421 CODE: 1686 CODE:
1433 1698
1434void 1699void
1435poll_wait() 1700poll_wait()
1436 PROTOTYPE: 1701 PROTOTYPE:
1437 CODE: 1702 CODE:
1438 if (nreqs)
1439 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}
1440 1741
1441int 1742int
1442nreqs() 1743nreqs()
1443 PROTOTYPE: 1744 PROTOTYPE:
1444 CODE: 1745 CODE:
1445 RETVAL = nreqs; 1746 RETVAL = nreqs;
1446 OUTPUT: 1747 OUTPUT:
1447 RETVAL 1748 RETVAL
1448 1749
1750int
1751nready()
1752 PROTOTYPE:
1753 CODE:
1754 RETVAL = get_nready ();
1755 OUTPUT:
1756 RETVAL
1757
1758int
1759npending()
1760 PROTOTYPE:
1761 CODE:
1762 RETVAL = get_npending ();
1763 OUTPUT:
1764 RETVAL
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
1449PROTOTYPES: DISABLE 1776PROTOTYPES: DISABLE
1450 1777
1451MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1778MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1452 1779
1453void 1780void
1468 PPCODE: 1795 PPCODE:
1469{ 1796{
1470 int i; 1797 int i;
1471 aio_req req; 1798 aio_req req;
1472 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
1473 if (grp->fd == 2) 1803 if (grp->int1 == 2)
1474 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");
1475 1805
1476 for (i = 1; i < items; ++i ) 1806 for (i = 1; i < items; ++i )
1477 { 1807 {
1478 if (GIMME_V != G_VOID) 1808 if (GIMME_V != G_VOID)
1480 1810
1481 req = SvAIO_REQ (ST (i)); 1811 req = SvAIO_REQ (ST (i));
1482 1812
1483 if (req) 1813 if (req)
1484 { 1814 {
1485 ++grp->length; 1815 ++grp->size;
1486 req->grp = grp; 1816 req->grp = grp;
1487 1817
1488 req->grp_prev = 0; 1818 req->grp_prev = 0;
1489 req->grp_next = grp->grp_first; 1819 req->grp_next = grp->grp_first;
1490 1820
1495 } 1825 }
1496 } 1826 }
1497} 1827}
1498 1828
1499void 1829void
1830cancel_subs (aio_req_ornot req)
1831 CODE:
1832 req_cancel_subs (req);
1833
1834void
1500result (aio_req grp, ...) 1835result (aio_req grp, ...)
1501 CODE: 1836 CODE:
1502{ 1837{
1503 int i; 1838 int i;
1839 AV *av;
1840
1841 grp->errorno = errno;
1842
1504 AV *av = newAV (); 1843 av = newAV ();
1505 1844
1506 for (i = 1; i < items; ++i ) 1845 for (i = 1; i < items; ++i )
1507 av_push (av, newSVsv (ST (i))); 1846 av_push (av, newSVsv (ST (i)));
1508 1847
1509 SvREFCNT_dec (grp->data); 1848 SvREFCNT_dec (grp->sv1);
1510 grp->data = (SV *)av; 1849 grp->sv1 = (SV *)av;
1511} 1850}
1851
1852void
1853errno (aio_req grp, int errorno = errno)
1854 CODE:
1855 grp->errorno = errorno;
1512 1856
1513void 1857void
1514limit (aio_req grp, int limit) 1858limit (aio_req grp, int limit)
1515 CODE: 1859 CODE:
1516 grp->fd2 = limit; 1860 grp->int2 = limit;
1517 aio_grp_feed (grp); 1861 aio_grp_feed (grp);
1518 1862
1519void 1863void
1520feed (aio_req grp, SV *callback=&PL_sv_undef) 1864feed (aio_req grp, SV *callback=&PL_sv_undef)
1521 CODE: 1865 CODE:
1522{ 1866{
1523 SvREFCNT_dec (grp->fh2); 1867 SvREFCNT_dec (grp->sv2);
1524 grp->fh2 = newSVsv (callback); 1868 grp->sv2 = newSVsv (callback);
1525 1869
1526 if (grp->fd2 <= 0) 1870 if (grp->int2 <= 0)
1527 grp->fd2 = 2; 1871 grp->int2 = 2;
1528 1872
1529 aio_grp_feed (grp); 1873 aio_grp_feed (grp);
1530} 1874}
1531 1875

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines