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.62 by root, Mon Oct 23 22:45:18 2006 UTC vs.
Revision 1.98 by root, Wed May 9 06:45:12 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines