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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC vs.
Revision 1.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
55#endif
56
57#ifndef PTHREAD_STACK_MIN
58/* care for broken platforms, e.g. windows */
59# define PTHREAD_STACK_MIN 16384
50#endif 60#endif
51 61
52#if __ia64 62#if __ia64
53# define STACKSIZE 65536 63# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 64#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN 65# define STACKSIZE PTHREAD_STACK_MIN
56#else 66#else
57# define STACKSIZE 16384 67# define STACKSIZE 16384
58#endif 68#endif
59 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
60/* buffer size for various temporary buffers */ 82/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 83#define AIO_BUFSIZE 65536
62 84
63#define dBUF \ 85#define dBUF \
64 char *aio_buf; \ 86 char *aio_buf; \
66 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 88 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
67 UNLOCK (wrklock); \ 89 UNLOCK (wrklock); \
68 if (!aio_buf) \ 90 if (!aio_buf) \
69 return -1; 91 return -1;
70 92
93typedef SV SV8; /* byte-sv, used for argument-checking */
94
71enum { 95enum {
72 REQ_QUIT, 96 REQ_QUIT,
73 REQ_OPEN, REQ_CLOSE, 97 REQ_OPEN, REQ_CLOSE,
74 REQ_READ, REQ_WRITE, REQ_READAHEAD, 98 REQ_READ, REQ_WRITE, REQ_READAHEAD,
75 REQ_SENDFILE, 99 REQ_SENDFILE,
76 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 100 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
77 REQ_FSYNC, REQ_FDATASYNC, 101 REQ_FSYNC, REQ_FDATASYNC,
78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 102 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
79 REQ_READDIR, 103 REQ_MKNOD, REQ_READDIR,
80 REQ_LINK, REQ_SYMLINK, 104 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
81 REQ_GROUP, REQ_NOP, 105 REQ_GROUP, REQ_NOP,
82 REQ_BUSY, 106 REQ_BUSY,
83}; 107};
84 108
85#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
87 111
88typedef struct aio_cb 112typedef struct aio_cb
89{ 113{
90 struct aio_cb *volatile next; 114 struct aio_cb *volatile next;
91 115
92 SV *data, *callback; 116 SV *callback, *fh;
93 SV *fh, *fh2; 117 SV *sv1, *sv2;
94 void *dataptr, *data2ptr; 118 void *ptr1, *ptr2;
95 Stat_t *statdata;
96 off_t offset; 119 off_t offs;
97 size_t length; 120 size_t size;
98 ssize_t result; 121 ssize_t result;
99 122
100 STRLEN dataoffset; 123 STRLEN stroffset;
101 int type; 124 int type;
102 int fd, fd2; 125 int int1, int2;
103 int errorno; 126 int errorno;
104 mode_t mode; /* open */ 127 mode_t mode; /* open */
105 128
106 unsigned char flags; 129 unsigned char flags;
107 unsigned char pri; 130 unsigned char pri;
109 SV *self; /* the perl counterpart of this request, if any */ 132 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 133 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
111} aio_cb; 134} aio_cb;
112 135
113enum { 136enum {
114 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) */
115}; 140};
116 141
117typedef aio_cb *aio_req; 142typedef aio_cb *aio_req;
118typedef aio_cb *aio_req_ornot; 143typedef aio_cb *aio_req_ornot;
119 144
124 DEFAULT_PRI = 0, 149 DEFAULT_PRI = 0,
125 PRI_BIAS = -PRI_MIN, 150 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 151 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
127}; 152};
128 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
129static int next_pri = DEFAULT_PRI + PRI_BIAS; 200static int next_pri = DEFAULT_PRI + PRI_BIAS;
130 201
131static int started, wanted; 202static unsigned int started, idle, wanted;
132static volatile int nreqs;
133static int max_outstanding = 1<<30;
134static int respipe [2];
135 203
136#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 204#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
137# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 205# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
138#else 206#else
139# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 207# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
140#endif 208#endif
141 209
142#define LOCK(mutex) pthread_mutex_lock (&(mutex)) 210#define LOCK(mutex) pthread_mutex_lock (&(mutex))
143#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 211#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
144 212
145/* worker threasd management */ 213/* worker threads management */
146static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 214static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
147 215
148typedef struct worker { 216typedef struct worker {
149 /* locked by wrklock */ 217 /* locked by wrklock */
150 struct worker *prev, *next; 218 struct worker *prev, *next;
180 wrk->prev->next = wrk->next; 248 wrk->prev->next = wrk->next;
181 249
182 free (wrk); 250 free (wrk);
183} 251}
184 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
185static pthread_mutex_t reslock = AIO_MUTEX_INIT; 258static pthread_mutex_t reslock = AIO_MUTEX_INIT;
186static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 259static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
187static 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
188 304
189/* 305/*
190 * a somewhat faster data structure might be nice, but 306 * a somewhat faster data structure might be nice, but
191 * with 8 priorities this actually needs <20 insns 307 * with 8 priorities this actually needs <20 insns
192 * per shift, the most expensive operation. 308 * per shift, the most expensive operation.
238 } 354 }
239 355
240 abort (); 356 abort ();
241} 357}
242 358
359static int poll_cb ();
243static void req_invoke (aio_req req); 360static int req_invoke (aio_req req);
244static void req_free (aio_req req); 361static void req_free (aio_req req);
362static void req_cancel (aio_req req);
245 363
246/* must be called at most once */ 364/* must be called at most once */
247static SV *req_sv (aio_req req, const char *klass) 365static SV *req_sv (aio_req req, const char *klass)
248{ 366{
249 if (!req->self) 367 if (!req->self)
267 return mg ? (aio_req)mg->mg_ptr : 0; 385 return mg ? (aio_req)mg->mg_ptr : 0;
268} 386}
269 387
270static void aio_grp_feed (aio_req grp) 388static void aio_grp_feed (aio_req grp)
271{ 389{
390 block_sig ();
391
272 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 392 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
273 { 393 {
274 int old_len = grp->length; 394 int old_len = grp->size;
275 395
276 if (grp->fh2 && SvOK (grp->fh2)) 396 if (grp->sv2 && SvOK (grp->sv2))
277 { 397 {
278 dSP; 398 dSP;
279 399
280 ENTER; 400 ENTER;
281 SAVETMPS; 401 SAVETMPS;
282 PUSHMARK (SP); 402 PUSHMARK (SP);
283 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 403 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
284 PUTBACK; 404 PUTBACK;
285 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 405 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
286 SPAGAIN; 406 SPAGAIN;
287 FREETMPS; 407 FREETMPS;
288 LEAVE; 408 LEAVE;
289 } 409 }
290 410
291 /* stop if no progress has been made */ 411 /* stop if no progress has been made */
292 if (old_len == grp->length) 412 if (old_len == grp->size)
293 { 413 {
294 SvREFCNT_dec (grp->fh2); 414 SvREFCNT_dec (grp->sv2);
295 grp->fh2 = 0; 415 grp->sv2 = 0;
296 break; 416 break;
297 } 417 }
298 } 418 }
419
420 unblock_sig ();
299} 421}
300 422
301static void aio_grp_dec (aio_req grp) 423static void aio_grp_dec (aio_req grp)
302{ 424{
303 --grp->length; 425 --grp->size;
304 426
305 /* call feeder, if applicable */ 427 /* call feeder, if applicable */
306 aio_grp_feed (grp); 428 aio_grp_feed (grp);
307 429
308 /* finish, if done */ 430 /* finish, if done */
309 if (!grp->length && grp->fd) 431 if (!grp->size && grp->int1)
310 { 432 {
433 block_sig ();
434
311 req_invoke (grp); 435 if (!req_invoke (grp))
436 {
437 req_free (grp);
438 unblock_sig ();
439 croak (0);
440 }
441
312 req_free (grp); 442 req_free (grp);
443 unblock_sig ();
313 } 444 }
314} 445}
315 446
316static void poll_wait ()
317{
318 fd_set rfd;
319
320 while (nreqs)
321 {
322 int size;
323#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
324 LOCK (reslock);
325#endif
326 size = res_queue.size;
327#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
328 UNLOCK (reslock);
329#endif
330
331 if (size)
332 return;
333
334 FD_ZERO(&rfd);
335 FD_SET(respipe [0], &rfd);
336
337 select (respipe [0] + 1, &rfd, 0, 0, 0);
338 }
339}
340
341static void req_invoke (aio_req req) 447static int req_invoke (aio_req req)
342{ 448{
343 dSP; 449 dSP;
450
451 if (req->flags & FLAG_SV1_RO_OFF)
452 SvREADONLY_off (req->sv1);
344 453
345 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
346 { 455 {
347 errno = req->errorno;
348
349 ENTER; 456 ENTER;
350 SAVETMPS; 457 SAVETMPS;
351 PUSHMARK (SP); 458 PUSHMARK (SP);
352 EXTEND (SP, 1); 459 EXTEND (SP, 1);
353 460
358 SV *rv = &PL_sv_undef; 465 SV *rv = &PL_sv_undef;
359 466
360 if (req->result >= 0) 467 if (req->result >= 0)
361 { 468 {
362 int i; 469 int i;
363 char *buf = req->data2ptr; 470 char *buf = req->ptr2;
364 AV *av = newAV (); 471 AV *av = newAV ();
365 472
366 av_extend (av, req->result - 1); 473 av_extend (av, req->result - 1);
367 474
368 for (i = 0; i < req->result; ++i) 475 for (i = 0; i < req->result; ++i)
388 PUSHs (sv_2mortal (newSViv (req->result))); 495 PUSHs (sv_2mortal (newSViv (req->result)));
389 PUTBACK; 496 PUTBACK;
390 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 497 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
391 SPAGAIN; 498 SPAGAIN;
392 499
393 fh = SvREFCNT_inc (POPs); 500 fh = POPs;
394
395 PUSHMARK (SP); 501 PUSHMARK (SP);
396 XPUSHs (sv_2mortal (fh)); 502 XPUSHs (fh);
397 } 503 }
398 break; 504 break;
399 505
400 case REQ_GROUP: 506 case REQ_GROUP:
401 req->fd = 2; /* mark group as finished */ 507 req->int1 = 2; /* mark group as finished */
402 508
403 if (req->data) 509 if (req->sv1)
404 { 510 {
405 int i; 511 int i;
406 AV *av = (AV *)req->data; 512 AV *av = (AV *)req->sv1;
407 513
408 EXTEND (SP, AvFILL (av) + 1); 514 EXTEND (SP, AvFILL (av) + 1);
409 for (i = 0; i <= AvFILL (av); ++i) 515 for (i = 0; i <= AvFILL (av); ++i)
410 PUSHs (*av_fetch (av, i, 0)); 516 PUSHs (*av_fetch (av, i, 0));
411 } 517 }
413 519
414 case REQ_NOP: 520 case REQ_NOP:
415 case REQ_BUSY: 521 case REQ_BUSY:
416 break; 522 break;
417 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
418 default: 548 default:
419 PUSHs (sv_2mortal (newSViv (req->result))); 549 PUSHs (sv_2mortal (newSViv (req->result)));
420 break; 550 break;
421 } 551 }
422 552
553 errno = req->errorno;
423 554
424 PUTBACK; 555 PUTBACK;
425 call_sv (req->callback, G_VOID | G_EVAL); 556 call_sv (req->callback, G_VOID | G_EVAL);
426 SPAGAIN; 557 SPAGAIN;
427 558
441 grp->grp_first = req->grp_next; 572 grp->grp_first = req->grp_next;
442 573
443 aio_grp_dec (grp); 574 aio_grp_dec (grp);
444 } 575 }
445 576
446 if (SvTRUE (ERRSV)) 577 return !SvTRUE (ERRSV);
447 {
448 req_free (req);
449 croak (0);
450 }
451} 578}
452 579
453static void req_free (aio_req req) 580static void req_free (aio_req req)
454{ 581{
455 if (req->self) 582 if (req->self)
456 { 583 {
457 sv_unmagic (req->self, PERL_MAGIC_ext); 584 sv_unmagic (req->self, PERL_MAGIC_ext);
458 SvREFCNT_dec (req->self); 585 SvREFCNT_dec (req->self);
459 } 586 }
460 587
461 SvREFCNT_dec (req->data);
462 SvREFCNT_dec (req->fh); 588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1);
463 SvREFCNT_dec (req->fh2); 590 SvREFCNT_dec (req->sv2);
464 SvREFCNT_dec (req->callback); 591 SvREFCNT_dec (req->callback);
465 Safefree (req->statdata);
466 592
467 if (req->type == REQ_READDIR) 593 if (req->flags & FLAG_PTR2_FREE)
468 free (req->data2ptr); 594 free (req->ptr2);
469 595
470 Safefree (req); 596 Safefree (req);
471} 597}
472 598
599static void req_cancel_subs (aio_req grp)
600{
601 aio_req sub;
602
603 if (grp->type != REQ_GROUP)
604 return;
605
606 SvREFCNT_dec (grp->sv2);
607 grp->sv2 = 0;
608
609 for (sub = grp->grp_first; sub; sub = sub->grp_next)
610 req_cancel (sub);
611}
612
473static void req_cancel (aio_req req) 613static void req_cancel (aio_req req)
474{ 614{
475 req->flags |= FLAG_CANCELLED; 615 req->flags |= FLAG_CANCELLED;
476 616
477 if (req->type == REQ_GROUP) 617 req_cancel_subs (req);
478 {
479 aio_req sub;
480
481 for (sub = req->grp_first; sub; sub = sub->grp_next)
482 req_cancel (sub);
483 }
484}
485
486static int poll_cb ()
487{
488 dSP;
489 int count = 0;
490 int do_croak = 0;
491 aio_req req;
492
493 for (;;)
494 {
495 LOCK (reslock);
496 req = reqq_shift (&res_queue);
497
498 if (req)
499 {
500 if (!res_queue.size)
501 {
502 /* read any signals sent by the worker threads */
503 char buf [32];
504 while (read (respipe [0], buf, 32) == 32)
505 ;
506 }
507 }
508
509 UNLOCK (reslock);
510
511 if (!req)
512 break;
513
514 --nreqs;
515
516 if (req->type == REQ_QUIT)
517 started--;
518 else if (req->type == REQ_GROUP && req->length)
519 {
520 req->fd = 1; /* mark request as delayed */
521 continue;
522 }
523 else
524 {
525 if (req->type == REQ_READ)
526 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
527
528 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
529 SvREADONLY_off (req->data);
530
531 if (req->statdata)
532 {
533 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
534 PL_laststatval = req->result;
535 PL_statcache = *(req->statdata);
536 }
537
538 req_invoke (req);
539
540 count++;
541 }
542
543 req_free (req);
544 }
545
546 return count;
547} 618}
548 619
549static void *aio_proc(void *arg); 620static void *aio_proc(void *arg);
550 621
551static void start_thread (void) 622static void start_thread (void)
552{ 623{
624 sigset_t fullsigset, oldsigset;
625 pthread_attr_t attr;
626
553 worker *wrk = calloc (1, sizeof (worker)); 627 worker *wrk = calloc (1, sizeof (worker));
554 628
555 if (!wrk) 629 if (!wrk)
556 croak ("unable to allocate worker thread data"); 630 croak ("unable to allocate worker thread data");
557
558 sigset_t fullsigset, oldsigset;
559 pthread_attr_t attr;
560 631
561 pthread_attr_init (&attr); 632 pthread_attr_init (&attr);
562 pthread_attr_setstacksize (&attr, STACKSIZE); 633 pthread_attr_setstacksize (&attr, STACKSIZE);
563 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
564 638
565 sigfillset (&fullsigset); 639 sigfillset (&fullsigset);
566 640
567 LOCK (wrklock); 641 LOCK (wrklock);
568 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
569 643
570 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
571 { 645 {
572 wrk->prev = &wrk_first; 646 wrk->prev = &wrk_first;
573 wrk->next = wrk_first.next; 647 wrk->next = wrk_first.next;
574 wrk_first.next->prev = wrk; 648 wrk_first.next->prev = wrk;
575 wrk_first.next = wrk; 649 wrk_first.next = wrk;
576 started++; 650 ++started;
577 } 651 }
578 else 652 else
579 free (wrk); 653 free (wrk);
580 654
581 sigprocmask (SIG_SETMASK, &oldsigset, 0); 655 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
582 UNLOCK (wrklock); 656 UNLOCK (wrklock);
583} 657}
584 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
585static void req_send (aio_req req) 671static void req_send (aio_req req)
586{ 672{
587 while (started < wanted && nreqs >= started) 673 block_sig ();
588 start_thread ();
589 674
590 ++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;
591 696
592 LOCK (reqlock); 697 LOCK (reqlock);
593 reqq_push (&req_queue, req); 698 reqq_push (&req_queue, req);
594 pthread_cond_signal (&reqwait); 699 pthread_cond_signal (&reqwait);
595 UNLOCK (reqlock); 700 UNLOCK (reqlock);
596 701
597 if (nreqs > max_outstanding) 702 LOCK (wrklock);
598 for (;;) 703 --started;
599 { 704 UNLOCK (wrklock);
600 poll_cb ();
601
602 if (nreqs <= max_outstanding)
603 break;
604
605 poll_wait ();
606 }
607} 705}
608 706
609static void end_thread (void) 707static void set_max_idle (int nthreads)
610{ 708{
611 aio_req req; 709 if (WORDACCESS_UNSAFE) LOCK (reqlock);
612 710 max_idle = nthreads <= 0 ? 1 : nthreads;
613 Newz (0, req, 1, aio_cb); 711 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
614
615 req->type = REQ_QUIT;
616 req->pri = PRI_MAX + PRI_BIAS;
617
618 req_send (req);
619} 712}
620 713
621static void min_parallel (int nthreads) 714static void min_parallel (int nthreads)
622{ 715{
623 if (wanted < nthreads) 716 if (wanted < nthreads)
624 wanted = nthreads; 717 wanted = nthreads;
625} 718}
626 719
627static void max_parallel (int nthreads) 720static void max_parallel (int nthreads)
628{ 721{
629 int cur = started;
630
631 if (wanted > nthreads) 722 if (wanted > nthreads)
632 wanted = nthreads; 723 wanted = nthreads;
633 724
634 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)
635 { 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
636 end_thread (); 743 maybe_start_thread ();
637 cur--; 744
745 FD_ZERO(&rfd);
746 FD_SET(respipe [0], &rfd);
747
748 select (respipe [0] + 1, &rfd, 0, 0, 0);
638 } 749 }
750}
639 751
640 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 (;;)
641 { 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
642 poll_wait (); 829 poll_wait ();
643 poll_cb (); 830
831 ++maxreqs;
644 } 832 }
833
834 unblock_sig ();
835 return count;
645} 836}
646 837
647static void create_pipe () 838static void create_pipe ()
648{ 839{
649 if (pipe (respipe)) 840 if (pipe (respipe))
704#if !HAVE_FDATASYNC 895#if !HAVE_FDATASYNC
705# define fdatasync fsync 896# define fdatasync fsync
706#endif 897#endif
707 898
708#if !HAVE_READAHEAD 899#if !HAVE_READAHEAD
709# define readahead aio_readahead 900# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
710 901
711static ssize_t readahead (int fd, off_t offset, size_t count) 902static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
712{ 903{
713 dBUF; 904 dBUF;
714 905
715 while (count > 0) 906 while (count > 0)
716 { 907 {
721 count -= len; 912 count -= len;
722 } 913 }
723 914
724 errno = 0; 915 errno = 0;
725} 916}
917
726#endif 918#endif
727 919
728#if !HAVE_READDIR_R 920#if !HAVE_READDIR_R
729# define readdir_r aio_readdir_r 921# define readdir_r aio_readdir_r
730 922
775 { 967 {
776 off_t sbytes; 968 off_t sbytes;
777 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 969 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
778 970
779 if (res < 0 && sbytes) 971 if (res < 0 && sbytes)
780 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 972 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
781 res = sbytes; 973 res = sbytes;
782 } 974 }
783 975
784# elif __hpux 976# elif __hpux
785 res = sendfile (ofd, ifd, offset, count, 0, 0); 977 res = sendfile (ofd, ifd, offset, count, 0, 0);
863 int memofs = 0; 1055 int memofs = 0;
864 int res = 0; 1056 int res = 0;
865 int errorno; 1057 int errorno;
866 1058
867 LOCK (wrklock); 1059 LOCK (wrklock);
868 self->dirp = dirp = opendir (req->dataptr); 1060 self->dirp = dirp = opendir (req->ptr1);
869 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);
870 UNLOCK (wrklock); 1064 UNLOCK (wrklock);
871
872 req->data2ptr = names = malloc (memlen);
873 1065
874 if (dirp && u && names) 1066 if (dirp && u && names)
875 for (;;) 1067 for (;;)
876 { 1068 {
877 errno = 0; 1069 errno = 0;
890 1082
891 while (memofs + len > memlen) 1083 while (memofs + len > memlen)
892 { 1084 {
893 memlen *= 2; 1085 memlen *= 2;
894 LOCK (wrklock); 1086 LOCK (wrklock);
895 req->data2ptr = names = realloc (names, memlen); 1087 req->ptr2 = names = realloc (names, memlen);
896 UNLOCK (wrklock); 1088 UNLOCK (wrklock);
897 1089
898 if (!names) 1090 if (!names)
899 break; 1091 break;
900 } 1092 }
913/*****************************************************************************/ 1105/*****************************************************************************/
914 1106
915static void *aio_proc (void *thr_arg) 1107static void *aio_proc (void *thr_arg)
916{ 1108{
917 aio_req req; 1109 aio_req req;
918 int type; 1110 struct timespec ts;
919 worker *self = (worker *)thr_arg; 1111 worker *self = (worker *)thr_arg;
920 1112
921 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 (;;)
922 { 1118 {
1119 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1120
923 LOCK (reqlock); 1121 LOCK (reqlock);
924 1122
925 for (;;) 1123 for (;;)
926 { 1124 {
927 self->req = req = reqq_shift (&req_queue); 1125 self->req = req = reqq_shift (&req_queue);
928 1126
929 if (req) 1127 if (req)
930 break; 1128 break;
931 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 */
932 pthread_cond_wait (&reqwait, &reqlock); 1146 pthread_cond_wait (&reqwait, &reqlock);
1147 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1148 }
1149
1150 --idle;
933 } 1151 }
1152
1153 --nready;
934 1154
935 UNLOCK (reqlock); 1155 UNLOCK (reqlock);
936 1156
937 errno = 0; /* strictly unnecessary */ 1157 errno = 0; /* strictly unnecessary */
938 type = req->type; /* remember type for QUIT check */
939 1158
940 if (!(req->flags & FLAG_CANCELLED)) 1159 if (!(req->flags & FLAG_CANCELLED))
941 switch (type) 1160 switch (req->type)
942 { 1161 {
943 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;
944 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;
945 1164
946 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;
947 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;
948 1167
949 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;
950 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;
951 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;
952 1171
953 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;
954 case REQ_CLOSE: req->result = close (req->fd); break; 1173 case REQ_CLOSE: req->result = close (req->int1); break;
955 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
956 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;
957 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1177 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
958 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1178 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
959 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;
960 1182
961 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1183 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
962 case REQ_FSYNC: req->result = fsync (req->fd); break; 1184 case REQ_FSYNC: req->result = fsync (req->int1); break;
963 case REQ_READDIR: scandir_ (req, self); break; 1185 case REQ_READDIR: scandir_ (req, self); break;
964 1186
965 case REQ_BUSY: 1187 case REQ_BUSY:
966 { 1188 {
967 struct timeval tv; 1189 struct timeval tv;
968 1190
969 tv.tv_sec = req->fd; 1191 tv.tv_sec = req->int1;
970 tv.tv_usec = req->fd2; 1192 tv.tv_usec = req->int2;
971 1193
972 req->result = select (0, 0, 0, 0, &tv); 1194 req->result = select (0, 0, 0, 0, &tv);
973 } 1195 }
974 1196
975 case REQ_GROUP: 1197 case REQ_GROUP:
976 case REQ_NOP: 1198 case REQ_NOP:
1199 break;
1200
977 case REQ_QUIT: 1201 case REQ_QUIT:
978 break; 1202 goto quit;
979 1203
980 default: 1204 default:
981 req->result = ENOSYS; 1205 req->result = ENOSYS;
982 break; 1206 break;
983 } 1207 }
984 1208
985 req->errorno = errno; 1209 req->errorno = errno;
986 1210
987 LOCK (reslock); 1211 LOCK (reslock);
988 1212
1213 ++npending;
1214
989 if (!reqq_push (&res_queue, req)) 1215 if (!reqq_push (&res_queue, req))
1216 {
990 /* write a dummy byte to the pipe so fh becomes ready */ 1217 /* write a dummy byte to the pipe so fh becomes ready */
991 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 }
992 1224
993 self->req = 0; 1225 self->req = 0;
994 worker_clear (self); 1226 worker_clear (self);
995 1227
996 UNLOCK (reslock); 1228 UNLOCK (reslock);
997 } 1229 }
998 while (type != REQ_QUIT);
999 1230
1231quit:
1000 LOCK (wrklock); 1232 LOCK (wrklock);
1001 worker_free (self); 1233 worker_free (self);
1002 UNLOCK (wrklock); 1234 UNLOCK (wrklock);
1003 1235
1004 return 0; 1236 return 0;
1051 1283
1052 worker_clear (wrk); 1284 worker_clear (wrk);
1053 worker_free (wrk); 1285 worker_free (wrk);
1054 } 1286 }
1055 1287
1056 started = 0; 1288 started = 0;
1289 idle = 0;
1057 nreqs = 0; 1290 nreqs = 0;
1291 nready = 0;
1292 npending = 0;
1058 1293
1059 close (respipe [0]); 1294 close (respipe [0]);
1060 close (respipe [1]); 1295 close (respipe [1]);
1061 create_pipe (); 1296 create_pipe ();
1062 1297
1089PROTOTYPES: ENABLE 1324PROTOTYPES: ENABLE
1090 1325
1091BOOT: 1326BOOT:
1092{ 1327{
1093 HV *stash = gv_stashpv ("IO::AIO", 1); 1328 HV *stash = gv_stashpv ("IO::AIO", 1);
1329
1094 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1330 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1095 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1331 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1096 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));
1097 1337
1098 create_pipe (); 1338 create_pipe ();
1099 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1339 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1100} 1340}
1101 1341
1102void 1342void
1103min_parallel (nthreads) 1343max_poll_reqs (int nreqs)
1104 int nthreads
1105 PROTOTYPE: $ 1344 PROTOTYPE: $
1345 CODE:
1346 max_poll_reqs = nreqs;
1106 1347
1107void 1348void
1108max_parallel (nthreads) 1349max_poll_time (double nseconds)
1109 int nthreads
1110 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);
1111 1367
1112int 1368int
1113max_outstanding (nreqs) 1369max_outstanding (int maxreqs)
1114 int nreqs 1370 PROTOTYPE: $
1115 PROTOTYPE: $
1116 CODE: 1371 CODE:
1117 RETVAL = max_outstanding; 1372 RETVAL = max_outstanding;
1118 max_outstanding = nreqs; 1373 max_outstanding = maxreqs;
1374 OUTPUT:
1375 RETVAL
1119 1376
1120void 1377void
1121aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1378aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1122 SV * pathname 1379 SV8 * pathname
1123 int flags 1380 int flags
1124 int mode 1381 int mode
1125 SV * callback 1382 SV * callback
1126 PROTOTYPE: $$$;$ 1383 PROTOTYPE: $$$;$
1127 PPCODE: 1384 PPCODE:
1128{ 1385{
1129 dREQ; 1386 dREQ;
1130 1387
1131 req->type = REQ_OPEN; 1388 req->type = REQ_OPEN;
1132 req->data = newSVsv (pathname); 1389 req->sv1 = newSVsv (pathname);
1133 req->dataptr = SvPVbyte_nolen (req->data); 1390 req->ptr1 = SvPVbyte_nolen (req->sv1);
1134 req->fd = flags; 1391 req->int1 = flags;
1135 req->mode = mode; 1392 req->mode = mode;
1136 1393
1137 REQ_SEND; 1394 REQ_SEND;
1138} 1395}
1139 1396
1149 PPCODE: 1406 PPCODE:
1150{ 1407{
1151 dREQ; 1408 dREQ;
1152 1409
1153 req->type = ix; 1410 req->type = ix;
1154 req->fh = newSVsv (fh); 1411 req->fh = newSVsv (fh);
1155 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1412 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1156 1413
1157 REQ_SEND (req); 1414 REQ_SEND (req);
1158} 1415}
1159 1416
1160void 1417void
1161aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1418aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1162 SV * fh 1419 SV * fh
1163 UV offset 1420 UV offset
1164 UV length 1421 UV length
1165 SV * data 1422 SV8 * data
1166 UV dataoffset 1423 UV dataoffset
1167 SV * callback 1424 SV * callback
1168 ALIAS: 1425 ALIAS:
1169 aio_read = REQ_READ 1426 aio_read = REQ_READ
1170 aio_write = REQ_WRITE 1427 aio_write = REQ_WRITE
1171 PROTOTYPE: $$$$$;$ 1428 PROTOTYPE: $$$$$;$
1172 PPCODE: 1429 PPCODE:
1173{ 1430{
1174 aio_req req;
1175 STRLEN svlen; 1431 STRLEN svlen;
1176 char *svptr = SvPVbyte (data, svlen); 1432 char *svptr = SvPVbyte (data, svlen);
1177 1433
1178 SvUPGRADE (data, SVt_PV); 1434 SvUPGRADE (data, SVt_PV);
1179 SvPOK_on (data); 1435 SvPOK_on (data);
1191 length = svlen - dataoffset; 1447 length = svlen - dataoffset;
1192 } 1448 }
1193 else 1449 else
1194 { 1450 {
1195 /* read: grow scalar as necessary */ 1451 /* read: grow scalar as necessary */
1196 svptr = SvGROW (data, length + dataoffset); 1452 svptr = SvGROW (data, length + dataoffset + 1);
1197 } 1453 }
1198 1454
1199 if (length < 0) 1455 if (length < 0)
1200 croak ("length must not be negative"); 1456 croak ("length must not be negative");
1201 1457
1202 { 1458 {
1203 dREQ; 1459 dREQ;
1204 1460
1205 req->type = ix; 1461 req->type = ix;
1206 req->fh = newSVsv (fh); 1462 req->fh = newSVsv (fh);
1207 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1463 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1208 : IoOFP (sv_2io (fh))); 1464 : IoOFP (sv_2io (fh)));
1209 req->offset = offset; 1465 req->offs = offset;
1210 req->length = length; 1466 req->size = length;
1211 req->data = SvREFCNT_inc (data); 1467 req->sv1 = SvREFCNT_inc (data);
1212 req->dataptr = (char *)svptr + dataoffset; 1468 req->ptr1 = (char *)svptr + dataoffset;
1469 req->stroffset = dataoffset;
1213 1470
1214 if (!SvREADONLY (data)) 1471 if (!SvREADONLY (data))
1215 { 1472 {
1216 SvREADONLY_on (data); 1473 SvREADONLY_on (data);
1217 req->data2ptr = (void *)data; 1474 req->flags |= FLAG_SV1_RO_OFF;
1218 } 1475 }
1219 1476
1220 REQ_SEND; 1477 REQ_SEND;
1221 } 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;
1222} 1501}
1223 1502
1224void 1503void
1225aio_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)
1226 SV * out_fh 1505 SV * out_fh
1232 PPCODE: 1511 PPCODE:
1233{ 1512{
1234 dREQ; 1513 dREQ;
1235 1514
1236 req->type = REQ_SENDFILE; 1515 req->type = REQ_SENDFILE;
1237 req->fh = newSVsv (out_fh); 1516 req->fh = newSVsv (out_fh);
1238 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1517 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1239 req->fh2 = newSVsv (in_fh); 1518 req->sv2 = newSVsv (in_fh);
1240 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1519 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1241 req->offset = in_offset; 1520 req->offs = in_offset;
1242 req->length = length; 1521 req->size = length;
1243 1522
1244 REQ_SEND; 1523 REQ_SEND;
1245} 1524}
1246 1525
1247void 1526void
1254 PPCODE: 1533 PPCODE:
1255{ 1534{
1256 dREQ; 1535 dREQ;
1257 1536
1258 req->type = REQ_READAHEAD; 1537 req->type = REQ_READAHEAD;
1259 req->fh = newSVsv (fh); 1538 req->fh = newSVsv (fh);
1260 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1539 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1261 req->offset = offset; 1540 req->offs = offset;
1262 req->length = length; 1541 req->size = length;
1263 1542
1264 REQ_SEND; 1543 REQ_SEND;
1265} 1544}
1266 1545
1267void 1546void
1268aio_stat (fh_or_path,callback=&PL_sv_undef) 1547aio_stat (fh_or_path,callback=&PL_sv_undef)
1269 SV * fh_or_path 1548 SV8 * fh_or_path
1270 SV * callback 1549 SV * callback
1271 ALIAS: 1550 ALIAS:
1272 aio_stat = REQ_STAT 1551 aio_stat = REQ_STAT
1273 aio_lstat = REQ_LSTAT 1552 aio_lstat = REQ_LSTAT
1274 PPCODE: 1553 PPCODE:
1275{ 1554{
1276 dREQ; 1555 dREQ;
1277 1556
1278 New (0, req->statdata, 1, Stat_t); 1557 req->ptr2 = malloc (sizeof (Stat_t));
1279 if (!req->statdata) 1558 if (!req->ptr2)
1280 { 1559 {
1281 req_free (req); 1560 req_free (req);
1282 croak ("out of memory during aio_req->statdata allocation"); 1561 croak ("out of memory during aio_stat statdata allocation");
1283 } 1562 }
1563
1564 req->flags |= FLAG_PTR2_FREE;
1284 1565
1285 if (SvPOK (fh_or_path)) 1566 if (SvPOK (fh_or_path))
1286 { 1567 {
1287 req->type = ix; 1568 req->type = ix;
1288 req->data = newSVsv (fh_or_path); 1569 req->sv1 = newSVsv (fh_or_path);
1289 req->dataptr = SvPVbyte_nolen (req->data); 1570 req->ptr1 = SvPVbyte_nolen (req->sv1);
1290 } 1571 }
1291 else 1572 else
1292 { 1573 {
1293 req->type = REQ_FSTAT; 1574 req->type = REQ_FSTAT;
1294 req->fh = newSVsv (fh_or_path); 1575 req->fh = newSVsv (fh_or_path);
1295 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1576 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1296 } 1577 }
1297 1578
1298 REQ_SEND; 1579 REQ_SEND;
1299} 1580}
1300 1581
1301void 1582void
1302aio_unlink (pathname,callback=&PL_sv_undef) 1583aio_unlink (pathname,callback=&PL_sv_undef)
1303 SV * pathname 1584 SV8 * pathname
1304 SV * callback 1585 SV * callback
1305 ALIAS: 1586 ALIAS:
1306 aio_unlink = REQ_UNLINK 1587 aio_unlink = REQ_UNLINK
1307 aio_rmdir = REQ_RMDIR 1588 aio_rmdir = REQ_RMDIR
1308 aio_readdir = REQ_READDIR 1589 aio_readdir = REQ_READDIR
1309 PPCODE: 1590 PPCODE:
1310{ 1591{
1311 dREQ; 1592 dREQ;
1312 1593
1313 req->type = ix; 1594 req->type = ix;
1314 req->data = newSVsv (pathname); 1595 req->sv1 = newSVsv (pathname);
1315 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;
1316 1609
1610 req->type = REQ_MKDIR;
1611 req->sv1 = newSVsv (pathname);
1612 req->ptr1 = SvPVbyte_nolen (req->sv1);
1613 req->mode = mode;
1614
1317 REQ_SEND; 1615 REQ_SEND;
1318} 1616}
1319 1617
1320void 1618void
1321aio_link (oldpath,newpath,callback=&PL_sv_undef) 1619aio_link (oldpath,newpath,callback=&PL_sv_undef)
1322 SV * oldpath 1620 SV8 * oldpath
1323 SV * newpath 1621 SV8 * newpath
1324 SV * callback 1622 SV * callback
1325 ALIAS: 1623 ALIAS:
1326 aio_link = REQ_LINK 1624 aio_link = REQ_LINK
1327 aio_symlink = REQ_SYMLINK 1625 aio_symlink = REQ_SYMLINK
1328 aio_rename = REQ_RENAME 1626 aio_rename = REQ_RENAME
1329 PPCODE: 1627 PPCODE:
1330{ 1628{
1331 dREQ; 1629 dREQ;
1332 1630
1333 req->type = ix; 1631 req->type = ix;
1334 req->fh = newSVsv (oldpath); 1632 req->fh = newSVsv (oldpath);
1335 req->data2ptr = SvPVbyte_nolen (req->fh); 1633 req->ptr2 = SvPVbyte_nolen (req->fh);
1336 req->data = newSVsv (newpath); 1634 req->sv1 = newSVsv (newpath);
1337 req->dataptr = SvPVbyte_nolen (req->data); 1635 req->ptr1 = SvPVbyte_nolen (req->sv1);
1338 1636
1339 REQ_SEND; 1637 REQ_SEND;
1340} 1638}
1341 1639
1342void 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
1343aio_busy (delay,callback=&PL_sv_undef) 1660aio_busy (delay,callback=&PL_sv_undef)
1344 double delay 1661 double delay
1345 SV * callback 1662 SV * callback
1346 PPCODE: 1663 PPCODE:
1347{ 1664{
1348 dREQ; 1665 dREQ;
1349 1666
1350 req->type = REQ_BUSY; 1667 req->type = REQ_BUSY;
1351 req->fd = delay < 0. ? 0 : delay; 1668 req->int1 = delay < 0. ? 0 : delay;
1352 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1669 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1353 1670
1354 REQ_SEND; 1671 REQ_SEND;
1355} 1672}
1356 1673
1357void 1674void
1361 PPCODE: 1678 PPCODE:
1362{ 1679{
1363 dREQ; 1680 dREQ;
1364 1681
1365 req->type = REQ_GROUP; 1682 req->type = REQ_GROUP;
1683
1366 req_send (req); 1684 req_send (req);
1367
1368 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1685 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1369} 1686}
1370 1687
1371void 1688void
1372aio_nop (callback=&PL_sv_undef) 1689aio_nop (callback=&PL_sv_undef)
1373 SV * callback 1690 SV * callback
1374 PPCODE: 1691 PPCODE:
1375{ 1692{
1376 dREQ; 1693 dREQ;
1377 1694
1378 req->type = REQ_NOP; 1695 req->type = REQ_NOP;
1379 1696
1380 REQ_SEND; 1697 REQ_SEND;
1381} 1698}
1382 1699
1383void 1700int
1384aioreq_pri (int pri = DEFAULT_PRI) 1701aioreq_pri (int pri = 0)
1385 CODE: 1702 PROTOTYPE: ;$
1703 CODE:
1704 RETVAL = next_pri - PRI_BIAS;
1705 if (items > 0)
1706 {
1386 if (pri < PRI_MIN) pri = PRI_MIN; 1707 if (pri < PRI_MIN) pri = PRI_MIN;
1387 if (pri > PRI_MAX) pri = PRI_MAX; 1708 if (pri > PRI_MAX) pri = PRI_MAX;
1388 next_pri = pri + PRI_BIAS; 1709 next_pri = pri + PRI_BIAS;
1710 }
1711 OUTPUT:
1712 RETVAL
1389 1713
1390void 1714void
1391aioreq_nice (int nice = 0) 1715aioreq_nice (int nice = 0)
1392 CODE: 1716 CODE:
1393 nice = next_pri - nice; 1717 nice = next_pri - nice;
1394 if (nice < PRI_MIN) nice = PRI_MIN; 1718 if (nice < PRI_MIN) nice = PRI_MIN;
1395 if (nice > PRI_MAX) nice = PRI_MAX; 1719 if (nice > PRI_MAX) nice = PRI_MAX;
1396 next_pri = nice + PRI_BIAS; 1720 next_pri = nice + PRI_BIAS;
1397 1721
1398void 1722void
1399flush () 1723flush ()
1400 PROTOTYPE: 1724 PROTOTYPE:
1401 CODE: 1725 CODE:
1403 { 1727 {
1404 poll_wait (); 1728 poll_wait ();
1405 poll_cb (); 1729 poll_cb ();
1406 } 1730 }
1407 1731
1408void 1732int
1409poll() 1733poll()
1410 PROTOTYPE: 1734 PROTOTYPE:
1411 CODE: 1735 CODE:
1412 if (nreqs)
1413 {
1414 poll_wait (); 1736 poll_wait ();
1415 poll_cb (); 1737 RETVAL = poll_cb ();
1416 } 1738 OUTPUT:
1739 RETVAL
1417 1740
1418int 1741int
1419poll_fileno() 1742poll_fileno()
1420 PROTOTYPE: 1743 PROTOTYPE:
1421 CODE: 1744 CODE:
1433 1756
1434void 1757void
1435poll_wait() 1758poll_wait()
1436 PROTOTYPE: 1759 PROTOTYPE:
1437 CODE: 1760 CODE:
1438 if (nreqs)
1439 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}
1440 1799
1441int 1800int
1442nreqs() 1801nreqs()
1443 PROTOTYPE: 1802 PROTOTYPE:
1444 CODE: 1803 CODE:
1445 RETVAL = nreqs; 1804 RETVAL = nreqs;
1446 OUTPUT: 1805 OUTPUT:
1447 RETVAL 1806 RETVAL
1448 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
1449PROTOTYPES: DISABLE 1834PROTOTYPES: DISABLE
1450 1835
1451MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1836MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1452 1837
1453void 1838void
1468 PPCODE: 1853 PPCODE:
1469{ 1854{
1470 int i; 1855 int i;
1471 aio_req req; 1856 aio_req req;
1472 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
1473 if (grp->fd == 2) 1861 if (grp->int1 == 2)
1474 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");
1475 1863
1476 for (i = 1; i < items; ++i ) 1864 for (i = 1; i < items; ++i )
1477 { 1865 {
1478 if (GIMME_V != G_VOID) 1866 if (GIMME_V != G_VOID)
1480 1868
1481 req = SvAIO_REQ (ST (i)); 1869 req = SvAIO_REQ (ST (i));
1482 1870
1483 if (req) 1871 if (req)
1484 { 1872 {
1485 ++grp->length; 1873 ++grp->size;
1486 req->grp = grp; 1874 req->grp = grp;
1487 1875
1488 req->grp_prev = 0; 1876 req->grp_prev = 0;
1489 req->grp_next = grp->grp_first; 1877 req->grp_next = grp->grp_first;
1490 1878
1495 } 1883 }
1496 } 1884 }
1497} 1885}
1498 1886
1499void 1887void
1888cancel_subs (aio_req_ornot req)
1889 CODE:
1890 req_cancel_subs (req);
1891
1892void
1500result (aio_req grp, ...) 1893result (aio_req grp, ...)
1501 CODE: 1894 CODE:
1502{ 1895{
1503 int i; 1896 int i;
1897 AV *av;
1898
1899 grp->errorno = errno;
1900
1504 AV *av = newAV (); 1901 av = newAV ();
1505 1902
1506 for (i = 1; i < items; ++i ) 1903 for (i = 1; i < items; ++i )
1507 av_push (av, newSVsv (ST (i))); 1904 av_push (av, newSVsv (ST (i)));
1508 1905
1509 SvREFCNT_dec (grp->data); 1906 SvREFCNT_dec (grp->sv1);
1510 grp->data = (SV *)av; 1907 grp->sv1 = (SV *)av;
1511} 1908}
1909
1910void
1911errno (aio_req grp, int errorno = errno)
1912 CODE:
1913 grp->errorno = errorno;
1512 1914
1513void 1915void
1514limit (aio_req grp, int limit) 1916limit (aio_req grp, int limit)
1515 CODE: 1917 CODE:
1516 grp->fd2 = limit; 1918 grp->int2 = limit;
1517 aio_grp_feed (grp); 1919 aio_grp_feed (grp);
1518 1920
1519void 1921void
1520feed (aio_req grp, SV *callback=&PL_sv_undef) 1922feed (aio_req grp, SV *callback=&PL_sv_undef)
1521 CODE: 1923 CODE:
1522{ 1924{
1523 SvREFCNT_dec (grp->fh2); 1925 SvREFCNT_dec (grp->sv2);
1524 grp->fh2 = newSVsv (callback); 1926 grp->sv2 = newSVsv (callback);
1525 1927
1526 if (grp->fd2 <= 0) 1928 if (grp->int2 <= 0)
1527 grp->fd2 = 2; 1929 grp->int2 = 2;
1528 1930
1529 aio_grp_feed (grp); 1931 aio_grp_feed (grp);
1530} 1932}
1531 1933

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines