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.75 by root, Thu Oct 26 06:44:48 2006 UTC vs.
Revision 1.97 by root, Sun Jan 7 22:59:57 2007 UTC

1/* solaris */ 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1 2#define _POSIX_PTHREAD_SEMANTICS 1
3 3
4#if __linux 4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE 5# define _GNU_SOURCE
6#endif 6#endif
7 7
8/* just in case */
8#define _REENTRANT 1 9#define _REENTRANT 1
9 10
10#include <errno.h> 11#include <errno.h>
11 12
12#include "EXTERN.h" 13#include "EXTERN.h"
16#include "autoconf/config.h" 17#include "autoconf/config.h"
17 18
18#include <pthread.h> 19#include <pthread.h>
19 20
20#include <stddef.h> 21#include <stddef.h>
22#include <stdlib.h>
21#include <errno.h> 23#include <errno.h>
22#include <sys/time.h> 24#include <sys/time.h>
23#include <sys/select.h> 25#include <sys/select.h>
24#include <sys/types.h> 26#include <sys/types.h>
25#include <sys/stat.h> 27#include <sys/stat.h>
42# else 44# else
43# error sendfile support requested but not available 45# error sendfile support requested but not available
44# endif 46# endif
45#endif 47#endif
46 48
49/* number of seconds after which idle threads exit */
50#define IDLE_TIMEOUT 10
51
47/* used for struct dirent, AIX doesn't provide it */ 52/* used for struct dirent, AIX doesn't provide it */
48#ifndef NAME_MAX 53#ifndef NAME_MAX
49# define NAME_MAX 4096 54# define NAME_MAX 4096
50#endif 55#endif
51 56
60# define STACKSIZE PTHREAD_STACK_MIN 65# define STACKSIZE PTHREAD_STACK_MIN
61#else 66#else
62# define STACKSIZE 16384 67# define STACKSIZE 16384
63#endif 68#endif
64 69
70/* wether word reads are potentially non-atomic.
71 * this is conservatice, likely most arches this runs
72 * on have atomic word read/writes.
73 */
74#ifndef WORDACCESS_UNSAFE
75# if __i386 || __x86_64
76# define WORDACCESS_UNSAFE 0
77# else
78# define WORDACCESS_UNSAFE 1
79# endif
80#endif
81
65/* buffer size for various temporary buffers */ 82/* buffer size for various temporary buffers */
66#define AIO_BUFSIZE 65536 83#define AIO_BUFSIZE 65536
67 84
68#define dBUF \ 85#define dBUF \
69 char *aio_buf; \ 86 char *aio_buf; \
71 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
72 UNLOCK (wrklock); \ 89 UNLOCK (wrklock); \
73 if (!aio_buf) \ 90 if (!aio_buf) \
74 return -1; 91 return -1;
75 92
93typedef SV SV8; /* byte-sv, used for argument-checking */
94
76enum { 95enum {
77 REQ_QUIT, 96 REQ_QUIT,
78 REQ_OPEN, REQ_CLOSE, 97 REQ_OPEN, REQ_CLOSE,
79 REQ_READ, REQ_WRITE, REQ_READAHEAD, 98 REQ_READ, REQ_WRITE, REQ_READAHEAD,
80 REQ_SENDFILE, 99 REQ_SENDFILE,
81 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 100 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
82 REQ_FSYNC, REQ_FDATASYNC, 101 REQ_FSYNC, REQ_FDATASYNC,
83 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 102 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
84 REQ_READDIR, 103 REQ_MKNOD, REQ_READDIR,
85 REQ_LINK, REQ_SYMLINK, 104 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
86 REQ_GROUP, REQ_NOP, 105 REQ_GROUP, REQ_NOP,
87 REQ_BUSY, 106 REQ_BUSY,
88}; 107};
89 108
90#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
92 111
93typedef struct aio_cb 112typedef struct aio_cb
94{ 113{
95 struct aio_cb *volatile next; 114 struct aio_cb *volatile next;
96 115
97 SV *data, *callback; 116 SV *callback, *fh;
98 SV *fh, *fh2; 117 SV *sv1, *sv2;
99 void *dataptr, *data2ptr; 118 void *ptr1, *ptr2;
100 Stat_t *statdata;
101 off_t offset; 119 off_t offs;
102 size_t length; 120 size_t size;
103 ssize_t result; 121 ssize_t result;
104 122
105 STRLEN dataoffset; 123 STRLEN stroffset;
106 int type; 124 int type;
107 int fd, fd2; 125 int int1, int2;
108 int errorno; 126 int errorno;
109 mode_t mode; /* open */ 127 mode_t mode; /* open */
110 128
111 unsigned char flags; 129 unsigned char flags;
112 unsigned char pri; 130 unsigned char pri;
114 SV *self; /* the perl counterpart of this request, if any */ 132 SV *self; /* the perl counterpart of this request, if any */
115 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
116} aio_cb; 134} aio_cb;
117 135
118enum { 136enum {
119 FLAG_CANCELLED = 0x01, 137 FLAG_CANCELLED = 0x01, /* request was cancelled */
138 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
139 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
120}; 140};
121 141
122typedef aio_cb *aio_req; 142typedef aio_cb *aio_req;
123typedef aio_cb *aio_req_ornot; 143typedef aio_cb *aio_req_ornot;
124 144
129 DEFAULT_PRI = 0, 149 DEFAULT_PRI = 0,
130 PRI_BIAS = -PRI_MIN, 150 PRI_BIAS = -PRI_MIN,
131 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 151 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
132}; 152};
133 153
154#define AIO_TICKS ((1000000 + 1023) >> 10)
155
156static unsigned int max_poll_time = 0;
157static unsigned int max_poll_reqs = 0;
158
159/* calculcate time difference in ~1/AIO_TICKS of a second */
160static int tvdiff (struct timeval *tv1, struct timeval *tv2)
161{
162 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
163 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
164}
165
166static pthread_t main_tid;
167static int main_sig;
168static int block_sig_level;
169
170void block_sig ()
171{
172 sigset_t ss;
173
174 if (block_sig_level++)
175 return;
176
177 if (!main_sig)
178 return;
179
180 sigemptyset (&ss);
181 sigaddset (&ss, main_sig);
182 pthread_sigmask (SIG_BLOCK, &ss, 0);
183}
184
185void unblock_sig ()
186{
187 sigset_t ss;
188
189 if (--block_sig_level)
190 return;
191
192 if (!main_sig)
193 return;
194
195 sigemptyset (&ss);
196 sigaddset (&ss, main_sig);
197 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
198}
199
134static int next_pri = DEFAULT_PRI + PRI_BIAS; 200static int next_pri = DEFAULT_PRI + PRI_BIAS;
135 201
136static int started, wanted; 202static unsigned int started, idle, wanted;
137static volatile int nreqs;
138static int respipe [2];
139 203
140#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 204#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
141# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 205# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
142#else 206#else
143# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 207# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
144#endif 208#endif
145 209
146#define LOCK(mutex) pthread_mutex_lock (&(mutex)) 210#define LOCK(mutex) pthread_mutex_lock (&(mutex))
147#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 211#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
148 212
149/* worker threasd management */ 213/* worker threads management */
150static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 214static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
151 215
152typedef struct worker { 216typedef struct worker {
153 /* locked by wrklock */ 217 /* locked by wrklock */
154 struct worker *prev, *next; 218 struct worker *prev, *next;
184 wrk->prev->next = wrk->next; 248 wrk->prev->next = wrk->next;
185 249
186 free (wrk); 250 free (wrk);
187} 251}
188 252
253static volatile unsigned int nreqs, nready, npending;
254static volatile unsigned int max_idle = 4;
255static volatile unsigned int max_outstanding = 0xffffffff;
256static int respipe [2];
257
189static pthread_mutex_t reslock = AIO_MUTEX_INIT; 258static pthread_mutex_t reslock = AIO_MUTEX_INIT;
190static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 259static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
191static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 260static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
261
262#if WORDACCESS_UNSAFE
263
264static unsigned int get_nready ()
265{
266 unsigned int retval;
267
268 LOCK (reqlock);
269 retval = nready;
270 UNLOCK (reqlock);
271
272 return retval;
273}
274
275static unsigned int get_npending ()
276{
277 unsigned int retval;
278
279 LOCK (reslock);
280 retval = npending;
281 UNLOCK (reslock);
282
283 return retval;
284}
285
286static unsigned int get_nthreads ()
287{
288 unsigned int retval;
289
290 LOCK (wrklock);
291 retval = started;
292 UNLOCK (wrklock);
293
294 return retval;
295}
296
297#else
298
299# define get_nready() nready
300# define get_npending() npending
301# define get_nthreads() started
302
303#endif
192 304
193/* 305/*
194 * a somewhat faster data structure might be nice, but 306 * a somewhat faster data structure might be nice, but
195 * with 8 priorities this actually needs <20 insns 307 * with 8 priorities this actually needs <20 insns
196 * per shift, the most expensive operation. 308 * per shift, the most expensive operation.
243 355
244 abort (); 356 abort ();
245} 357}
246 358
247static int poll_cb (); 359static int poll_cb ();
248static void req_invoke (aio_req req); 360static int req_invoke (aio_req req);
249static void req_free (aio_req req); 361static void req_free (aio_req req);
250static void req_cancel (aio_req req); 362static void req_cancel (aio_req req);
251 363
252/* must be called at most once */ 364/* must be called at most once */
253static SV *req_sv (aio_req req, const char *klass) 365static SV *req_sv (aio_req req, const char *klass)
273 return mg ? (aio_req)mg->mg_ptr : 0; 385 return mg ? (aio_req)mg->mg_ptr : 0;
274} 386}
275 387
276static void aio_grp_feed (aio_req grp) 388static void aio_grp_feed (aio_req grp)
277{ 389{
390 block_sig ();
391
278 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 392 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
279 { 393 {
280 int old_len = grp->length; 394 int old_len = grp->size;
281 395
282 if (grp->fh2 && SvOK (grp->fh2)) 396 if (grp->sv2 && SvOK (grp->sv2))
283 { 397 {
284 dSP; 398 dSP;
285 399
286 ENTER; 400 ENTER;
287 SAVETMPS; 401 SAVETMPS;
288 PUSHMARK (SP); 402 PUSHMARK (SP);
289 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 403 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
290 PUTBACK; 404 PUTBACK;
291 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 405 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
292 SPAGAIN; 406 SPAGAIN;
293 FREETMPS; 407 FREETMPS;
294 LEAVE; 408 LEAVE;
295 } 409 }
296 410
297 /* stop if no progress has been made */ 411 /* stop if no progress has been made */
298 if (old_len == grp->length) 412 if (old_len == grp->size)
299 { 413 {
300 SvREFCNT_dec (grp->fh2); 414 SvREFCNT_dec (grp->sv2);
301 grp->fh2 = 0; 415 grp->sv2 = 0;
302 break; 416 break;
303 } 417 }
304 } 418 }
419
420 unblock_sig ();
305} 421}
306 422
307static void aio_grp_dec (aio_req grp) 423static void aio_grp_dec (aio_req grp)
308{ 424{
309 --grp->length; 425 --grp->size;
310 426
311 /* call feeder, if applicable */ 427 /* call feeder, if applicable */
312 aio_grp_feed (grp); 428 aio_grp_feed (grp);
313 429
314 /* finish, if done */ 430 /* finish, if done */
315 if (!grp->length && grp->fd) 431 if (!grp->size && grp->int1)
316 { 432 {
433 block_sig ();
434
317 req_invoke (grp); 435 if (!req_invoke (grp))
436 {
437 req_free (grp);
438 unblock_sig ();
439 croak (0);
440 }
441
318 req_free (grp); 442 req_free (grp);
443 unblock_sig ();
319 } 444 }
320} 445}
321 446
322static void poll_wait ()
323{
324 fd_set rfd;
325
326 while (nreqs)
327 {
328 int size;
329#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
330 LOCK (reslock);
331#endif
332 size = res_queue.size;
333#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
334 UNLOCK (reslock);
335#endif
336
337 if (size)
338 return;
339
340 FD_ZERO(&rfd);
341 FD_SET(respipe [0], &rfd);
342
343 select (respipe [0] + 1, &rfd, 0, 0, 0);
344 }
345}
346
347static void req_invoke (aio_req req) 447static int req_invoke (aio_req req)
348{ 448{
349 dSP; 449 dSP;
450
451 if (req->flags & FLAG_SV1_RO_OFF)
452 SvREADONLY_off (req->sv1);
350 453
351 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
352 { 455 {
353 errno = req->errorno;
354
355 ENTER; 456 ENTER;
356 SAVETMPS; 457 SAVETMPS;
357 PUSHMARK (SP); 458 PUSHMARK (SP);
358 EXTEND (SP, 1); 459 EXTEND (SP, 1);
359 460
364 SV *rv = &PL_sv_undef; 465 SV *rv = &PL_sv_undef;
365 466
366 if (req->result >= 0) 467 if (req->result >= 0)
367 { 468 {
368 int i; 469 int i;
369 char *buf = req->data2ptr; 470 char *buf = req->ptr2;
370 AV *av = newAV (); 471 AV *av = newAV ();
371 472
372 av_extend (av, req->result - 1); 473 av_extend (av, req->result - 1);
373 474
374 for (i = 0; i < req->result; ++i) 475 for (i = 0; i < req->result; ++i)
394 PUSHs (sv_2mortal (newSViv (req->result))); 495 PUSHs (sv_2mortal (newSViv (req->result)));
395 PUTBACK; 496 PUTBACK;
396 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 497 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
397 SPAGAIN; 498 SPAGAIN;
398 499
399 fh = SvREFCNT_inc (POPs); 500 fh = POPs;
400
401 PUSHMARK (SP); 501 PUSHMARK (SP);
402 XPUSHs (sv_2mortal (fh)); 502 XPUSHs (fh);
403 } 503 }
404 break; 504 break;
405 505
406 case REQ_GROUP: 506 case REQ_GROUP:
407 req->fd = 2; /* mark group as finished */ 507 req->int1 = 2; /* mark group as finished */
408 508
409 if (req->data) 509 if (req->sv1)
410 { 510 {
411 int i; 511 int i;
412 AV *av = (AV *)req->data; 512 AV *av = (AV *)req->sv1;
413 513
414 EXTEND (SP, AvFILL (av) + 1); 514 EXTEND (SP, AvFILL (av) + 1);
415 for (i = 0; i <= AvFILL (av); ++i) 515 for (i = 0; i <= AvFILL (av); ++i)
416 PUSHs (*av_fetch (av, i, 0)); 516 PUSHs (*av_fetch (av, i, 0));
417 } 517 }
419 519
420 case REQ_NOP: 520 case REQ_NOP:
421 case REQ_BUSY: 521 case REQ_BUSY:
422 break; 522 break;
423 523
524 case REQ_READLINK:
525 if (req->result > 0)
526 {
527 SvCUR_set (req->sv1, req->result);
528 *SvEND (req->sv1) = 0;
529 PUSHs (req->sv1);
530 }
531 break;
532
533 case REQ_STAT:
534 case REQ_LSTAT:
535 case REQ_FSTAT:
536 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
537 PL_laststatval = req->result;
538 PL_statcache = *(Stat_t *)(req->ptr2);
539 PUSHs (sv_2mortal (newSViv (req->result)));
540 break;
541
542 case REQ_READ:
543 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
544 *SvEND (req->sv1) = 0;
545 PUSHs (sv_2mortal (newSViv (req->result)));
546 break;
547
424 default: 548 default:
425 PUSHs (sv_2mortal (newSViv (req->result))); 549 PUSHs (sv_2mortal (newSViv (req->result)));
426 break; 550 break;
427 } 551 }
428 552
553 errno = req->errorno;
429 554
430 PUTBACK; 555 PUTBACK;
431 call_sv (req->callback, G_VOID | G_EVAL); 556 call_sv (req->callback, G_VOID | G_EVAL);
432 SPAGAIN; 557 SPAGAIN;
433 558
447 grp->grp_first = req->grp_next; 572 grp->grp_first = req->grp_next;
448 573
449 aio_grp_dec (grp); 574 aio_grp_dec (grp);
450 } 575 }
451 576
452 if (SvTRUE (ERRSV)) 577 return !SvTRUE (ERRSV);
453 {
454 req_free (req);
455 croak (0);
456 }
457} 578}
458 579
459static void req_free (aio_req req) 580static void req_free (aio_req req)
460{ 581{
461 if (req->self) 582 if (req->self)
462 { 583 {
463 sv_unmagic (req->self, PERL_MAGIC_ext); 584 sv_unmagic (req->self, PERL_MAGIC_ext);
464 SvREFCNT_dec (req->self); 585 SvREFCNT_dec (req->self);
465 } 586 }
466 587
467 SvREFCNT_dec (req->data);
468 SvREFCNT_dec (req->fh); 588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1);
469 SvREFCNT_dec (req->fh2); 590 SvREFCNT_dec (req->sv2);
470 SvREFCNT_dec (req->callback); 591 SvREFCNT_dec (req->callback);
471 Safefree (req->statdata);
472 592
473 if (req->type == REQ_READDIR) 593 if (req->flags & FLAG_PTR2_FREE)
474 free (req->data2ptr); 594 free (req->ptr2);
475 595
476 Safefree (req); 596 Safefree (req);
477} 597}
478 598
479static void req_cancel_subs (aio_req grp) 599static void req_cancel_subs (aio_req grp)
481 aio_req sub; 601 aio_req sub;
482 602
483 if (grp->type != REQ_GROUP) 603 if (grp->type != REQ_GROUP)
484 return; 604 return;
485 605
486 SvREFCNT_dec (grp->fh2); 606 SvREFCNT_dec (grp->sv2);
487 grp->fh2 = 0; 607 grp->sv2 = 0;
488 608
489 for (sub = grp->grp_first; sub; sub = sub->grp_next) 609 for (sub = grp->grp_first; sub; sub = sub->grp_next)
490 req_cancel (sub); 610 req_cancel (sub);
491} 611}
492 612
493static void req_cancel (aio_req req) 613static void req_cancel (aio_req req)
494{ 614{
495 req->flags |= FLAG_CANCELLED; 615 req->flags |= FLAG_CANCELLED;
496 616
497 req_cancel_subs (req); 617 req_cancel_subs (req);
498}
499
500static int poll_cb ()
501{
502 dSP;
503 int count = 0;
504 int do_croak = 0;
505 aio_req req;
506
507 for (;;)
508 {
509 LOCK (reslock);
510 req = reqq_shift (&res_queue);
511
512 if (req)
513 {
514 if (!res_queue.size)
515 {
516 /* read any signals sent by the worker threads */
517 char buf [32];
518 while (read (respipe [0], buf, 32) == 32)
519 ;
520 }
521 }
522
523 UNLOCK (reslock);
524
525 if (!req)
526 break;
527
528 --nreqs;
529
530 if (req->type == REQ_QUIT)
531 started--;
532 else if (req->type == REQ_GROUP && req->length)
533 {
534 req->fd = 1; /* mark request as delayed */
535 continue;
536 }
537 else
538 {
539 if (req->type == REQ_READ)
540 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
541
542 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
543 SvREADONLY_off (req->data);
544
545 if (req->statdata)
546 {
547 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
548 PL_laststatval = req->result;
549 PL_statcache = *(req->statdata);
550 }
551
552 req_invoke (req);
553
554 count++;
555 }
556
557 req_free (req);
558 }
559
560 return count;
561} 618}
562 619
563static void *aio_proc(void *arg); 620static void *aio_proc(void *arg);
564 621
565static void start_thread (void) 622static void start_thread (void)
573 croak ("unable to allocate worker thread data"); 630 croak ("unable to allocate worker thread data");
574 631
575 pthread_attr_init (&attr); 632 pthread_attr_init (&attr);
576 pthread_attr_setstacksize (&attr, STACKSIZE); 633 pthread_attr_setstacksize (&attr, STACKSIZE);
577 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 634 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
635#ifdef PTHREAD_SCOPE_PROCESS
636 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
637#endif
578 638
579 sigfillset (&fullsigset); 639 sigfillset (&fullsigset);
580 640
581 LOCK (wrklock); 641 LOCK (wrklock);
582 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
583 643
584 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
585 { 645 {
586 wrk->prev = &wrk_first; 646 wrk->prev = &wrk_first;
587 wrk->next = wrk_first.next; 647 wrk->next = wrk_first.next;
588 wrk_first.next->prev = wrk; 648 wrk_first.next->prev = wrk;
589 wrk_first.next = wrk; 649 wrk_first.next = wrk;
590 started++; 650 ++started;
591 } 651 }
592 else 652 else
593 free (wrk); 653 free (wrk);
594 654
595 sigprocmask (SIG_SETMASK, &oldsigset, 0); 655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
596 UNLOCK (wrklock); 656 UNLOCK (wrklock);
597} 657}
598 658
659static void maybe_start_thread ()
660{
661 if (get_nthreads () >= wanted)
662 return;
663
664 /* todo: maybe use idle here, but might be less exact */
665 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
666 return;
667
668 start_thread ();
669}
670
599static void req_send (aio_req req) 671static void req_send (aio_req req)
600{ 672{
601 while (started < wanted && nreqs >= started) 673 block_sig ();
602 start_thread ();
603 674
604 ++nreqs; 675 ++nreqs;
676
677 LOCK (reqlock);
678 ++nready;
679 reqq_push (&req_queue, req);
680 pthread_cond_signal (&reqwait);
681 UNLOCK (reqlock);
682
683 unblock_sig ();
684
685 maybe_start_thread ();
686}
687
688static void end_thread (void)
689{
690 aio_req req;
691
692 Newz (0, req, 1, aio_cb);
693
694 req->type = REQ_QUIT;
695 req->pri = PRI_MAX + PRI_BIAS;
605 696
606 LOCK (reqlock); 697 LOCK (reqlock);
607 reqq_push (&req_queue, req); 698 reqq_push (&req_queue, req);
608 pthread_cond_signal (&reqwait); 699 pthread_cond_signal (&reqwait);
609 UNLOCK (reqlock); 700 UNLOCK (reqlock);
610}
611 701
612static void end_thread (void) 702 LOCK (wrklock);
613{ 703 --started;
614 aio_req req; 704 UNLOCK (wrklock);
705}
615 706
616 Newz (0, req, 1, aio_cb); 707static void set_max_idle (int nthreads)
617 708{
618 req->type = REQ_QUIT; 709 if (WORDACCESS_UNSAFE) LOCK (reqlock);
619 req->pri = PRI_MAX + PRI_BIAS; 710 max_idle = nthreads <= 0 ? 1 : nthreads;
620 711 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
621 req_send (req);
622} 712}
623 713
624static void min_parallel (int nthreads) 714static void min_parallel (int nthreads)
625{ 715{
626 if (wanted < nthreads) 716 if (wanted < nthreads)
627 wanted = nthreads; 717 wanted = nthreads;
628} 718}
629 719
630static void max_parallel (int nthreads) 720static void max_parallel (int nthreads)
631{ 721{
632 int cur = started;
633
634 if (wanted > nthreads) 722 if (wanted > nthreads)
635 wanted = nthreads; 723 wanted = nthreads;
636 724
637 while (cur > wanted) 725 while (started > wanted)
726 end_thread ();
727}
728
729static void poll_wait ()
730{
731 fd_set rfd;
732
733 while (nreqs)
638 { 734 {
735 int size;
736 if (WORDACCESS_UNSAFE) LOCK (reslock);
737 size = res_queue.size;
738 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
739
740 if (size)
741 return;
742
639 end_thread (); 743 maybe_start_thread ();
640 cur--; 744
745 FD_ZERO(&rfd);
746 FD_SET(respipe [0], &rfd);
747
748 select (respipe [0] + 1, &rfd, 0, 0, 0);
641 } 749 }
750}
642 751
643 while (started > wanted) 752static int poll_cb ()
753{
754 dSP;
755 int count = 0;
756 int maxreqs = max_poll_reqs;
757 int do_croak = 0;
758 struct timeval tv_start, tv_now;
759 aio_req req;
760
761 if (max_poll_time)
762 gettimeofday (&tv_start, 0);
763
764 block_sig ();
765
766 for (;;)
644 { 767 {
768 for (;;)
769 {
770 maybe_start_thread ();
771
772 LOCK (reslock);
773 req = reqq_shift (&res_queue);
774
775 if (req)
776 {
777 --npending;
778
779 if (!res_queue.size)
780 {
781 /* read any signals sent by the worker threads */
782 char buf [4];
783 while (read (respipe [0], buf, 4) == 4)
784 ;
785 }
786 }
787
788 UNLOCK (reslock);
789
790 if (!req)
791 break;
792
793 --nreqs;
794
795 if (req->type == REQ_GROUP && req->size)
796 {
797 req->int1 = 1; /* mark request as delayed */
798 continue;
799 }
800 else
801 {
802 if (!req_invoke (req))
803 {
804 req_free (req);
805 unblock_sig ();
806 croak (0);
807 }
808
809 count++;
810 }
811
812 req_free (req);
813
814 if (maxreqs && !--maxreqs)
815 break;
816
817 if (max_poll_time)
818 {
819 gettimeofday (&tv_now, 0);
820
821 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
822 break;
823 }
824 }
825
826 if (nreqs <= max_outstanding)
827 break;
828
645 poll_wait (); 829 poll_wait ();
646 poll_cb (); 830
831 ++maxreqs;
647 } 832 }
833
834 unblock_sig ();
835 return count;
648} 836}
649 837
650static void create_pipe () 838static void create_pipe ()
651{ 839{
652 if (pipe (respipe)) 840 if (pipe (respipe))
779 { 967 {
780 off_t sbytes; 968 off_t sbytes;
781 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 969 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
782 970
783 if (res < 0 && sbytes) 971 if (res < 0 && sbytes)
784 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 972 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
785 res = sbytes; 973 res = sbytes;
786 } 974 }
787 975
788# elif __hpux 976# elif __hpux
789 res = sendfile (ofd, ifd, offset, count, 0, 0); 977 res = sendfile (ofd, ifd, offset, count, 0, 0);
867 int memofs = 0; 1055 int memofs = 0;
868 int res = 0; 1056 int res = 0;
869 int errorno; 1057 int errorno;
870 1058
871 LOCK (wrklock); 1059 LOCK (wrklock);
872 self->dirp = dirp = opendir (req->dataptr); 1060 self->dirp = dirp = opendir (req->ptr1);
873 self->dbuf = u = malloc (sizeof (*u)); 1061 self->dbuf = u = malloc (sizeof (*u));
1062 req->flags |= FLAG_PTR2_FREE;
1063 req->ptr2 = names = malloc (memlen);
874 UNLOCK (wrklock); 1064 UNLOCK (wrklock);
875
876 req->data2ptr = names = malloc (memlen);
877 1065
878 if (dirp && u && names) 1066 if (dirp && u && names)
879 for (;;) 1067 for (;;)
880 { 1068 {
881 errno = 0; 1069 errno = 0;
894 1082
895 while (memofs + len > memlen) 1083 while (memofs + len > memlen)
896 { 1084 {
897 memlen *= 2; 1085 memlen *= 2;
898 LOCK (wrklock); 1086 LOCK (wrklock);
899 req->data2ptr = names = realloc (names, memlen); 1087 req->ptr2 = names = realloc (names, memlen);
900 UNLOCK (wrklock); 1088 UNLOCK (wrklock);
901 1089
902 if (!names) 1090 if (!names)
903 break; 1091 break;
904 } 1092 }
917/*****************************************************************************/ 1105/*****************************************************************************/
918 1106
919static void *aio_proc (void *thr_arg) 1107static void *aio_proc (void *thr_arg)
920{ 1108{
921 aio_req req; 1109 aio_req req;
922 int type; 1110 struct timespec ts;
923 worker *self = (worker *)thr_arg; 1111 worker *self = (worker *)thr_arg;
924 1112
925 do 1113 /* try to distribute timeouts somewhat evenly */
1114 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1115 * (1000000000UL / 1024UL);
1116
1117 for (;;)
926 { 1118 {
1119 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1120
927 LOCK (reqlock); 1121 LOCK (reqlock);
928 1122
929 for (;;) 1123 for (;;)
930 { 1124 {
931 self->req = req = reqq_shift (&req_queue); 1125 self->req = req = reqq_shift (&req_queue);
932 1126
933 if (req) 1127 if (req)
934 break; 1128 break;
935 1129
1130 ++idle;
1131
1132 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1133 == ETIMEDOUT)
1134 {
1135 if (idle > max_idle)
1136 {
1137 --idle;
1138 UNLOCK (reqlock);
1139 LOCK (wrklock);
1140 --started;
1141 UNLOCK (wrklock);
1142 goto quit;
1143 }
1144
1145 /* we are allowed to idle, so do so without any timeout */
936 pthread_cond_wait (&reqwait, &reqlock); 1146 pthread_cond_wait (&reqwait, &reqlock);
1147 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1148 }
1149
1150 --idle;
937 } 1151 }
1152
1153 --nready;
938 1154
939 UNLOCK (reqlock); 1155 UNLOCK (reqlock);
940 1156
941 errno = 0; /* strictly unnecessary */ 1157 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
943 1158
944 if (!(req->flags & FLAG_CANCELLED)) 1159 if (!(req->flags & FLAG_CANCELLED))
945 switch (type) 1160 switch (req->type)
946 { 1161 {
947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1162 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; 1163 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
949 1164
950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1165 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; 1166 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
952 1167
953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1168 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; 1169 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; 1170 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
956 1171
957 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1172 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
958 case REQ_CLOSE: req->result = close (req->fd); break; 1173 case REQ_CLOSE: req->result = close (req->int1); break;
959 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
960 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1176 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
961 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1177 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1178 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1179 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1180 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1181 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
964 1182
965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1183 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
966 case REQ_FSYNC: req->result = fsync (req->fd); break; 1184 case REQ_FSYNC: req->result = fsync (req->int1); break;
967 case REQ_READDIR: scandir_ (req, self); break; 1185 case REQ_READDIR: scandir_ (req, self); break;
968 1186
969 case REQ_BUSY: 1187 case REQ_BUSY:
970 { 1188 {
971 struct timeval tv; 1189 struct timeval tv;
972 1190
973 tv.tv_sec = req->fd; 1191 tv.tv_sec = req->int1;
974 tv.tv_usec = req->fd2; 1192 tv.tv_usec = req->int2;
975 1193
976 req->result = select (0, 0, 0, 0, &tv); 1194 req->result = select (0, 0, 0, 0, &tv);
977 } 1195 }
978 1196
979 case REQ_GROUP: 1197 case REQ_GROUP:
980 case REQ_NOP: 1198 case REQ_NOP:
1199 break;
1200
981 case REQ_QUIT: 1201 case REQ_QUIT:
982 break; 1202 goto quit;
983 1203
984 default: 1204 default:
985 req->result = ENOSYS; 1205 req->result = ENOSYS;
986 break; 1206 break;
987 } 1207 }
988 1208
989 req->errorno = errno; 1209 req->errorno = errno;
990 1210
991 LOCK (reslock); 1211 LOCK (reslock);
992 1212
1213 ++npending;
1214
993 if (!reqq_push (&res_queue, req)) 1215 if (!reqq_push (&res_queue, req))
1216 {
994 /* write a dummy byte to the pipe so fh becomes ready */ 1217 /* write a dummy byte to the pipe so fh becomes ready */
995 write (respipe [1], &respipe, 1); 1218 write (respipe [1], &respipe, 1);
1219
1220 /* optionally signal the main thread asynchronously */
1221 if (main_sig)
1222 pthread_kill (main_tid, main_sig);
1223 }
996 1224
997 self->req = 0; 1225 self->req = 0;
998 worker_clear (self); 1226 worker_clear (self);
999 1227
1000 UNLOCK (reslock); 1228 UNLOCK (reslock);
1001 } 1229 }
1002 while (type != REQ_QUIT);
1003 1230
1231quit:
1004 LOCK (wrklock); 1232 LOCK (wrklock);
1005 worker_free (self); 1233 worker_free (self);
1006 UNLOCK (wrklock); 1234 UNLOCK (wrklock);
1007 1235
1008 return 0; 1236 return 0;
1055 1283
1056 worker_clear (wrk); 1284 worker_clear (wrk);
1057 worker_free (wrk); 1285 worker_free (wrk);
1058 } 1286 }
1059 1287
1060 started = 0; 1288 started = 0;
1289 idle = 0;
1061 nreqs = 0; 1290 nreqs = 0;
1291 nready = 0;
1292 npending = 0;
1062 1293
1063 close (respipe [0]); 1294 close (respipe [0]);
1064 close (respipe [1]); 1295 close (respipe [1]);
1065 create_pipe (); 1296 create_pipe ();
1066 1297
1093PROTOTYPES: ENABLE 1324PROTOTYPES: ENABLE
1094 1325
1095BOOT: 1326BOOT:
1096{ 1327{
1097 HV *stash = gv_stashpv ("IO::AIO", 1); 1328 HV *stash = gv_stashpv ("IO::AIO", 1);
1329
1098 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1330 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1099 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1331 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1100 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1332 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1333 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1334 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1335 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1336 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1101 1337
1102 create_pipe (); 1338 create_pipe ();
1103 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1339 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1104} 1340}
1105 1341
1106void 1342void
1107min_parallel (nthreads) 1343max_poll_reqs (int nreqs)
1108 int nthreads
1109 PROTOTYPE: $ 1344 PROTOTYPE: $
1345 CODE:
1346 max_poll_reqs = nreqs;
1110 1347
1111void 1348void
1112max_parallel (nthreads) 1349max_poll_time (double nseconds)
1113 int nthreads
1114 PROTOTYPE: $ 1350 PROTOTYPE: $
1351 CODE:
1352 max_poll_time = nseconds * AIO_TICKS;
1353
1354void
1355min_parallel (int nthreads)
1356 PROTOTYPE: $
1357
1358void
1359max_parallel (int nthreads)
1360 PROTOTYPE: $
1361
1362void
1363max_idle (int nthreads)
1364 PROTOTYPE: $
1365 CODE:
1366 set_max_idle (nthreads);
1367
1368int
1369max_outstanding (int maxreqs)
1370 PROTOTYPE: $
1371 CODE:
1372 RETVAL = max_outstanding;
1373 max_outstanding = maxreqs;
1374 OUTPUT:
1375 RETVAL
1115 1376
1116void 1377void
1117aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1378aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1118 SV * pathname 1379 SV8 * pathname
1119 int flags 1380 int flags
1120 int mode 1381 int mode
1121 SV * callback 1382 SV * callback
1122 PROTOTYPE: $$$;$ 1383 PROTOTYPE: $$$;$
1123 PPCODE: 1384 PPCODE:
1124{ 1385{
1125 dREQ; 1386 dREQ;
1126 1387
1127 req->type = REQ_OPEN; 1388 req->type = REQ_OPEN;
1128 req->data = newSVsv (pathname); 1389 req->sv1 = newSVsv (pathname);
1129 req->dataptr = SvPVbyte_nolen (req->data); 1390 req->ptr1 = SvPVbyte_nolen (req->sv1);
1130 req->fd = flags; 1391 req->int1 = flags;
1131 req->mode = mode; 1392 req->mode = mode;
1132 1393
1133 REQ_SEND; 1394 REQ_SEND;
1134} 1395}
1135 1396
1145 PPCODE: 1406 PPCODE:
1146{ 1407{
1147 dREQ; 1408 dREQ;
1148 1409
1149 req->type = ix; 1410 req->type = ix;
1150 req->fh = newSVsv (fh); 1411 req->fh = newSVsv (fh);
1151 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1412 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1152 1413
1153 REQ_SEND (req); 1414 REQ_SEND (req);
1154} 1415}
1155 1416
1156void 1417void
1157aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1418aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1158 SV * fh 1419 SV * fh
1159 UV offset 1420 UV offset
1160 UV length 1421 UV length
1161 SV * data 1422 SV8 * data
1162 UV dataoffset 1423 UV dataoffset
1163 SV * callback 1424 SV * callback
1164 ALIAS: 1425 ALIAS:
1165 aio_read = REQ_READ 1426 aio_read = REQ_READ
1166 aio_write = REQ_WRITE 1427 aio_write = REQ_WRITE
1167 PROTOTYPE: $$$$$;$ 1428 PROTOTYPE: $$$$$;$
1168 PPCODE: 1429 PPCODE:
1169{ 1430{
1170 aio_req req;
1171 STRLEN svlen; 1431 STRLEN svlen;
1172 char *svptr = SvPVbyte (data, svlen); 1432 char *svptr = SvPVbyte (data, svlen);
1173 1433
1174 SvUPGRADE (data, SVt_PV); 1434 SvUPGRADE (data, SVt_PV);
1175 SvPOK_on (data); 1435 SvPOK_on (data);
1187 length = svlen - dataoffset; 1447 length = svlen - dataoffset;
1188 } 1448 }
1189 else 1449 else
1190 { 1450 {
1191 /* read: grow scalar as necessary */ 1451 /* read: grow scalar as necessary */
1192 svptr = SvGROW (data, length + dataoffset); 1452 svptr = SvGROW (data, length + dataoffset + 1);
1193 } 1453 }
1194 1454
1195 if (length < 0) 1455 if (length < 0)
1196 croak ("length must not be negative"); 1456 croak ("length must not be negative");
1197 1457
1198 { 1458 {
1199 dREQ; 1459 dREQ;
1200 1460
1201 req->type = ix; 1461 req->type = ix;
1202 req->fh = newSVsv (fh); 1462 req->fh = newSVsv (fh);
1203 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1463 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1204 : IoOFP (sv_2io (fh))); 1464 : IoOFP (sv_2io (fh)));
1205 req->offset = offset; 1465 req->offs = offset;
1206 req->length = length; 1466 req->size = length;
1207 req->data = SvREFCNT_inc (data); 1467 req->sv1 = SvREFCNT_inc (data);
1208 req->dataptr = (char *)svptr + dataoffset; 1468 req->ptr1 = (char *)svptr + dataoffset;
1469 req->stroffset = dataoffset;
1209 1470
1210 if (!SvREADONLY (data)) 1471 if (!SvREADONLY (data))
1211 { 1472 {
1212 SvREADONLY_on (data); 1473 SvREADONLY_on (data);
1213 req->data2ptr = (void *)data; 1474 req->flags |= FLAG_SV1_RO_OFF;
1214 } 1475 }
1215 1476
1216 REQ_SEND; 1477 REQ_SEND;
1217 } 1478 }
1479}
1480
1481void
1482aio_readlink (path,callback=&PL_sv_undef)
1483 SV8 * path
1484 SV * callback
1485 PROTOTYPE: $$;$
1486 PPCODE:
1487{
1488 SV *data;
1489 dREQ;
1490
1491 data = newSV (NAME_MAX);
1492 SvPOK_on (data);
1493
1494 req->type = REQ_READLINK;
1495 req->fh = newSVsv (path);
1496 req->ptr2 = SvPVbyte_nolen (req->fh);
1497 req->sv1 = data;
1498 req->ptr1 = SvPVbyte_nolen (data);
1499
1500 REQ_SEND;
1218} 1501}
1219 1502
1220void 1503void
1221aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1504aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1222 SV * out_fh 1505 SV * out_fh
1228 PPCODE: 1511 PPCODE:
1229{ 1512{
1230 dREQ; 1513 dREQ;
1231 1514
1232 req->type = REQ_SENDFILE; 1515 req->type = REQ_SENDFILE;
1233 req->fh = newSVsv (out_fh); 1516 req->fh = newSVsv (out_fh);
1234 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1517 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1235 req->fh2 = newSVsv (in_fh); 1518 req->sv2 = newSVsv (in_fh);
1236 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1519 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1237 req->offset = in_offset; 1520 req->offs = in_offset;
1238 req->length = length; 1521 req->size = length;
1239 1522
1240 REQ_SEND; 1523 REQ_SEND;
1241} 1524}
1242 1525
1243void 1526void
1250 PPCODE: 1533 PPCODE:
1251{ 1534{
1252 dREQ; 1535 dREQ;
1253 1536
1254 req->type = REQ_READAHEAD; 1537 req->type = REQ_READAHEAD;
1255 req->fh = newSVsv (fh); 1538 req->fh = newSVsv (fh);
1256 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1539 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1257 req->offset = offset; 1540 req->offs = offset;
1258 req->length = length; 1541 req->size = length;
1259 1542
1260 REQ_SEND; 1543 REQ_SEND;
1261} 1544}
1262 1545
1263void 1546void
1264aio_stat (fh_or_path,callback=&PL_sv_undef) 1547aio_stat (fh_or_path,callback=&PL_sv_undef)
1265 SV * fh_or_path 1548 SV8 * fh_or_path
1266 SV * callback 1549 SV * callback
1267 ALIAS: 1550 ALIAS:
1268 aio_stat = REQ_STAT 1551 aio_stat = REQ_STAT
1269 aio_lstat = REQ_LSTAT 1552 aio_lstat = REQ_LSTAT
1270 PPCODE: 1553 PPCODE:
1271{ 1554{
1272 dREQ; 1555 dREQ;
1273 1556
1274 New (0, req->statdata, 1, Stat_t); 1557 req->ptr2 = malloc (sizeof (Stat_t));
1275 if (!req->statdata) 1558 if (!req->ptr2)
1276 { 1559 {
1277 req_free (req); 1560 req_free (req);
1278 croak ("out of memory during aio_req->statdata allocation"); 1561 croak ("out of memory during aio_stat statdata allocation");
1279 } 1562 }
1563
1564 req->flags |= FLAG_PTR2_FREE;
1280 1565
1281 if (SvPOK (fh_or_path)) 1566 if (SvPOK (fh_or_path))
1282 { 1567 {
1283 req->type = ix; 1568 req->type = ix;
1284 req->data = newSVsv (fh_or_path); 1569 req->sv1 = newSVsv (fh_or_path);
1285 req->dataptr = SvPVbyte_nolen (req->data); 1570 req->ptr1 = SvPVbyte_nolen (req->sv1);
1286 } 1571 }
1287 else 1572 else
1288 { 1573 {
1289 req->type = REQ_FSTAT; 1574 req->type = REQ_FSTAT;
1290 req->fh = newSVsv (fh_or_path); 1575 req->fh = newSVsv (fh_or_path);
1291 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1576 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 } 1577 }
1293 1578
1294 REQ_SEND; 1579 REQ_SEND;
1295} 1580}
1296 1581
1297void 1582void
1298aio_unlink (pathname,callback=&PL_sv_undef) 1583aio_unlink (pathname,callback=&PL_sv_undef)
1299 SV * pathname 1584 SV8 * pathname
1300 SV * callback 1585 SV * callback
1301 ALIAS: 1586 ALIAS:
1302 aio_unlink = REQ_UNLINK 1587 aio_unlink = REQ_UNLINK
1303 aio_rmdir = REQ_RMDIR 1588 aio_rmdir = REQ_RMDIR
1304 aio_readdir = REQ_READDIR 1589 aio_readdir = REQ_READDIR
1305 PPCODE: 1590 PPCODE:
1306{ 1591{
1307 dREQ; 1592 dREQ;
1308 1593
1309 req->type = ix; 1594 req->type = ix;
1310 req->data = newSVsv (pathname); 1595 req->sv1 = newSVsv (pathname);
1311 req->dataptr = SvPVbyte_nolen (req->data); 1596 req->ptr1 = SvPVbyte_nolen (req->sv1);
1597
1598 REQ_SEND;
1599}
1600
1601void
1602aio_mkdir (pathname,mode,callback=&PL_sv_undef)
1603 SV8 * pathname
1604 UV mode
1605 SV * callback
1606 PPCODE:
1607{
1608 dREQ;
1312 1609
1610 req->type = REQ_MKDIR;
1611 req->sv1 = newSVsv (pathname);
1612 req->ptr1 = SvPVbyte_nolen (req->sv1);
1613 req->mode = mode;
1614
1313 REQ_SEND; 1615 REQ_SEND;
1314} 1616}
1315 1617
1316void 1618void
1317aio_link (oldpath,newpath,callback=&PL_sv_undef) 1619aio_link (oldpath,newpath,callback=&PL_sv_undef)
1318 SV * oldpath 1620 SV8 * oldpath
1319 SV * newpath 1621 SV8 * newpath
1320 SV * callback 1622 SV * callback
1321 ALIAS: 1623 ALIAS:
1322 aio_link = REQ_LINK 1624 aio_link = REQ_LINK
1323 aio_symlink = REQ_SYMLINK 1625 aio_symlink = REQ_SYMLINK
1324 aio_rename = REQ_RENAME 1626 aio_rename = REQ_RENAME
1325 PPCODE: 1627 PPCODE:
1326{ 1628{
1327 dREQ; 1629 dREQ;
1328 1630
1329 req->type = ix; 1631 req->type = ix;
1330 req->fh = newSVsv (oldpath); 1632 req->fh = newSVsv (oldpath);
1331 req->data2ptr = SvPVbyte_nolen (req->fh); 1633 req->ptr2 = SvPVbyte_nolen (req->fh);
1332 req->data = newSVsv (newpath); 1634 req->sv1 = newSVsv (newpath);
1333 req->dataptr = SvPVbyte_nolen (req->data); 1635 req->ptr1 = SvPVbyte_nolen (req->sv1);
1334 1636
1335 REQ_SEND; 1637 REQ_SEND;
1336} 1638}
1337 1639
1338void 1640void
1641aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1642 SV8 * pathname
1643 UV mode
1644 UV dev
1645 SV * callback
1646 PPCODE:
1647{
1648 dREQ;
1649
1650 req->type = REQ_MKNOD;
1651 req->sv1 = newSVsv (pathname);
1652 req->ptr1 = SvPVbyte_nolen (req->sv1);
1653 req->mode = (mode_t)mode;
1654 req->offs = dev;
1655
1656 REQ_SEND;
1657}
1658
1659void
1339aio_busy (delay,callback=&PL_sv_undef) 1660aio_busy (delay,callback=&PL_sv_undef)
1340 double delay 1661 double delay
1341 SV * callback 1662 SV * callback
1342 PPCODE: 1663 PPCODE:
1343{ 1664{
1344 dREQ; 1665 dREQ;
1345 1666
1346 req->type = REQ_BUSY; 1667 req->type = REQ_BUSY;
1347 req->fd = delay < 0. ? 0 : delay; 1668 req->int1 = delay < 0. ? 0 : delay;
1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1669 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1349 1670
1350 REQ_SEND; 1671 REQ_SEND;
1351} 1672}
1352 1673
1353void 1674void
1357 PPCODE: 1678 PPCODE:
1358{ 1679{
1359 dREQ; 1680 dREQ;
1360 1681
1361 req->type = REQ_GROUP; 1682 req->type = REQ_GROUP;
1683
1362 req_send (req); 1684 req_send (req);
1363
1364 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1685 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1365} 1686}
1366 1687
1367void 1688void
1368aio_nop (callback=&PL_sv_undef) 1689aio_nop (callback=&PL_sv_undef)
1369 SV * callback 1690 SV * callback
1370 PPCODE: 1691 PPCODE:
1371{ 1692{
1372 dREQ; 1693 dREQ;
1373 1694
1374 req->type = REQ_NOP; 1695 req->type = REQ_NOP;
1375 1696
1376 REQ_SEND; 1697 REQ_SEND;
1377} 1698}
1378 1699
1379void 1700int
1380aioreq_pri (int pri = DEFAULT_PRI) 1701aioreq_pri (int pri = 0)
1381 CODE: 1702 PROTOTYPE: ;$
1703 CODE:
1704 RETVAL = next_pri - PRI_BIAS;
1705 if (items > 0)
1706 {
1382 if (pri < PRI_MIN) pri = PRI_MIN; 1707 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX; 1708 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS; 1709 next_pri = pri + PRI_BIAS;
1710 }
1711 OUTPUT:
1712 RETVAL
1385 1713
1386void 1714void
1387aioreq_nice (int nice = 0) 1715aioreq_nice (int nice = 0)
1388 CODE: 1716 CODE:
1389 nice = next_pri - nice; 1717 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN; 1718 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX; 1719 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS; 1720 next_pri = nice + PRI_BIAS;
1393 1721
1394void 1722void
1395flush () 1723flush ()
1396 PROTOTYPE: 1724 PROTOTYPE:
1397 CODE: 1725 CODE:
1399 { 1727 {
1400 poll_wait (); 1728 poll_wait ();
1401 poll_cb (); 1729 poll_cb ();
1402 } 1730 }
1403 1731
1404void 1732int
1405poll() 1733poll()
1406 PROTOTYPE: 1734 PROTOTYPE:
1407 CODE: 1735 CODE:
1408 if (nreqs)
1409 {
1410 poll_wait (); 1736 poll_wait ();
1411 poll_cb (); 1737 RETVAL = poll_cb ();
1412 } 1738 OUTPUT:
1739 RETVAL
1413 1740
1414int 1741int
1415poll_fileno() 1742poll_fileno()
1416 PROTOTYPE: 1743 PROTOTYPE:
1417 CODE: 1744 CODE:
1429 1756
1430void 1757void
1431poll_wait() 1758poll_wait()
1432 PROTOTYPE: 1759 PROTOTYPE:
1433 CODE: 1760 CODE:
1434 if (nreqs)
1435 poll_wait (); 1761 poll_wait ();
1762
1763void
1764setsig (int signum = SIGIO)
1765 PROTOTYPE: ;$
1766 CODE:
1767{
1768 if (block_sig_level)
1769 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1770
1771 LOCK (reslock);
1772 main_tid = pthread_self ();
1773 main_sig = signum;
1774 UNLOCK (reslock);
1775
1776 if (main_sig && npending)
1777 pthread_kill (main_tid, main_sig);
1778}
1779
1780void
1781aio_block (SV *cb)
1782 PROTOTYPE: &
1783 PPCODE:
1784{
1785 int count;
1786
1787 block_sig ();
1788 PUSHMARK (SP);
1789 PUTBACK;
1790 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1791 SPAGAIN;
1792 unblock_sig ();
1793
1794 if (SvTRUE (ERRSV))
1795 croak (0);
1796
1797 XSRETURN (count);
1798}
1436 1799
1437int 1800int
1438nreqs() 1801nreqs()
1439 PROTOTYPE: 1802 PROTOTYPE:
1440 CODE: 1803 CODE:
1441 RETVAL = nreqs; 1804 RETVAL = nreqs;
1442 OUTPUT: 1805 OUTPUT:
1443 RETVAL 1806 RETVAL
1444 1807
1808int
1809nready()
1810 PROTOTYPE:
1811 CODE:
1812 RETVAL = get_nready ();
1813 OUTPUT:
1814 RETVAL
1815
1816int
1817npending()
1818 PROTOTYPE:
1819 CODE:
1820 RETVAL = get_npending ();
1821 OUTPUT:
1822 RETVAL
1823
1824int
1825nthreads()
1826 PROTOTYPE:
1827 CODE:
1828 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1829 RETVAL = started;
1830 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1831 OUTPUT:
1832 RETVAL
1833
1445PROTOTYPES: DISABLE 1834PROTOTYPES: DISABLE
1446 1835
1447MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1836MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1448 1837
1449void 1838void
1464 PPCODE: 1853 PPCODE:
1465{ 1854{
1466 int i; 1855 int i;
1467 aio_req req; 1856 aio_req req;
1468 1857
1858 if (main_sig && !block_sig_level)
1859 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1860
1469 if (grp->fd == 2) 1861 if (grp->int1 == 2)
1470 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1862 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1471 1863
1472 for (i = 1; i < items; ++i ) 1864 for (i = 1; i < items; ++i )
1473 { 1865 {
1474 if (GIMME_V != G_VOID) 1866 if (GIMME_V != G_VOID)
1476 1868
1477 req = SvAIO_REQ (ST (i)); 1869 req = SvAIO_REQ (ST (i));
1478 1870
1479 if (req) 1871 if (req)
1480 { 1872 {
1481 ++grp->length; 1873 ++grp->size;
1482 req->grp = grp; 1874 req->grp = grp;
1483 1875
1484 req->grp_prev = 0; 1876 req->grp_prev = 0;
1485 req->grp_next = grp->grp_first; 1877 req->grp_next = grp->grp_first;
1486 1878
1500void 1892void
1501result (aio_req grp, ...) 1893result (aio_req grp, ...)
1502 CODE: 1894 CODE:
1503{ 1895{
1504 int i; 1896 int i;
1897 AV *av;
1898
1899 grp->errorno = errno;
1900
1505 AV *av = newAV (); 1901 av = newAV ();
1506 1902
1507 for (i = 1; i < items; ++i ) 1903 for (i = 1; i < items; ++i )
1508 av_push (av, newSVsv (ST (i))); 1904 av_push (av, newSVsv (ST (i)));
1509 1905
1510 SvREFCNT_dec (grp->data); 1906 SvREFCNT_dec (grp->sv1);
1511 grp->data = (SV *)av; 1907 grp->sv1 = (SV *)av;
1512} 1908}
1909
1910void
1911errno (aio_req grp, int errorno = errno)
1912 CODE:
1913 grp->errorno = errorno;
1513 1914
1514void 1915void
1515limit (aio_req grp, int limit) 1916limit (aio_req grp, int limit)
1516 CODE: 1917 CODE:
1517 grp->fd2 = limit; 1918 grp->int2 = limit;
1518 aio_grp_feed (grp); 1919 aio_grp_feed (grp);
1519 1920
1520void 1921void
1521feed (aio_req grp, SV *callback=&PL_sv_undef) 1922feed (aio_req grp, SV *callback=&PL_sv_undef)
1522 CODE: 1923 CODE:
1523{ 1924{
1524 SvREFCNT_dec (grp->fh2); 1925 SvREFCNT_dec (grp->sv2);
1525 grp->fh2 = newSVsv (callback); 1926 grp->sv2 = newSVsv (callback);
1526 1927
1527 if (grp->fd2 <= 0) 1928 if (grp->int2 <= 0)
1528 grp->fd2 = 2; 1929 grp->int2 = 2;
1529 1930
1530 aio_grp_feed (grp); 1931 aio_grp_feed (grp);
1531} 1932}
1532 1933

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines