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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines