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

Diff Legend

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