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.66 by root, Tue Oct 24 00:34:47 2006 UTC vs.
Revision 1.96 by root, Sat Dec 23 04:49:37 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines