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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines