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.60 by root, Mon Oct 23 20:05:27 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
99enum { 145enum {
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 while (nreqs) 449 dSP;
450
451 if (req->flags & FLAG_SV1_RO_OFF)
452 SvREADONLY_off (req->sv1);
453
454 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
197 { 455 {
198 aio_req req; 456 ENTER;
199 pthread_mutex_lock (&reslock); 457 SAVETMPS;
200 req = ress; 458 PUSHMARK (SP);
201 pthread_mutex_unlock (&reslock); 459 EXTEND (SP, 1);
202 460
203 if (req) 461 switch (req->type)
204 return; 462 {
463 case REQ_READDIR:
464 {
465 SV *rv = &PL_sv_undef;
205 466
206 fd_set rfd; 467 if (req->result >= 0)
207 FD_ZERO(&rfd); 468 {
208 FD_SET(respipe [0], &rfd); 469 int i;
470 char *buf = req->ptr2;
471 AV *av = newAV ();
209 472
210 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;
211 } 561 }
212}
213 562
214static void req_invoke (aio_req req)
215{
216 dSP;
217 int errorno = errno;
218
219 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
220 return;
221
222 errno = req->errorno;
223
224 ENTER;
225 SAVETMPS;
226 PUSHMARK (SP);
227 EXTEND (SP, 1);
228
229 switch (req->type)
230 {
231 case REQ_READDIR:
232 {
233 SV *rv = &PL_sv_undef;
234
235 if (req->result >= 0)
236 {
237 char *buf = req->data2ptr;
238 AV *av = newAV ();
239
240 while (req->result)
241 {
242 SV *sv = newSVpv (buf, 0);
243
244 av_push (av, sv);
245 buf += SvCUR (sv) + 1;
246 req->result--;
247 }
248
249 rv = sv_2mortal (newRV_noinc ((SV *)av));
250 }
251
252 PUSHs (rv);
253 }
254 break;
255
256 case REQ_OPEN:
257 {
258 /* convert fd to fh */
259 SV *fh;
260
261 PUSHs (sv_2mortal (newSViv (req->result)));
262 PUTBACK;
263 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
264 SPAGAIN;
265
266 fh = SvREFCNT_inc (POPs);
267
268 PUSHMARK (SP);
269 XPUSHs (sv_2mortal (fh));
270 }
271 break;
272
273 case REQ_GROUP:
274 req->fd = 2; /* mark group as finished */
275
276 if (req->data)
277 {
278 int i;
279 AV *av = (AV *)req->data;
280
281 EXTEND (SP, AvFILL (av) + 1);
282 for (i = 0; i <= AvFILL (av); ++i)
283 PUSHs (*av_fetch (av, i, 0));
284 }
285 break;
286
287 case REQ_NOP:
288 case REQ_SLEEP:
289 break;
290
291 default:
292 PUSHs (sv_2mortal (newSViv (req->result)));
293 break;
294 }
295
296
297 PUTBACK;
298 call_sv (req->callback, G_VOID | G_EVAL);
299 SPAGAIN;
300
301 FREETMPS;
302 LEAVE;
303
304 errno = errorno;
305
306 if (SvTRUE (ERRSV))
307 {
308 req_free (req);
309 croak (0);
310 }
311}
312
313static void req_free (aio_req req)
314{
315 if (req->grp) 563 if (req->grp)
316 { 564 {
317 aio_req grp = req->grp; 565 aio_req grp = req->grp;
318 566
319 /* unlink request */ 567 /* unlink request */
324 grp->grp_first = req->grp_next; 572 grp->grp_first = req->grp_next;
325 573
326 aio_grp_dec (grp); 574 aio_grp_dec (grp);
327 } 575 }
328 576
577 return !SvTRUE (ERRSV);
578}
579
580static void req_free (aio_req req)
581{
329 if (req->self) 582 if (req->self)
330 { 583 {
331 sv_unmagic (req->self, PERL_MAGIC_ext); 584 sv_unmagic (req->self, PERL_MAGIC_ext);
332 SvREFCNT_dec (req->self); 585 SvREFCNT_dec (req->self);
333 } 586 }
334 587
335 SvREFCNT_dec (req->data);
336 SvREFCNT_dec (req->fh); 588 SvREFCNT_dec (req->fh);
589 SvREFCNT_dec (req->sv1);
337 SvREFCNT_dec (req->fh2); 590 SvREFCNT_dec (req->sv2);
338 SvREFCNT_dec (req->callback); 591 SvREFCNT_dec (req->callback);
339 Safefree (req->statdata);
340 592
341 if (req->type == REQ_READDIR && req->result >= 0) 593 if (req->flags & FLAG_PTR2_FREE)
342 free (req->data2ptr); 594 free (req->ptr2);
343 595
344 Safefree (req); 596 Safefree (req);
345} 597}
346 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
347static void req_cancel (aio_req req) 613static void req_cancel (aio_req req)
348{ 614{
349 req->flags |= FLAG_CANCELLED; 615 req->flags |= FLAG_CANCELLED;
350 616
351 if (req->type == REQ_GROUP) 617 req_cancel_subs (req);
352 {
353 aio_req sub;
354
355 for (sub = req->grp_first; sub; sub = sub->grp_next)
356 req_cancel (sub);
357 }
358}
359
360static int poll_cb ()
361{
362 dSP;
363 int count = 0;
364 int do_croak = 0;
365 aio_req req;
366
367 for (;;)
368 {
369 pthread_mutex_lock (&reslock);
370 req = ress;
371
372 if (req)
373 {
374 ress = req->next;
375
376 if (!ress)
377 {
378 /* read any signals sent by the worker threads */
379 char buf [32];
380 while (read (respipe [0], buf, 32) == 32)
381 ;
382
383 rese = 0;
384 }
385 }
386
387 pthread_mutex_unlock (&reslock);
388
389 if (!req)
390 break;
391
392 --nreqs;
393
394 if (req->type == REQ_QUIT)
395 started--;
396 else if (req->type == REQ_GROUP && req->length)
397 {
398 req->fd = 1; /* mark request as delayed */
399 continue;
400 }
401 else
402 {
403 if (req->type == REQ_READ)
404 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
405
406 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
407 SvREADONLY_off (req->data);
408
409 if (req->statdata)
410 {
411 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
412 PL_laststatval = req->result;
413 PL_statcache = *(req->statdata);
414 }
415
416 req_invoke (req);
417
418 count++;
419 }
420
421 req_free (req);
422 }
423
424 return count;
425} 618}
426 619
427static void *aio_proc(void *arg); 620static void *aio_proc(void *arg);
428 621
429static void start_thread (void) 622static void start_thread (void)
430{ 623{
431 sigset_t fullsigset, oldsigset; 624 sigset_t fullsigset, oldsigset;
432 pthread_t tid;
433 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");
434 631
435 pthread_attr_init (&attr); 632 pthread_attr_init (&attr);
436 pthread_attr_setstacksize (&attr, STACKSIZE); 633 pthread_attr_setstacksize (&attr, STACKSIZE);
437 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
438 638
439 sigfillset (&fullsigset); 639 sigfillset (&fullsigset);
640
641 LOCK (wrklock);
440 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 642 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
441 643
442 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 644 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
443 started++;
444
445 sigprocmask (SIG_SETMASK, &oldsigset, 0);
446}
447
448static void req_send (aio_req req)
449{
450 while (started < wanted && nreqs >= started)
451 start_thread ();
452
453 ++nreqs;
454
455 pthread_mutex_lock (&reqlock);
456
457 req->next = 0;
458
459 if (reqe)
460 { 645 {
461 reqe->next = req; 646 wrk->prev = &wrk_first;
462 reqe = req; 647 wrk->next = wrk_first.next;
648 wrk_first.next->prev = wrk;
649 wrk_first.next = wrk;
650 ++started;
463 } 651 }
464 else 652 else
465 reqe = reqs = req; 653 free (wrk);
466 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);
467 pthread_cond_signal (&reqwait); 680 pthread_cond_signal (&reqwait);
468 pthread_mutex_unlock (&reqlock); 681 UNLOCK (reqlock);
469 682
470 if (nreqs > max_outstanding) 683 unblock_sig ();
471 for (;;)
472 {
473 poll_cb ();
474 684
475 if (nreqs <= max_outstanding) 685 maybe_start_thread ();
476 break;
477
478 poll_wait ();
479 }
480} 686}
481 687
482static void end_thread (void) 688static void end_thread (void)
483{ 689{
484 aio_req req; 690 aio_req req;
691
485 Newz (0, req, 1, aio_cb); 692 Newz (0, req, 1, aio_cb);
693
486 req->type = REQ_QUIT; 694 req->type = REQ_QUIT;
695 req->pri = PRI_MAX + PRI_BIAS;
487 696
488 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);
489} 712}
490 713
491static void min_parallel (int nthreads) 714static void min_parallel (int nthreads)
492{ 715{
493 if (wanted < nthreads) 716 if (wanted < nthreads)
494 wanted = nthreads; 717 wanted = nthreads;
495} 718}
496 719
497static void max_parallel (int nthreads) 720static void max_parallel (int nthreads)
498{ 721{
499 int cur = started;
500
501 if (wanted > nthreads) 722 if (wanted > nthreads)
502 wanted = nthreads; 723 wanted = nthreads;
503 724
504 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)
505 { 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
506 end_thread (); 743 maybe_start_thread ();
507 cur--; 744
745 FD_ZERO(&rfd);
746 FD_SET(respipe [0], &rfd);
747
748 select (respipe [0] + 1, &rfd, 0, 0, 0);
508 } 749 }
750}
509 751
510 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 (;;)
511 { 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
512 poll_wait (); 829 poll_wait ();
513 poll_cb (); 830
831 ++maxreqs;
514 } 832 }
833
834 unblock_sig ();
835 return count;
515} 836}
516 837
517static void create_pipe () 838static void create_pipe ()
518{ 839{
519 if (pipe (respipe)) 840 if (pipe (respipe))
543static 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)
544{ 865{
545 ssize_t res; 866 ssize_t res;
546 off_t ooffset; 867 off_t ooffset;
547 868
548 pthread_mutex_lock (&preadwritelock); 869 LOCK (preadwritelock);
549 ooffset = lseek (fd, 0, SEEK_CUR); 870 ooffset = lseek (fd, 0, SEEK_CUR);
550 lseek (fd, offset, SEEK_SET); 871 lseek (fd, offset, SEEK_SET);
551 res = read (fd, buf, count); 872 res = read (fd, buf, count);
552 lseek (fd, ooffset, SEEK_SET); 873 lseek (fd, ooffset, SEEK_SET);
553 pthread_mutex_unlock (&preadwritelock); 874 UNLOCK (preadwritelock);
554 875
555 return res; 876 return res;
556} 877}
557 878
558static 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)
559{ 880{
560 ssize_t res; 881 ssize_t res;
561 off_t ooffset; 882 off_t ooffset;
562 883
563 pthread_mutex_lock (&preadwritelock); 884 LOCK (preadwritelock);
564 ooffset = lseek (fd, 0, SEEK_CUR); 885 ooffset = lseek (fd, 0, SEEK_CUR);
565 lseek (fd, offset, SEEK_SET); 886 lseek (fd, offset, SEEK_SET);
566 res = write (fd, buf, count); 887 res = write (fd, buf, count);
567 lseek (fd, offset, SEEK_SET); 888 lseek (fd, offset, SEEK_SET);
568 pthread_mutex_unlock (&preadwritelock); 889 UNLOCK (preadwritelock);
569 890
570 return res; 891 return res;
571} 892}
572#endif 893#endif
573 894
574#if !HAVE_FDATASYNC 895#if !HAVE_FDATASYNC
575# define fdatasync fsync 896# define fdatasync fsync
576#endif 897#endif
577 898
578#if !HAVE_READAHEAD 899#if !HAVE_READAHEAD
579# define readahead aio_readahead 900# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
580 901
581static 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)
582{ 903{
583 char readahead_buf[4096]; 904 dBUF;
584 905
585 while (count > 0) 906 while (count > 0)
586 { 907 {
587 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 908 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
588 909
589 pread (fd, readahead_buf, len, offset); 910 pread (fd, aio_buf, len, offset);
590 offset += len; 911 offset += len;
591 count -= len; 912 count -= len;
592 } 913 }
593 914
594 errno = 0; 915 errno = 0;
595} 916}
917
596#endif 918#endif
597 919
598#if !HAVE_READDIR_R 920#if !HAVE_READDIR_R
599# define readdir_r aio_readdir_r 921# define readdir_r aio_readdir_r
600 922
603static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 925static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
604{ 926{
605 struct dirent *e; 927 struct dirent *e;
606 int errorno; 928 int errorno;
607 929
608 pthread_mutex_lock (&readdirlock); 930 LOCK (readdirlock);
609 931
610 e = readdir (dirp); 932 e = readdir (dirp);
611 errorno = errno; 933 errorno = errno;
612 934
613 if (e) 935 if (e)
616 strcpy (ent->d_name, e->d_name); 938 strcpy (ent->d_name, e->d_name);
617 } 939 }
618 else 940 else
619 *res = 0; 941 *res = 0;
620 942
621 pthread_mutex_unlock (&readdirlock); 943 UNLOCK (readdirlock);
622 944
623 errno = errorno; 945 errno = errorno;
624 return e ? 0 : -1; 946 return e ? 0 : -1;
625} 947}
626#endif 948#endif
627 949
628/* sendfile always needs emulation */ 950/* sendfile always needs emulation */
629static 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)
630{ 952{
631 ssize_t res; 953 ssize_t res;
632 954
633 if (!count) 955 if (!count)
634 return 0; 956 return 0;
645 { 967 {
646 off_t sbytes; 968 off_t sbytes;
647 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 969 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
648 970
649 if (res < 0 && sbytes) 971 if (res < 0 && sbytes)
650 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 972 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
651 res = sbytes; 973 res = sbytes;
652 } 974 }
653 975
654# elif __hpux 976# elif __hpux
655 res = sendfile (ofd, ifd, offset, count, 0, 0); 977 res = sendfile (ofd, ifd, offset, count, 0, 0);
683#endif 1005#endif
684 ) 1006 )
685 ) 1007 )
686 { 1008 {
687 /* emulate sendfile. this is a major pain in the ass */ 1009 /* emulate sendfile. this is a major pain in the ass */
688 char buf[4096]; 1010 dBUF;
1011
689 res = 0; 1012 res = 0;
690 1013
691 while (count) 1014 while (count)
692 { 1015 {
693 ssize_t cnt; 1016 ssize_t cnt;
694 1017
695 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 1018 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
696 1019
697 if (cnt <= 0) 1020 if (cnt <= 0)
698 { 1021 {
699 if (cnt && !res) res = -1; 1022 if (cnt && !res) res = -1;
700 break; 1023 break;
701 } 1024 }
702 1025
703 cnt = write (ofd, buf, cnt); 1026 cnt = write (ofd, aio_buf, cnt);
704 1027
705 if (cnt <= 0) 1028 if (cnt <= 0)
706 { 1029 {
707 if (cnt && !res) res = -1; 1030 if (cnt && !res) res = -1;
708 break; 1031 break;
716 1039
717 return res; 1040 return res;
718} 1041}
719 1042
720/* read a full directory */ 1043/* read a full directory */
721static int scandir_ (const char *path, void **namesp) 1044static void scandir_ (aio_req req, worker *self)
722{ 1045{
723 DIR *dirp = opendir (path); 1046 DIR *dirp;
724 union 1047 union
725 { 1048 {
726 struct dirent d; 1049 struct dirent d;
727 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 1050 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
728 } u; 1051 } *u;
729 struct dirent *entp; 1052 struct dirent *entp;
730 char *name, *names; 1053 char *name, *names;
731 int memlen = 4096; 1054 int memlen = 4096;
732 int memofs = 0; 1055 int memofs = 0;
733 int res = 0; 1056 int res = 0;
734 int errorno; 1057 int errorno;
735 1058
736 if (!dirp) 1059 LOCK (wrklock);
737 return -1; 1060 self->dirp = dirp = opendir (req->ptr1);
738 1061 self->dbuf = u = malloc (sizeof (*u));
1062 req->flags |= FLAG_PTR2_FREE;
739 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);
740 1116
741 for (;;) 1117 for (;;)
742 { 1118 {
743 errno = 0, readdir_r (dirp, &u.d, &entp); 1119 ts.tv_sec = time (0) + IDLE_TIMEOUT;
744 1120
745 if (!entp) 1121 LOCK (reqlock);
746 break;
747
748 name = entp->d_name;
749
750 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
751 {
752 int len = strlen (name) + 1;
753
754 res++;
755
756 while (memofs + len > memlen)
757 {
758 memlen *= 2;
759 names = realloc (names, memlen);
760 if (!names)
761 break;
762 }
763
764 memcpy (names + memofs, name, len);
765 memofs += len;
766 }
767 }
768
769 errorno = errno;
770 closedir (dirp);
771
772 if (errorno)
773 {
774 free (names);
775 errno = errorno;
776 res = -1;
777 }
778
779 *namesp = (void *)names;
780 return res;
781}
782
783/*****************************************************************************/
784
785static void *aio_proc (void *thr_arg)
786{
787 aio_req req;
788 int type;
789
790 do
791 {
792 pthread_mutex_lock (&reqlock);
793 1122
794 for (;;) 1123 for (;;)
795 { 1124 {
796 req = reqs; 1125 self->req = req = reqq_shift (&req_queue);
797
798 if (reqs)
799 {
800 reqs = reqs->next;
801 if (!reqs) reqe = 0;
802 }
803 1126
804 if (req) 1127 if (req)
805 break; 1128 break;
806 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 */
807 pthread_cond_wait (&reqwait, &reqlock); 1146 pthread_cond_wait (&reqwait, &reqlock);
1147 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1148 }
1149
1150 --idle;
808 } 1151 }
809 1152
810 pthread_mutex_unlock (&reqlock); 1153 --nready;
1154
1155 UNLOCK (reqlock);
811 1156
812 errno = 0; /* strictly unnecessary */ 1157 errno = 0; /* strictly unnecessary */
813 type = req->type; /* remember type for QUIT check */
814 1158
815 if (!(req->flags & FLAG_CANCELLED)) 1159 if (!(req->flags & FLAG_CANCELLED))
816 switch (type) 1160 switch (req->type)
817 { 1161 {
818 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;
819 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;
820 1164
821 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;
822 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;
823 1167
824 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;
825 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;
826 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;
827 1171
828 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;
829 case REQ_CLOSE: req->result = close (req->fd); break; 1173 case REQ_CLOSE: req->result = close (req->int1); break;
830 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1174 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
831 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1175 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
832 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1176 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
833 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1177 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
834 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;
835 1181
836 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1182 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
837 case REQ_FSYNC: req->result = fsync (req->fd); break; 1183 case REQ_FSYNC: req->result = fsync (req->int1); break;
838 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1184 case REQ_READDIR: scandir_ (req, self); break;
839 1185
840 case REQ_SLEEP: 1186 case REQ_BUSY:
841 { 1187 {
842 struct timeval tv; 1188 struct timeval tv;
843 1189
844 tv.tv_sec = req->fd; 1190 tv.tv_sec = req->int1;
845 tv.tv_usec = req->fd2; 1191 tv.tv_usec = req->int2;
846 1192
847 req->result = select (0, 0, 0, 0, &tv); 1193 req->result = select (0, 0, 0, 0, &tv);
848 } 1194 }
849 1195
850 case REQ_GROUP: 1196 case REQ_GROUP:
851 case REQ_NOP: 1197 case REQ_NOP:
1198 break;
1199
852 case REQ_QUIT: 1200 case REQ_QUIT:
853 break; 1201 goto quit;
854 1202
855 default: 1203 default:
856 req->result = ENOSYS; 1204 req->result = ENOSYS;
857 break; 1205 break;
858 } 1206 }
859 1207
860 req->errorno = errno; 1208 req->errorno = errno;
861 1209
862 pthread_mutex_lock (&reslock); 1210 LOCK (reslock);
863 1211
864 req->next = 0; 1212 ++npending;
865 1213
866 if (rese) 1214 if (!reqq_push (&res_queue, req))
867 { 1215 {
868 rese->next = req;
869 rese = req;
870 }
871 else
872 {
873 rese = ress = req;
874
875 /* write a dummy byte to the pipe so fh becomes ready */ 1216 /* write a dummy byte to the pipe so fh becomes ready */
876 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);
877 } 1222 }
878 1223
879 pthread_mutex_unlock (&reslock); 1224 self->req = 0;
1225 worker_clear (self);
1226
1227 UNLOCK (reslock);
880 } 1228 }
881 while (type != REQ_QUIT); 1229
1230quit:
1231 LOCK (wrklock);
1232 worker_free (self);
1233 UNLOCK (wrklock);
882 1234
883 return 0; 1235 return 0;
884} 1236}
885 1237
886/*****************************************************************************/ 1238/*****************************************************************************/
887 1239
888static void atfork_prepare (void) 1240static void atfork_prepare (void)
889{ 1241{
890 pthread_mutex_lock (&reqlock); 1242 LOCK (wrklock);
891 pthread_mutex_lock (&reslock); 1243 LOCK (reqlock);
1244 LOCK (reslock);
892#if !HAVE_PREADWRITE 1245#if !HAVE_PREADWRITE
893 pthread_mutex_lock (&preadwritelock); 1246 LOCK (preadwritelock);
894#endif 1247#endif
895#if !HAVE_READDIR_R 1248#if !HAVE_READDIR_R
896 pthread_mutex_lock (&readdirlock); 1249 LOCK (readdirlock);
897#endif 1250#endif
898} 1251}
899 1252
900static void atfork_parent (void) 1253static void atfork_parent (void)
901{ 1254{
902#if !HAVE_READDIR_R 1255#if !HAVE_READDIR_R
903 pthread_mutex_unlock (&readdirlock); 1256 UNLOCK (readdirlock);
904#endif 1257#endif
905#if !HAVE_PREADWRITE 1258#if !HAVE_PREADWRITE
906 pthread_mutex_unlock (&preadwritelock); 1259 UNLOCK (preadwritelock);
907#endif 1260#endif
908 pthread_mutex_unlock (&reslock); 1261 UNLOCK (reslock);
909 pthread_mutex_unlock (&reqlock); 1262 UNLOCK (reqlock);
1263 UNLOCK (wrklock);
910} 1264}
911 1265
912static void atfork_child (void) 1266static void atfork_child (void)
913{ 1267{
914 aio_req prv; 1268 aio_req prv;
915 1269
916 started = 0; 1270 while (prv = reqq_shift (&req_queue))
1271 req_free (prv);
917 1272
918 while (reqs) 1273 while (prv = reqq_shift (&res_queue))
1274 req_free (prv);
1275
1276 while (wrk_first.next != &wrk_first)
919 { 1277 {
920 prv = reqs; 1278 worker *wrk = wrk_first.next;
921 reqs = prv->next; 1279
1280 if (wrk->req)
1281 req_free (wrk->req);
1282
1283 worker_clear (wrk);
922 req_free (prv); 1284 worker_free (wrk);
923 } 1285 }
924 1286
925 reqs = reqe = 0; 1287 started = 0;
926 1288 idle = 0;
927 while (ress) 1289 nreqs = 0;
928 { 1290 nready = 0;
929 prv = ress; 1291 npending = 0;
930 ress = prv->next;
931 req_free (prv);
932 }
933
934 ress = rese = 0;
935 1292
936 close (respipe [0]); 1293 close (respipe [0]);
937 close (respipe [1]); 1294 close (respipe [1]);
938 create_pipe (); 1295 create_pipe ();
939 1296
966PROTOTYPES: ENABLE 1323PROTOTYPES: ENABLE
967 1324
968BOOT: 1325BOOT:
969{ 1326{
970 HV *stash = gv_stashpv ("IO::AIO", 1); 1327 HV *stash = gv_stashpv ("IO::AIO", 1);
1328
971 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1329 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
972 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1330 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
973 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));
974 1336
975 create_pipe (); 1337 create_pipe ();
976 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1338 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
977} 1339}
978 1340
979void 1341void
980min_parallel (nthreads) 1342max_poll_reqs (int nreqs)
981 int nthreads
982 PROTOTYPE: $ 1343 PROTOTYPE: $
1344 CODE:
1345 max_poll_reqs = nreqs;
983 1346
984void 1347void
985max_parallel (nthreads) 1348max_poll_time (double nseconds)
986 int nthreads
987 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);
988 1366
989int 1367int
990max_outstanding (nreqs) 1368max_outstanding (int maxreqs)
991 int nreqs 1369 PROTOTYPE: $
992 PROTOTYPE: $
993 CODE: 1370 CODE:
994 RETVAL = max_outstanding; 1371 RETVAL = max_outstanding;
995 max_outstanding = nreqs; 1372 max_outstanding = maxreqs;
1373 OUTPUT:
1374 RETVAL
996 1375
997void 1376void
998aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1377aio_open (pathname,flags,mode,callback=&PL_sv_undef)
999 SV * pathname 1378 SV8 * pathname
1000 int flags 1379 int flags
1001 int mode 1380 int mode
1002 SV * callback 1381 SV * callback
1003 PROTOTYPE: $$$;$ 1382 PROTOTYPE: $$$;$
1004 PPCODE: 1383 PPCODE:
1005{ 1384{
1006 dREQ; 1385 dREQ;
1007 1386
1008 req->type = REQ_OPEN; 1387 req->type = REQ_OPEN;
1009 req->data = newSVsv (pathname); 1388 req->sv1 = newSVsv (pathname);
1010 req->dataptr = SvPVbyte_nolen (req->data); 1389 req->ptr1 = SvPVbyte_nolen (req->sv1);
1011 req->fd = flags; 1390 req->int1 = flags;
1012 req->mode = mode; 1391 req->mode = mode;
1013 1392
1014 REQ_SEND; 1393 REQ_SEND;
1015} 1394}
1016 1395
1026 PPCODE: 1405 PPCODE:
1027{ 1406{
1028 dREQ; 1407 dREQ;
1029 1408
1030 req->type = ix; 1409 req->type = ix;
1031 req->fh = newSVsv (fh); 1410 req->fh = newSVsv (fh);
1032 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1411 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1033 1412
1034 REQ_SEND (req); 1413 REQ_SEND (req);
1035} 1414}
1036 1415
1037void 1416void
1038aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1417aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1039 SV * fh 1418 SV * fh
1040 UV offset 1419 UV offset
1041 UV length 1420 UV length
1042 SV * data 1421 SV8 * data
1043 UV dataoffset 1422 UV dataoffset
1044 SV * callback 1423 SV * callback
1045 ALIAS: 1424 ALIAS:
1046 aio_read = REQ_READ 1425 aio_read = REQ_READ
1047 aio_write = REQ_WRITE 1426 aio_write = REQ_WRITE
1048 PROTOTYPE: $$$$$;$ 1427 PROTOTYPE: $$$$$;$
1049 PPCODE: 1428 PPCODE:
1050{ 1429{
1051 aio_req req;
1052 STRLEN svlen; 1430 STRLEN svlen;
1053 char *svptr = SvPVbyte (data, svlen); 1431 char *svptr = SvPVbyte (data, svlen);
1054 1432
1055 SvUPGRADE (data, SVt_PV); 1433 SvUPGRADE (data, SVt_PV);
1056 SvPOK_on (data); 1434 SvPOK_on (data);
1078 1456
1079 { 1457 {
1080 dREQ; 1458 dREQ;
1081 1459
1082 req->type = ix; 1460 req->type = ix;
1083 req->fh = newSVsv (fh); 1461 req->fh = newSVsv (fh);
1084 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1462 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1085 : IoOFP (sv_2io (fh))); 1463 : IoOFP (sv_2io (fh)));
1086 req->offset = offset; 1464 req->offs = offset;
1087 req->length = length; 1465 req->size = length;
1088 req->data = SvREFCNT_inc (data); 1466 req->sv1 = SvREFCNT_inc (data);
1089 req->dataptr = (char *)svptr + dataoffset; 1467 req->ptr1 = (char *)svptr + dataoffset;
1468 req->stroffset = dataoffset;
1090 1469
1091 if (!SvREADONLY (data)) 1470 if (!SvREADONLY (data))
1092 { 1471 {
1093 SvREADONLY_on (data); 1472 SvREADONLY_on (data);
1094 req->data2ptr = (void *)data; 1473 req->flags |= FLAG_SV1_RO_OFF;
1095 } 1474 }
1096 1475
1097 REQ_SEND; 1476 REQ_SEND;
1098 } 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;
1099} 1500}
1100 1501
1101void 1502void
1102aio_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)
1103 SV * out_fh 1504 SV * out_fh
1109 PPCODE: 1510 PPCODE:
1110{ 1511{
1111 dREQ; 1512 dREQ;
1112 1513
1113 req->type = REQ_SENDFILE; 1514 req->type = REQ_SENDFILE;
1114 req->fh = newSVsv (out_fh); 1515 req->fh = newSVsv (out_fh);
1115 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1516 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1116 req->fh2 = newSVsv (in_fh); 1517 req->sv2 = newSVsv (in_fh);
1117 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1518 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1118 req->offset = in_offset; 1519 req->offs = in_offset;
1119 req->length = length; 1520 req->size = length;
1120 1521
1121 REQ_SEND; 1522 REQ_SEND;
1122} 1523}
1123 1524
1124void 1525void
1131 PPCODE: 1532 PPCODE:
1132{ 1533{
1133 dREQ; 1534 dREQ;
1134 1535
1135 req->type = REQ_READAHEAD; 1536 req->type = REQ_READAHEAD;
1136 req->fh = newSVsv (fh); 1537 req->fh = newSVsv (fh);
1137 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1538 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1138 req->offset = offset; 1539 req->offs = offset;
1139 req->length = length; 1540 req->size = length;
1140 1541
1141 REQ_SEND; 1542 REQ_SEND;
1142} 1543}
1143 1544
1144void 1545void
1145aio_stat (fh_or_path,callback=&PL_sv_undef) 1546aio_stat (fh_or_path,callback=&PL_sv_undef)
1146 SV * fh_or_path 1547 SV8 * fh_or_path
1147 SV * callback 1548 SV * callback
1148 ALIAS: 1549 ALIAS:
1149 aio_stat = REQ_STAT 1550 aio_stat = REQ_STAT
1150 aio_lstat = REQ_LSTAT 1551 aio_lstat = REQ_LSTAT
1151 PPCODE: 1552 PPCODE:
1152{ 1553{
1153 dREQ; 1554 dREQ;
1154 1555
1155 New (0, req->statdata, 1, Stat_t); 1556 req->ptr2 = malloc (sizeof (Stat_t));
1156 if (!req->statdata) 1557 if (!req->ptr2)
1157 { 1558 {
1158 req_free (req); 1559 req_free (req);
1159 croak ("out of memory during aio_req->statdata allocation"); 1560 croak ("out of memory during aio_stat statdata allocation");
1160 } 1561 }
1562
1563 req->flags |= FLAG_PTR2_FREE;
1161 1564
1162 if (SvPOK (fh_or_path)) 1565 if (SvPOK (fh_or_path))
1163 { 1566 {
1164 req->type = ix; 1567 req->type = ix;
1165 req->data = newSVsv (fh_or_path); 1568 req->sv1 = newSVsv (fh_or_path);
1166 req->dataptr = SvPVbyte_nolen (req->data); 1569 req->ptr1 = SvPVbyte_nolen (req->sv1);
1167 } 1570 }
1168 else 1571 else
1169 { 1572 {
1170 req->type = REQ_FSTAT; 1573 req->type = REQ_FSTAT;
1171 req->fh = newSVsv (fh_or_path); 1574 req->fh = newSVsv (fh_or_path);
1172 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1575 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1173 } 1576 }
1174 1577
1175 REQ_SEND; 1578 REQ_SEND;
1176} 1579}
1177 1580
1178void 1581void
1179aio_unlink (pathname,callback=&PL_sv_undef) 1582aio_unlink (pathname,callback=&PL_sv_undef)
1180 SV * pathname 1583 SV8 * pathname
1181 SV * callback 1584 SV * callback
1182 ALIAS: 1585 ALIAS:
1183 aio_unlink = REQ_UNLINK 1586 aio_unlink = REQ_UNLINK
1184 aio_rmdir = REQ_RMDIR 1587 aio_rmdir = REQ_RMDIR
1185 aio_readdir = REQ_READDIR 1588 aio_readdir = REQ_READDIR
1186 PPCODE: 1589 PPCODE:
1187{ 1590{
1188 dREQ; 1591 dREQ;
1189 1592
1190 req->type = ix; 1593 req->type = ix;
1191 req->data = newSVsv (pathname); 1594 req->sv1 = newSVsv (pathname);
1192 req->dataptr = SvPVbyte_nolen (req->data); 1595 req->ptr1 = SvPVbyte_nolen (req->sv1);
1193 1596
1194 REQ_SEND; 1597 REQ_SEND;
1195} 1598}
1196 1599
1197void 1600void
1198aio_link (oldpath,newpath,callback=&PL_sv_undef) 1601aio_link (oldpath,newpath,callback=&PL_sv_undef)
1199 SV * oldpath 1602 SV8 * oldpath
1200 SV * newpath 1603 SV8 * newpath
1201 SV * callback 1604 SV * callback
1202 ALIAS: 1605 ALIAS:
1203 aio_link = REQ_LINK 1606 aio_link = REQ_LINK
1204 aio_symlink = REQ_SYMLINK 1607 aio_symlink = REQ_SYMLINK
1205 aio_rename = REQ_RENAME 1608 aio_rename = REQ_RENAME
1206 PPCODE: 1609 PPCODE:
1207{ 1610{
1208 dREQ; 1611 dREQ;
1209 1612
1210 req->type = ix; 1613 req->type = ix;
1211 req->fh = newSVsv (oldpath); 1614 req->fh = newSVsv (oldpath);
1212 req->data2ptr = SvPVbyte_nolen (req->fh); 1615 req->ptr2 = SvPVbyte_nolen (req->fh);
1213 req->data = newSVsv (newpath); 1616 req->sv1 = newSVsv (newpath);
1214 req->dataptr = SvPVbyte_nolen (req->data); 1617 req->ptr1 = SvPVbyte_nolen (req->sv1);
1215 1618
1216 REQ_SEND; 1619 REQ_SEND;
1217} 1620}
1218 1621
1219void 1622void
1220aio_sleep (delay,callback=&PL_sv_undef) 1623aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1221 double delay 1624 SV8 * pathname
1222 SV * callback 1625 SV * callback
1626 UV mode
1627 UV dev
1223 PPCODE: 1628 PPCODE:
1224{ 1629{
1225 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}
1226 1640
1641void
1642aio_busy (delay,callback=&PL_sv_undef)
1643 double delay
1644 SV * callback
1645 PPCODE:
1646{
1647 dREQ;
1648
1227 req->type = REQ_SLEEP; 1649 req->type = REQ_BUSY;
1228 req->fd = delay < 0. ? 0 : delay; 1650 req->int1 = delay < 0. ? 0 : delay;
1229 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1651 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1230 1652
1231 REQ_SEND; 1653 REQ_SEND;
1232} 1654}
1233 1655
1234void 1656void
1238 PPCODE: 1660 PPCODE:
1239{ 1661{
1240 dREQ; 1662 dREQ;
1241 1663
1242 req->type = REQ_GROUP; 1664 req->type = REQ_GROUP;
1665
1243 req_send (req); 1666 req_send (req);
1244
1245 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1667 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1246} 1668}
1247 1669
1248void 1670void
1249aio_nop (callback=&PL_sv_undef) 1671aio_nop (callback=&PL_sv_undef)
1250 SV * callback 1672 SV * callback
1251 PPCODE: 1673 PPCODE:
1252{ 1674{
1253 dREQ; 1675 dREQ;
1254 1676
1255 req->type = REQ_NOP; 1677 req->type = REQ_NOP;
1256 1678
1257 REQ_SEND; 1679 REQ_SEND;
1258} 1680}
1259 1681
1260#if 0 1682int
1261 1683aioreq_pri (int pri = 0)
1262void 1684 PROTOTYPE: ;$
1263aio_pri (int pri = DEFAULT_PRI)
1264 CODE: 1685 CODE:
1686 RETVAL = next_pri - PRI_BIAS;
1687 if (items > 0)
1688 {
1265 if (pri > PRI_MIN) pri = PRI_MIN; 1689 if (pri < PRI_MIN) pri = PRI_MIN;
1266 if (pri < PRI_MAX) pri = PRI_MAX; 1690 if (pri > PRI_MAX) pri = PRI_MAX;
1267 next_pri = pri + PRI_BIAS; 1691 next_pri = pri + PRI_BIAS;
1692 }
1693 OUTPUT:
1694 RETVAL
1268 1695
1269#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;
1270 1703
1271void 1704void
1272flush () 1705flush ()
1273 PROTOTYPE: 1706 PROTOTYPE:
1274 CODE: 1707 CODE:
1276 { 1709 {
1277 poll_wait (); 1710 poll_wait ();
1278 poll_cb (); 1711 poll_cb ();
1279 } 1712 }
1280 1713
1281void 1714int
1282poll() 1715poll()
1283 PROTOTYPE: 1716 PROTOTYPE:
1284 CODE: 1717 CODE:
1285 if (nreqs)
1286 {
1287 poll_wait (); 1718 poll_wait ();
1288 poll_cb (); 1719 RETVAL = poll_cb ();
1289 } 1720 OUTPUT:
1721 RETVAL
1290 1722
1291int 1723int
1292poll_fileno() 1724poll_fileno()
1293 PROTOTYPE: 1725 PROTOTYPE:
1294 CODE: 1726 CODE:
1306 1738
1307void 1739void
1308poll_wait() 1740poll_wait()
1309 PROTOTYPE: 1741 PROTOTYPE:
1310 CODE: 1742 CODE:
1311 if (nreqs)
1312 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}
1313 1781
1314int 1782int
1315nreqs() 1783nreqs()
1316 PROTOTYPE: 1784 PROTOTYPE:
1317 CODE: 1785 CODE:
1318 RETVAL = nreqs; 1786 RETVAL = nreqs;
1319 OUTPUT: 1787 OUTPUT:
1320 RETVAL 1788 RETVAL
1321 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
1322PROTOTYPES: DISABLE 1816PROTOTYPES: DISABLE
1323 1817
1324MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1818MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1325 1819
1326void 1820void
1327cancel (aio_req_ornot req) 1821cancel (aio_req_ornot req)
1328 PROTOTYPE:
1329 CODE: 1822 CODE:
1330 req_cancel (req); 1823 req_cancel (req);
1331 1824
1332void 1825void
1333cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1826cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1342 PPCODE: 1835 PPCODE:
1343{ 1836{
1344 int i; 1837 int i;
1345 aio_req req; 1838 aio_req req;
1346 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
1347 if (grp->fd == 2) 1843 if (grp->int1 == 2)
1348 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");
1349 1845
1350 for (i = 1; i < items; ++i ) 1846 for (i = 1; i < items; ++i )
1351 { 1847 {
1352 if (GIMME_V != G_VOID) 1848 if (GIMME_V != G_VOID)
1354 1850
1355 req = SvAIO_REQ (ST (i)); 1851 req = SvAIO_REQ (ST (i));
1356 1852
1357 if (req) 1853 if (req)
1358 { 1854 {
1359 ++grp->length; 1855 ++grp->size;
1360 req->grp = grp; 1856 req->grp = grp;
1361 1857
1362 req->grp_prev = 0; 1858 req->grp_prev = 0;
1363 req->grp_next = grp->grp_first; 1859 req->grp_next = grp->grp_first;
1364 1860
1369 } 1865 }
1370 } 1866 }
1371} 1867}
1372 1868
1373void 1869void
1870cancel_subs (aio_req_ornot req)
1871 CODE:
1872 req_cancel_subs (req);
1873
1874void
1374result (aio_req grp, ...) 1875result (aio_req grp, ...)
1375 CODE: 1876 CODE:
1376{ 1877{
1377 int i; 1878 int i;
1879 AV *av;
1880
1881 grp->errorno = errno;
1882
1378 AV *av = newAV (); 1883 av = newAV ();
1379 1884
1380 for (i = 1; i < items; ++i ) 1885 for (i = 1; i < items; ++i )
1381 av_push (av, newSVsv (ST (i))); 1886 av_push (av, newSVsv (ST (i)));
1382 1887
1383 SvREFCNT_dec (grp->data); 1888 SvREFCNT_dec (grp->sv1);
1384 grp->data = (SV *)av; 1889 grp->sv1 = (SV *)av;
1385} 1890}
1386 1891
1387void 1892void
1893errno (aio_req grp, int errorno = errno)
1894 CODE:
1895 grp->errorno = errorno;
1896
1897void
1388feed_limit (aio_req grp, int limit) 1898limit (aio_req grp, int limit)
1389 CODE: 1899 CODE:
1390 grp->fd2 = limit; 1900 grp->int2 = limit;
1391 aio_grp_feed (grp); 1901 aio_grp_feed (grp);
1392 1902
1393void 1903void
1394feed (aio_req grp, SV *callback=&PL_sv_undef) 1904feed (aio_req grp, SV *callback=&PL_sv_undef)
1395 CODE: 1905 CODE:
1396{ 1906{
1397 SvREFCNT_dec (grp->fh2); 1907 SvREFCNT_dec (grp->sv2);
1398 grp->fh2 = newSVsv (callback); 1908 grp->sv2 = newSVsv (callback);
1399 1909
1400 if (grp->fd2 <= 0) 1910 if (grp->int2 <= 0)
1401 grp->fd2 = 2; 1911 grp->int2 = 2;
1402 1912
1403 aio_grp_feed (grp); 1913 aio_grp_feed (grp);
1404} 1914}
1405 1915

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines