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.79 by root, Thu Oct 26 16:28:33 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_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;
150static volatile unsigned int nreqs, nready, npending;
151static volatile unsigned int max_outstanding = 0xffffffff;
152static int respipe [2];
153
154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
156#else
157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
158#endif
159
160#define LOCK(mutex) pthread_mutex_lock (&(mutex))
161#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
162 180
163/* worker threads management */ 181/* worker threads management */
164static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 182static mutex_t wrklock = MUTEX_INIT;
165 183
166typedef struct worker { 184typedef struct worker {
167 /* locked by wrklock */ 185 /* locked by wrklock */
168 struct worker *prev, *next; 186 struct worker *prev, *next;
169 187
170 pthread_t tid; 188 thread_t tid;
171 189
172 /* locked by reslock, reqlock or wrklock */ 190 /* locked by reslock, reqlock or wrklock */
173 aio_req req; /* currently processed request */ 191 aio_req req; /* currently processed request */
174 void *dbuf; 192 void *dbuf;
175 DIR *dirp; 193 DIR *dirp;
198 wrk->prev->next = wrk->next; 216 wrk->prev->next = wrk->next;
199 217
200 free (wrk); 218 free (wrk);
201} 219}
202 220
221static volatile unsigned int nreqs, nready, npending;
222static volatile unsigned int max_idle = 4;
223static volatile unsigned int max_outstanding = 0xffffffff;
224static int respipe [2];
225
203static pthread_mutex_t reslock = AIO_MUTEX_INIT; 226static mutex_t reslock = MUTEX_INIT;
204static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 227static mutex_t reqlock = MUTEX_INIT;
205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 228static cond_t reqwait = COND_INIT;
229
230#if WORDACCESS_UNSAFE
231
232static unsigned int get_nready ()
233{
234 unsigned int retval;
235
236 LOCK (reqlock);
237 retval = nready;
238 UNLOCK (reqlock);
239
240 return retval;
241}
242
243static unsigned int get_npending ()
244{
245 unsigned int retval;
246
247 LOCK (reslock);
248 retval = npending;
249 UNLOCK (reslock);
250
251 return retval;
252}
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
265#else
266
267# define get_nready() nready
268# define get_npending() npending
269# define get_nthreads() started
270
271#endif
206 272
207/* 273/*
208 * a somewhat faster data structure might be nice, but 274 * a somewhat faster data structure might be nice, but
209 * with 8 priorities this actually needs <20 insns 275 * with 8 priorities this actually needs <20 insns
210 * per shift, the most expensive operation. 276 * per shift, the most expensive operation.
256 } 322 }
257 323
258 abort (); 324 abort ();
259} 325}
260 326
261static int poll_cb (int max); 327static int poll_cb ();
262static void req_invoke (aio_req req); 328static int req_invoke (aio_req req);
263static void req_free (aio_req req); 329static void req_destroy (aio_req req);
264static void req_cancel (aio_req req); 330static void req_cancel (aio_req req);
265 331
266/* must be called at most once */ 332/* must be called at most once */
267static SV *req_sv (aio_req req, const char *klass) 333static SV *req_sv (aio_req req, const char *klass)
268{ 334{
287 return mg ? (aio_req)mg->mg_ptr : 0; 353 return mg ? (aio_req)mg->mg_ptr : 0;
288} 354}
289 355
290static void aio_grp_feed (aio_req grp) 356static void aio_grp_feed (aio_req grp)
291{ 357{
358 block_sig ();
359
292 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 360 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
293 { 361 {
294 int old_len = grp->length; 362 int old_len = grp->size;
295 363
296 if (grp->fh2 && SvOK (grp->fh2)) 364 if (grp->sv2 && SvOK (grp->sv2))
297 { 365 {
298 dSP; 366 dSP;
299 367
300 ENTER; 368 ENTER;
301 SAVETMPS; 369 SAVETMPS;
302 PUSHMARK (SP); 370 PUSHMARK (SP);
303 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 371 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
304 PUTBACK; 372 PUTBACK;
305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 373 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
306 SPAGAIN; 374 SPAGAIN;
307 FREETMPS; 375 FREETMPS;
308 LEAVE; 376 LEAVE;
309 } 377 }
310 378
311 /* stop if no progress has been made */ 379 /* stop if no progress has been made */
312 if (old_len == grp->length) 380 if (old_len == grp->size)
313 { 381 {
314 SvREFCNT_dec (grp->fh2); 382 SvREFCNT_dec (grp->sv2);
315 grp->fh2 = 0; 383 grp->sv2 = 0;
316 break; 384 break;
317 } 385 }
318 } 386 }
387
388 unblock_sig ();
319} 389}
320 390
321static void aio_grp_dec (aio_req grp) 391static void aio_grp_dec (aio_req grp)
322{ 392{
323 --grp->length; 393 --grp->size;
324 394
325 /* call feeder, if applicable */ 395 /* call feeder, if applicable */
326 aio_grp_feed (grp); 396 aio_grp_feed (grp);
327 397
328 /* finish, if done */ 398 /* finish, if done */
329 if (!grp->length && grp->fd) 399 if (!grp->size && grp->int1)
330 { 400 {
401 block_sig ();
402
331 req_invoke (grp); 403 if (!req_invoke (grp))
404 {
405 req_destroy (grp);
406 unblock_sig ();
407 croak (0);
408 }
409
332 req_free (grp); 410 req_destroy (grp);
411 unblock_sig ();
333 } 412 }
334} 413}
335 414
336static void poll_wait ()
337{
338 fd_set rfd;
339
340 while (nreqs)
341 {
342 int size;
343 if (WORDREAD_UNSAFE) LOCK (reslock);
344 size = res_queue.size;
345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
346
347 if (size)
348 return;
349
350 FD_ZERO(&rfd);
351 FD_SET(respipe [0], &rfd);
352
353 select (respipe [0] + 1, &rfd, 0, 0, 0);
354 }
355}
356
357static void req_invoke (aio_req req) 415static int req_invoke (aio_req req)
358{ 416{
359 dSP; 417 dSP;
418
419 if (req->flags & FLAG_SV2_RO_OFF)
420 SvREADONLY_off (req->sv2);
360 421
361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 422 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
362 { 423 {
363 ENTER; 424 ENTER;
364 SAVETMPS; 425 SAVETMPS;
372 SV *rv = &PL_sv_undef; 433 SV *rv = &PL_sv_undef;
373 434
374 if (req->result >= 0) 435 if (req->result >= 0)
375 { 436 {
376 int i; 437 int i;
377 char *buf = req->data2ptr; 438 char *buf = req->ptr2;
378 AV *av = newAV (); 439 AV *av = newAV ();
379 440
380 av_extend (av, req->result - 1); 441 av_extend (av, req->result - 1);
381 442
382 for (i = 0; i < req->result; ++i) 443 for (i = 0; i < req->result; ++i)
402 PUSHs (sv_2mortal (newSViv (req->result))); 463 PUSHs (sv_2mortal (newSViv (req->result)));
403 PUTBACK; 464 PUTBACK;
404 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 465 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
405 SPAGAIN; 466 SPAGAIN;
406 467
407 fh = SvREFCNT_inc (POPs); 468 fh = POPs;
408
409 PUSHMARK (SP); 469 PUSHMARK (SP);
410 XPUSHs (sv_2mortal (fh)); 470 XPUSHs (fh);
411 } 471 }
412 break; 472 break;
413 473
414 case REQ_GROUP: 474 case REQ_GROUP:
415 req->fd = 2; /* mark group as finished */ 475 req->int1 = 2; /* mark group as finished */
416 476
417 if (req->data) 477 if (req->sv1)
418 { 478 {
419 int i; 479 int i;
420 AV *av = (AV *)req->data; 480 AV *av = (AV *)req->sv1;
421 481
422 EXTEND (SP, AvFILL (av) + 1); 482 EXTEND (SP, AvFILL (av) + 1);
423 for (i = 0; i <= AvFILL (av); ++i) 483 for (i = 0; i <= AvFILL (av); ++i)
424 PUSHs (*av_fetch (av, i, 0)); 484 PUSHs (*av_fetch (av, i, 0));
425 } 485 }
427 487
428 case REQ_NOP: 488 case REQ_NOP:
429 case REQ_BUSY: 489 case REQ_BUSY:
430 break; 490 break;
431 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
432 default: 516 default:
433 PUSHs (sv_2mortal (newSViv (req->result))); 517 PUSHs (sv_2mortal (newSViv (req->result)));
434 break; 518 break;
435 } 519 }
436 520
456 grp->grp_first = req->grp_next; 540 grp->grp_first = req->grp_next;
457 541
458 aio_grp_dec (grp); 542 aio_grp_dec (grp);
459 } 543 }
460 544
461 if (SvTRUE (ERRSV)) 545 return !SvTRUE (ERRSV);
462 {
463 req_free (req);
464 croak (0);
465 }
466} 546}
467 547
468static void req_free (aio_req req) 548static void req_destroy (aio_req req)
469{ 549{
470 if (req->self) 550 if (req->self)
471 { 551 {
472 sv_unmagic (req->self, PERL_MAGIC_ext); 552 sv_unmagic (req->self, PERL_MAGIC_ext);
473 SvREFCNT_dec (req->self); 553 SvREFCNT_dec (req->self);
474 } 554 }
475 555
476 SvREFCNT_dec (req->data);
477 SvREFCNT_dec (req->fh); 556 SvREFCNT_dec (req->sv1);
478 SvREFCNT_dec (req->fh2); 557 SvREFCNT_dec (req->sv2);
479 SvREFCNT_dec (req->callback); 558 SvREFCNT_dec (req->callback);
480 Safefree (req->statdata);
481 559
482 if (req->type == REQ_READDIR) 560 if (req->flags & FLAG_PTR2_FREE)
483 free (req->data2ptr); 561 free (req->ptr2);
484 562
485 Safefree (req); 563 Safefree (req);
486} 564}
487 565
488static void req_cancel_subs (aio_req grp) 566static void req_cancel_subs (aio_req grp)
490 aio_req sub; 568 aio_req sub;
491 569
492 if (grp->type != REQ_GROUP) 570 if (grp->type != REQ_GROUP)
493 return; 571 return;
494 572
495 SvREFCNT_dec (grp->fh2); 573 SvREFCNT_dec (grp->sv2);
496 grp->fh2 = 0; 574 grp->sv2 = 0;
497 575
498 for (sub = grp->grp_first; sub; sub = sub->grp_next) 576 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub); 577 req_cancel (sub);
500} 578}
501 579
504 req->flags |= FLAG_CANCELLED; 582 req->flags |= FLAG_CANCELLED;
505 583
506 req_cancel_subs (req); 584 req_cancel_subs (req);
507} 585}
508 586
509static int poll_cb (int max)
510{
511 dSP;
512 int count = 0;
513 int do_croak = 0;
514 aio_req req;
515
516 for (;;)
517 {
518 while (max <= 0 || count < max)
519 {
520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
522
523 if (req)
524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
529 /* read any signals sent by the worker threads */
530 char buf [32];
531 while (read (respipe [0], buf, 32) == 32)
532 ;
533 }
534 }
535
536 UNLOCK (reslock);
537
538 if (!req)
539 break;
540
541 --nreqs;
542
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length)
546 {
547 req->fd = 1; /* mark request as delayed */
548 continue;
549 }
550 else
551 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req);
566
567 count++;
568 }
569
570 req_free (req);
571 }
572
573 if (nreqs <= max_outstanding)
574 break;
575
576 poll_wait ();
577
578 max = 0;
579 }
580
581 return count;
582}
583
584static void *aio_proc(void *arg); 587static void *aio_proc (void *arg);
585 588
586static void start_thread (void) 589static void start_thread (void)
587{ 590{
588 sigset_t fullsigset, oldsigset;
589 pthread_attr_t attr;
590
591 worker *wrk = calloc (1, sizeof (worker)); 591 worker *wrk = calloc (1, sizeof (worker));
592 592
593 if (!wrk) 593 if (!wrk)
594 croak ("unable to allocate worker thread data"); 594 croak ("unable to allocate worker thread data");
595 595
596 pthread_attr_init (&attr);
597 pthread_attr_setstacksize (&attr, STACKSIZE);
598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
599
600 sigfillset (&fullsigset);
601
602 LOCK (wrklock); 596 LOCK (wrklock);
603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
604 597
605 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 598 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
606 { 599 {
607 wrk->prev = &wrk_first; 600 wrk->prev = &wrk_first;
608 wrk->next = wrk_first.next; 601 wrk->next = wrk_first.next;
609 wrk_first.next->prev = wrk; 602 wrk_first.next->prev = wrk;
610 wrk_first.next = wrk; 603 wrk_first.next = wrk;
611 ++started; 604 ++started;
612 } 605 }
613 else 606 else
614 free (wrk); 607 free (wrk);
615 608
616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock); 609 UNLOCK (wrklock);
618} 610}
619 611
612static void maybe_start_thread ()
613{
614 if (get_nthreads () >= wanted)
615 return;
616
617 /* todo: maybe use idle here, but might be less exact */
618 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
619 return;
620
621 start_thread ();
622}
623
620static void req_send (aio_req req) 624static void req_send (aio_req req)
621{ 625{
622 while (started < wanted && nreqs >= started) 626 block_sig ();
623 start_thread ();
624 627
625 ++nreqs; 628 ++nreqs;
626 629
627 LOCK (reqlock); 630 LOCK (reqlock);
628 ++nready; 631 ++nready;
629 reqq_push (&req_queue, req); 632 reqq_push (&req_queue, req);
630 pthread_cond_signal (&reqwait); 633 COND_SIGNAL (reqwait);
631 UNLOCK (reqlock); 634 UNLOCK (reqlock);
635
636 unblock_sig ();
637
638 maybe_start_thread ();
632} 639}
633 640
634static void end_thread (void) 641static void end_thread (void)
635{ 642{
636 aio_req req; 643 aio_req req;
638 Newz (0, req, 1, aio_cb); 645 Newz (0, req, 1, aio_cb);
639 646
640 req->type = REQ_QUIT; 647 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS; 648 req->pri = PRI_MAX + PRI_BIAS;
642 649
643 req_send (req); 650 LOCK (reqlock);
651 reqq_push (&req_queue, req);
652 COND_SIGNAL (reqwait);
653 UNLOCK (reqlock);
654
655 LOCK (wrklock);
656 --started;
657 UNLOCK (wrklock);
658}
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);
644} 665}
645 666
646static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
647{ 668{
648 if (wanted < nthreads) 669 if (wanted < nthreads)
649 wanted = nthreads; 670 wanted = nthreads;
650} 671}
651 672
652static void max_parallel (int nthreads) 673static void max_parallel (int nthreads)
653{ 674{
654 int cur = started;
655
656 if (wanted > nthreads) 675 if (wanted > nthreads)
657 wanted = nthreads; 676 wanted = nthreads;
658 677
659 while (cur > wanted) 678 while (started > wanted)
679 end_thread ();
680}
681
682static void poll_wait ()
683{
684 fd_set rfd;
685
686 while (nreqs)
660 { 687 {
688 int size;
689 if (WORDACCESS_UNSAFE) LOCK (reslock);
690 size = res_queue.size;
691 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
692
693 if (size)
694 return;
695
661 end_thread (); 696 maybe_start_thread ();
662 cur--; 697
698 FD_ZERO(&rfd);
699 FD_SET(respipe [0], &rfd);
700
701 select (respipe [0] + 1, &rfd, 0, 0, 0);
663 } 702 }
703}
664 704
665 while (started > wanted) 705static int poll_cb ()
706{
707 dSP;
708 int count = 0;
709 int maxreqs = max_poll_reqs;
710 int do_croak = 0;
711 struct timeval tv_start, tv_now;
712 aio_req req;
713
714 if (max_poll_time)
715 gettimeofday (&tv_start, 0);
716
717 block_sig ();
718
719 for (;;)
666 { 720 {
721 for (;;)
722 {
723 maybe_start_thread ();
724
725 LOCK (reslock);
726 req = reqq_shift (&res_queue);
727
728 if (req)
729 {
730 --npending;
731
732 if (!res_queue.size)
733 {
734 /* read any signals sent by the worker threads */
735 char buf [4];
736 while (read (respipe [0], buf, 4) == 4)
737 ;
738 }
739 }
740
741 UNLOCK (reslock);
742
743 if (!req)
744 break;
745
746 --nreqs;
747
748 if (req->type == REQ_GROUP && req->size)
749 {
750 req->int1 = 1; /* mark request as delayed */
751 continue;
752 }
753 else
754 {
755 if (!req_invoke (req))
756 {
757 req_destroy (req);
758 unblock_sig ();
759 croak (0);
760 }
761
762 count++;
763 }
764
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 }
777 }
778
779 if (nreqs <= max_outstanding)
780 break;
781
667 poll_wait (); 782 poll_wait ();
668 poll_cb (0); 783
784 ++maxreqs;
669 } 785 }
786
787 unblock_sig ();
788 return count;
670} 789}
671 790
672static void create_pipe () 791static void create_pipe ()
673{ 792{
674 if (pipe (respipe)) 793 if (pipe (respipe))
691/* 810/*
692 * make our pread/pwrite safe against themselves, but not against 811 * make our pread/pwrite safe against themselves, but not against
693 * 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,
694 * but that's your problem, not mine. 813 * but that's your problem, not mine.
695 */ 814 */
696static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 815static mutex_t preadwritelock = MUTEX_INIT;
697 816
698static 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)
699{ 818{
700 ssize_t res; 819 ssize_t res;
701 off_t ooffset; 820 off_t ooffset;
724 843
725 return res; 844 return res;
726} 845}
727#endif 846#endif
728 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
729#if !HAVE_FDATASYNC 876#if !HAVE_FDATASYNC
730# define fdatasync fsync 877# define fdatasync fsync
731#endif 878#endif
732 879
733#if !HAVE_READAHEAD 880#if !HAVE_READAHEAD
752#endif 899#endif
753 900
754#if !HAVE_READDIR_R 901#if !HAVE_READDIR_R
755# define readdir_r aio_readdir_r 902# define readdir_r aio_readdir_r
756 903
757static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 904static mutex_t readdirlock = MUTEX_INIT;
758 905
759static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 906static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
760{ 907{
761 struct dirent *e; 908 struct dirent *e;
762 int errorno; 909 int errorno;
889 int memofs = 0; 1036 int memofs = 0;
890 int res = 0; 1037 int res = 0;
891 int errorno; 1038 int errorno;
892 1039
893 LOCK (wrklock); 1040 LOCK (wrklock);
894 self->dirp = dirp = opendir (req->dataptr); 1041 self->dirp = dirp = opendir (req->ptr1);
895 self->dbuf = u = malloc (sizeof (*u)); 1042 self->dbuf = u = malloc (sizeof (*u));
1043 req->flags |= FLAG_PTR2_FREE;
896 req->data2ptr = names = malloc (memlen); 1044 req->ptr2 = names = malloc (memlen);
897 UNLOCK (wrklock); 1045 UNLOCK (wrklock);
898 1046
899 if (dirp && u && names) 1047 if (dirp && u && names)
900 for (;;) 1048 for (;;)
901 { 1049 {
915 1063
916 while (memofs + len > memlen) 1064 while (memofs + len > memlen)
917 { 1065 {
918 memlen *= 2; 1066 memlen *= 2;
919 LOCK (wrklock); 1067 LOCK (wrklock);
920 req->data2ptr = names = realloc (names, memlen); 1068 req->ptr2 = names = realloc (names, memlen);
921 UNLOCK (wrklock); 1069 UNLOCK (wrklock);
922 1070
923 if (!names) 1071 if (!names)
924 break; 1072 break;
925 } 1073 }
938/*****************************************************************************/ 1086/*****************************************************************************/
939 1087
940static void *aio_proc (void *thr_arg) 1088static void *aio_proc (void *thr_arg)
941{ 1089{
942 aio_req req; 1090 aio_req req;
943 int type; 1091 struct timespec ts;
944 worker *self = (worker *)thr_arg; 1092 worker *self = (worker *)thr_arg;
945 1093
946 do 1094 /* try to distribute timeouts somewhat evenly */
1095 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1096 * (1000000000UL / 1024UL);
1097
1098 for (;;)
947 { 1099 {
1100 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1101
948 LOCK (reqlock); 1102 LOCK (reqlock);
949 1103
950 for (;;) 1104 for (;;)
951 { 1105 {
952 self->req = req = reqq_shift (&req_queue); 1106 self->req = req = reqq_shift (&req_queue);
953 1107
954 if (req) 1108 if (req)
955 break; 1109 break;
956 1110
957 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;
958 } 1132 }
959 1133
960 --nready; 1134 --nready;
961 1135
962 UNLOCK (reqlock); 1136 UNLOCK (reqlock);
963 1137
964 errno = 0; /* strictly unnecessary */ 1138 errno = 0; /* strictly unnecessary */
965 type = req->type; /* remember type for QUIT check */
966 1139
967 if (!(req->flags & FLAG_CANCELLED)) 1140 if (!(req->flags & FLAG_CANCELLED))
968 switch (type) 1141 switch (req->type)
969 { 1142 {
970 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1143 case REQ_READ: req->result = req->offs >= 0
971 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;
972 1149
973 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;
974 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;
975 1152
976 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;
977 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;
978 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;
979 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
980 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;
981 case REQ_CLOSE: req->result = close (req->fd); break; 1163 case REQ_CLOSE: req->result = close (req->int1); break;
982 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1164 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
983 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;
984 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1167 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1168 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1169 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); 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;
987 1172
988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1173 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
989 case REQ_FSYNC: req->result = fsync (req->fd); break; 1174 case REQ_FSYNC: req->result = fsync (req->int1); break;
990 case REQ_READDIR: scandir_ (req, self); break; 1175 case REQ_READDIR: scandir_ (req, self); break;
991 1176
992 case REQ_BUSY: 1177 case REQ_BUSY:
993 { 1178 {
994 struct timeval tv; 1179 struct timeval tv;
995 1180
996 tv.tv_sec = req->fd; 1181 tv.tv_sec = req->nv1;
997 tv.tv_usec = req->fd2; 1182 tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.;
998 1183
999 req->result = select (0, 0, 0, 0, &tv); 1184 req->result = select (0, 0, 0, 0, &tv);
1000 } 1185 }
1001 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);
1209 }
1210
1002 case REQ_GROUP: 1211 case REQ_GROUP:
1003 case REQ_NOP: 1212 case REQ_NOP:
1213 break;
1214
1004 case REQ_QUIT: 1215 case REQ_QUIT:
1005 break; 1216 goto quit;
1006 1217
1007 default: 1218 default:
1008 req->result = ENOSYS; 1219 req->result = -1;
1009 break; 1220 break;
1010 } 1221 }
1011 1222
1012 req->errorno = errno; 1223 req->errorno = errno;
1013 1224
1014 LOCK (reslock); 1225 LOCK (reslock);
1015 1226
1016 ++npending; 1227 ++npending;
1017 1228
1018 if (!reqq_push (&res_queue, req)) 1229 if (!reqq_push (&res_queue, req))
1230 {
1019 /* write a dummy byte to the pipe so fh becomes ready */ 1231 /* write a dummy byte to the pipe so fh becomes ready */
1020 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 }
1021 1238
1022 self->req = 0; 1239 self->req = 0;
1023 worker_clear (self); 1240 worker_clear (self);
1024 1241
1025 UNLOCK (reslock); 1242 UNLOCK (reslock);
1026 } 1243 }
1027 while (type != REQ_QUIT);
1028 1244
1245quit:
1029 LOCK (wrklock); 1246 LOCK (wrklock);
1030 worker_free (self); 1247 worker_free (self);
1031 UNLOCK (wrklock); 1248 UNLOCK (wrklock);
1032 1249
1033 return 0; 1250 return 0;
1064static void atfork_child (void) 1281static void atfork_child (void)
1065{ 1282{
1066 aio_req prv; 1283 aio_req prv;
1067 1284
1068 while (prv = reqq_shift (&req_queue)) 1285 while (prv = reqq_shift (&req_queue))
1069 req_free (prv); 1286 req_destroy (prv);
1070 1287
1071 while (prv = reqq_shift (&res_queue)) 1288 while (prv = reqq_shift (&res_queue))
1072 req_free (prv); 1289 req_destroy (prv);
1073 1290
1074 while (wrk_first.next != &wrk_first) 1291 while (wrk_first.next != &wrk_first)
1075 { 1292 {
1076 worker *wrk = wrk_first.next; 1293 worker *wrk = wrk_first.next;
1077 1294
1078 if (wrk->req) 1295 if (wrk->req)
1079 req_free (wrk->req); 1296 req_destroy (wrk->req);
1080 1297
1081 worker_clear (wrk); 1298 worker_clear (wrk);
1082 worker_free (wrk); 1299 worker_free (wrk);
1083 } 1300 }
1084 1301
1085 started = 0; 1302 started = 0;
1303 idle = 0;
1086 nreqs = 0; 1304 nreqs = 0;
1305 nready = 0;
1306 npending = 0;
1087 1307
1088 close (respipe [0]); 1308 close (respipe [0]);
1089 close (respipe [1]); 1309 close (respipe [1]);
1090 create_pipe (); 1310 create_pipe ();
1091 1311
1118PROTOTYPES: ENABLE 1338PROTOTYPES: ENABLE
1119 1339
1120BOOT: 1340BOOT:
1121{ 1341{
1122 HV *stash = gv_stashpv ("IO::AIO", 1); 1342 HV *stash = gv_stashpv ("IO::AIO", 1);
1343
1123 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1344 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1124 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1345 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1125 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1346 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1347 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1348 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1349 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1350 newCONSTSUB (stash, "SIGIO", newSViv (SIGIO));
1126 1351
1127 create_pipe (); 1352 create_pipe ();
1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1353 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1129} 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;
1130 1367
1131void 1368void
1132min_parallel (int nthreads) 1369min_parallel (int nthreads)
1133 PROTOTYPE: $ 1370 PROTOTYPE: $
1134 1371
1135void 1372void
1136max_parallel (int nthreads) 1373max_parallel (int nthreads)
1137 PROTOTYPE: $ 1374 PROTOTYPE: $
1375
1376void
1377max_idle (int nthreads)
1378 PROTOTYPE: $
1379 CODE:
1380 set_max_idle (nthreads);
1138 1381
1139int 1382int
1140max_outstanding (int maxreqs) 1383max_outstanding (int maxreqs)
1141 PROTOTYPE: $ 1384 PROTOTYPE: $
1142 CODE: 1385 CODE:
1144 max_outstanding = maxreqs; 1387 max_outstanding = maxreqs;
1145 OUTPUT: 1388 OUTPUT:
1146 RETVAL 1389 RETVAL
1147 1390
1148void 1391void
1149aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1392aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1150 SV * pathname
1151 int flags
1152 int mode
1153 SV * callback
1154 PROTOTYPE: $$$;$ 1393 PROTOTYPE: $$$;$
1155 PPCODE: 1394 PPCODE:
1156{ 1395{
1157 dREQ; 1396 dREQ;
1158 1397
1159 req->type = REQ_OPEN; 1398 req->type = REQ_OPEN;
1160 req->data = newSVsv (pathname); 1399 req->sv1 = newSVsv (pathname);
1161 req->dataptr = SvPVbyte_nolen (req->data); 1400 req->ptr1 = SvPVbyte_nolen (req->sv1);
1162 req->fd = flags; 1401 req->int1 = flags;
1163 req->mode = mode; 1402 req->mode = mode;
1164 1403
1165 REQ_SEND; 1404 REQ_SEND;
1166} 1405}
1167 1406
1168void 1407void
1169aio_close (fh,callback=&PL_sv_undef) 1408aio_close (SV *fh, SV *callback=&PL_sv_undef)
1170 SV * fh
1171 SV * callback
1172 PROTOTYPE: $;$ 1409 PROTOTYPE: $;$
1173 ALIAS: 1410 ALIAS:
1174 aio_close = REQ_CLOSE 1411 aio_close = REQ_CLOSE
1175 aio_fsync = REQ_FSYNC 1412 aio_fsync = REQ_FSYNC
1176 aio_fdatasync = REQ_FDATASYNC 1413 aio_fdatasync = REQ_FDATASYNC
1177 PPCODE: 1414 PPCODE:
1178{ 1415{
1179 dREQ; 1416 dREQ;
1180 1417
1181 req->type = ix; 1418 req->type = ix;
1182 req->fh = newSVsv (fh); 1419 req->sv1 = newSVsv (fh);
1183 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1420 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1184 1421
1185 REQ_SEND (req); 1422 REQ_SEND (req);
1186} 1423}
1187 1424
1188void 1425void
1189aio_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)
1190 SV * fh
1191 UV offset
1192 UV length
1193 SV * data
1194 UV dataoffset
1195 SV * callback
1196 ALIAS: 1427 ALIAS:
1197 aio_read = REQ_READ 1428 aio_read = REQ_READ
1198 aio_write = REQ_WRITE 1429 aio_write = REQ_WRITE
1199 PROTOTYPE: $$$$$;$ 1430 PROTOTYPE: $$$$$;$
1200 PPCODE: 1431 PPCODE:
1201{ 1432{
1202 aio_req req;
1203 STRLEN svlen; 1433 STRLEN svlen;
1204 char *svptr = SvPVbyte (data, svlen); 1434 char *svptr = SvPVbyte (data, svlen);
1435 UV len = SvUV (length);
1205 1436
1206 SvUPGRADE (data, SVt_PV); 1437 SvUPGRADE (data, SVt_PV);
1207 SvPOK_on (data); 1438 SvPOK_on (data);
1208 1439
1209 if (dataoffset < 0) 1440 if (dataoffset < 0)
1210 dataoffset += svlen; 1441 dataoffset += svlen;
1211 1442
1212 if (dataoffset < 0 || dataoffset > svlen) 1443 if (dataoffset < 0 || dataoffset > svlen)
1213 croak ("data offset outside of string"); 1444 croak ("dataoffset outside of data scalar");
1214 1445
1215 if (ix == REQ_WRITE) 1446 if (ix == REQ_WRITE)
1216 { 1447 {
1217 /* write: check length and adjust. */ 1448 /* write: check length and adjust. */
1218 if (length < 0 || length + dataoffset > svlen) 1449 if (!SvOK (length) || len + dataoffset > svlen)
1219 length = svlen - dataoffset; 1450 len = svlen - dataoffset;
1220 } 1451 }
1221 else 1452 else
1222 { 1453 {
1223 /* read: grow scalar as necessary */ 1454 /* read: grow scalar as necessary */
1224 svptr = SvGROW (data, length + dataoffset); 1455 svptr = SvGROW (data, len + dataoffset + 1);
1225 } 1456 }
1226 1457
1227 if (length < 0) 1458 if (len < 0)
1228 croak ("length must not be negative"); 1459 croak ("length must not be negative");
1229 1460
1230 { 1461 {
1231 dREQ; 1462 dREQ;
1232 1463
1233 req->type = ix; 1464 req->type = ix;
1234 req->fh = newSVsv (fh); 1465 req->sv1 = newSVsv (fh);
1235 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1466 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1236 : IoOFP (sv_2io (fh))); 1467 : IoOFP (sv_2io (fh)));
1468 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1237 req->offset = offset; 1469 req->size = len;
1238 req->length = length;
1239 req->data = SvREFCNT_inc (data); 1470 req->sv2 = SvREFCNT_inc (data);
1240 req->dataptr = (char *)svptr + dataoffset; 1471 req->ptr1 = (char *)svptr + dataoffset;
1472 req->stroffset = dataoffset;
1241 1473
1242 if (!SvREADONLY (data)) 1474 if (!SvREADONLY (data))
1243 { 1475 {
1244 SvREADONLY_on (data); 1476 SvREADONLY_on (data);
1245 req->data2ptr = (void *)data; 1477 req->flags |= FLAG_SV2_RO_OFF;
1246 } 1478 }
1247 1479
1248 REQ_SEND; 1480 REQ_SEND;
1249 } 1481 }
1250} 1482}
1251 1483
1252void 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
1253aio_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)
1254 SV * out_fh
1255 SV * in_fh
1256 UV in_offset
1257 UV length
1258 SV * callback
1259 PROTOTYPE: $$$$;$ 1506 PROTOTYPE: $$$$;$
1260 PPCODE: 1507 PPCODE:
1261{ 1508{
1262 dREQ; 1509 dREQ;
1263 1510
1264 req->type = REQ_SENDFILE; 1511 req->type = REQ_SENDFILE;
1265 req->fh = newSVsv (out_fh); 1512 req->sv1 = newSVsv (out_fh);
1266 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1267 req->fh2 = newSVsv (in_fh); 1514 req->sv2 = newSVsv (in_fh);
1268 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1515 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1269 req->offset = in_offset; 1516 req->offs = SvVAL64 (in_offset);
1270 req->length = length; 1517 req->size = length;
1271 1518
1272 REQ_SEND; 1519 REQ_SEND;
1273} 1520}
1274 1521
1275void 1522void
1276aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1523aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
1277 SV * fh
1278 UV offset
1279 IV length
1280 SV * callback
1281 PROTOTYPE: $$$;$ 1524 PROTOTYPE: $$$;$
1282 PPCODE: 1525 PPCODE:
1283{ 1526{
1284 dREQ; 1527 dREQ;
1285 1528
1286 req->type = REQ_READAHEAD; 1529 req->type = REQ_READAHEAD;
1287 req->fh = newSVsv (fh); 1530 req->sv1 = newSVsv (fh);
1288 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1531 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1289 req->offset = offset; 1532 req->offs = SvVAL64 (offset);
1290 req->length = length; 1533 req->size = length;
1291 1534
1292 REQ_SEND; 1535 REQ_SEND;
1293} 1536}
1294 1537
1295void 1538void
1296aio_stat (fh_or_path,callback=&PL_sv_undef) 1539aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1297 SV * fh_or_path
1298 SV * callback
1299 ALIAS: 1540 ALIAS:
1300 aio_stat = REQ_STAT 1541 aio_stat = REQ_STAT
1301 aio_lstat = REQ_LSTAT 1542 aio_lstat = REQ_LSTAT
1302 PPCODE: 1543 PPCODE:
1303{ 1544{
1304 dREQ; 1545 dREQ;
1305 1546
1306 New (0, req->statdata, 1, Stat_t); 1547 req->ptr2 = malloc (sizeof (Stat_t));
1307 if (!req->statdata) 1548 if (!req->ptr2)
1308 { 1549 {
1309 req_free (req); 1550 req_destroy (req);
1310 croak ("out of memory during aio_req->statdata allocation"); 1551 croak ("out of memory during aio_stat statdata allocation");
1311 } 1552 }
1553
1554 req->flags |= FLAG_PTR2_FREE;
1555 req->sv1 = newSVsv (fh_or_path);
1312 1556
1313 if (SvPOK (fh_or_path)) 1557 if (SvPOK (fh_or_path))
1314 { 1558 {
1315 req->type = ix; 1559 req->type = ix;
1316 req->data = newSVsv (fh_or_path);
1317 req->dataptr = SvPVbyte_nolen (req->data); 1560 req->ptr1 = SvPVbyte_nolen (req->sv1);
1318 } 1561 }
1319 else 1562 else
1320 { 1563 {
1321 req->type = REQ_FSTAT; 1564 req->type = REQ_FSTAT;
1322 req->fh = newSVsv (fh_or_path);
1323 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1324 } 1566 }
1325 1567
1326 REQ_SEND; 1568 REQ_SEND;
1327} 1569}
1328 1570
1329void 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
1330aio_unlink (pathname,callback=&PL_sv_undef) 1643aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1331 SV * pathname
1332 SV * callback
1333 ALIAS: 1644 ALIAS:
1334 aio_unlink = REQ_UNLINK 1645 aio_unlink = REQ_UNLINK
1335 aio_rmdir = REQ_RMDIR 1646 aio_rmdir = REQ_RMDIR
1336 aio_readdir = REQ_READDIR 1647 aio_readdir = REQ_READDIR
1337 PPCODE: 1648 PPCODE:
1338{ 1649{
1339 dREQ; 1650 dREQ;
1340 1651
1341 req->type = ix; 1652 req->type = ix;
1342 req->data = newSVsv (pathname); 1653 req->sv1 = newSVsv (pathname);
1343 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;
1344 1664
1665 req->type = REQ_MKDIR;
1666 req->sv1 = newSVsv (pathname);
1667 req->ptr1 = SvPVbyte_nolen (req->sv1);
1668 req->mode = mode;
1669
1345 REQ_SEND; 1670 REQ_SEND;
1346} 1671}
1347 1672
1348void 1673void
1349aio_link (oldpath,newpath,callback=&PL_sv_undef) 1674aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1350 SV * oldpath
1351 SV * newpath
1352 SV * callback
1353 ALIAS: 1675 ALIAS:
1354 aio_link = REQ_LINK 1676 aio_link = REQ_LINK
1355 aio_symlink = REQ_SYMLINK 1677 aio_symlink = REQ_SYMLINK
1356 aio_rename = REQ_RENAME 1678 aio_rename = REQ_RENAME
1357 PPCODE: 1679 PPCODE:
1358{ 1680{
1359 dREQ; 1681 dREQ;
1360 1682
1361 req->type = ix; 1683 req->type = ix;
1362 req->fh = newSVsv (oldpath); 1684 req->sv2 = newSVsv (oldpath);
1363 req->data2ptr = SvPVbyte_nolen (req->fh); 1685 req->ptr2 = SvPVbyte_nolen (req->sv2);
1364 req->data = newSVsv (newpath); 1686 req->sv1 = newSVsv (newpath);
1365 req->dataptr = SvPVbyte_nolen (req->data); 1687 req->ptr1 = SvPVbyte_nolen (req->sv1);
1366 1688
1367 REQ_SEND; 1689 REQ_SEND;
1368} 1690}
1369 1691
1370void 1692void
1371aio_busy (delay,callback=&PL_sv_undef) 1693aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1372 double delay
1373 SV * callback
1374 PPCODE: 1694 PPCODE:
1375{ 1695{
1376 dREQ; 1696 dREQ;
1697
1698 req->type = REQ_MKNOD;
1699 req->sv1 = newSVsv (pathname);
1700 req->ptr1 = SvPVbyte_nolen (req->sv1);
1701 req->mode = (mode_t)mode;
1702 req->offs = dev;
1703
1704 REQ_SEND;
1705}
1706
1707void
1708aio_busy (double delay, SV *callback=&PL_sv_undef)
1709 PPCODE:
1710{
1711 dREQ;
1377 1712
1378 req->type = REQ_BUSY; 1713 req->type = REQ_BUSY;
1379 req->fd = delay < 0. ? 0 : delay; 1714 req->nv1 = delay < 0. ? 0. : delay;
1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1381 1715
1382 REQ_SEND; 1716 REQ_SEND;
1383} 1717}
1384 1718
1385void 1719void
1386aio_group (callback=&PL_sv_undef) 1720aio_group (SV *callback=&PL_sv_undef)
1387 SV * callback
1388 PROTOTYPE: ;$ 1721 PROTOTYPE: ;$
1389 PPCODE: 1722 PPCODE:
1390{ 1723{
1391 dREQ; 1724 dREQ;
1392 1725
1393 req->type = REQ_GROUP; 1726 req->type = REQ_GROUP;
1727
1394 req_send (req); 1728 req_send (req);
1395
1396 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1729 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1397} 1730}
1398 1731
1399void 1732void
1400aio_nop (callback=&PL_sv_undef) 1733aio_nop (SV *callback=&PL_sv_undef)
1401 SV * callback
1402 PPCODE: 1734 PPCODE:
1403{ 1735{
1404 dREQ; 1736 dREQ;
1405 1737
1406 req->type = REQ_NOP; 1738 req->type = REQ_NOP;
1435 PROTOTYPE: 1767 PROTOTYPE:
1436 CODE: 1768 CODE:
1437 while (nreqs) 1769 while (nreqs)
1438 { 1770 {
1439 poll_wait (); 1771 poll_wait ();
1440 poll_cb (0); 1772 poll_cb ();
1441 } 1773 }
1442 1774
1443void 1775int
1444poll() 1776poll()
1445 PROTOTYPE: 1777 PROTOTYPE:
1446 CODE: 1778 CODE:
1447 if (nreqs)
1448 {
1449 poll_wait (); 1779 poll_wait ();
1450 poll_cb (0); 1780 RETVAL = poll_cb ();
1451 } 1781 OUTPUT:
1782 RETVAL
1452 1783
1453int 1784int
1454poll_fileno() 1785poll_fileno()
1455 PROTOTYPE: 1786 PROTOTYPE:
1456 CODE: 1787 CODE:
1460 1791
1461int 1792int
1462poll_cb(...) 1793poll_cb(...)
1463 PROTOTYPE: 1794 PROTOTYPE:
1464 CODE: 1795 CODE:
1465 RETVAL = poll_cb (0); 1796 RETVAL = poll_cb ();
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1474 OUTPUT: 1797 OUTPUT:
1475 RETVAL 1798 RETVAL
1476 1799
1477void 1800void
1478poll_wait() 1801poll_wait()
1479 PROTOTYPE: 1802 PROTOTYPE:
1480 CODE: 1803 CODE:
1481 if (nreqs)
1482 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}
1483 1842
1484int 1843int
1485nreqs() 1844nreqs()
1486 PROTOTYPE: 1845 PROTOTYPE:
1487 CODE: 1846 CODE:
1491 1850
1492int 1851int
1493nready() 1852nready()
1494 PROTOTYPE: 1853 PROTOTYPE:
1495 CODE: 1854 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready; 1855 RETVAL = get_nready ();
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT: 1856 OUTPUT:
1500 RETVAL 1857 RETVAL
1501 1858
1502int 1859int
1503npending() 1860npending()
1504 PROTOTYPE: 1861 PROTOTYPE:
1505 CODE: 1862 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending; 1863 RETVAL = get_npending ();
1864 OUTPUT:
1865 RETVAL
1866
1867int
1868nthreads()
1869 PROTOTYPE:
1870 CODE:
1871 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1872 RETVAL = started;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock); 1873 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1509 OUTPUT: 1874 OUTPUT:
1510 RETVAL 1875 RETVAL
1511 1876
1512PROTOTYPES: DISABLE 1877PROTOTYPES: DISABLE
1513 1878
1531 PPCODE: 1896 PPCODE:
1532{ 1897{
1533 int i; 1898 int i;
1534 aio_req req; 1899 aio_req req;
1535 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
1536 if (grp->fd == 2) 1904 if (grp->int1 == 2)
1537 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");
1538 1906
1539 for (i = 1; i < items; ++i ) 1907 for (i = 1; i < items; ++i )
1540 { 1908 {
1541 if (GIMME_V != G_VOID) 1909 if (GIMME_V != G_VOID)
1543 1911
1544 req = SvAIO_REQ (ST (i)); 1912 req = SvAIO_REQ (ST (i));
1545 1913
1546 if (req) 1914 if (req)
1547 { 1915 {
1548 ++grp->length; 1916 ++grp->size;
1549 req->grp = grp; 1917 req->grp = grp;
1550 1918
1551 req->grp_prev = 0; 1919 req->grp_prev = 0;
1552 req->grp_next = grp->grp_first; 1920 req->grp_next = grp->grp_first;
1553 1921
1576 av = newAV (); 1944 av = newAV ();
1577 1945
1578 for (i = 1; i < items; ++i ) 1946 for (i = 1; i < items; ++i )
1579 av_push (av, newSVsv (ST (i))); 1947 av_push (av, newSVsv (ST (i)));
1580 1948
1581 SvREFCNT_dec (grp->data); 1949 SvREFCNT_dec (grp->sv1);
1582 grp->data = (SV *)av; 1950 grp->sv1 = (SV *)av;
1583} 1951}
1584 1952
1585void 1953void
1586errno (aio_req grp, int errorno = errno) 1954errno (aio_req grp, int errorno = errno)
1587 CODE: 1955 CODE:
1588 grp->errorno = errorno; 1956 grp->errorno = errorno;
1589 1957
1590void 1958void
1591limit (aio_req grp, int limit) 1959limit (aio_req grp, int limit)
1592 CODE: 1960 CODE:
1593 grp->fd2 = limit; 1961 grp->int2 = limit;
1594 aio_grp_feed (grp); 1962 aio_grp_feed (grp);
1595 1963
1596void 1964void
1597feed (aio_req grp, SV *callback=&PL_sv_undef) 1965feed (aio_req grp, SV *callback=&PL_sv_undef)
1598 CODE: 1966 CODE:
1599{ 1967{
1600 SvREFCNT_dec (grp->fh2); 1968 SvREFCNT_dec (grp->sv2);
1601 grp->fh2 = newSVsv (callback); 1969 grp->sv2 = newSVsv (callback);
1602 1970
1603 if (grp->fd2 <= 0) 1971 if (grp->int2 <= 0)
1604 grp->fd2 = 2; 1972 grp->int2 = 2;
1605 1973
1606 aio_grp_feed (grp); 1974 aio_grp_feed (grp);
1607} 1975}
1608 1976

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines