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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines