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.51 by root, Sun Oct 22 22:14:33 2006 UTC vs.
Revision 1.78 by root, Thu Oct 26 14:35:34 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"
… …
39/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 49#ifndef NAME_MAX
41# define NAME_MAX 4096 50# define NAME_MAX 4096
42#endif 51#endif
43 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
44#if __ia64 58#if __ia64
45# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
46#else 62#else
47# define STACKSIZE 8192 63# define STACKSIZE 16384
48#endif 64#endif
65
66/* buffer size for various temporary buffers */
67#define AIO_BUFSIZE 65536
68
69#define dBUF \
70 char *aio_buf; \
71 LOCK (wrklock); \
72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \
74 if (!aio_buf) \
75 return -1;
49 76
50enum { 77enum {
51 REQ_QUIT, 78 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 79 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 80 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 82 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 83 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 85 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 86 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP, 87 REQ_GROUP, REQ_NOP,
61 REQ_GROUP, 88 REQ_BUSY,
62}; 89};
63 90
64#define AIO_REQ_KLASS "IO::AIO::REQ" 91#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 92#define AIO_GRP_KLASS "IO::AIO::GRP"
66 93
67typedef struct aio_cb 94typedef struct aio_cb
68{ 95{
69 struct aio_cb *volatile next; 96 struct aio_cb *volatile next;
70
71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 97
75 SV *data, *callback; 98 SV *data, *callback;
76 SV *fh, *fh2; 99 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 100 void *dataptr, *data2ptr;
78 Stat_t *statdata; 101 Stat_t *statdata;
79 off_t offset; 102 off_t offset;
80 size_t length; 103 size_t length;
81 ssize_t result; 104 ssize_t result;
82 105
106 STRLEN dataoffset;
83 int type; 107 int type;
84 int fd, fd2; 108 int fd, fd2;
85 int errorno; 109 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 110 mode_t mode; /* open */
111
88 unsigned char cancelled; 112 unsigned char flags;
113 unsigned char pri;
114
115 SV *self; /* the perl counterpart of this request, if any */
116 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 117} aio_cb;
118
119enum {
120 FLAG_CANCELLED = 0x01,
121};
90 122
91typedef aio_cb *aio_req; 123typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 124typedef aio_cb *aio_req_ornot;
93 125
126enum {
127 PRI_MIN = -4,
128 PRI_MAX = 4,
129
130 DEFAULT_PRI = 0,
131 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
133};
134
135static int next_pri = DEFAULT_PRI + PRI_BIAS;
136
94static int started, wanted; 137static unsigned int started, wanted;
95static volatile int nreqs; 138static volatile unsigned int nreqs;
96static int max_outstanding = 1<<30; 139static volatile unsigned int max_outstanding = 0xffffffff;
97static int respipe [2]; 140static int respipe [2];
98 141
142#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
143# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
144#else
145# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
146#endif
147
148#define LOCK(mutex) pthread_mutex_lock (&(mutex))
149#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
150
151/* worker threads management */
152static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
153
154typedef struct worker {
155 /* locked by wrklock */
156 struct worker *prev, *next;
157
158 pthread_t tid;
159
160 /* locked by reslock, reqlock or wrklock */
161 aio_req req; /* currently processed request */
162 void *dbuf;
163 DIR *dirp;
164} worker;
165
166static worker wrk_first = { &wrk_first, &wrk_first, 0 };
167
168static void worker_clear (worker *wrk)
169{
170 if (wrk->dirp)
171 {
172 closedir (wrk->dirp);
173 wrk->dirp = 0;
174 }
175
176 if (wrk->dbuf)
177 {
178 free (wrk->dbuf);
179 wrk->dbuf = 0;
180 }
181}
182
183static void worker_free (worker *wrk)
184{
185 wrk->next->prev = wrk->prev;
186 wrk->prev->next = wrk->next;
187
188 free (wrk);
189}
190
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 191static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 192static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 193static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 194
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 195/*
104static volatile aio_req ress, rese; /* queue start, queue end */ 196 * a somewhat faster data structure might be nice, but
197 * with 8 priorities this actually needs <20 insns
198 * per shift, the most expensive operation.
199 */
200typedef struct {
201 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
202 int size;
203} reqq;
105 204
205static reqq req_queue;
206static reqq res_queue;
207
208int reqq_push (reqq *q, aio_req req)
209{
210 int pri = req->pri;
211 req->next = 0;
212
213 if (q->qe[pri])
214 {
215 q->qe[pri]->next = req;
216 q->qe[pri] = req;
217 }
218 else
219 q->qe[pri] = q->qs[pri] = req;
220
221 return q->size++;
222}
223
224aio_req reqq_shift (reqq *q)
225{
226 int pri;
227
228 if (!q->size)
229 return 0;
230
231 --q->size;
232
233 for (pri = NUM_PRI; pri--; )
234 {
235 aio_req req = q->qs[pri];
236
237 if (req)
238 {
239 if (!(q->qs[pri] = req->next))
240 q->qe[pri] = 0;
241
242 return req;
243 }
244 }
245
246 abort ();
247}
248
249static int poll_cb (int max);
106static void req_invoke (aio_req req); 250static void req_invoke (aio_req req);
107static void req_free (aio_req req); 251static void req_free (aio_req req);
252static void req_cancel (aio_req req);
108 253
109/* must be called at most once */ 254/* must be called at most once */
110static SV *req_sv (aio_req req, const char *klass) 255static SV *req_sv (aio_req req, const char *klass)
111{ 256{
112 if (!req->self) 257 if (!req->self)
… …
118 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 263 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
119} 264}
120 265
121static aio_req SvAIO_REQ (SV *sv) 266static aio_req SvAIO_REQ (SV *sv)
122{ 267{
268 MAGIC *mg;
269
123 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 270 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
124 croak ("object of class " AIO_REQ_KLASS " expected"); 271 croak ("object of class " AIO_REQ_KLASS " expected");
125 272
126 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 273 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
127 274
128 return mg ? (aio_req)mg->mg_ptr : 0; 275 return mg ? (aio_req)mg->mg_ptr : 0;
129} 276}
130 277
131static void aio_grp_feed (aio_req grp) 278static void aio_grp_feed (aio_req grp)
132{ 279{
133 while (grp->length < grp->fd2) 280 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
134 { 281 {
135 int old_len = grp->length; 282 int old_len = grp->length;
136 283
137 if (grp->fh2 && SvOK (grp->fh2)) 284 if (grp->fh2 && SvOK (grp->fh2))
138 { 285 {
… …
141 ENTER; 288 ENTER;
142 SAVETMPS; 289 SAVETMPS;
143 PUSHMARK (SP); 290 PUSHMARK (SP);
144 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 291 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
145 PUTBACK; 292 PUTBACK;
146 call_sv (grp->fh2, G_VOID | G_EVAL); 293 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
147 SPAGAIN; 294 SPAGAIN;
148 FREETMPS; 295 FREETMPS;
149 LEAVE; 296 LEAVE;
150 } 297 }
151 298
… …
174 } 321 }
175} 322}
176 323
177static void poll_wait () 324static void poll_wait ()
178{ 325{
179 if (nreqs && !ress)
180 {
181 fd_set rfd; 326 fd_set rfd;
327
328 while (nreqs)
329 {
330 int size;
331#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
332 LOCK (reslock);
333#endif
334 size = res_queue.size;
335#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
336 UNLOCK (reslock);
337#endif
338
339 if (size)
340 return;
341
182 FD_ZERO(&rfd); 342 FD_ZERO(&rfd);
183 FD_SET(respipe [0], &rfd); 343 FD_SET(respipe [0], &rfd);
184 344
185 select (respipe [0] + 1, &rfd, 0, 0, 0); 345 select (respipe [0] + 1, &rfd, 0, 0, 0);
186 } 346 }
187} 347}
188 348
189static void req_invoke (aio_req req) 349static void req_invoke (aio_req req)
190{ 350{
191 dSP; 351 dSP;
192 int errorno = errno;
193 352
194 if (req->cancelled || !SvOK (req->callback)) 353 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
195 return; 354 {
196
197 errno = req->errorno; 355 errno = req->errorno;
198 356
199 ENTER; 357 ENTER;
200 SAVETMPS; 358 SAVETMPS;
201 PUSHMARK (SP); 359 PUSHMARK (SP);
202 EXTEND (SP, 1); 360 EXTEND (SP, 1);
203 361
204 switch (req->type) 362 switch (req->type)
205 {
206 case REQ_READDIR:
207 { 363 {
208 SV *rv = &PL_sv_undef; 364 case REQ_READDIR:
209
210 if (req->result >= 0)
211 { 365 {
212 char *buf = req->data2ptr; 366 SV *rv = &PL_sv_undef;
213 AV *av = newAV ();
214 367
215 while (req->result) 368 if (req->result >= 0)
216 { 369 {
370 int i;
371 char *buf = req->data2ptr;
372 AV *av = newAV ();
373
374 av_extend (av, req->result - 1);
375
376 for (i = 0; i < req->result; ++i)
377 {
217 SV *sv = newSVpv (buf, 0); 378 SV *sv = newSVpv (buf, 0);
218 379
219 av_push (av, sv); 380 av_store (av, i, sv);
220 buf += SvCUR (sv) + 1; 381 buf += SvCUR (sv) + 1;
221 req->result--; 382 }
383
384 rv = sv_2mortal (newRV_noinc ((SV *)av));
222 } 385 }
223 386
224 rv = sv_2mortal (newRV_noinc ((SV *)av)); 387 PUSHs (rv);
225 } 388 }
389 break;
226 390
227 PUSHs (rv); 391 case REQ_OPEN:
392 {
393 /* convert fd to fh */
394 SV *fh;
395
396 PUSHs (sv_2mortal (newSViv (req->result)));
397 PUTBACK;
398 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
399 SPAGAIN;
400
401 fh = SvREFCNT_inc (POPs);
402
403 PUSHMARK (SP);
404 XPUSHs (sv_2mortal (fh));
405 }
406 break;
407
408 case REQ_GROUP:
409 req->fd = 2; /* mark group as finished */
410
411 if (req->data)
412 {
413 int i;
414 AV *av = (AV *)req->data;
415
416 EXTEND (SP, AvFILL (av) + 1);
417 for (i = 0; i <= AvFILL (av); ++i)
418 PUSHs (*av_fetch (av, i, 0));
419 }
420 break;
421
422 case REQ_NOP:
423 case REQ_BUSY:
424 break;
425
426 default:
427 PUSHs (sv_2mortal (newSViv (req->result)));
428 break;
228 } 429 }
229 break;
230 430
231 case REQ_OPEN:
232 {
233 /* convert fd to fh */
234 SV *fh;
235 431
236 PUSHs (sv_2mortal (newSViv (req->result)));
237 PUTBACK; 432 PUTBACK;
238 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
239 SPAGAIN;
240
241 fh = SvREFCNT_inc (POPs);
242
243 PUSHMARK (SP);
244 XPUSHs (sv_2mortal (fh));
245 }
246 break;
247
248 case REQ_GROUP:
249 req->fd = 2; /* mark group as finished */
250
251 if (req->data)
252 {
253 int i;
254 AV *av = (AV *)req->data;
255
256 EXTEND (SP, AvFILL (av) + 1);
257 for (i = 0; i <= AvFILL (av); ++i)
258 PUSHs (*av_fetch (av, i, 0));
259 }
260 break;
261
262 case REQ_SLEEP:
263 break;
264
265 default:
266 PUSHs (sv_2mortal (newSViv (req->result)));
267 break;
268 }
269
270
271 PUTBACK;
272 call_sv (req->callback, G_VOID | G_EVAL); 433 call_sv (req->callback, G_VOID | G_EVAL);
273 SPAGAIN; 434 SPAGAIN;
274 435
275 FREETMPS; 436 FREETMPS;
276 LEAVE; 437 LEAVE;
277
278 errno = errorno;
279
280 if (SvTRUE (ERRSV))
281 { 438 }
282 req_free (req);
283 croak (0);
284 }
285}
286 439
287static void req_free (aio_req req)
288{
289 if (req->grp) 440 if (req->grp)
290 { 441 {
291 aio_req grp = req->grp; 442 aio_req grp = req->grp;
292 443
293 /* unlink request */ 444 /* unlink request */
… …
298 grp->grp_first = req->grp_next; 449 grp->grp_first = req->grp_next;
299 450
300 aio_grp_dec (grp); 451 aio_grp_dec (grp);
301 } 452 }
302 453
454 if (SvTRUE (ERRSV))
455 {
456 req_free (req);
457 croak (0);
458 }
459}
460
461static void req_free (aio_req req)
462{
303 if (req->self) 463 if (req->self)
304 { 464 {
305 sv_unmagic (req->self, PERL_MAGIC_ext); 465 sv_unmagic (req->self, PERL_MAGIC_ext);
306 SvREFCNT_dec (req->self); 466 SvREFCNT_dec (req->self);
307 } 467 }
… …
310 SvREFCNT_dec (req->fh); 470 SvREFCNT_dec (req->fh);
311 SvREFCNT_dec (req->fh2); 471 SvREFCNT_dec (req->fh2);
312 SvREFCNT_dec (req->callback); 472 SvREFCNT_dec (req->callback);
313 Safefree (req->statdata); 473 Safefree (req->statdata);
314 474
315 if (req->type == REQ_READDIR && req->result >= 0) 475 if (req->type == REQ_READDIR)
316 free (req->data2ptr); 476 free (req->data2ptr);
317 477
318 Safefree (req); 478 Safefree (req);
319} 479}
320 480
481static void req_cancel_subs (aio_req grp)
482{
483 aio_req sub;
484
485 if (grp->type != REQ_GROUP)
486 return;
487
488 SvREFCNT_dec (grp->fh2);
489 grp->fh2 = 0;
490
491 for (sub = grp->grp_first; sub; sub = sub->grp_next)
492 req_cancel (sub);
493}
494
321static void req_cancel (aio_req req) 495static void req_cancel (aio_req req)
322{ 496{
323 req->cancelled = 1; 497 req->flags |= FLAG_CANCELLED;
324 498
325 if (req->type == REQ_GROUP) 499 req_cancel_subs (req);
326 {
327 aio_req sub;
328
329 for (sub = req->grp_first; sub; sub = sub->grp_next)
330 req_cancel (sub);
331 }
332} 500}
333 501
334static int poll_cb () 502static int poll_cb (int max)
335{ 503{
336 dSP; 504 dSP;
337 int count = 0; 505 int count = 0;
338 int do_croak = 0; 506 int do_croak = 0;
339 aio_req req; 507 aio_req req;
340 508
341 for (;;) 509 for (;;)
342 { 510 {
343 pthread_mutex_lock (&reslock); 511 while (max <= 0 || count < max)
344 req = ress;
345
346 if (req)
347 { 512 {
348 ress = req->next; 513 LOCK (reslock);
514 req = reqq_shift (&res_queue);
349 515
350 if (!ress) 516 if (req)
351 { 517 {
518 if (!res_queue.size)
519 {
352 /* read any signals sent by the worker threads */ 520 /* read any signals sent by the worker threads */
353 char buf [32]; 521 char buf [32];
354 while (read (respipe [0], buf, 32) == 32) 522 while (read (respipe [0], buf, 32) == 32)
523 ;
355 ; 524 }
356
357 rese = 0;
358 } 525 }
526
527 UNLOCK (reslock);
528
529 if (!req)
530 break;
531
532 --nreqs;
533
534 if (req->type == REQ_QUIT)
535 --started;
536 else if (req->type == REQ_GROUP && req->length)
537 {
538 req->fd = 1; /* mark request as delayed */
539 continue;
540 }
541 else
542 {
543 if (req->type == REQ_READ)
544 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
545
546 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
547 SvREADONLY_off (req->data);
548
549 if (req->statdata)
550 {
551 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
552 PL_laststatval = req->result;
553 PL_statcache = *(req->statdata);
554 }
555
556 req_invoke (req);
557
558 count++;
559 }
560
561 req_free (req);
359 } 562 }
360 563
361 pthread_mutex_unlock (&reslock); 564 if (nreqs <= max_outstanding)
362
363 if (!req)
364 break; 565 break;
365 566
366 --nreqs; 567 poll_wait ();
367 568
368 if (req->type == REQ_QUIT) 569 max = 0;
369 started--;
370 else if (req->type == REQ_GROUP && req->length)
371 {
372 req->fd = 1; /* mark request as delayed */
373 continue;
374 }
375 else
376 {
377 if (req->type == REQ_READ)
378 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
379
380 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
381 SvREADONLY_off (req->data);
382
383 if (req->statdata)
384 {
385 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
386 PL_laststatval = req->result;
387 PL_statcache = *(req->statdata);
388 }
389
390 req_invoke (req);
391
392 count++;
393 }
394
395 req_free (req);
396 } 570 }
397 571
398 return count; 572 return count;
399} 573}
400 574
401static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
402 576
403static void start_thread (void) 577static void start_thread (void)
404{ 578{
405 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
406 pthread_t tid;
407 pthread_attr_t attr; 580 pthread_attr_t attr;
581
582 worker *wrk = calloc (1, sizeof (worker));
583
584 if (!wrk)
585 croak ("unable to allocate worker thread data");
408 586
409 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
410 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
411 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
412 590
413 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
592
593 LOCK (wrklock);
414 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
415 595
416 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 596 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
597 {
598 wrk->prev = &wrk_first;
599 wrk->next = wrk_first.next;
600 wrk_first.next->prev = wrk;
601 wrk_first.next = wrk;
417 started++; 602 ++started;
603 }
604 else
605 free (wrk);
418 606
419 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock);
420} 609}
421 610
422static void req_send (aio_req req) 611static void req_send (aio_req req)
423{ 612{
424 while (started < wanted && nreqs >= started) 613 while (started < wanted && nreqs >= started)
425 start_thread (); 614 start_thread ();
426 615
427 ++nreqs; 616 ++nreqs;
428 617
429 pthread_mutex_lock (&reqlock); 618 LOCK (reqlock);
430 619 reqq_push (&req_queue, req);
431 req->next = 0;
432
433 if (reqe)
434 {
435 reqe->next = req;
436 reqe = req;
437 }
438 else
439 reqe = reqs = req;
440
441 pthread_cond_signal (&reqwait); 620 pthread_cond_signal (&reqwait);
442 pthread_mutex_unlock (&reqlock); 621 UNLOCK (reqlock);
443
444 if (nreqs > max_outstanding)
445 for (;;)
446 {
447 poll_cb ();
448
449 if (nreqs <= max_outstanding)
450 break;
451
452 poll_wait ();
453 }
454} 622}
455 623
456static void end_thread (void) 624static void end_thread (void)
457{ 625{
458 aio_req req; 626 aio_req req;
627
459 Newz (0, req, 1, aio_cb); 628 Newz (0, req, 1, aio_cb);
629
460 req->type = REQ_QUIT; 630 req->type = REQ_QUIT;
631 req->pri = PRI_MAX + PRI_BIAS;
461 632
462 req_send (req); 633 req_send (req);
463} 634}
464 635
465static void min_parallel (int nthreads) 636static void min_parallel (int nthreads)
… …
482 } 653 }
483 654
484 while (started > wanted) 655 while (started > wanted)
485 { 656 {
486 poll_wait (); 657 poll_wait ();
487 poll_cb (); 658 poll_cb (0);
488 } 659 }
489} 660}
490 661
491static void create_pipe () 662static void create_pipe ()
492{ 663{
… …
517static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 688static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
518{ 689{
519 ssize_t res; 690 ssize_t res;
520 off_t ooffset; 691 off_t ooffset;
521 692
522 pthread_mutex_lock (&preadwritelock); 693 LOCK (preadwritelock);
523 ooffset = lseek (fd, 0, SEEK_CUR); 694 ooffset = lseek (fd, 0, SEEK_CUR);
524 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
525 res = read (fd, buf, count); 696 res = read (fd, buf, count);
526 lseek (fd, ooffset, SEEK_SET); 697 lseek (fd, ooffset, SEEK_SET);
527 pthread_mutex_unlock (&preadwritelock); 698 UNLOCK (preadwritelock);
528 699
529 return res; 700 return res;
530} 701}
531 702
532static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 703static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
533{ 704{
534 ssize_t res; 705 ssize_t res;
535 off_t ooffset; 706 off_t ooffset;
536 707
537 pthread_mutex_lock (&preadwritelock); 708 LOCK (preadwritelock);
538 ooffset = lseek (fd, 0, SEEK_CUR); 709 ooffset = lseek (fd, 0, SEEK_CUR);
539 lseek (fd, offset, SEEK_SET); 710 lseek (fd, offset, SEEK_SET);
540 res = write (fd, buf, count); 711 res = write (fd, buf, count);
541 lseek (fd, offset, SEEK_SET); 712 lseek (fd, offset, SEEK_SET);
542 pthread_mutex_unlock (&preadwritelock); 713 UNLOCK (preadwritelock);
543 714
544 return res; 715 return res;
545} 716}
546#endif 717#endif
547 718
548#if !HAVE_FDATASYNC 719#if !HAVE_FDATASYNC
549# define fdatasync fsync 720# define fdatasync fsync
550#endif 721#endif
551 722
552#if !HAVE_READAHEAD 723#if !HAVE_READAHEAD
553# define readahead aio_readahead 724# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
554 725
555static ssize_t readahead (int fd, off_t offset, size_t count) 726static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
556{ 727{
557 char readahead_buf[4096]; 728 dBUF;
558 729
559 while (count > 0) 730 while (count > 0)
560 { 731 {
561 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 732 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
562 733
563 pread (fd, readahead_buf, len, offset); 734 pread (fd, aio_buf, len, offset);
564 offset += len; 735 offset += len;
565 count -= len; 736 count -= len;
566 } 737 }
567 738
568 errno = 0; 739 errno = 0;
569} 740}
741
570#endif 742#endif
571 743
572#if !HAVE_READDIR_R 744#if !HAVE_READDIR_R
573# define readdir_r aio_readdir_r 745# define readdir_r aio_readdir_r
574 746
… …
577static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 749static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
578{ 750{
579 struct dirent *e; 751 struct dirent *e;
580 int errorno; 752 int errorno;
581 753
582 pthread_mutex_lock (&readdirlock); 754 LOCK (readdirlock);
583 755
584 e = readdir (dirp); 756 e = readdir (dirp);
585 errorno = errno; 757 errorno = errno;
586 758
587 if (e) 759 if (e)
… …
590 strcpy (ent->d_name, e->d_name); 762 strcpy (ent->d_name, e->d_name);
591 } 763 }
592 else 764 else
593 *res = 0; 765 *res = 0;
594 766
595 pthread_mutex_unlock (&readdirlock); 767 UNLOCK (readdirlock);
596 768
597 errno = errorno; 769 errno = errorno;
598 return e ? 0 : -1; 770 return e ? 0 : -1;
599} 771}
600#endif 772#endif
601 773
602/* sendfile always needs emulation */ 774/* sendfile always needs emulation */
603static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 775static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
604{ 776{
605 ssize_t res; 777 ssize_t res;
606 778
607 if (!count) 779 if (!count)
608 return 0; 780 return 0;
… …
619 { 791 {
620 off_t sbytes; 792 off_t sbytes;
621 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 793 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
622 794
623 if (res < 0 && sbytes) 795 if (res < 0 && sbytes)
624 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 796 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
625 res = sbytes; 797 res = sbytes;
626 } 798 }
627 799
628# elif __hpux 800# elif __hpux
629 res = sendfile (ofd, ifd, offset, count, 0, 0); 801 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
657#endif 829#endif
658 ) 830 )
659 ) 831 )
660 { 832 {
661 /* emulate sendfile. this is a major pain in the ass */ 833 /* emulate sendfile. this is a major pain in the ass */
662 char buf[4096]; 834 dBUF;
835
663 res = 0; 836 res = 0;
664 837
665 while (count) 838 while (count)
666 { 839 {
667 ssize_t cnt; 840 ssize_t cnt;
668 841
669 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 842 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
670 843
671 if (cnt <= 0) 844 if (cnt <= 0)
672 { 845 {
673 if (cnt && !res) res = -1; 846 if (cnt && !res) res = -1;
674 break; 847 break;
675 } 848 }
676 849
677 cnt = write (ofd, buf, cnt); 850 cnt = write (ofd, aio_buf, cnt);
678 851
679 if (cnt <= 0) 852 if (cnt <= 0)
680 { 853 {
681 if (cnt && !res) res = -1; 854 if (cnt && !res) res = -1;
682 break; 855 break;
… …
690 863
691 return res; 864 return res;
692} 865}
693 866
694/* read a full directory */ 867/* read a full directory */
695static int scandir_ (const char *path, void **namesp) 868static void scandir_ (aio_req req, worker *self)
696{ 869{
697 DIR *dirp = opendir (path); 870 DIR *dirp;
698 union 871 union
699 { 872 {
700 struct dirent d; 873 struct dirent d;
701 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 874 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
702 } u; 875 } *u;
703 struct dirent *entp; 876 struct dirent *entp;
704 char *name, *names; 877 char *name, *names;
705 int memlen = 4096; 878 int memlen = 4096;
706 int memofs = 0; 879 int memofs = 0;
707 int res = 0; 880 int res = 0;
708 int errorno; 881 int errorno;
709 882
710 if (!dirp) 883 LOCK (wrklock);
711 return -1; 884 self->dirp = dirp = opendir (req->dataptr);
712 885 self->dbuf = u = malloc (sizeof (*u));
713 names = malloc (memlen); 886 req->data2ptr = names = malloc (memlen);
887 UNLOCK (wrklock);
714 888
889 if (dirp && u && names)
715 for (;;) 890 for (;;)
716 { 891 {
892 errno = 0;
717 errno = 0, readdir_r (dirp, &u.d, &entp); 893 readdir_r (dirp, &u->d, &entp);
718 894
719 if (!entp) 895 if (!entp)
720 break; 896 break;
721 897
722 name = entp->d_name; 898 name = entp->d_name;
723 899
724 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 900 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
725 { 901 {
726 int len = strlen (name) + 1; 902 int len = strlen (name) + 1;
727 903
728 res++; 904 res++;
729 905
730 while (memofs + len > memlen) 906 while (memofs + len > memlen)
731 { 907 {
732 memlen *= 2; 908 memlen *= 2;
909 LOCK (wrklock);
733 names = realloc (names, memlen); 910 req->data2ptr = names = realloc (names, memlen);
911 UNLOCK (wrklock);
912
734 if (!names) 913 if (!names)
735 break; 914 break;
736 } 915 }
737 916
738 memcpy (names + memofs, name, len); 917 memcpy (names + memofs, name, len);
739 memofs += len; 918 memofs += len;
740 } 919 }
741 } 920 }
742 921
743 errorno = errno;
744 closedir (dirp);
745
746 if (errorno) 922 if (errno)
747 {
748 free (names);
749 errno = errorno;
750 res = -1; 923 res = -1;
751 } 924
752 925 req->result = res;
753 *namesp = (void *)names;
754 return res;
755} 926}
756 927
757/*****************************************************************************/ 928/*****************************************************************************/
758 929
759static void *aio_proc (void *thr_arg) 930static void *aio_proc (void *thr_arg)
760{ 931{
761 aio_req req; 932 aio_req req;
762 int type; 933 int type;
934 worker *self = (worker *)thr_arg;
763 935
764 do 936 do
765 { 937 {
766 pthread_mutex_lock (&reqlock); 938 LOCK (reqlock);
767 939
768 for (;;) 940 for (;;)
769 { 941 {
770 req = reqs; 942 self->req = req = reqq_shift (&req_queue);
771
772 if (reqs)
773 {
774 reqs = reqs->next;
775 if (!reqs) reqe = 0;
776 }
777 943
778 if (req) 944 if (req)
779 break; 945 break;
780 946
781 pthread_cond_wait (&reqwait, &reqlock); 947 pthread_cond_wait (&reqwait, &reqlock);
782 } 948 }
783 949
784 pthread_mutex_unlock (&reqlock); 950 UNLOCK (reqlock);
785 951
786 errno = 0; /* strictly unnecessary */ 952 errno = 0; /* strictly unnecessary */
787
788 if (!req->cancelled)
789 switch (type = req->type) /* remember type for QUIT check */ 953 type = req->type; /* remember type for QUIT check */
954
955 if (!(req->flags & FLAG_CANCELLED))
956 switch (type)
790 { 957 {
791 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 958 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
792 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 959 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
793 960
794 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 961 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
795 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 962 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
796 963
797 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 964 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
798 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 965 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
799 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 966 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
800 967
… …
806 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 973 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
807 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 974 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
808 975
809 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 976 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
810 case REQ_FSYNC: req->result = fsync (req->fd); break; 977 case REQ_FSYNC: req->result = fsync (req->fd); break;
811 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 978 case REQ_READDIR: scandir_ (req, self); break;
812 979
813 case REQ_SLEEP: 980 case REQ_BUSY:
814 { 981 {
815 struct timeval tv; 982 struct timeval tv;
816 983
817 tv.tv_sec = req->fd; 984 tv.tv_sec = req->fd;
818 tv.tv_usec = req->fd2; 985 tv.tv_usec = req->fd2;
819 986
820 req->result = select (0, 0, 0, 0, &tv); 987 req->result = select (0, 0, 0, 0, &tv);
821 } 988 }
822 989
990 case REQ_GROUP:
991 case REQ_NOP:
823 case REQ_QUIT: 992 case REQ_QUIT:
824 break; 993 break;
825 994
826 default: 995 default:
827 req->result = ENOSYS; 996 req->result = ENOSYS;
828 break; 997 break;
829 } 998 }
830 999
831 req->errorno = errno; 1000 req->errorno = errno;
832 1001
833 pthread_mutex_lock (&reslock); 1002 LOCK (reslock);
834 1003
835 req->next = 0; 1004 if (!reqq_push (&res_queue, req))
836
837 printf ("queue rese %p\n", rese);//D
838 if (rese)
839 {
840 rese->next = req;
841 rese = req;
842 }
843 else
844 {
845 rese = ress = req;
846
847 /* write a dummy byte to the pipe so fh becomes ready */ 1005 /* write a dummy byte to the pipe so fh becomes ready */
848 write (respipe [1], &respipe, 1); 1006 write (respipe [1], &respipe, 1);
849 }
850 1007
851 pthread_mutex_unlock (&reslock); 1008 self->req = 0;
1009 worker_clear (self);
1010
1011 UNLOCK (reslock);
852 } 1012 }
853 while (type != REQ_QUIT); 1013 while (type != REQ_QUIT);
854 1014
1015 LOCK (wrklock);
1016 worker_free (self);
1017 UNLOCK (wrklock);
1018
855 return 0; 1019 return 0;
856} 1020}
857 1021
858/*****************************************************************************/ 1022/*****************************************************************************/
859 1023
860static void atfork_prepare (void) 1024static void atfork_prepare (void)
861{ 1025{
862 pthread_mutex_lock (&reqlock); 1026 LOCK (wrklock);
863 pthread_mutex_lock (&reslock); 1027 LOCK (reqlock);
1028 LOCK (reslock);
864#if !HAVE_PREADWRITE 1029#if !HAVE_PREADWRITE
865 pthread_mutex_lock (&preadwritelock); 1030 LOCK (preadwritelock);
866#endif 1031#endif
867#if !HAVE_READDIR_R 1032#if !HAVE_READDIR_R
868 pthread_mutex_lock (&readdirlock); 1033 LOCK (readdirlock);
869#endif 1034#endif
870} 1035}
871 1036
872static void atfork_parent (void) 1037static void atfork_parent (void)
873{ 1038{
874#if !HAVE_READDIR_R 1039#if !HAVE_READDIR_R
875 pthread_mutex_unlock (&readdirlock); 1040 UNLOCK (readdirlock);
876#endif 1041#endif
877#if !HAVE_PREADWRITE 1042#if !HAVE_PREADWRITE
878 pthread_mutex_unlock (&preadwritelock); 1043 UNLOCK (preadwritelock);
879#endif 1044#endif
880 pthread_mutex_unlock (&reslock); 1045 UNLOCK (reslock);
881 pthread_mutex_unlock (&reqlock); 1046 UNLOCK (reqlock);
1047 UNLOCK (wrklock);
882} 1048}
883 1049
884static void atfork_child (void) 1050static void atfork_child (void)
885{ 1051{
886 aio_req prv; 1052 aio_req prv;
887 1053
1054 while (prv = reqq_shift (&req_queue))
1055 req_free (prv);
1056
1057 while (prv = reqq_shift (&res_queue))
1058 req_free (prv);
1059
1060 while (wrk_first.next != &wrk_first)
1061 {
1062 worker *wrk = wrk_first.next;
1063
1064 if (wrk->req)
1065 req_free (wrk->req);
1066
1067 worker_clear (wrk);
1068 worker_free (wrk);
1069 }
1070
888 started = 0; 1071 started = 0;
889 1072 nreqs = 0;
890 while (reqs)
891 {
892 prv = reqs;
893 reqs = prv->next;
894 req_free (prv);
895 }
896
897 reqs = reqe = 0;
898
899 while (ress)
900 {
901 prv = ress;
902 ress = prv->next;
903 req_free (prv);
904 }
905
906 ress = rese = 0;
907 1073
908 close (respipe [0]); 1074 close (respipe [0]);
909 close (respipe [1]); 1075 close (respipe [1]);
910 create_pipe (); 1076 create_pipe ();
911 1077
912 atfork_parent (); 1078 atfork_parent ();
913} 1079}
914 1080
915#define dREQ \ 1081#define dREQ \
916 aio_req req; \ 1082 aio_req req; \
1083 int req_pri = next_pri; \
1084 next_pri = DEFAULT_PRI + PRI_BIAS; \
917 \ 1085 \
918 if (SvOK (callback) && !SvROK (callback)) \ 1086 if (SvOK (callback) && !SvROK (callback)) \
919 croak ("callback must be undef or of reference type"); \ 1087 croak ("callback must be undef or of reference type"); \
920 \ 1088 \
921 Newz (0, req, 1, aio_cb); \ 1089 Newz (0, req, 1, aio_cb); \
922 if (!req) \ 1090 if (!req) \
923 croak ("out of memory during aio_req allocation"); \ 1091 croak ("out of memory during aio_req allocation"); \
924 \ 1092 \
925 req->callback = newSVsv (callback) 1093 req->callback = newSVsv (callback); \
1094 req->pri = req_pri
926 1095
927#define REQ_SEND \ 1096#define REQ_SEND \
928 req_send (req); \ 1097 req_send (req); \
929 \ 1098 \
930 if (GIMME_V != G_VOID) \ 1099 if (GIMME_V != G_VOID) \
… …
944 create_pipe (); 1113 create_pipe ();
945 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1114 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
946} 1115}
947 1116
948void 1117void
949min_parallel (nthreads) 1118min_parallel (int nthreads)
950 int nthreads
951 PROTOTYPE: $ 1119 PROTOTYPE: $
952 1120
953void 1121void
954max_parallel (nthreads) 1122max_parallel (int nthreads)
955 int nthreads
956 PROTOTYPE: $ 1123 PROTOTYPE: $
957 1124
958int 1125int
959max_outstanding (nreqs) 1126max_outstanding (int maxreqs)
960 int nreqs 1127 PROTOTYPE: $
961 PROTOTYPE: $
962 CODE: 1128 CODE:
963 RETVAL = max_outstanding; 1129 RETVAL = max_outstanding;
964 max_outstanding = nreqs; 1130 max_outstanding = maxreqs;
1131 OUTPUT:
1132 RETVAL
965 1133
966void 1134void
967aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1135aio_open (pathname,flags,mode,callback=&PL_sv_undef)
968 SV * pathname 1136 SV * pathname
969 int flags 1137 int flags
… …
1184 1352
1185 REQ_SEND; 1353 REQ_SEND;
1186} 1354}
1187 1355
1188void 1356void
1189aio_sleep (delay,callback=&PL_sv_undef) 1357aio_busy (delay,callback=&PL_sv_undef)
1190 double delay 1358 double delay
1191 SV * callback 1359 SV * callback
1192 PPCODE: 1360 PPCODE:
1193{ 1361{
1194 dREQ; 1362 dREQ;
1195 1363
1196 req->type = REQ_SLEEP; 1364 req->type = REQ_BUSY;
1197 req->fd = delay < 0. ? 0 : delay; 1365 req->fd = delay < 0. ? 0 : delay;
1198 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1366 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1199 1367
1200 REQ_SEND; 1368 REQ_SEND;
1201} 1369}
… …
1205 SV * callback 1373 SV * callback
1206 PROTOTYPE: ;$ 1374 PROTOTYPE: ;$
1207 PPCODE: 1375 PPCODE:
1208{ 1376{
1209 dREQ; 1377 dREQ;
1378
1210 req->type = REQ_GROUP; 1379 req->type = REQ_GROUP;
1211 req_send (req); 1380 req_send (req);
1381
1212 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1382 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1213} 1383}
1384
1385void
1386aio_nop (callback=&PL_sv_undef)
1387 SV * callback
1388 PPCODE:
1389{
1390 dREQ;
1391
1392 req->type = REQ_NOP;
1393
1394 REQ_SEND;
1395}
1396
1397void
1398aioreq_pri (int pri = DEFAULT_PRI)
1399 CODE:
1400 if (pri < PRI_MIN) pri = PRI_MIN;
1401 if (pri > PRI_MAX) pri = PRI_MAX;
1402 next_pri = pri + PRI_BIAS;
1403
1404void
1405aioreq_nice (int nice = 0)
1406 CODE:
1407 nice = next_pri - nice;
1408 if (nice < PRI_MIN) nice = PRI_MIN;
1409 if (nice > PRI_MAX) nice = PRI_MAX;
1410 next_pri = nice + PRI_BIAS;
1214 1411
1215void 1412void
1216flush () 1413flush ()
1217 PROTOTYPE: 1414 PROTOTYPE:
1218 CODE: 1415 CODE:
1219 while (nreqs) 1416 while (nreqs)
1220 { 1417 {
1221 poll_wait (); 1418 poll_wait ();
1222 poll_cb (); 1419 poll_cb (0);
1223 } 1420 }
1224 1421
1225void 1422void
1226poll() 1423poll()
1227 PROTOTYPE: 1424 PROTOTYPE:
1228 CODE: 1425 CODE:
1229 if (nreqs) 1426 if (nreqs)
1230 { 1427 {
1231 poll_wait (); 1428 poll_wait ();
1232 poll_cb (); 1429 poll_cb (0);
1233 } 1430 }
1234 1431
1235int 1432int
1236poll_fileno() 1433poll_fileno()
1237 PROTOTYPE: 1434 PROTOTYPE:
… …
1242 1439
1243int 1440int
1244poll_cb(...) 1441poll_cb(...)
1245 PROTOTYPE: 1442 PROTOTYPE:
1246 CODE: 1443 CODE:
1247 RETVAL = poll_cb (); 1444 RETVAL = poll_cb (0);
1445 OUTPUT:
1446 RETVAL
1447
1448int
1449poll_some(int max = 0)
1450 PROTOTYPE: $
1451 CODE:
1452 RETVAL = poll_cb (max);
1248 OUTPUT: 1453 OUTPUT:
1249 RETVAL 1454 RETVAL
1250 1455
1251void 1456void
1252poll_wait() 1457poll_wait()
… …
1267 1472
1268MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1473MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1269 1474
1270void 1475void
1271cancel (aio_req_ornot req) 1476cancel (aio_req_ornot req)
1272 PROTOTYPE:
1273 CODE: 1477 CODE:
1274 req_cancel (req); 1478 req_cancel (req);
1275 1479
1480void
1481cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1482 CODE:
1483 SvREFCNT_dec (req->callback);
1484 req->callback = newSVsv (callback);
1485
1276MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1486MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1277 1487
1278void 1488void
1279add (aio_req grp, ...) 1489add (aio_req grp, ...)
1280 PPCODE: 1490 PPCODE:
1281{ 1491{
1282 int i; 1492 int i;
1493 aio_req req;
1283 1494
1284 if (grp->fd == 2) 1495 if (grp->fd == 2)
1285 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1496 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1286 1497
1287 for (i = 1; i < items; ++i ) 1498 for (i = 1; i < items; ++i )
1288 { 1499 {
1289 if (GIMME_V != G_VOID) 1500 if (GIMME_V != G_VOID)
1290 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1501 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1291 1502
1292 aio_req req = SvAIO_REQ (ST (i)); 1503 req = SvAIO_REQ (ST (i));
1293 1504
1294 if (req) 1505 if (req)
1295 { 1506 {
1296 ++grp->length; 1507 ++grp->length;
1297 req->grp = grp; 1508 req->grp = grp;
… …
1306 } 1517 }
1307 } 1518 }
1308} 1519}
1309 1520
1310void 1521void
1522cancel_subs (aio_req_ornot req)
1523 CODE:
1524 req_cancel_subs (req);
1525
1526void
1311result (aio_req grp, ...) 1527result (aio_req grp, ...)
1312 CODE: 1528 CODE:
1313{ 1529{
1314 int i; 1530 int i;
1315 AV *av = newAV (); 1531 AV *av = newAV ();
… …
1320 SvREFCNT_dec (grp->data); 1536 SvREFCNT_dec (grp->data);
1321 grp->data = (SV *)av; 1537 grp->data = (SV *)av;
1322} 1538}
1323 1539
1324void 1540void
1325lock (aio_req grp)
1326 CODE:
1327 ++grp->length;
1328
1329void
1330unlock (aio_req grp)
1331 CODE:
1332 aio_grp_dec (grp);
1333
1334void
1335feeder_limit (aio_req grp, int limit) 1541limit (aio_req grp, int limit)
1336 CODE: 1542 CODE:
1337 grp->fd2 = limit; 1543 grp->fd2 = limit;
1338 aio_grp_feed (grp); 1544 aio_grp_feed (grp);
1339 1545
1340void 1546void
1341set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1547feed (aio_req grp, SV *callback=&PL_sv_undef)
1342 CODE: 1548 CODE:
1343{ 1549{
1344 SvREFCNT_dec (grp->fh2); 1550 SvREFCNT_dec (grp->fh2);
1345 grp->fh2 = newSVsv (callback); 1551 grp->fh2 = newSVsv (callback);
1346 1552

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines