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.74 by root, Wed Oct 25 17:57:30 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
5# define _GNU_SOURCE
6#endif
7
8#define _REENTRANT 1
9 2
10#include <errno.h> 3#include <errno.h>
11 4
12#include "EXTERN.h" 5#include "EXTERN.h"
13#include "perl.h" 6#include "perl.h"
14#include "XSUB.h" 7#include "XSUB.h"
15 8
16#include "autoconf/config.h" 9#include "autoconf/config.h"
17 10
18#include <pthread.h>
19
20#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
21#include <errno.h> 13#include <errno.h>
22#include <sys/time.h> 14#include <sys/time.h>
23#include <sys/select.h> 15#include <sys/select.h>
24#include <sys/types.h> 16#include <sys/types.h>
25#include <sys/stat.h> 17#include <sys/stat.h>
26#include <limits.h> 18#include <limits.h>
27#include <unistd.h> 19#include <unistd.h>
28#include <fcntl.h> 20#include <fcntl.h>
29#include <signal.h> 21#include <signal.h>
30#include <sched.h> 22#include <sched.h>
23#include <utime.h>
31 24
32#if HAVE_SENDFILE 25#if HAVE_SENDFILE
33# if __linux 26# if __linux
34# include <sys/sendfile.h> 27# include <sys/sendfile.h>
35# elif __freebsd 28# elif __freebsd
… …
42# else 35# else
43# error sendfile support requested but not available 36# error sendfile support requested but not available
44# endif 37# endif
45#endif 38#endif
46 39
40/* number of seconds after which idle threads exit */
41#define IDLE_TIMEOUT 10
42
47/* used for struct dirent, AIX doesn't provide it */ 43/* used for struct dirent, AIX doesn't provide it */
48#ifndef NAME_MAX 44#ifndef NAME_MAX
49# define NAME_MAX 4096 45# define NAME_MAX 4096
50#endif
51
52#if __ia64
53# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN
56#else
57# define STACKSIZE 16384
58#endif 46#endif
59 47
60/* buffer size for various temporary buffers */ 48/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536 49#define AIO_BUFSIZE 65536
62 50
… …
66 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 54 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
67 UNLOCK (wrklock); \ 55 UNLOCK (wrklock); \
68 if (!aio_buf) \ 56 if (!aio_buf) \
69 return -1; 57 return -1;
70 58
59typedef SV SV8; /* byte-sv, used for argument-checking */
60
71enum { 61enum {
72 REQ_QUIT, 62 REQ_QUIT,
73 REQ_OPEN, REQ_CLOSE, 63 REQ_OPEN, REQ_CLOSE,
74 REQ_READ, REQ_WRITE, REQ_READAHEAD, 64 REQ_READ, REQ_WRITE, REQ_READAHEAD,
75 REQ_SENDFILE, 65 REQ_SENDFILE,
76 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 */
77 REQ_FSYNC, REQ_FDATASYNC, 70 REQ_FSYNC, REQ_FDATASYNC,
78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 71 REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME,
79 REQ_READDIR, 72 REQ_MKNOD, REQ_READDIR,
80 REQ_LINK, REQ_SYMLINK, 73 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
81 REQ_GROUP, REQ_NOP, 74 REQ_GROUP, REQ_NOP,
82 REQ_BUSY, 75 REQ_BUSY,
83}; 76};
84 77
85#define AIO_REQ_KLASS "IO::AIO::REQ" 78#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
87 80
88typedef struct aio_cb 81typedef struct aio_cb
89{ 82{
90 struct aio_cb *volatile next; 83 struct aio_cb *volatile next;
91 84
92 SV *data, *callback; 85 SV *callback;
93 SV *fh, *fh2; 86 SV *sv1, *sv2;
94 void *dataptr, *data2ptr; 87 void *ptr1, *ptr2;
95 Stat_t *statdata;
96 off_t offset; 88 off_t offs;
97 size_t length; 89 size_t size;
98 ssize_t result; 90 ssize_t result;
91 double nv1, nv2;
99 92
100 STRLEN dataoffset; 93 STRLEN stroffset;
101 int type; 94 int type;
102 int fd, fd2; 95 int int1, int2, int3;
103 int errorno; 96 int errorno;
104 mode_t mode; /* open */ 97 mode_t mode; /* open */
105 98
106 unsigned char flags; 99 unsigned char flags;
107 unsigned char pri; 100 unsigned char pri;
… …
109 SV *self; /* the perl counterpart of this request, if any */ 102 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 103 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
111} aio_cb; 104} aio_cb;
112 105
113enum { 106enum {
114 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) */
115}; 110};
116 111
117typedef aio_cb *aio_req; 112typedef aio_cb *aio_req;
118typedef aio_cb *aio_req_ornot; 113typedef aio_cb *aio_req_ornot;
119 114
… …
124 DEFAULT_PRI = 0, 119 DEFAULT_PRI = 0,
125 PRI_BIAS = -PRI_MIN, 120 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 121 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
127}; 122};
128 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
129static int next_pri = DEFAULT_PRI + PRI_BIAS; 170static int next_pri = DEFAULT_PRI + PRI_BIAS;
130 171
131static int started, wanted; 172static unsigned int started, idle, wanted;
132static volatile int nreqs;
133static int respipe [2];
134 173
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif
140
141#define LOCK(mutex) pthread_mutex_lock (&(mutex))
142#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
143
144/* worker threasd management */ 174/* worker threads management */
145static pthread_mutex_t wrklock = AIO_MUTEX_INIT; 175static mutex_t wrklock = MUTEX_INIT;
146 176
147typedef struct worker { 177typedef struct worker {
148 /* locked by wrklock */ 178 /* locked by wrklock */
149 struct worker *prev, *next; 179 struct worker *prev, *next;
150 180
151 pthread_t tid; 181 thread_t tid;
152 182
153 /* locked by reslock, reqlock or wrklock */ 183 /* locked by reslock, reqlock or wrklock */
154 aio_req req; /* currently processed request */ 184 aio_req req; /* currently processed request */
155 void *dbuf; 185 void *dbuf;
156 DIR *dirp; 186 DIR *dirp;
… …
179 wrk->prev->next = wrk->next; 209 wrk->prev->next = wrk->next;
180 210
181 free (wrk); 211 free (wrk);
182} 212}
183 213
214static volatile unsigned int nreqs, nready, npending;
215static volatile unsigned int max_idle = 4;
216static volatile unsigned int max_outstanding = 0xffffffff;
217static int respipe [2];
218
184static pthread_mutex_t reslock = AIO_MUTEX_INIT; 219static mutex_t reslock = MUTEX_INIT;
185static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 220static mutex_t reqlock = MUTEX_INIT;
186static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 221static cond_t reqwait = COND_INIT;
222
223#if WORDACCESS_UNSAFE
224
225static unsigned int get_nready ()
226{
227 unsigned int retval;
228
229 LOCK (reqlock);
230 retval = nready;
231 UNLOCK (reqlock);
232
233 return retval;
234}
235
236static unsigned int get_npending ()
237{
238 unsigned int retval;
239
240 LOCK (reslock);
241 retval = npending;
242 UNLOCK (reslock);
243
244 return retval;
245}
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
258#else
259
260# define get_nready() nready
261# define get_npending() npending
262# define get_nthreads() started
263
264#endif
187 265
188/* 266/*
189 * a somewhat faster data structure might be nice, but 267 * a somewhat faster data structure might be nice, but
190 * with 8 priorities this actually needs <20 insns 268 * with 8 priorities this actually needs <20 insns
191 * per shift, the most expensive operation. 269 * per shift, the most expensive operation.
… …
238 316
239 abort (); 317 abort ();
240} 318}
241 319
242static int poll_cb (); 320static int poll_cb ();
243static void req_invoke (aio_req req); 321static int req_invoke (aio_req req);
244static void req_free (aio_req req); 322static void req_free (aio_req req);
245static void req_cancel (aio_req req); 323static void req_cancel (aio_req req);
246 324
247/* must be called at most once */ 325/* must be called at most once */
248static SV *req_sv (aio_req req, const char *klass) 326static SV *req_sv (aio_req req, const char *klass)
… …
268 return mg ? (aio_req)mg->mg_ptr : 0; 346 return mg ? (aio_req)mg->mg_ptr : 0;
269} 347}
270 348
271static void aio_grp_feed (aio_req grp) 349static void aio_grp_feed (aio_req grp)
272{ 350{
351 block_sig ();
352
273 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
274 { 354 {
275 int old_len = grp->length; 355 int old_len = grp->size;
276 356
277 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
278 { 358 {
279 dSP; 359 dSP;
280 360
281 ENTER; 361 ENTER;
282 SAVETMPS; 362 SAVETMPS;
283 PUSHMARK (SP); 363 PUSHMARK (SP);
284 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
285 PUTBACK; 365 PUTBACK;
286 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
287 SPAGAIN; 367 SPAGAIN;
288 FREETMPS; 368 FREETMPS;
289 LEAVE; 369 LEAVE;
290 } 370 }
291 371
292 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
293 if (old_len == grp->length) 373 if (old_len == grp->size)
294 { 374 {
295 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
296 grp->fh2 = 0; 376 grp->sv2 = 0;
297 break; 377 break;
298 } 378 }
299 } 379 }
380
381 unblock_sig ();
300} 382}
301 383
302static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
303{ 385{
304 --grp->length; 386 --grp->size;
305 387
306 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
307 aio_grp_feed (grp); 389 aio_grp_feed (grp);
308 390
309 /* finish, if done */ 391 /* finish, if done */
310 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
311 { 393 {
394 block_sig ();
395
312 req_invoke (grp); 396 if (!req_invoke (grp))
397 {
398 req_free (grp);
399 unblock_sig ();
400 croak (0);
401 }
402
313 req_free (grp); 403 req_free (grp);
404 unblock_sig ();
314 } 405 }
315} 406}
316 407
317static void poll_wait ()
318{
319 fd_set rfd;
320
321 while (nreqs)
322 {
323 int size;
324#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
325 LOCK (reslock);
326#endif
327 size = res_queue.size;
328#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
329 UNLOCK (reslock);
330#endif
331
332 if (size)
333 return;
334
335 FD_ZERO(&rfd);
336 FD_SET(respipe [0], &rfd);
337
338 select (respipe [0] + 1, &rfd, 0, 0, 0);
339 }
340}
341
342static void req_invoke (aio_req req) 408static int req_invoke (aio_req req)
343{ 409{
344 dSP; 410 dSP;
411
412 if (req->flags & FLAG_SV2_RO_OFF)
413 SvREADONLY_off (req->sv2);
345 414
346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 415 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
347 { 416 {
348 errno = req->errorno;
349
350 ENTER; 417 ENTER;
351 SAVETMPS; 418 SAVETMPS;
352 PUSHMARK (SP); 419 PUSHMARK (SP);
353 EXTEND (SP, 1); 420 EXTEND (SP, 1);
354 421
… …
359 SV *rv = &PL_sv_undef; 426 SV *rv = &PL_sv_undef;
360 427
361 if (req->result >= 0) 428 if (req->result >= 0)
362 { 429 {
363 int i; 430 int i;
364 char *buf = req->data2ptr; 431 char *buf = req->ptr2;
365 AV *av = newAV (); 432 AV *av = newAV ();
366 433
367 av_extend (av, req->result - 1); 434 av_extend (av, req->result - 1);
368 435
369 for (i = 0; i < req->result; ++i) 436 for (i = 0; i < req->result; ++i)
… …
389 PUSHs (sv_2mortal (newSViv (req->result))); 456 PUSHs (sv_2mortal (newSViv (req->result)));
390 PUTBACK; 457 PUTBACK;
391 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 458 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
392 SPAGAIN; 459 SPAGAIN;
393 460
394 fh = SvREFCNT_inc (POPs); 461 fh = POPs;
395
396 PUSHMARK (SP); 462 PUSHMARK (SP);
397 XPUSHs (sv_2mortal (fh)); 463 XPUSHs (fh);
398 } 464 }
399 break; 465 break;
400 466
401 case REQ_GROUP: 467 case REQ_GROUP:
402 req->fd = 2; /* mark group as finished */ 468 req->int1 = 2; /* mark group as finished */
403 469
404 if (req->data) 470 if (req->sv1)
405 { 471 {
406 int i; 472 int i;
407 AV *av = (AV *)req->data; 473 AV *av = (AV *)req->sv1;
408 474
409 EXTEND (SP, AvFILL (av) + 1); 475 EXTEND (SP, AvFILL (av) + 1);
410 for (i = 0; i <= AvFILL (av); ++i) 476 for (i = 0; i <= AvFILL (av); ++i)
411 PUSHs (*av_fetch (av, i, 0)); 477 PUSHs (*av_fetch (av, i, 0));
412 } 478 }
… …
414 480
415 case REQ_NOP: 481 case REQ_NOP:
416 case REQ_BUSY: 482 case REQ_BUSY:
417 break; 483 break;
418 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
419 default: 509 default:
420 PUSHs (sv_2mortal (newSViv (req->result))); 510 PUSHs (sv_2mortal (newSViv (req->result)));
421 break; 511 break;
422 } 512 }
423 513
514 errno = req->errorno;
424 515
425 PUTBACK; 516 PUTBACK;
426 call_sv (req->callback, G_VOID | G_EVAL); 517 call_sv (req->callback, G_VOID | G_EVAL);
427 SPAGAIN; 518 SPAGAIN;
428 519
… …
442 grp->grp_first = req->grp_next; 533 grp->grp_first = req->grp_next;
443 534
444 aio_grp_dec (grp); 535 aio_grp_dec (grp);
445 } 536 }
446 537
447 if (SvTRUE (ERRSV)) 538 return !SvTRUE (ERRSV);
448 {
449 req_free (req);
450 croak (0);
451 }
452} 539}
453 540
454static void req_free (aio_req req) 541static void req_free (aio_req req)
455{ 542{
456 if (req->self) 543 if (req->self)
457 { 544 {
458 sv_unmagic (req->self, PERL_MAGIC_ext); 545 sv_unmagic (req->self, PERL_MAGIC_ext);
459 SvREFCNT_dec (req->self); 546 SvREFCNT_dec (req->self);
460 } 547 }
461 548
462 SvREFCNT_dec (req->data);
463 SvREFCNT_dec (req->fh); 549 SvREFCNT_dec (req->sv1);
464 SvREFCNT_dec (req->fh2); 550 SvREFCNT_dec (req->sv2);
465 SvREFCNT_dec (req->callback); 551 SvREFCNT_dec (req->callback);
466 Safefree (req->statdata);
467 552
468 if (req->type == REQ_READDIR) 553 if (req->flags & FLAG_PTR2_FREE)
469 free (req->data2ptr); 554 free (req->ptr2);
470 555
471 Safefree (req); 556 Safefree (req);
472} 557}
473 558
474static void req_cancel_subs (aio_req grp) 559static void req_cancel_subs (aio_req grp)
… …
476 aio_req sub; 561 aio_req sub;
477 562
478 if (grp->type != REQ_GROUP) 563 if (grp->type != REQ_GROUP)
479 return; 564 return;
480 565
481 SvREFCNT_dec (grp->fh2); 566 SvREFCNT_dec (grp->sv2);
482 grp->fh2 = 0; 567 grp->sv2 = 0;
483 568
484 for (sub = grp->grp_first; sub; sub = sub->grp_next) 569 for (sub = grp->grp_first; sub; sub = sub->grp_next)
485 req_cancel (sub); 570 req_cancel (sub);
486} 571}
487 572
… …
490 req->flags |= FLAG_CANCELLED; 575 req->flags |= FLAG_CANCELLED;
491 576
492 req_cancel_subs (req); 577 req_cancel_subs (req);
493} 578}
494 579
495static int poll_cb ()
496{
497 dSP;
498 int count = 0;
499 int do_croak = 0;
500 aio_req req;
501
502 for (;;)
503 {
504 LOCK (reslock);
505 req = reqq_shift (&res_queue);
506
507 if (req)
508 {
509 if (!res_queue.size)
510 {
511 /* read any signals sent by the worker threads */
512 char buf [32];
513 while (read (respipe [0], buf, 32) == 32)
514 ;
515 }
516 }
517
518 UNLOCK (reslock);
519
520 if (!req)
521 break;
522
523 --nreqs;
524
525 if (req->type == REQ_QUIT)
526 started--;
527 else if (req->type == REQ_GROUP && req->length)
528 {
529 req->fd = 1; /* mark request as delayed */
530 continue;
531 }
532 else
533 {
534 if (req->type == REQ_READ)
535 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
536
537 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
538 SvREADONLY_off (req->data);
539
540 if (req->statdata)
541 {
542 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
543 PL_laststatval = req->result;
544 PL_statcache = *(req->statdata);
545 }
546
547 req_invoke (req);
548
549 count++;
550 }
551
552 req_free (req);
553 }
554
555 return count;
556}
557
558static void *aio_proc(void *arg); 580static void *aio_proc(void *arg);
559 581
560static void start_thread (void) 582static void start_thread (void)
561{ 583{
562 sigset_t fullsigset, oldsigset;
563 pthread_attr_t attr;
564
565 worker *wrk = calloc (1, sizeof (worker)); 584 worker *wrk = calloc (1, sizeof (worker));
566 585
567 if (!wrk) 586 if (!wrk)
568 croak ("unable to allocate worker thread data"); 587 croak ("unable to allocate worker thread data");
569 588
570 pthread_attr_init (&attr);
571 pthread_attr_setstacksize (&attr, STACKSIZE);
572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
573
574 sigfillset (&fullsigset);
575
576 LOCK (wrklock); 589 LOCK (wrklock);
577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
578 590
579 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) 591 if (thread_create (&wrk->tid, aio_proc, (void *)wrk))
580 { 592 {
581 wrk->prev = &wrk_first; 593 wrk->prev = &wrk_first;
582 wrk->next = wrk_first.next; 594 wrk->next = wrk_first.next;
583 wrk_first.next->prev = wrk; 595 wrk_first.next->prev = wrk;
584 wrk_first.next = wrk; 596 wrk_first.next = wrk;
585 started++; 597 ++started;
586 } 598 }
587 else 599 else
588 free (wrk); 600 free (wrk);
589 601
590 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock); 602 UNLOCK (wrklock);
592} 603}
593 604
605static void maybe_start_thread ()
606{
607 if (get_nthreads () >= wanted)
608 return;
609
610 /* todo: maybe use idle here, but might be less exact */
611 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
612 return;
613
614 start_thread ();
615}
616
594static void req_send (aio_req req) 617static void req_send (aio_req req)
595{ 618{
596 while (started < wanted && nreqs >= started) 619 block_sig ();
597 start_thread ();
598 620
599 ++nreqs; 621 ++nreqs;
622
623 LOCK (reqlock);
624 ++nready;
625 reqq_push (&req_queue, req);
626 COND_SIGNAL (reqwait);
627 UNLOCK (reqlock);
628
629 unblock_sig ();
630
631 maybe_start_thread ();
632}
633
634static void end_thread (void)
635{
636 aio_req req;
637
638 Newz (0, req, 1, aio_cb);
639
640 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS;
600 642
601 LOCK (reqlock); 643 LOCK (reqlock);
602 reqq_push (&req_queue, req); 644 reqq_push (&req_queue, req);
603 pthread_cond_signal (&reqwait); 645 COND_SIGNAL (reqwait);
604 UNLOCK (reqlock); 646 UNLOCK (reqlock);
605}
606 647
607static void end_thread (void) 648 LOCK (wrklock);
608{ 649 --started;
609 aio_req req; 650 UNLOCK (wrklock);
651}
610 652
611 Newz (0, req, 1, aio_cb); 653static void set_max_idle (int nthreads)
612 654{
613 req->type = REQ_QUIT; 655 if (WORDACCESS_UNSAFE) LOCK (reqlock);
614 req->pri = PRI_MAX + PRI_BIAS; 656 max_idle = nthreads <= 0 ? 1 : nthreads;
615 657 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
616 req_send (req);
617} 658}
618 659
619static void min_parallel (int nthreads) 660static void min_parallel (int nthreads)
620{ 661{
621 if (wanted < nthreads) 662 if (wanted < nthreads)
622 wanted = nthreads; 663 wanted = nthreads;
623} 664}
624 665
625static void max_parallel (int nthreads) 666static void max_parallel (int nthreads)
626{ 667{
627 int cur = started;
628
629 if (wanted > nthreads) 668 if (wanted > nthreads)
630 wanted = nthreads; 669 wanted = nthreads;
631 670
632 while (cur > wanted) 671 while (started > wanted)
672 end_thread ();
673}
674
675static void poll_wait ()
676{
677 fd_set rfd;
678
679 while (nreqs)
633 { 680 {
681 int size;
682 if (WORDACCESS_UNSAFE) LOCK (reslock);
683 size = res_queue.size;
684 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
685
686 if (size)
687 return;
688
634 end_thread (); 689 maybe_start_thread ();
635 cur--; 690
691 FD_ZERO(&rfd);
692 FD_SET(respipe [0], &rfd);
693
694 select (respipe [0] + 1, &rfd, 0, 0, 0);
636 } 695 }
696}
637 697
638 while (started > wanted) 698static int poll_cb ()
699{
700 dSP;
701 int count = 0;
702 int maxreqs = max_poll_reqs;
703 int do_croak = 0;
704 struct timeval tv_start, tv_now;
705 aio_req req;
706
707 if (max_poll_time)
708 gettimeofday (&tv_start, 0);
709
710 block_sig ();
711
712 for (;;)
639 { 713 {
714 for (;;)
715 {
716 maybe_start_thread ();
717
718 LOCK (reslock);
719 req = reqq_shift (&res_queue);
720
721 if (req)
722 {
723 --npending;
724
725 if (!res_queue.size)
726 {
727 /* read any signals sent by the worker threads */
728 char buf [4];
729 while (read (respipe [0], buf, 4) == 4)
730 ;
731 }
732 }
733
734 UNLOCK (reslock);
735
736 if (!req)
737 break;
738
739 --nreqs;
740
741 if (req->type == REQ_GROUP && req->size)
742 {
743 req->int1 = 1; /* mark request as delayed */
744 continue;
745 }
746 else
747 {
748 if (!req_invoke (req))
749 {
750 req_free (req);
751 unblock_sig ();
752 croak (0);
753 }
754
755 count++;
756 }
757
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 }
770 }
771
772 if (nreqs <= max_outstanding)
773 break;
774
640 poll_wait (); 775 poll_wait ();
641 poll_cb (); 776
777 ++maxreqs;
642 } 778 }
779
780 unblock_sig ();
781 return count;
643} 782}
644 783
645static void create_pipe () 784static void create_pipe ()
646{ 785{
647 if (pipe (respipe)) 786 if (pipe (respipe))
… …
664/* 803/*
665 * make our pread/pwrite safe against themselves, but not against 804 * make our pread/pwrite safe against themselves, but not against
666 * 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,
667 * but that's your problem, not mine. 806 * but that's your problem, not mine.
668 */ 807 */
669static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 808static mutex_t preadwritelock = MUTEX_INIT;
670 809
671static 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)
672{ 811{
673 ssize_t res; 812 ssize_t res;
674 off_t ooffset; 813 off_t ooffset;
… …
697 836
698 return res; 837 return res;
699} 838}
700#endif 839#endif
701 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
702#if !HAVE_FDATASYNC 869#if !HAVE_FDATASYNC
703# define fdatasync fsync 870# define fdatasync fsync
704#endif 871#endif
705 872
706#if !HAVE_READAHEAD 873#if !HAVE_READAHEAD
707# define readahead aio_readahead 874# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
708 875
709static ssize_t readahead (int fd, off_t offset, size_t count) 876static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
710{ 877{
711 dBUF; 878 dBUF;
712 879
713 while (count > 0) 880 while (count > 0)
714 { 881 {
… …
719 count -= len; 886 count -= len;
720 } 887 }
721 888
722 errno = 0; 889 errno = 0;
723} 890}
891
724#endif 892#endif
725 893
726#if !HAVE_READDIR_R 894#if !HAVE_READDIR_R
727# define readdir_r aio_readdir_r 895# define readdir_r aio_readdir_r
728 896
729static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 897static mutex_t readdirlock = MUTEX_INIT;
730 898
731static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 899static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
732{ 900{
733 struct dirent *e; 901 struct dirent *e;
734 int errorno; 902 int errorno;
… …
773 { 941 {
774 off_t sbytes; 942 off_t sbytes;
775 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 943 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
776 944
777 if (res < 0 && sbytes) 945 if (res < 0 && sbytes)
778 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 946 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
779 res = sbytes; 947 res = sbytes;
780 } 948 }
781 949
782# elif __hpux 950# elif __hpux
783 res = sendfile (ofd, ifd, offset, count, 0, 0); 951 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
861 int memofs = 0; 1029 int memofs = 0;
862 int res = 0; 1030 int res = 0;
863 int errorno; 1031 int errorno;
864 1032
865 LOCK (wrklock); 1033 LOCK (wrklock);
866 self->dirp = dirp = opendir (req->dataptr); 1034 self->dirp = dirp = opendir (req->ptr1);
867 self->dbuf = u = malloc (sizeof (*u)); 1035 self->dbuf = u = malloc (sizeof (*u));
1036 req->flags |= FLAG_PTR2_FREE;
1037 req->ptr2 = names = malloc (memlen);
868 UNLOCK (wrklock); 1038 UNLOCK (wrklock);
869
870 req->data2ptr = names = malloc (memlen);
871 1039
872 if (dirp && u && names) 1040 if (dirp && u && names)
873 for (;;) 1041 for (;;)
874 { 1042 {
875 errno = 0; 1043 errno = 0;
… …
888 1056
889 while (memofs + len > memlen) 1057 while (memofs + len > memlen)
890 { 1058 {
891 memlen *= 2; 1059 memlen *= 2;
892 LOCK (wrklock); 1060 LOCK (wrklock);
893 req->data2ptr = names = realloc (names, memlen); 1061 req->ptr2 = names = realloc (names, memlen);
894 UNLOCK (wrklock); 1062 UNLOCK (wrklock);
895 1063
896 if (!names) 1064 if (!names)
897 break; 1065 break;
898 } 1066 }
… …
911/*****************************************************************************/ 1079/*****************************************************************************/
912 1080
913static void *aio_proc (void *thr_arg) 1081static void *aio_proc (void *thr_arg)
914{ 1082{
915 aio_req req; 1083 aio_req req;
916 int type; 1084 struct timespec ts;
917 worker *self = (worker *)thr_arg; 1085 worker *self = (worker *)thr_arg;
918 1086
919 do 1087 /* try to distribute timeouts somewhat evenly */
1088 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1089 * (1000000000UL / 1024UL);
1090
1091 for (;;)
920 { 1092 {
1093 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1094
921 LOCK (reqlock); 1095 LOCK (reqlock);
922 1096
923 for (;;) 1097 for (;;)
924 { 1098 {
925 self->req = req = reqq_shift (&req_queue); 1099 self->req = req = reqq_shift (&req_queue);
926 1100
927 if (req) 1101 if (req)
928 break; 1102 break;
929 1103
930 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;
931 } 1125 }
1126
1127 --nready;
932 1128
933 UNLOCK (reqlock); 1129 UNLOCK (reqlock);
934 1130
935 errno = 0; /* strictly unnecessary */ 1131 errno = 0; /* strictly unnecessary */
936 type = req->type; /* remember type for QUIT check */
937 1132
938 if (!(req->flags & FLAG_CANCELLED)) 1133 if (!(req->flags & FLAG_CANCELLED))
939 switch (type) 1134 switch (req->type)
940 { 1135 {
941 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;
942 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;
943 1138
944 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;
945 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;
946 1141
947 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;
948 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;
949 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;
950 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
951 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;
952 case REQ_CLOSE: req->result = close (req->fd); break; 1152 case REQ_CLOSE: req->result = close (req->int1); break;
953 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1153 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
954 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;
955 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1156 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
956 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1157 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
957 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;
958 1161
959 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1162 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
960 case REQ_FSYNC: req->result = fsync (req->fd); break; 1163 case REQ_FSYNC: req->result = fsync (req->int1); break;
961 case REQ_READDIR: scandir_ (req, self); break; 1164 case REQ_READDIR: scandir_ (req, self); break;
962 1165
963 case REQ_BUSY: 1166 case REQ_BUSY:
964 { 1167 {
965 struct timeval tv; 1168 struct timeval tv;
966 1169
967 tv.tv_sec = req->fd; 1170 tv.tv_sec = req->nv1;
968 tv.tv_usec = req->fd2; 1171 tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.;
969 1172
970 req->result = select (0, 0, 0, 0, &tv); 1173 req->result = select (0, 0, 0, 0, &tv);
971 } 1174 }
972 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);
1198 }
1199
973 case REQ_GROUP: 1200 case REQ_GROUP:
974 case REQ_NOP: 1201 case REQ_NOP:
1202 break;
1203
975 case REQ_QUIT: 1204 case REQ_QUIT:
976 break; 1205 goto quit;
977 1206
978 default: 1207 default:
979 req->result = ENOSYS; 1208 req->result = -1;
980 break; 1209 break;
981 } 1210 }
982 1211
983 req->errorno = errno; 1212 req->errorno = errno;
984 1213
985 LOCK (reslock); 1214 LOCK (reslock);
986 1215
1216 ++npending;
1217
987 if (!reqq_push (&res_queue, req)) 1218 if (!reqq_push (&res_queue, req))
1219 {
988 /* write a dummy byte to the pipe so fh becomes ready */ 1220 /* write a dummy byte to the pipe so fh becomes ready */
989 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 }
990 1227
991 self->req = 0; 1228 self->req = 0;
992 worker_clear (self); 1229 worker_clear (self);
993 1230
994 UNLOCK (reslock); 1231 UNLOCK (reslock);
995 } 1232 }
996 while (type != REQ_QUIT);
997 1233
1234quit:
998 LOCK (wrklock); 1235 LOCK (wrklock);
999 worker_free (self); 1236 worker_free (self);
1000 UNLOCK (wrklock); 1237 UNLOCK (wrklock);
1001 1238
1002 return 0; 1239 return 0;
… …
1049 1286
1050 worker_clear (wrk); 1287 worker_clear (wrk);
1051 worker_free (wrk); 1288 worker_free (wrk);
1052 } 1289 }
1053 1290
1054 started = 0; 1291 started = 0;
1292 idle = 0;
1055 nreqs = 0; 1293 nreqs = 0;
1294 nready = 0;
1295 npending = 0;
1056 1296
1057 close (respipe [0]); 1297 close (respipe [0]);
1058 close (respipe [1]); 1298 close (respipe [1]);
1059 create_pipe (); 1299 create_pipe ();
1060 1300
… …
1087PROTOTYPES: ENABLE 1327PROTOTYPES: ENABLE
1088 1328
1089BOOT: 1329BOOT:
1090{ 1330{
1091 HV *stash = gv_stashpv ("IO::AIO", 1); 1331 HV *stash = gv_stashpv ("IO::AIO", 1);
1332
1092 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1333 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1093 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1334 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1094 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));
1095 1340
1096 create_pipe (); 1341 create_pipe ();
1097 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1342 ATFORK (atfork_prepare, atfork_parent, atfork_child);
1098} 1343}
1099 1344
1100void 1345void
1101min_parallel (nthreads) 1346max_poll_reqs (int nreqs)
1102 int nthreads
1103 PROTOTYPE: $ 1347 PROTOTYPE: $
1348 CODE:
1349 max_poll_reqs = nreqs;
1104 1350
1105void 1351void
1106max_parallel (nthreads) 1352max_poll_time (double nseconds)
1107 int nthreads
1108 PROTOTYPE: $ 1353 PROTOTYPE: $
1354 CODE:
1355 max_poll_time = nseconds * AIO_TICKS;
1109 1356
1110void 1357void
1358min_parallel (int nthreads)
1359 PROTOTYPE: $
1360
1361void
1362max_parallel (int nthreads)
1363 PROTOTYPE: $
1364
1365void
1366max_idle (int nthreads)
1367 PROTOTYPE: $
1368 CODE:
1369 set_max_idle (nthreads);
1370
1371int
1372max_outstanding (int maxreqs)
1373 PROTOTYPE: $
1374 CODE:
1375 RETVAL = max_outstanding;
1376 max_outstanding = maxreqs;
1377 OUTPUT:
1378 RETVAL
1379
1380void
1111aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1381aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1112 SV * pathname
1113 int flags
1114 int mode
1115 SV * callback
1116 PROTOTYPE: $$$;$ 1382 PROTOTYPE: $$$;$
1117 PPCODE: 1383 PPCODE:
1118{ 1384{
1119 dREQ; 1385 dREQ;
1120 1386
1121 req->type = REQ_OPEN; 1387 req->type = REQ_OPEN;
1122 req->data = newSVsv (pathname); 1388 req->sv1 = newSVsv (pathname);
1123 req->dataptr = SvPVbyte_nolen (req->data); 1389 req->ptr1 = SvPVbyte_nolen (req->sv1);
1124 req->fd = flags; 1390 req->int1 = flags;
1125 req->mode = mode; 1391 req->mode = mode;
1126 1392
1127 REQ_SEND; 1393 REQ_SEND;
1128} 1394}
1129 1395
1130void 1396void
1131aio_close (fh,callback=&PL_sv_undef) 1397aio_close (SV *fh, SV *callback=&PL_sv_undef)
1132 SV * fh
1133 SV * callback
1134 PROTOTYPE: $;$ 1398 PROTOTYPE: $;$
1135 ALIAS: 1399 ALIAS:
1136 aio_close = REQ_CLOSE 1400 aio_close = REQ_CLOSE
1137 aio_fsync = REQ_FSYNC 1401 aio_fsync = REQ_FSYNC
1138 aio_fdatasync = REQ_FDATASYNC 1402 aio_fdatasync = REQ_FDATASYNC
1139 PPCODE: 1403 PPCODE:
1140{ 1404{
1141 dREQ; 1405 dREQ;
1142 1406
1143 req->type = ix; 1407 req->type = ix;
1144 req->fh = newSVsv (fh); 1408 req->sv1 = newSVsv (fh);
1145 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1409 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1146 1410
1147 REQ_SEND (req); 1411 REQ_SEND (req);
1148} 1412}
1149 1413
1150void 1414void
1151aio_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)
1152 SV * fh
1153 UV offset
1154 UV length
1155 SV * data
1156 UV dataoffset
1157 SV * callback
1158 ALIAS: 1416 ALIAS:
1159 aio_read = REQ_READ 1417 aio_read = REQ_READ
1160 aio_write = REQ_WRITE 1418 aio_write = REQ_WRITE
1161 PROTOTYPE: $$$$$;$ 1419 PROTOTYPE: $$$$$;$
1162 PPCODE: 1420 PPCODE:
1163{ 1421{
1164 aio_req req;
1165 STRLEN svlen; 1422 STRLEN svlen;
1166 char *svptr = SvPVbyte (data, svlen); 1423 char *svptr = SvPVbyte (data, svlen);
1167 1424
1168 SvUPGRADE (data, SVt_PV); 1425 SvUPGRADE (data, SVt_PV);
1169 SvPOK_on (data); 1426 SvPOK_on (data);
… …
1181 length = svlen - dataoffset; 1438 length = svlen - dataoffset;
1182 } 1439 }
1183 else 1440 else
1184 { 1441 {
1185 /* read: grow scalar as necessary */ 1442 /* read: grow scalar as necessary */
1186 svptr = SvGROW (data, length + dataoffset); 1443 svptr = SvGROW (data, length + dataoffset + 1);
1187 } 1444 }
1188 1445
1189 if (length < 0) 1446 if (length < 0)
1190 croak ("length must not be negative"); 1447 croak ("length must not be negative");
1191 1448
1192 { 1449 {
1193 dREQ; 1450 dREQ;
1194 1451
1195 req->type = ix; 1452 req->type = ix;
1196 req->fh = newSVsv (fh); 1453 req->sv1 = newSVsv (fh);
1197 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1454 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1198 : IoOFP (sv_2io (fh))); 1455 : IoOFP (sv_2io (fh)));
1199 req->offset = offset; 1456 req->offs = offset;
1200 req->length = length; 1457 req->size = length;
1201 req->data = SvREFCNT_inc (data); 1458 req->sv2 = SvREFCNT_inc (data);
1202 req->dataptr = (char *)svptr + dataoffset; 1459 req->ptr1 = (char *)svptr + dataoffset;
1460 req->stroffset = dataoffset;
1203 1461
1204 if (!SvREADONLY (data)) 1462 if (!SvREADONLY (data))
1205 { 1463 {
1206 SvREADONLY_on (data); 1464 SvREADONLY_on (data);
1207 req->data2ptr = (void *)data; 1465 req->flags |= FLAG_SV2_RO_OFF;
1208 } 1466 }
1209 1467
1210 REQ_SEND; 1468 REQ_SEND;
1211 } 1469 }
1212} 1470}
1213 1471
1214void 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
1215aio_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)
1216 SV * out_fh
1217 SV * in_fh
1218 UV in_offset
1219 UV length
1220 SV * callback
1221 PROTOTYPE: $$$$;$ 1494 PROTOTYPE: $$$$;$
1222 PPCODE: 1495 PPCODE:
1223{ 1496{
1224 dREQ; 1497 dREQ;
1225 1498
1226 req->type = REQ_SENDFILE; 1499 req->type = REQ_SENDFILE;
1227 req->fh = newSVsv (out_fh); 1500 req->sv1 = newSVsv (out_fh);
1228 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1501 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1229 req->fh2 = newSVsv (in_fh); 1502 req->sv2 = newSVsv (in_fh);
1230 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1503 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1231 req->offset = in_offset; 1504 req->offs = in_offset;
1232 req->length = length; 1505 req->size = length;
1233 1506
1234 REQ_SEND; 1507 REQ_SEND;
1235} 1508}
1236 1509
1237void 1510void
1238aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1511aio_readahead (SV *fh, UV offset, IV length, SV *callback=&PL_sv_undef)
1239 SV * fh
1240 UV offset
1241 IV length
1242 SV * callback
1243 PROTOTYPE: $$$;$ 1512 PROTOTYPE: $$$;$
1244 PPCODE: 1513 PPCODE:
1245{ 1514{
1246 dREQ; 1515 dREQ;
1247 1516
1248 req->type = REQ_READAHEAD; 1517 req->type = REQ_READAHEAD;
1249 req->fh = newSVsv (fh); 1518 req->sv1 = newSVsv (fh);
1250 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1519 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1251 req->offset = offset; 1520 req->offs = offset;
1252 req->length = length; 1521 req->size = length;
1253 1522
1254 REQ_SEND; 1523 REQ_SEND;
1255} 1524}
1256 1525
1257void 1526void
1258aio_stat (fh_or_path,callback=&PL_sv_undef) 1527aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1259 SV * fh_or_path
1260 SV * callback
1261 ALIAS: 1528 ALIAS:
1262 aio_stat = REQ_STAT 1529 aio_stat = REQ_STAT
1263 aio_lstat = REQ_LSTAT 1530 aio_lstat = REQ_LSTAT
1264 PPCODE: 1531 PPCODE:
1265{ 1532{
1266 dREQ; 1533 dREQ;
1267 1534
1268 New (0, req->statdata, 1, Stat_t); 1535 req->ptr2 = malloc (sizeof (Stat_t));
1269 if (!req->statdata) 1536 if (!req->ptr2)
1270 { 1537 {
1271 req_free (req); 1538 req_free (req);
1272 croak ("out of memory during aio_req->statdata allocation"); 1539 croak ("out of memory during aio_stat statdata allocation");
1273 } 1540 }
1541
1542 req->flags |= FLAG_PTR2_FREE;
1543 req->sv1 = newSVsv (fh_or_path);
1274 1544
1275 if (SvPOK (fh_or_path)) 1545 if (SvPOK (fh_or_path))
1276 { 1546 {
1277 req->type = ix; 1547 req->type = ix;
1278 req->data = newSVsv (fh_or_path);
1279 req->dataptr = SvPVbyte_nolen (req->data); 1548 req->ptr1 = SvPVbyte_nolen (req->sv1);
1280 } 1549 }
1281 else 1550 else
1282 { 1551 {
1283 req->type = REQ_FSTAT; 1552 req->type = REQ_FSTAT;
1284 req->fh = newSVsv (fh_or_path);
1285 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1553 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1286 } 1554 }
1287 1555
1288 REQ_SEND; 1556 REQ_SEND;
1289} 1557}
1290 1558
1291void 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
1292aio_unlink (pathname,callback=&PL_sv_undef) 1631aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1293 SV * pathname
1294 SV * callback
1295 ALIAS: 1632 ALIAS:
1296 aio_unlink = REQ_UNLINK 1633 aio_unlink = REQ_UNLINK
1297 aio_rmdir = REQ_RMDIR 1634 aio_rmdir = REQ_RMDIR
1298 aio_readdir = REQ_READDIR 1635 aio_readdir = REQ_READDIR
1299 PPCODE: 1636 PPCODE:
1300{ 1637{
1301 dREQ; 1638 dREQ;
1302 1639
1303 req->type = ix; 1640 req->type = ix;
1304 req->data = newSVsv (pathname); 1641 req->sv1 = newSVsv (pathname);
1305 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;
1306 1652
1653 req->type = REQ_MKDIR;
1654 req->sv1 = newSVsv (pathname);
1655 req->ptr1 = SvPVbyte_nolen (req->sv1);
1656 req->mode = mode;
1657
1307 REQ_SEND; 1658 REQ_SEND;
1308} 1659}
1309 1660
1310void 1661void
1311aio_link (oldpath,newpath,callback=&PL_sv_undef) 1662aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1312 SV * oldpath
1313 SV * newpath
1314 SV * callback
1315 ALIAS: 1663 ALIAS:
1316 aio_link = REQ_LINK 1664 aio_link = REQ_LINK
1317 aio_symlink = REQ_SYMLINK 1665 aio_symlink = REQ_SYMLINK
1318 aio_rename = REQ_RENAME 1666 aio_rename = REQ_RENAME
1319 PPCODE: 1667 PPCODE:
1320{ 1668{
1321 dREQ; 1669 dREQ;
1322 1670
1323 req->type = ix; 1671 req->type = ix;
1324 req->fh = newSVsv (oldpath); 1672 req->sv2 = newSVsv (oldpath);
1325 req->data2ptr = SvPVbyte_nolen (req->fh); 1673 req->ptr2 = SvPVbyte_nolen (req->sv2);
1326 req->data = newSVsv (newpath); 1674 req->sv1 = newSVsv (newpath);
1327 req->dataptr = SvPVbyte_nolen (req->data); 1675 req->ptr1 = SvPVbyte_nolen (req->sv1);
1328 1676
1329 REQ_SEND; 1677 REQ_SEND;
1330} 1678}
1331 1679
1332void 1680void
1333aio_busy (delay,callback=&PL_sv_undef) 1681aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1334 double delay
1335 SV * callback
1336 PPCODE: 1682 PPCODE:
1337{ 1683{
1338 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;
1339 1700
1340 req->type = REQ_BUSY; 1701 req->type = REQ_BUSY;
1341 req->fd = delay < 0. ? 0 : delay; 1702 req->nv1 = delay < 0. ? 0. : delay;
1342 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1343 1703
1344 REQ_SEND; 1704 REQ_SEND;
1345} 1705}
1346 1706
1347void 1707void
1348aio_group (callback=&PL_sv_undef) 1708aio_group (SV *callback=&PL_sv_undef)
1349 SV * callback
1350 PROTOTYPE: ;$ 1709 PROTOTYPE: ;$
1351 PPCODE: 1710 PPCODE:
1352{ 1711{
1353 dREQ; 1712 dREQ;
1354 1713
1355 req->type = REQ_GROUP; 1714 req->type = REQ_GROUP;
1715
1356 req_send (req); 1716 req_send (req);
1357
1358 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1717 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1359} 1718}
1360 1719
1361void 1720void
1362aio_nop (callback=&PL_sv_undef) 1721aio_nop (SV *callback=&PL_sv_undef)
1363 SV * callback
1364 PPCODE: 1722 PPCODE:
1365{ 1723{
1366 dREQ; 1724 dREQ;
1367 1725
1368 req->type = REQ_NOP; 1726 req->type = REQ_NOP;
1369 1727
1370 REQ_SEND; 1728 REQ_SEND;
1371} 1729}
1372 1730
1373void 1731int
1374aioreq_pri (int pri = DEFAULT_PRI) 1732aioreq_pri (int pri = 0)
1375 CODE: 1733 PROTOTYPE: ;$
1734 CODE:
1735 RETVAL = next_pri - PRI_BIAS;
1736 if (items > 0)
1737 {
1376 if (pri < PRI_MIN) pri = PRI_MIN; 1738 if (pri < PRI_MIN) pri = PRI_MIN;
1377 if (pri > PRI_MAX) pri = PRI_MAX; 1739 if (pri > PRI_MAX) pri = PRI_MAX;
1378 next_pri = pri + PRI_BIAS; 1740 next_pri = pri + PRI_BIAS;
1741 }
1742 OUTPUT:
1743 RETVAL
1379 1744
1380void 1745void
1381aioreq_nice (int nice = 0) 1746aioreq_nice (int nice = 0)
1382 CODE: 1747 CODE:
1383 nice = next_pri - nice; 1748 nice = next_pri - nice;
1384 if (nice < PRI_MIN) nice = PRI_MIN; 1749 if (nice < PRI_MIN) nice = PRI_MIN;
1385 if (nice > PRI_MAX) nice = PRI_MAX; 1750 if (nice > PRI_MAX) nice = PRI_MAX;
1386 next_pri = nice + PRI_BIAS; 1751 next_pri = nice + PRI_BIAS;
1387 1752
1388void 1753void
1389flush () 1754flush ()
1390 PROTOTYPE: 1755 PROTOTYPE:
1391 CODE: 1756 CODE:
… …
1393 { 1758 {
1394 poll_wait (); 1759 poll_wait ();
1395 poll_cb (); 1760 poll_cb ();
1396 } 1761 }
1397 1762
1398void 1763int
1399poll() 1764poll()
1400 PROTOTYPE: 1765 PROTOTYPE:
1401 CODE: 1766 CODE:
1402 if (nreqs)
1403 {
1404 poll_wait (); 1767 poll_wait ();
1405 poll_cb (); 1768 RETVAL = poll_cb ();
1406 } 1769 OUTPUT:
1770 RETVAL
1407 1771
1408int 1772int
1409poll_fileno() 1773poll_fileno()
1410 PROTOTYPE: 1774 PROTOTYPE:
1411 CODE: 1775 CODE:
… …
1423 1787
1424void 1788void
1425poll_wait() 1789poll_wait()
1426 PROTOTYPE: 1790 PROTOTYPE:
1427 CODE: 1791 CODE:
1428 if (nreqs)
1429 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}
1430 1830
1431int 1831int
1432nreqs() 1832nreqs()
1433 PROTOTYPE: 1833 PROTOTYPE:
1434 CODE: 1834 CODE:
1435 RETVAL = nreqs; 1835 RETVAL = nreqs;
1436 OUTPUT: 1836 OUTPUT:
1437 RETVAL 1837 RETVAL
1438 1838
1839int
1840nready()
1841 PROTOTYPE:
1842 CODE:
1843 RETVAL = get_nready ();
1844 OUTPUT:
1845 RETVAL
1846
1847int
1848npending()
1849 PROTOTYPE:
1850 CODE:
1851 RETVAL = get_npending ();
1852 OUTPUT:
1853 RETVAL
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
1439PROTOTYPES: DISABLE 1865PROTOTYPES: DISABLE
1440 1866
1441MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1867MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1442 1868
1443void 1869void
… …
1458 PPCODE: 1884 PPCODE:
1459{ 1885{
1460 int i; 1886 int i;
1461 aio_req req; 1887 aio_req req;
1462 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
1463 if (grp->fd == 2) 1892 if (grp->int1 == 2)
1464 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");
1465 1894
1466 for (i = 1; i < items; ++i ) 1895 for (i = 1; i < items; ++i )
1467 { 1896 {
1468 if (GIMME_V != G_VOID) 1897 if (GIMME_V != G_VOID)
… …
1470 1899
1471 req = SvAIO_REQ (ST (i)); 1900 req = SvAIO_REQ (ST (i));
1472 1901
1473 if (req) 1902 if (req)
1474 { 1903 {
1475 ++grp->length; 1904 ++grp->size;
1476 req->grp = grp; 1905 req->grp = grp;
1477 1906
1478 req->grp_prev = 0; 1907 req->grp_prev = 0;
1479 req->grp_next = grp->grp_first; 1908 req->grp_next = grp->grp_first;
1480 1909
… …
1494void 1923void
1495result (aio_req grp, ...) 1924result (aio_req grp, ...)
1496 CODE: 1925 CODE:
1497{ 1926{
1498 int i; 1927 int i;
1928 AV *av;
1929
1930 grp->errorno = errno;
1931
1499 AV *av = newAV (); 1932 av = newAV ();
1500 1933
1501 for (i = 1; i < items; ++i ) 1934 for (i = 1; i < items; ++i )
1502 av_push (av, newSVsv (ST (i))); 1935 av_push (av, newSVsv (ST (i)));
1503 1936
1504 SvREFCNT_dec (grp->data); 1937 SvREFCNT_dec (grp->sv1);
1505 grp->data = (SV *)av; 1938 grp->sv1 = (SV *)av;
1506} 1939}
1940
1941void
1942errno (aio_req grp, int errorno = errno)
1943 CODE:
1944 grp->errorno = errorno;
1507 1945
1508void 1946void
1509limit (aio_req grp, int limit) 1947limit (aio_req grp, int limit)
1510 CODE: 1948 CODE:
1511 grp->fd2 = limit; 1949 grp->int2 = limit;
1512 aio_grp_feed (grp); 1950 aio_grp_feed (grp);
1513 1951
1514void 1952void
1515feed (aio_req grp, SV *callback=&PL_sv_undef) 1953feed (aio_req grp, SV *callback=&PL_sv_undef)
1516 CODE: 1954 CODE:
1517{ 1955{
1518 SvREFCNT_dec (grp->fh2); 1956 SvREFCNT_dec (grp->sv2);
1519 grp->fh2 = newSVsv (callback); 1957 grp->sv2 = newSVsv (callback);
1520 1958
1521 if (grp->fd2 <= 0) 1959 if (grp->int2 <= 0)
1522 grp->fd2 = 2; 1960 grp->int2 = 2;
1523 1961
1524 aio_grp_feed (grp); 1962 aio_grp_feed (grp);
1525} 1963}
1526 1964

Diff Legend

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