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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.62 by root, Mon Oct 23 22:45:18 2006 UTC vs.
Revision 1.94 by root, Sun Nov 26 18:28:37 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines