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

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

Diff Legend

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