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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines