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.83 by root, Sat Oct 28 00:17:30 2006 UTC vs.
Revision 1.102 by root, Sun Jun 3 09:44:17 2007 UTC

1/* solaris */ 1#include "xthread.h"
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
9#define _REENTRANT 1
10 2
11#include <errno.h> 3#include <errno.h>
12 4
13#include "EXTERN.h" 5#include "EXTERN.h"
14#include "perl.h" 6#include "perl.h"
15#include "XSUB.h" 7#include "XSUB.h"
16 8
17#include "autoconf/config.h" 9#include "autoconf/config.h"
18 10
19#include <pthread.h>
20
21#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
22#include <errno.h> 13#include <errno.h>
23#include <sys/time.h> 14#include <sys/time.h>
24#include <sys/select.h> 15#include <sys/select.h>
25#include <sys/types.h> 16#include <sys/types.h>
26#include <sys/stat.h> 17#include <sys/stat.h>
27#include <limits.h> 18#include <limits.h>
28#include <unistd.h> 19#include <unistd.h>
29#include <fcntl.h> 20#include <fcntl.h>
30#include <signal.h> 21#include <signal.h>
31#include <sched.h> 22#include <sched.h>
23#include <utime.h>
32 24
33#if HAVE_SENDFILE 25#if HAVE_SENDFILE
34# if __linux 26# if __linux
35# include <sys/sendfile.h> 27# include <sys/sendfile.h>
36# elif __freebsd 28# elif __freebsd
43# else 35# else
44# error sendfile support requested but not available 36# error sendfile support requested but not available
45# endif 37# endif
46#endif 38#endif
47 39
40/* number of seconds after which idle threads exit */
41#define IDLE_TIMEOUT 10
42
48/* used for struct dirent, AIX doesn't provide it */ 43/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 44#ifndef NAME_MAX
50# define NAME_MAX 4096 45# define NAME_MAX 4096
51#endif 46#endif
52 47
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
58#if __ia64
59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
62#else
63# define STACKSIZE 16384
64#endif
65
66/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes.
69 */
70#ifndef WORDREAD_UNSAFE
71# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0
73# else
74# define WORDREAD_UNSAFE 1
75# endif
76#endif
77
78/* buffer size for various temporary buffers */ 48/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536 49#define AIO_BUFSIZE 65536
50
51/* use NV for 32 bit perls as it allows larger offsets */
52#if IVSIZE >= 8
53# define SvVAL64 SvIV
54#else
55# define SvVAL64 SvNV
56#endif
80 57
81#define dBUF \ 58#define dBUF \
82 char *aio_buf; \ 59 char *aio_buf; \
83 LOCK (wrklock); \ 60 LOCK (wrklock); \
84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 61 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \ 62 UNLOCK (wrklock); \
86 if (!aio_buf) \ 63 if (!aio_buf) \
87 return -1; 64 return -1;
88 65
66typedef SV SV8; /* byte-sv, used for argument-checking */
67
89enum { 68enum {
90 REQ_QUIT, 69 REQ_QUIT,
91 REQ_OPEN, REQ_CLOSE, 70 REQ_OPEN, REQ_CLOSE,
92 REQ_READ, REQ_WRITE, REQ_READAHEAD, 71 REQ_READ, REQ_WRITE,
93 REQ_SENDFILE, 72 REQ_READAHEAD, REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 73 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
74 REQ_UTIME, REQ_FUTIME,
75 REQ_CHMOD, REQ_FCHMOD,
76 REQ_CHOWN, REQ_FCHOWN,
95 REQ_FSYNC, REQ_FDATASYNC, 77 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 78 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
97 REQ_MKNOD, REQ_READDIR, 79 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 80 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 81 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 82 REQ_BUSY,
101}; 83};
102 84
103#define AIO_REQ_KLASS "IO::AIO::REQ" 85#define AIO_REQ_KLASS "IO::AIO::REQ"
105 87
106typedef struct aio_cb 88typedef struct aio_cb
107{ 89{
108 struct aio_cb *volatile next; 90 struct aio_cb *volatile next;
109 91
110 SV *data, *callback; 92 SV *callback;
111 SV *fh, *fh2; 93 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 94 void *ptr1, *ptr2;
113 Stat_t *statdata;
114 off_t offset; 95 off_t offs;
115 size_t length; 96 size_t size;
116 ssize_t result; 97 ssize_t result;
98 double nv1, nv2;
117 99
118 STRLEN dataoffset; 100 STRLEN stroffset;
119 int type; 101 int type;
120 int fd, fd2; 102 int int1, int2, int3;
121 int errorno; 103 int errorno;
122 mode_t mode; /* open */ 104 mode_t mode; /* open */
123 105
124 unsigned char flags; 106 unsigned char flags;
125 unsigned char pri; 107 unsigned char pri;
127 SV *self; /* the perl counterpart of this request, if any */ 109 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 111} aio_cb;
130 112
131enum { 113enum {
132 FLAG_CANCELLED = 0x01, 114 FLAG_CANCELLED = 0x01, /* request was cancelled */
115 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
116 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
133}; 117};
134 118
135typedef aio_cb *aio_req; 119typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 120typedef aio_cb *aio_req_ornot;
137 121
142 DEFAULT_PRI = 0, 126 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 127 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 128 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 129};
146 130
131#define AIO_TICKS ((1000000 + 1023) >> 10)
132
133static unsigned int max_poll_time = 0;
134static unsigned int max_poll_reqs = 0;
135
136/* calculcate time difference in ~1/AIO_TICKS of a second */
137static int tvdiff (struct timeval *tv1, struct timeval *tv2)
138{
139 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
140 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
141}
142
143static thread_t main_tid;
144static int main_sig;
145static int block_sig_level;
146
147void block_sig ()
148{
149 sigset_t ss;
150
151 if (block_sig_level++)
152 return;
153
154 if (!main_sig)
155 return;
156
157 sigemptyset (&ss);
158 sigaddset (&ss, main_sig);
159 pthread_sigmask (SIG_BLOCK, &ss, 0);
160}
161
162void unblock_sig ()
163{
164 sigset_t ss;
165
166 if (--block_sig_level)
167 return;
168
169 if (!main_sig)
170 return;
171
172 sigemptyset (&ss);
173 sigaddset (&ss, main_sig);
174 pthread_sigmask (SIG_UNBLOCK, &ss, 0);
175}
176
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 177static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 178
149static unsigned int started, wanted; 179static unsigned int started, idle, wanted;
150
151#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
152# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
153#else
154# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
155#endif
156
157#define LOCK(mutex) pthread_mutex_lock (&(mutex))
158#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
159 180
160/* worker threads management */ 181/* worker threads management */
161static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 182static mutex_t wrklock = MUTEX_INIT;
162 183
163typedef struct worker { 184typedef struct worker {
164 /* locked by wrklock */ 185 /* locked by wrklock */
165 struct worker *prev, *next; 186 struct worker *prev, *next;
166 187
167 pthread_t tid; 188 thread_t tid;
168 189
169 /* locked by reslock, reqlock or wrklock */ 190 /* locked by reslock, reqlock or wrklock */
170 aio_req req; /* currently processed request */ 191 aio_req req; /* currently processed request */
171 void *dbuf; 192 void *dbuf;
172 DIR *dirp; 193 DIR *dirp;
196 217
197 free (wrk); 218 free (wrk);
198} 219}
199 220
200static volatile unsigned int nreqs, nready, npending; 221static volatile unsigned int nreqs, nready, npending;
222static volatile unsigned int max_idle = 4;
201static volatile unsigned int max_outstanding = 0xffffffff; 223static volatile unsigned int max_outstanding = 0xffffffff;
202static int respipe [2]; 224static int respipe [2];
203 225
204static pthread_mutex_t reslock = AIO_MUTEX_INIT; 226static mutex_t reslock = MUTEX_INIT;
205static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 227static mutex_t reqlock = MUTEX_INIT;
206static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 228static cond_t reqwait = COND_INIT;
207 229
208#if WORDREAD_UNSAFE 230#if WORDACCESS_UNSAFE
209 231
210static unsigned int get_nready () 232static unsigned int get_nready ()
211{ 233{
212 unsigned int retval; 234 unsigned int retval;
213 235
227 UNLOCK (reslock); 249 UNLOCK (reslock);
228 250
229 return retval; 251 return retval;
230} 252}
231 253
254static unsigned int get_nthreads ()
255{
256 unsigned int retval;
257
258 LOCK (wrklock);
259 retval = started;
260 UNLOCK (wrklock);
261
262 return retval;
263}
264
232#else 265#else
233 266
234# define get_nready() nready 267# define get_nready() nready
235# define get_npending() npending 268# define get_npending() npending
269# define get_nthreads() started
236 270
237#endif 271#endif
238 272
239/* 273/*
240 * a somewhat faster data structure might be nice, but 274 * a somewhat faster data structure might be nice, but
288 } 322 }
289 323
290 abort (); 324 abort ();
291} 325}
292 326
293static int poll_cb (int max); 327static int poll_cb ();
294static void req_invoke (aio_req req); 328static int req_invoke (aio_req req);
295static void req_free (aio_req req); 329static void req_destroy (aio_req req);
296static void req_cancel (aio_req req); 330static void req_cancel (aio_req req);
297 331
298/* must be called at most once */ 332/* must be called at most once */
299static SV *req_sv (aio_req req, const char *klass) 333static SV *req_sv (aio_req req, const char *klass)
300{ 334{
319 return mg ? (aio_req)mg->mg_ptr : 0; 353 return mg ? (aio_req)mg->mg_ptr : 0;
320} 354}
321 355
322static void aio_grp_feed (aio_req grp) 356static void aio_grp_feed (aio_req grp)
323{ 357{
358 block_sig ();
359
324 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 360 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
325 { 361 {
326 int old_len = grp->length; 362 int old_len = grp->size;
327 363
328 if (grp->fh2 && SvOK (grp->fh2)) 364 if (grp->sv2 && SvOK (grp->sv2))
329 { 365 {
330 dSP; 366 dSP;
331 367
332 ENTER; 368 ENTER;
333 SAVETMPS; 369 SAVETMPS;
334 PUSHMARK (SP); 370 PUSHMARK (SP);
335 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 371 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
336 PUTBACK; 372 PUTBACK;
337 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 373 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
338 SPAGAIN; 374 SPAGAIN;
339 FREETMPS; 375 FREETMPS;
340 LEAVE; 376 LEAVE;
341 } 377 }
342 378
343 /* stop if no progress has been made */ 379 /* stop if no progress has been made */
344 if (old_len == grp->length) 380 if (old_len == grp->size)
345 { 381 {
346 SvREFCNT_dec (grp->fh2); 382 SvREFCNT_dec (grp->sv2);
347 grp->fh2 = 0; 383 grp->sv2 = 0;
348 break; 384 break;
349 } 385 }
350 } 386 }
387
388 unblock_sig ();
351} 389}
352 390
353static void aio_grp_dec (aio_req grp) 391static void aio_grp_dec (aio_req grp)
354{ 392{
355 --grp->length; 393 --grp->size;
356 394
357 /* call feeder, if applicable */ 395 /* call feeder, if applicable */
358 aio_grp_feed (grp); 396 aio_grp_feed (grp);
359 397
360 /* finish, if done */ 398 /* finish, if done */
361 if (!grp->length && grp->fd) 399 if (!grp->size && grp->int1)
362 { 400 {
401 block_sig ();
402
363 req_invoke (grp); 403 if (!req_invoke (grp))
404 {
405 req_destroy (grp);
406 unblock_sig ();
407 croak (0);
408 }
409
364 req_free (grp); 410 req_destroy (grp);
411 unblock_sig ();
365 } 412 }
366} 413}
367 414
368static void req_invoke (aio_req req) 415static int req_invoke (aio_req req)
369{ 416{
370 dSP; 417 dSP;
418
419 if (req->flags & FLAG_SV2_RO_OFF)
420 SvREADONLY_off (req->sv2);
371 421
372 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 422 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
373 { 423 {
374 ENTER; 424 ENTER;
375 SAVETMPS; 425 SAVETMPS;
383 SV *rv = &PL_sv_undef; 433 SV *rv = &PL_sv_undef;
384 434
385 if (req->result >= 0) 435 if (req->result >= 0)
386 { 436 {
387 int i; 437 int i;
388 char *buf = req->data2ptr; 438 char *buf = req->ptr2;
389 AV *av = newAV (); 439 AV *av = newAV ();
390 440
391 av_extend (av, req->result - 1); 441 av_extend (av, req->result - 1);
392 442
393 for (i = 0; i < req->result; ++i) 443 for (i = 0; i < req->result; ++i)
413 PUSHs (sv_2mortal (newSViv (req->result))); 463 PUSHs (sv_2mortal (newSViv (req->result)));
414 PUTBACK; 464 PUTBACK;
415 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 465 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
416 SPAGAIN; 466 SPAGAIN;
417 467
418 fh = SvREFCNT_inc (POPs); 468 fh = POPs;
419
420 PUSHMARK (SP); 469 PUSHMARK (SP);
421 XPUSHs (sv_2mortal (fh)); 470 XPUSHs (fh);
422 } 471 }
423 break; 472 break;
424 473
425 case REQ_GROUP: 474 case REQ_GROUP:
426 req->fd = 2; /* mark group as finished */ 475 req->int1 = 2; /* mark group as finished */
427 476
428 if (req->data) 477 if (req->sv1)
429 { 478 {
430 int i; 479 int i;
431 AV *av = (AV *)req->data; 480 AV *av = (AV *)req->sv1;
432 481
433 EXTEND (SP, AvFILL (av) + 1); 482 EXTEND (SP, AvFILL (av) + 1);
434 for (i = 0; i <= AvFILL (av); ++i) 483 for (i = 0; i <= AvFILL (av); ++i)
435 PUSHs (*av_fetch (av, i, 0)); 484 PUSHs (*av_fetch (av, i, 0));
436 } 485 }
438 487
439 case REQ_NOP: 488 case REQ_NOP:
440 case REQ_BUSY: 489 case REQ_BUSY:
441 break; 490 break;
442 491
492 case REQ_READLINK:
493 if (req->result > 0)
494 {
495 SvCUR_set (req->sv2, req->result);
496 *SvEND (req->sv2) = 0;
497 PUSHs (req->sv2);
498 }
499 break;
500
501 case REQ_STAT:
502 case REQ_LSTAT:
503 case REQ_FSTAT:
504 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
505 PL_laststatval = req->result;
506 PL_statcache = *(Stat_t *)(req->ptr2);
507 PUSHs (sv_2mortal (newSViv (req->result)));
508 break;
509
510 case REQ_READ:
511 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
512 *SvEND (req->sv2) = 0;
513 PUSHs (sv_2mortal (newSViv (req->result)));
514 break;
515
443 default: 516 default:
444 PUSHs (sv_2mortal (newSViv (req->result))); 517 PUSHs (sv_2mortal (newSViv (req->result)));
445 break; 518 break;
446 } 519 }
447 520
467 grp->grp_first = req->grp_next; 540 grp->grp_first = req->grp_next;
468 541
469 aio_grp_dec (grp); 542 aio_grp_dec (grp);
470 } 543 }
471 544
472 if (SvTRUE (ERRSV)) 545 return !SvTRUE (ERRSV);
473 {
474 req_free (req);
475 croak (0);
476 }
477} 546}
478 547
479static void req_free (aio_req req) 548static void req_destroy (aio_req req)
480{ 549{
481 if (req->self) 550 if (req->self)
482 { 551 {
483 sv_unmagic (req->self, PERL_MAGIC_ext); 552 sv_unmagic (req->self, PERL_MAGIC_ext);
484 SvREFCNT_dec (req->self); 553 SvREFCNT_dec (req->self);
485 } 554 }
486 555
487 SvREFCNT_dec (req->data);
488 SvREFCNT_dec (req->fh); 556 SvREFCNT_dec (req->sv1);
489 SvREFCNT_dec (req->fh2); 557 SvREFCNT_dec (req->sv2);
490 SvREFCNT_dec (req->callback); 558 SvREFCNT_dec (req->callback);
491 Safefree (req->statdata);
492 559
493 if (req->type == REQ_READDIR) 560 if (req->flags & FLAG_PTR2_FREE)
494 free (req->data2ptr); 561 free (req->ptr2);
495 562
496 Safefree (req); 563 Safefree (req);
497} 564}
498 565
499static void req_cancel_subs (aio_req grp) 566static void req_cancel_subs (aio_req grp)
501 aio_req sub; 568 aio_req sub;
502 569
503 if (grp->type != REQ_GROUP) 570 if (grp->type != REQ_GROUP)
504 return; 571 return;
505 572
506 SvREFCNT_dec (grp->fh2); 573 SvREFCNT_dec (grp->sv2);
507 grp->fh2 = 0; 574 grp->sv2 = 0;
508 575
509 for (sub = grp->grp_first; sub; sub = sub->grp_next) 576 for (sub = grp->grp_first; sub; sub = sub->grp_next)
510 req_cancel (sub); 577 req_cancel (sub);
511} 578}
512 579
515 req->flags |= FLAG_CANCELLED; 582 req->flags |= FLAG_CANCELLED;
516 583
517 req_cancel_subs (req); 584 req_cancel_subs (req);
518} 585}
519 586
520static void *aio_proc(void *arg); 587static void *aio_proc (void *arg);
521 588
522static void start_thread (void) 589static void start_thread (void)
523{ 590{
524 sigset_t fullsigset, oldsigset;
525 pthread_attr_t attr;
526
527 worker *wrk = calloc (1, sizeof (worker)); 591 worker *wrk = calloc (1, sizeof (worker));
528 592
529 if (!wrk) 593 if (!wrk)
530 croak ("unable to allocate worker thread data"); 594 croak ("unable to allocate worker thread data");
531 595
532 pthread_attr_init (&attr);
533 pthread_attr_setstacksize (&attr, STACKSIZE);
534 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
535#ifdef PTHREAD_SCOPE_PROCESS
536 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
537#endif
538
539 sigfillset (&fullsigset);
540
541 LOCK (wrklock); 596 LOCK (wrklock);
542 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
543 597
544 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 598 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
545 { 599 {
546 wrk->prev = &wrk_first; 600 wrk->prev = &wrk_first;
547 wrk->next = wrk_first.next; 601 wrk->next = wrk_first.next;
548 wrk_first.next->prev = wrk; 602 wrk_first.next->prev = wrk;
549 wrk_first.next = wrk; 603 wrk_first.next = wrk;
550 ++started; 604 ++started;
551 } 605 }
552 else 606 else
553 free (wrk); 607 free (wrk);
554 608
555 sigprocmask (SIG_SETMASK, &oldsigset, 0);
556 UNLOCK (wrklock); 609 UNLOCK (wrklock);
557} 610}
558 611
559static void maybe_start_thread () 612static void maybe_start_thread ()
560{ 613{
561#if 0 614 if (get_nthreads () >= wanted)
562 static struct timeval last;
563 struct timeval diff, now;
564#endif
565
566 if (started >= wanted)
567 return; 615 return;
568 616
569 if (nready <= nreqs - get_nready () - get_npending ()) 617 /* todo: maybe use idle here, but might be less exact */
618 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 619 return;
571 620
572#if 0
573 gettimeofday (&now, 0);
574
575 diff.tv_sec = now.tv_sec - last.tv_sec;
576 diff.tv_usec = now.tv_usec - last.tv_usec;
577
578 if (diff.tv_usec < 0)
579 {
580 --diff.tv_sec;
581 diff.tv_usec += 1000000;
582 }
583
584 if (!diff.tv_sec && diff.tv_usec < 10000)
585 return;
586
587 last = now;
588#endif
589
590 start_thread (); 621 start_thread ();
591} 622}
592 623
593static void req_send (aio_req req) 624static void req_send (aio_req req)
594{ 625{
626 block_sig ();
627
595 ++nreqs; 628 ++nreqs;
596 629
597 LOCK (reqlock); 630 LOCK (reqlock);
598 ++nready; 631 ++nready;
599 reqq_push (&req_queue, req); 632 reqq_push (&req_queue, req);
600 pthread_cond_signal (&reqwait); 633 COND_SIGNAL (reqwait);
601 UNLOCK (reqlock); 634 UNLOCK (reqlock);
635
636 unblock_sig ();
602 637
603 maybe_start_thread (); 638 maybe_start_thread ();
604} 639}
605 640
606static void end_thread (void) 641static void end_thread (void)
612 req->type = REQ_QUIT; 647 req->type = REQ_QUIT;
613 req->pri = PRI_MAX + PRI_BIAS; 648 req->pri = PRI_MAX + PRI_BIAS;
614 649
615 LOCK (reqlock); 650 LOCK (reqlock);
616 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
617 pthread_cond_signal (&reqwait); 652 COND_SIGNAL (reqwait);
618 UNLOCK (reqlock); 653 UNLOCK (reqlock);
619 654
620 LOCK (wrklock); 655 LOCK (wrklock);
621 --started; 656 --started;
622 UNLOCK (wrklock); 657 UNLOCK (wrklock);
623} 658}
624 659
660static void set_max_idle (int nthreads)
661{
662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
663 max_idle = nthreads <= 0 ? 1 : nthreads;
664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
665}
666
625static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
626{ 668{
627 if (wanted < nthreads) 669 if (wanted < nthreads)
628 wanted = nthreads; 670 wanted = nthreads;
629} 671}
642 fd_set rfd; 684 fd_set rfd;
643 685
644 while (nreqs) 686 while (nreqs)
645 { 687 {
646 int size; 688 int size;
647 if (WORDREAD_UNSAFE) LOCK (reslock); 689 if (WORDACCESS_UNSAFE) LOCK (reslock);
648 size = res_queue.size; 690 size = res_queue.size;
649 if (WORDREAD_UNSAFE) UNLOCK (reslock); 691 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
650 692
651 if (size) 693 if (size)
652 return; 694 return;
653 695
654 maybe_start_thread (); 696 maybe_start_thread ();
658 700
659 select (respipe [0] + 1, &rfd, 0, 0, 0); 701 select (respipe [0] + 1, &rfd, 0, 0, 0);
660 } 702 }
661} 703}
662 704
663static int poll_cb (int max) 705static int poll_cb ()
664{ 706{
665 dSP; 707 dSP;
666 int count = 0; 708 int count = 0;
709 int maxreqs = max_poll_reqs;
667 int do_croak = 0; 710 int do_croak = 0;
711 struct timeval tv_start, tv_now;
668 aio_req req; 712 aio_req req;
713
714 if (max_poll_time)
715 gettimeofday (&tv_start, 0);
716
717 block_sig ();
669 718
670 for (;;) 719 for (;;)
671 { 720 {
672 while (max <= 0 || count < max) 721 for (;;)
673 { 722 {
674 maybe_start_thread (); 723 maybe_start_thread ();
675 724
676 LOCK (reslock); 725 LOCK (reslock);
677 req = reqq_shift (&res_queue); 726 req = reqq_shift (&res_queue);
681 --npending; 730 --npending;
682 731
683 if (!res_queue.size) 732 if (!res_queue.size)
684 { 733 {
685 /* read any signals sent by the worker threads */ 734 /* read any signals sent by the worker threads */
686 char buf [32]; 735 char buf [4];
687 while (read (respipe [0], buf, 32) == 32) 736 while (read (respipe [0], buf, 4) == 4)
688 ; 737 ;
689 } 738 }
690 } 739 }
691 740
692 UNLOCK (reslock); 741 UNLOCK (reslock);
694 if (!req) 743 if (!req)
695 break; 744 break;
696 745
697 --nreqs; 746 --nreqs;
698 747
699 if (req->type == REQ_GROUP && req->length) 748 if (req->type == REQ_GROUP && req->size)
700 { 749 {
701 req->fd = 1; /* mark request as delayed */ 750 req->int1 = 1; /* mark request as delayed */
702 continue; 751 continue;
703 } 752 }
704 else 753 else
705 { 754 {
706 if (req->type == REQ_READ) 755 if (!req_invoke (req))
707 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
708
709 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
710 SvREADONLY_off (req->data);
711
712 if (req->statdata)
713 { 756 {
714 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 757 req_destroy (req);
715 PL_laststatval = req->result; 758 unblock_sig ();
716 PL_statcache = *(req->statdata); 759 croak (0);
717 } 760 }
718
719 req_invoke (req);
720 761
721 count++; 762 count++;
722 } 763 }
723 764
724 req_free (req); 765 req_destroy (req);
766
767 if (maxreqs && !--maxreqs)
768 break;
769
770 if (max_poll_time)
771 {
772 gettimeofday (&tv_now, 0);
773
774 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
775 break;
776 }
725 } 777 }
726 778
727 if (nreqs <= max_outstanding) 779 if (nreqs <= max_outstanding)
728 break; 780 break;
729 781
730 poll_wait (); 782 poll_wait ();
731 783
732 max = 0; 784 ++maxreqs;
733 } 785 }
734 786
787 unblock_sig ();
735 return count; 788 return count;
736} 789}
737 790
738static void create_pipe () 791static void create_pipe ()
739{ 792{
757/* 810/*
758 * make our pread/pwrite safe against themselves, but not against 811 * make our pread/pwrite safe against themselves, but not against
759 * normal read/write by using a mutex. slows down execution a lot, 812 * normal read/write by using a mutex. slows down execution a lot,
760 * but that's your problem, not mine. 813 * but that's your problem, not mine.
761 */ 814 */
762static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 815static mutex_t preadwritelock = MUTEX_INIT;
763 816
764static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 817static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
765{ 818{
766 ssize_t res; 819 ssize_t res;
767 off_t ooffset; 820 off_t ooffset;
790 843
791 return res; 844 return res;
792} 845}
793#endif 846#endif
794 847
848#ifndef HAVE_FUTIMES
849
850# define utimes(path,times) aio_utimes (path, times)
851# define futimes(fd,times) aio_futimes (fd, times)
852
853int aio_utimes (const char *filename, const struct timeval times[2])
854{
855 if (times)
856 {
857 struct utimbuf buf;
858
859 buf.actime = times[0].tv_sec;
860 buf.modtime = times[1].tv_sec;
861
862 return utime (filename, &buf);
863 }
864 else
865 return utime (filename, 0);
866}
867
868int aio_futimes (int fd, const struct timeval tv[2])
869{
870 errno = ENOSYS;
871 return -1;
872}
873
874#endif
875
795#if !HAVE_FDATASYNC 876#if !HAVE_FDATASYNC
796# define fdatasync fsync 877# define fdatasync fsync
797#endif 878#endif
798 879
799#if !HAVE_READAHEAD 880#if !HAVE_READAHEAD
818#endif 899#endif
819 900
820#if !HAVE_READDIR_R 901#if !HAVE_READDIR_R
821# define readdir_r aio_readdir_r 902# define readdir_r aio_readdir_r
822 903
823static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 904static mutex_t readdirlock = MUTEX_INIT;
824 905
825static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 906static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
826{ 907{
827 struct dirent *e; 908 struct dirent *e;
828 int errorno; 909 int errorno;
955 int memofs = 0; 1036 int memofs = 0;
956 int res = 0; 1037 int res = 0;
957 int errorno; 1038 int errorno;
958 1039
959 LOCK (wrklock); 1040 LOCK (wrklock);
960 self->dirp = dirp = opendir (req->dataptr); 1041 self->dirp = dirp = opendir (req->ptr1);
961 self->dbuf = u = malloc (sizeof (*u)); 1042 self->dbuf = u = malloc (sizeof (*u));
1043 req->flags |= FLAG_PTR2_FREE;
962 req->data2ptr = names = malloc (memlen); 1044 req->ptr2 = names = malloc (memlen);
963 UNLOCK (wrklock); 1045 UNLOCK (wrklock);
964 1046
965 if (dirp && u && names) 1047 if (dirp && u && names)
966 for (;;) 1048 for (;;)
967 { 1049 {
981 1063
982 while (memofs + len > memlen) 1064 while (memofs + len > memlen)
983 { 1065 {
984 memlen *= 2; 1066 memlen *= 2;
985 LOCK (wrklock); 1067 LOCK (wrklock);
986 req->data2ptr = names = realloc (names, memlen); 1068 req->ptr2 = names = realloc (names, memlen);
987 UNLOCK (wrklock); 1069 UNLOCK (wrklock);
988 1070
989 if (!names) 1071 if (!names)
990 break; 1072 break;
991 } 1073 }
1004/*****************************************************************************/ 1086/*****************************************************************************/
1005 1087
1006static void *aio_proc (void *thr_arg) 1088static void *aio_proc (void *thr_arg)
1007{ 1089{
1008 aio_req req; 1090 aio_req req;
1091 struct timespec ts;
1009 worker *self = (worker *)thr_arg; 1092 worker *self = (worker *)thr_arg;
1093
1094 /* try to distribute timeouts somewhat evenly */
1095 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1096 * (1000000000UL / 1024UL);
1010 1097
1011 for (;;) 1098 for (;;)
1012 { 1099 {
1100 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1101
1013 LOCK (reqlock); 1102 LOCK (reqlock);
1014 1103
1015 for (;;) 1104 for (;;)
1016 { 1105 {
1017 self->req = req = reqq_shift (&req_queue); 1106 self->req = req = reqq_shift (&req_queue);
1018 1107
1019 if (req) 1108 if (req)
1020 break; 1109 break;
1021 1110
1022 pthread_cond_wait (&reqwait, &reqlock); 1111 ++idle;
1112
1113 if (COND_TIMEDWAIT (reqwait, reqlock, ts)
1114 == ETIMEDOUT)
1115 {
1116 if (idle > max_idle)
1117 {
1118 --idle;
1119 UNLOCK (reqlock);
1120 LOCK (wrklock);
1121 --started;
1122 UNLOCK (wrklock);
1123 goto quit;
1124 }
1125
1126 /* we are allowed to idle, so do so without any timeout */
1127 COND_WAIT (reqwait, reqlock);
1128 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1129 }
1130
1131 --idle;
1023 } 1132 }
1024 1133
1025 --nready; 1134 --nready;
1026 1135
1027 UNLOCK (reqlock); 1136 UNLOCK (reqlock);
1029 errno = 0; /* strictly unnecessary */ 1138 errno = 0; /* strictly unnecessary */
1030 1139
1031 if (!(req->flags & FLAG_CANCELLED)) 1140 if (!(req->flags & FLAG_CANCELLED))
1032 switch (req->type) 1141 switch (req->type)
1033 { 1142 {
1034 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1143 case REQ_READ: req->result = req->offs >= 0
1035 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1144 ? pread (req->int1, req->ptr1, req->size, req->offs)
1145 : read (req->int1, req->ptr1, req->size); break;
1146 case REQ_WRITE: req->result = req->offs >= 0
1147 ? pwrite (req->int1, req->ptr1, req->size, req->offs)
1148 : write (req->int1, req->ptr1, req->size); break;
1036 1149
1037 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1150 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1038 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1151 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1039 1152
1040 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1153 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1041 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1154 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1042 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1155 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1043 1156
1157 case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1158 case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1159 case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break;
1160 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1161
1044 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1162 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1045 case REQ_CLOSE: req->result = close (req->fd); break; 1163 case REQ_CLOSE: req->result = close (req->int1); break;
1046 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1164 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1047 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1165 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1166 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1048 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1167 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1049 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1168 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1050 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1169 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1051 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1170 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1171 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1052 1172
1053 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1173 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1054 case REQ_FSYNC: req->result = fsync (req->fd); break; 1174 case REQ_FSYNC: req->result = fsync (req->int1); break;
1055 case REQ_READDIR: scandir_ (req, self); break; 1175 case REQ_READDIR: scandir_ (req, self); break;
1056 1176
1057 case REQ_BUSY: 1177 case REQ_BUSY:
1058 { 1178 {
1059 struct timeval tv; 1179 struct timeval tv;
1060 1180
1061 tv.tv_sec = req->fd; 1181 tv.tv_sec = req->nv1;
1062 tv.tv_usec = req->fd2; 1182 tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.;
1063 1183
1064 req->result = select (0, 0, 0, 0, &tv); 1184 req->result = select (0, 0, 0, 0, &tv);
1185 }
1186
1187 case REQ_UTIME:
1188 case REQ_FUTIME:
1189 {
1190 struct timeval tv[2];
1191 struct timeval *times;
1192
1193 if (req->nv1 != -1. || req->nv2 != -1.)
1194 {
1195 tv[0].tv_sec = req->nv1;
1196 tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.;
1197 tv[1].tv_sec = req->nv2;
1198 tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.;
1199
1200 times = tv;
1201 }
1202 else
1203 times = 0;
1204
1205
1206 req->result = req->type == REQ_FUTIME
1207 ? futimes (req->int1, times)
1208 : utimes (req->ptr1, times);
1065 } 1209 }
1066 1210
1067 case REQ_GROUP: 1211 case REQ_GROUP:
1068 case REQ_NOP: 1212 case REQ_NOP:
1069 break; 1213 break;
1070 1214
1071 case REQ_QUIT: 1215 case REQ_QUIT:
1072 LOCK (wrklock); 1216 goto quit;
1073 worker_free (self);
1074 --started;
1075 UNLOCK (wrklock);
1076 return 0;
1077 1217
1078 default: 1218 default:
1079 req->result = ENOSYS; 1219 req->result = -1;
1080 break; 1220 break;
1081 } 1221 }
1082 1222
1083 req->errorno = errno; 1223 req->errorno = errno;
1084 1224
1085 LOCK (reslock); 1225 LOCK (reslock);
1086 1226
1087 ++npending; 1227 ++npending;
1088 1228
1089 if (!reqq_push (&res_queue, req)) 1229 if (!reqq_push (&res_queue, req))
1230 {
1090 /* write a dummy byte to the pipe so fh becomes ready */ 1231 /* write a dummy byte to the pipe so fh becomes ready */
1091 write (respipe [1], &respipe, 1); 1232 write (respipe [1], &respipe, 1);
1233
1234 /* optionally signal the main thread asynchronously */
1235 if (main_sig)
1236 pthread_kill (main_tid, main_sig);
1237 }
1092 1238
1093 self->req = 0; 1239 self->req = 0;
1094 worker_clear (self); 1240 worker_clear (self);
1095 1241
1096 UNLOCK (reslock); 1242 UNLOCK (reslock);
1097 } 1243 }
1244
1245quit:
1246 LOCK (wrklock);
1247 worker_free (self);
1248 UNLOCK (wrklock);
1249
1250 return 0;
1098} 1251}
1099 1252
1100/*****************************************************************************/ 1253/*****************************************************************************/
1101 1254
1102static void atfork_prepare (void) 1255static void atfork_prepare (void)
1128static void atfork_child (void) 1281static void atfork_child (void)
1129{ 1282{
1130 aio_req prv; 1283 aio_req prv;
1131 1284
1132 while (prv = reqq_shift (&req_queue)) 1285 while (prv = reqq_shift (&req_queue))
1133 req_free (prv); 1286 req_destroy (prv);
1134 1287
1135 while (prv = reqq_shift (&res_queue)) 1288 while (prv = reqq_shift (&res_queue))
1136 req_free (prv); 1289 req_destroy (prv);
1137 1290
1138 while (wrk_first.next != &wrk_first) 1291 while (wrk_first.next != &wrk_first)
1139 { 1292 {
1140 worker *wrk = wrk_first.next; 1293 worker *wrk = wrk_first.next;
1141 1294
1142 if (wrk->req) 1295 if (wrk->req)
1143 req_free (wrk->req); 1296 req_destroy (wrk->req);
1144 1297
1145 worker_clear (wrk); 1298 worker_clear (wrk);
1146 worker_free (wrk); 1299 worker_free (wrk);
1147 } 1300 }
1148 1301
1149 started = 0; 1302 started = 0;
1303 idle = 0;
1150 nreqs = 0; 1304 nreqs = 0;
1305 nready = 0;
1306 npending = 0;
1151 1307
1152 close (respipe [0]); 1308 close (respipe [0]);
1153 close (respipe [1]); 1309 close (respipe [1]);
1154 create_pipe (); 1310 create_pipe ();
1155 1311
1189 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1345 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1190 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1346 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1191 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1347 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1192 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1348 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1193 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 1349 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1350 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1194 1351
1195 create_pipe (); 1352 create_pipe ();
1196 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1353 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1197
1198 start_thread ();
1199} 1354}
1355
1356void
1357max_poll_reqs (int nreqs)
1358 PROTOTYPE: $
1359 CODE:
1360 max_poll_reqs = nreqs;
1361
1362void
1363max_poll_time (double nseconds)
1364 PROTOTYPE: $
1365 CODE:
1366 max_poll_time = nseconds * AIO_TICKS;
1200 1367
1201void 1368void
1202min_parallel (int nthreads) 1369min_parallel (int nthreads)
1203 PROTOTYPE: $ 1370 PROTOTYPE: $
1204 1371
1205void 1372void
1206max_parallel (int nthreads) 1373max_parallel (int nthreads)
1207 PROTOTYPE: $ 1374 PROTOTYPE: $
1375
1376void
1377max_idle (int nthreads)
1378 PROTOTYPE: $
1379 CODE:
1380 set_max_idle (nthreads);
1208 1381
1209int 1382int
1210max_outstanding (int maxreqs) 1383max_outstanding (int maxreqs)
1211 PROTOTYPE: $ 1384 PROTOTYPE: $
1212 CODE: 1385 CODE:
1214 max_outstanding = maxreqs; 1387 max_outstanding = maxreqs;
1215 OUTPUT: 1388 OUTPUT:
1216 RETVAL 1389 RETVAL
1217 1390
1218void 1391void
1219aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1392aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1220 SV * pathname
1221 int flags
1222 int mode
1223 SV * callback
1224 PROTOTYPE: $$$;$ 1393 PROTOTYPE: $$$;$
1225 PPCODE: 1394 PPCODE:
1226{ 1395{
1227 dREQ; 1396 dREQ;
1228 1397
1229 req->type = REQ_OPEN; 1398 req->type = REQ_OPEN;
1230 req->data = newSVsv (pathname); 1399 req->sv1 = newSVsv (pathname);
1231 req->dataptr = SvPVbyte_nolen (req->data); 1400 req->ptr1 = SvPVbyte_nolen (req->sv1);
1232 req->fd = flags; 1401 req->int1 = flags;
1233 req->mode = mode; 1402 req->mode = mode;
1234 1403
1235 REQ_SEND; 1404 REQ_SEND;
1236} 1405}
1237 1406
1238void 1407void
1239aio_close (fh,callback=&PL_sv_undef) 1408aio_close (SV *fh, SV *callback=&PL_sv_undef)
1240 SV * fh
1241 SV * callback
1242 PROTOTYPE: $;$ 1409 PROTOTYPE: $;$
1243 ALIAS: 1410 ALIAS:
1244 aio_close = REQ_CLOSE 1411 aio_close = REQ_CLOSE
1245 aio_fsync = REQ_FSYNC 1412 aio_fsync = REQ_FSYNC
1246 aio_fdatasync = REQ_FDATASYNC 1413 aio_fdatasync = REQ_FDATASYNC
1247 PPCODE: 1414 PPCODE:
1248{ 1415{
1249 dREQ; 1416 dREQ;
1250 1417
1251 req->type = ix; 1418 req->type = ix;
1252 req->fh = newSVsv (fh); 1419 req->sv1 = newSVsv (fh);
1253 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1420 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1254 1421
1255 REQ_SEND (req); 1422 REQ_SEND (req);
1256} 1423}
1257 1424
1258void 1425void
1259aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1426aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1260 SV * fh
1261 UV offset
1262 UV length
1263 SV * data
1264 UV dataoffset
1265 SV * callback
1266 ALIAS: 1427 ALIAS:
1267 aio_read = REQ_READ 1428 aio_read = REQ_READ
1268 aio_write = REQ_WRITE 1429 aio_write = REQ_WRITE
1269 PROTOTYPE: $$$$$;$ 1430 PROTOTYPE: $$$$$;$
1270 PPCODE: 1431 PPCODE:
1271{ 1432{
1272 aio_req req;
1273 STRLEN svlen; 1433 STRLEN svlen;
1274 char *svptr = SvPVbyte (data, svlen); 1434 char *svptr = SvPVbyte (data, svlen);
1435 UV len = SvUV (length);
1275 1436
1276 SvUPGRADE (data, SVt_PV); 1437 SvUPGRADE (data, SVt_PV);
1277 SvPOK_on (data); 1438 SvPOK_on (data);
1278 1439
1279 if (dataoffset < 0) 1440 if (dataoffset < 0)
1280 dataoffset += svlen; 1441 dataoffset += svlen;
1281 1442
1282 if (dataoffset < 0 || dataoffset > svlen) 1443 if (dataoffset < 0 || dataoffset > svlen)
1283 croak ("data offset outside of string"); 1444 croak ("dataoffset outside of data scalar");
1284 1445
1285 if (ix == REQ_WRITE) 1446 if (ix == REQ_WRITE)
1286 { 1447 {
1287 /* write: check length and adjust. */ 1448 /* write: check length and adjust. */
1288 if (length < 0 || length + dataoffset > svlen) 1449 if (!SvOK (length) || len + dataoffset > svlen)
1289 length = svlen - dataoffset; 1450 len = svlen - dataoffset;
1290 } 1451 }
1291 else 1452 else
1292 { 1453 {
1293 /* read: grow scalar as necessary */ 1454 /* read: grow scalar as necessary */
1294 svptr = SvGROW (data, length + dataoffset); 1455 svptr = SvGROW (data, len + dataoffset + 1);
1295 } 1456 }
1296 1457
1297 if (length < 0) 1458 if (len < 0)
1298 croak ("length must not be negative"); 1459 croak ("length must not be negative");
1299 1460
1300 { 1461 {
1301 dREQ; 1462 dREQ;
1302 1463
1303 req->type = ix; 1464 req->type = ix;
1304 req->fh = newSVsv (fh); 1465 req->sv1 = newSVsv (fh);
1305 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1466 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1306 : IoOFP (sv_2io (fh))); 1467 : IoOFP (sv_2io (fh)));
1468 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1307 req->offset = offset; 1469 req->size = len;
1308 req->length = length;
1309 req->data = SvREFCNT_inc (data); 1470 req->sv2 = SvREFCNT_inc (data);
1310 req->dataptr = (char *)svptr + dataoffset; 1471 req->ptr1 = (char *)svptr + dataoffset;
1472 req->stroffset = dataoffset;
1311 1473
1312 if (!SvREADONLY (data)) 1474 if (!SvREADONLY (data))
1313 { 1475 {
1314 SvREADONLY_on (data); 1476 SvREADONLY_on (data);
1315 req->data2ptr = (void *)data; 1477 req->flags |= FLAG_SV2_RO_OFF;
1316 } 1478 }
1317 1479
1318 REQ_SEND; 1480 REQ_SEND;
1319 } 1481 }
1320} 1482}
1321 1483
1322void 1484void
1485aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
1486 PROTOTYPE: $$;$
1487 PPCODE:
1488{
1489 SV *data;
1490 dREQ;
1491
1492 data = newSV (NAME_MAX);
1493 SvPOK_on (data);
1494
1495 req->type = REQ_READLINK;
1496 req->sv1 = newSVsv (path);
1497 req->ptr2 = SvPVbyte_nolen (req->sv1);
1498 req->sv2 = data;
1499 req->ptr1 = SvPVbyte_nolen (data);
1500
1501 REQ_SEND;
1502}
1503
1504void
1323aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1505aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
1324 SV * out_fh
1325 SV * in_fh
1326 UV in_offset
1327 UV length
1328 SV * callback
1329 PROTOTYPE: $$$$;$ 1506 PROTOTYPE: $$$$;$
1330 PPCODE: 1507 PPCODE:
1331{ 1508{
1332 dREQ; 1509 dREQ;
1333 1510
1334 req->type = REQ_SENDFILE; 1511 req->type = REQ_SENDFILE;
1335 req->fh = newSVsv (out_fh); 1512 req->sv1 = newSVsv (out_fh);
1336 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1337 req->fh2 = newSVsv (in_fh); 1514 req->sv2 = newSVsv (in_fh);
1338 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1515 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1339 req->offset = in_offset; 1516 req->offs = SvVAL64 (in_offset);
1340 req->length = length; 1517 req->size = length;
1341 1518
1342 REQ_SEND; 1519 REQ_SEND;
1343} 1520}
1344 1521
1345void 1522void
1346aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1523aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1347 SV * fh
1348 UV offset
1349 IV length
1350 SV * callback
1351 PROTOTYPE: $$$;$ 1524 PROTOTYPE: $$$;$
1352 PPCODE: 1525 PPCODE:
1353{ 1526{
1354 dREQ; 1527 dREQ;
1355 1528
1356 req->type = REQ_READAHEAD; 1529 req->type = REQ_READAHEAD;
1357 req->fh = newSVsv (fh); 1530 req->sv1 = newSVsv (fh);
1358 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1531 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1359 req->offset = offset; 1532 req->offs = SvVAL64 (offset);
1360 req->length = length; 1533 req->size = length;
1361 1534
1362 REQ_SEND; 1535 REQ_SEND;
1363} 1536}
1364 1537
1365void 1538void
1366aio_stat (fh_or_path,callback=&PL_sv_undef) 1539aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1367 SV * fh_or_path
1368 SV * callback
1369 ALIAS: 1540 ALIAS:
1370 aio_stat = REQ_STAT 1541 aio_stat = REQ_STAT
1371 aio_lstat = REQ_LSTAT 1542 aio_lstat = REQ_LSTAT
1372 PPCODE: 1543 PPCODE:
1373{ 1544{
1374 dREQ; 1545 dREQ;
1375 1546
1376 New (0, req->statdata, 1, Stat_t); 1547 req->ptr2 = malloc (sizeof (Stat_t));
1377 if (!req->statdata) 1548 if (!req->ptr2)
1378 { 1549 {
1379 req_free (req); 1550 req_destroy (req);
1380 croak ("out of memory during aio_req->statdata allocation"); 1551 croak ("out of memory during aio_stat statdata allocation");
1381 } 1552 }
1553
1554 req->flags |= FLAG_PTR2_FREE;
1555 req->sv1 = newSVsv (fh_or_path);
1382 1556
1383 if (SvPOK (fh_or_path)) 1557 if (SvPOK (fh_or_path))
1384 { 1558 {
1385 req->type = ix; 1559 req->type = ix;
1386 req->data = newSVsv (fh_or_path);
1387 req->dataptr = SvPVbyte_nolen (req->data); 1560 req->ptr1 = SvPVbyte_nolen (req->sv1);
1388 } 1561 }
1389 else 1562 else
1390 { 1563 {
1391 req->type = REQ_FSTAT; 1564 req->type = REQ_FSTAT;
1392 req->fh = newSVsv (fh_or_path);
1393 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1394 } 1566 }
1395 1567
1396 REQ_SEND; 1568 REQ_SEND;
1397} 1569}
1398 1570
1399void 1571void
1572aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1573 PPCODE:
1574{
1575 dREQ;
1576
1577 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1578 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1579 req->sv1 = newSVsv (fh_or_path);
1580
1581 if (SvPOK (fh_or_path))
1582 {
1583 req->type = REQ_UTIME;
1584 req->ptr1 = SvPVbyte_nolen (req->sv1);
1585 }
1586 else
1587 {
1588 req->type = REQ_FUTIME;
1589 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1590 }
1591
1592 REQ_SEND;
1593}
1594
1595void
1596aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1597 PPCODE:
1598{
1599 dREQ;
1600
1601 req->mode = mode;
1602 req->sv1 = newSVsv (fh_or_path);
1603
1604 if (SvPOK (fh_or_path))
1605 {
1606 req->type = REQ_CHMOD;
1607 req->ptr1 = SvPVbyte_nolen (req->sv1);
1608 }
1609 else
1610 {
1611 req->type = REQ_FCHMOD;
1612 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1613 }
1614
1615 REQ_SEND;
1616}
1617
1618void
1619aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
1620 PPCODE:
1621{
1622 dREQ;
1623
1624 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1625 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1626 req->sv1 = newSVsv (fh_or_path);
1627
1628 if (SvPOK (fh_or_path))
1629 {
1630 req->type = REQ_CHOWN;
1631 req->ptr1 = SvPVbyte_nolen (req->sv1);
1632 }
1633 else
1634 {
1635 req->type = REQ_FCHOWN;
1636 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1637 }
1638
1639 REQ_SEND;
1640}
1641
1642void
1400aio_unlink (pathname,callback=&PL_sv_undef) 1643aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1401 SV * pathname
1402 SV * callback
1403 ALIAS: 1644 ALIAS:
1404 aio_unlink = REQ_UNLINK 1645 aio_unlink = REQ_UNLINK
1405 aio_rmdir = REQ_RMDIR 1646 aio_rmdir = REQ_RMDIR
1406 aio_readdir = REQ_READDIR 1647 aio_readdir = REQ_READDIR
1407 PPCODE: 1648 PPCODE:
1408{ 1649{
1409 dREQ; 1650 dREQ;
1410 1651
1411 req->type = ix; 1652 req->type = ix;
1412 req->data = newSVsv (pathname); 1653 req->sv1 = newSVsv (pathname);
1413 req->dataptr = SvPVbyte_nolen (req->data); 1654 req->ptr1 = SvPVbyte_nolen (req->sv1);
1655
1656 REQ_SEND;
1657}
1658
1659void
1660aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1661 PPCODE:
1662{
1663 dREQ;
1414 1664
1665 req->type = REQ_MKDIR;
1666 req->sv1 = newSVsv (pathname);
1667 req->ptr1 = SvPVbyte_nolen (req->sv1);
1668 req->mode = mode;
1669
1415 REQ_SEND; 1670 REQ_SEND;
1416} 1671}
1417 1672
1418void 1673void
1419aio_link (oldpath,newpath,callback=&PL_sv_undef) 1674aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1420 SV * oldpath
1421 SV * newpath
1422 SV * callback
1423 ALIAS: 1675 ALIAS:
1424 aio_link = REQ_LINK 1676 aio_link = REQ_LINK
1425 aio_symlink = REQ_SYMLINK 1677 aio_symlink = REQ_SYMLINK
1426 aio_rename = REQ_RENAME 1678 aio_rename = REQ_RENAME
1427 PPCODE: 1679 PPCODE:
1428{ 1680{
1429 dREQ; 1681 dREQ;
1430 1682
1431 req->type = ix; 1683 req->type = ix;
1432 req->fh = newSVsv (oldpath); 1684 req->sv2 = newSVsv (oldpath);
1433 req->data2ptr = SvPVbyte_nolen (req->fh); 1685 req->ptr2 = SvPVbyte_nolen (req->sv2);
1434 req->data = newSVsv (newpath); 1686 req->sv1 = newSVsv (newpath);
1435 req->dataptr = SvPVbyte_nolen (req->data); 1687 req->ptr1 = SvPVbyte_nolen (req->sv1);
1436 1688
1437 REQ_SEND; 1689 REQ_SEND;
1438} 1690}
1439 1691
1440void 1692void
1441aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1693aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1442 SV * pathname
1443 SV * callback
1444 UV mode
1445 UV dev
1446 PPCODE: 1694 PPCODE:
1447{ 1695{
1448 dREQ; 1696 dREQ;
1449 1697
1450 req->type = REQ_MKNOD; 1698 req->type = REQ_MKNOD;
1451 req->data = newSVsv (pathname); 1699 req->sv1 = newSVsv (pathname);
1452 req->dataptr = SvPVbyte_nolen (req->data); 1700 req->ptr1 = SvPVbyte_nolen (req->sv1);
1453 req->mode = (mode_t)mode; 1701 req->mode = (mode_t)mode;
1454 req->offset = dev; 1702 req->offs = dev;
1455 1703
1456 REQ_SEND; 1704 REQ_SEND;
1457} 1705}
1458 1706
1459void 1707void
1460aio_busy (delay,callback=&PL_sv_undef) 1708aio_busy (double delay, SV *callback=&PL_sv_undef)
1461 double delay
1462 SV * callback
1463 PPCODE: 1709 PPCODE:
1464{ 1710{
1465 dREQ; 1711 dREQ;
1466 1712
1467 req->type = REQ_BUSY; 1713 req->type = REQ_BUSY;
1468 req->fd = delay < 0. ? 0 : delay; 1714 req->nv1 = delay < 0. ? 0. : delay;
1469 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1470 1715
1471 REQ_SEND; 1716 REQ_SEND;
1472} 1717}
1473 1718
1474void 1719void
1475aio_group (callback=&PL_sv_undef) 1720aio_group (SV *callback=&PL_sv_undef)
1476 SV * callback
1477 PROTOTYPE: ;$ 1721 PROTOTYPE: ;$
1478 PPCODE: 1722 PPCODE:
1479{ 1723{
1480 dREQ; 1724 dREQ;
1481 1725
1482 req->type = REQ_GROUP; 1726 req->type = REQ_GROUP;
1727
1483 req_send (req); 1728 req_send (req);
1484
1485 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1729 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1486} 1730}
1487 1731
1488void 1732void
1489aio_nop (callback=&PL_sv_undef) 1733aio_nop (SV *callback=&PL_sv_undef)
1490 SV * callback
1491 PPCODE: 1734 PPCODE:
1492{ 1735{
1493 dREQ; 1736 dREQ;
1494 1737
1495 req->type = REQ_NOP; 1738 req->type = REQ_NOP;
1524 PROTOTYPE: 1767 PROTOTYPE:
1525 CODE: 1768 CODE:
1526 while (nreqs) 1769 while (nreqs)
1527 { 1770 {
1528 poll_wait (); 1771 poll_wait ();
1529 poll_cb (0); 1772 poll_cb ();
1530 } 1773 }
1531 1774
1532void 1775int
1533poll() 1776poll()
1534 PROTOTYPE: 1777 PROTOTYPE:
1535 CODE: 1778 CODE:
1536 if (nreqs)
1537 {
1538 poll_wait (); 1779 poll_wait ();
1539 poll_cb (0); 1780 RETVAL = poll_cb ();
1540 } 1781 OUTPUT:
1782 RETVAL
1541 1783
1542int 1784int
1543poll_fileno() 1785poll_fileno()
1544 PROTOTYPE: 1786 PROTOTYPE:
1545 CODE: 1787 CODE:
1549 1791
1550int 1792int
1551poll_cb(...) 1793poll_cb(...)
1552 PROTOTYPE: 1794 PROTOTYPE:
1553 CODE: 1795 CODE:
1554 RETVAL = poll_cb (0); 1796 RETVAL = poll_cb ();
1555 OUTPUT:
1556 RETVAL
1557
1558int
1559poll_some(int max = 0)
1560 PROTOTYPE: $
1561 CODE:
1562 RETVAL = poll_cb (max);
1563 OUTPUT: 1797 OUTPUT:
1564 RETVAL 1798 RETVAL
1565 1799
1566void 1800void
1567poll_wait() 1801poll_wait()
1568 PROTOTYPE: 1802 PROTOTYPE:
1569 CODE: 1803 CODE:
1570 if (nreqs)
1571 poll_wait (); 1804 poll_wait ();
1805
1806void
1807setsig (int signum = SIGIO)
1808 PROTOTYPE: ;$
1809 CODE:
1810{
1811 if (block_sig_level)
1812 croak ("cannot call IO::AIO::setsig from within aio_block/callback");
1813
1814 LOCK (reslock);
1815 main_tid = pthread_self ();
1816 main_sig = signum;
1817 UNLOCK (reslock);
1818
1819 if (main_sig && npending)
1820 pthread_kill (main_tid, main_sig);
1821}
1822
1823void
1824aio_block (SV *cb)
1825 PROTOTYPE: &
1826 PPCODE:
1827{
1828 int count;
1829
1830 block_sig ();
1831 PUSHMARK (SP);
1832 PUTBACK;
1833 count = call_sv (cb, GIMME_V | G_NOARGS | G_EVAL);
1834 SPAGAIN;
1835 unblock_sig ();
1836
1837 if (SvTRUE (ERRSV))
1838 croak (0);
1839
1840 XSRETURN (count);
1841}
1572 1842
1573int 1843int
1574nreqs() 1844nreqs()
1575 PROTOTYPE: 1845 PROTOTYPE:
1576 CODE: 1846 CODE:
1592 CODE: 1862 CODE:
1593 RETVAL = get_npending (); 1863 RETVAL = get_npending ();
1594 OUTPUT: 1864 OUTPUT:
1595 RETVAL 1865 RETVAL
1596 1866
1867int
1868nthreads()
1869 PROTOTYPE:
1870 CODE:
1871 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1872 RETVAL = started;
1873 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1874 OUTPUT:
1875 RETVAL
1876
1597PROTOTYPES: DISABLE 1877PROTOTYPES: DISABLE
1598 1878
1599MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1879MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1600 1880
1601void 1881void
1616 PPCODE: 1896 PPCODE:
1617{ 1897{
1618 int i; 1898 int i;
1619 aio_req req; 1899 aio_req req;
1620 1900
1901 if (main_sig && !block_sig_level)
1902 croak ("aio_group->add called outside aio_block/callback context while IO::AIO::setsig is in use");
1903
1621 if (grp->fd == 2) 1904 if (grp->int1 == 2)
1622 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1905 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1623 1906
1624 for (i = 1; i < items; ++i ) 1907 for (i = 1; i < items; ++i )
1625 { 1908 {
1626 if (GIMME_V != G_VOID) 1909 if (GIMME_V != G_VOID)
1628 1911
1629 req = SvAIO_REQ (ST (i)); 1912 req = SvAIO_REQ (ST (i));
1630 1913
1631 if (req) 1914 if (req)
1632 { 1915 {
1633 ++grp->length; 1916 ++grp->size;
1634 req->grp = grp; 1917 req->grp = grp;
1635 1918
1636 req->grp_prev = 0; 1919 req->grp_prev = 0;
1637 req->grp_next = grp->grp_first; 1920 req->grp_next = grp->grp_first;
1638 1921
1661 av = newAV (); 1944 av = newAV ();
1662 1945
1663 for (i = 1; i < items; ++i ) 1946 for (i = 1; i < items; ++i )
1664 av_push (av, newSVsv (ST (i))); 1947 av_push (av, newSVsv (ST (i)));
1665 1948
1666 SvREFCNT_dec (grp->data); 1949 SvREFCNT_dec (grp->sv1);
1667 grp->data = (SV *)av; 1950 grp->sv1 = (SV *)av;
1668} 1951}
1669 1952
1670void 1953void
1671errno (aio_req grp, int errorno = errno) 1954errno (aio_req grp, int errorno = errno)
1672 CODE: 1955 CODE:
1673 grp->errorno = errorno; 1956 grp->errorno = errorno;
1674 1957
1675void 1958void
1676limit (aio_req grp, int limit) 1959limit (aio_req grp, int limit)
1677 CODE: 1960 CODE:
1678 grp->fd2 = limit; 1961 grp->int2 = limit;
1679 aio_grp_feed (grp); 1962 aio_grp_feed (grp);
1680 1963
1681void 1964void
1682feed (aio_req grp, SV *callback=&PL_sv_undef) 1965feed (aio_req grp, SV *callback=&PL_sv_undef)
1683 CODE: 1966 CODE:
1684{ 1967{
1685 SvREFCNT_dec (grp->fh2); 1968 SvREFCNT_dec (grp->sv2);
1686 grp->fh2 = newSVsv (callback); 1969 grp->sv2 = newSVsv (callback);
1687 1970
1688 if (grp->fd2 <= 0) 1971 if (grp->int2 <= 0)
1689 grp->fd2 = 2; 1972 grp->int2 = 2;
1690 1973
1691 aio_grp_feed (grp); 1974 aio_grp_feed (grp);
1692} 1975}
1693 1976

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines