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.63 by root, Mon Oct 23 23:48:31 2006 UTC vs.
Revision 1.78 by root, Thu Oct 26 14:35:34 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
… …
44/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 49#ifndef NAME_MAX
46# define NAME_MAX 4096 50# define NAME_MAX 4096
47#endif 51#endif
48 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
49#if __ia64 58#if __ia64
50# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
51#else 62#else
52# define STACKSIZE 8192 63# define STACKSIZE 16384
53#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;
54 76
55enum { 77enum {
56 REQ_QUIT, 78 REQ_QUIT,
57 REQ_OPEN, REQ_CLOSE, 79 REQ_OPEN, REQ_CLOSE,
58 REQ_READ, REQ_WRITE, REQ_READAHEAD, 80 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
61 REQ_FSYNC, REQ_FDATASYNC, 83 REQ_FSYNC, REQ_FDATASYNC,
62 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
63 REQ_READDIR, 85 REQ_READDIR,
64 REQ_LINK, REQ_SYMLINK, 86 REQ_LINK, REQ_SYMLINK,
65 REQ_GROUP, REQ_NOP, 87 REQ_GROUP, REQ_NOP,
66 REQ_SLEEP, 88 REQ_BUSY,
67}; 89};
68 90
69#define AIO_REQ_KLASS "IO::AIO::REQ" 91#define AIO_REQ_KLASS "IO::AIO::REQ"
70#define AIO_GRP_KLASS "IO::AIO::GRP" 92#define AIO_GRP_KLASS "IO::AIO::GRP"
71 93
… …
105 PRI_MIN = -4, 127 PRI_MIN = -4,
106 PRI_MAX = 4, 128 PRI_MAX = 4,
107 129
108 DEFAULT_PRI = 0, 130 DEFAULT_PRI = 0,
109 PRI_BIAS = -PRI_MIN, 131 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
110}; 133};
111 134
112static int next_pri = DEFAULT_PRI + PRI_BIAS; 135static int next_pri = DEFAULT_PRI + PRI_BIAS;
113 136
114static int started, wanted; 137static unsigned int started, wanted;
115static volatile int nreqs; 138static volatile unsigned int nreqs;
116static int max_outstanding = 1<<30; 139static volatile unsigned int max_outstanding = 0xffffffff;
117static int respipe [2]; 140static int respipe [2];
118 141
119#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 142#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
120# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 143# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121#else 144#else
122# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 145# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123#endif 146#endif
124 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
125static pthread_mutex_t reslock = AIO_MUTEX_INIT; 191static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 192static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 193static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128 194
129static volatile aio_req reqs, reqe; /* queue start, queue end */ 195/*
130static 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;
131 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);
132static void req_invoke (aio_req req); 250static void req_invoke (aio_req req);
133static void req_free (aio_req req); 251static void req_free (aio_req req);
252static void req_cancel (aio_req req);
134 253
135/* must be called at most once */ 254/* must be called at most once */
136static SV *req_sv (aio_req req, const char *klass) 255static SV *req_sv (aio_req req, const char *klass)
137{ 256{
138 if (!req->self) 257 if (!req->self)
… …
169 ENTER; 288 ENTER;
170 SAVETMPS; 289 SAVETMPS;
171 PUSHMARK (SP); 290 PUSHMARK (SP);
172 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 291 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
173 PUTBACK; 292 PUTBACK;
174 call_sv (grp->fh2, G_VOID | G_EVAL); 293 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
175 SPAGAIN; 294 SPAGAIN;
176 FREETMPS; 295 FREETMPS;
177 LEAVE; 296 LEAVE;
178 } 297 }
179 298
… …
206{ 325{
207 fd_set rfd; 326 fd_set rfd;
208 327
209 while (nreqs) 328 while (nreqs)
210 { 329 {
211 aio_req req; 330 int size;
212 pthread_mutex_lock (&reslock); 331#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
213 req = ress; 332 LOCK (reslock);
214 pthread_mutex_unlock (&reslock); 333#endif
334 size = res_queue.size;
335#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
336 UNLOCK (reslock);
337#endif
215 338
216 if (req) 339 if (size)
217 return; 340 return;
218 341
219 FD_ZERO(&rfd); 342 FD_ZERO(&rfd);
220 FD_SET(respipe [0], &rfd); 343 FD_SET(respipe [0], &rfd);
221 344
… …
224} 347}
225 348
226static void req_invoke (aio_req req) 349static void req_invoke (aio_req req)
227{ 350{
228 dSP; 351 dSP;
229 int errorno = errno;
230 352
231 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 353 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
232 return; 354 {
233
234 errno = req->errorno; 355 errno = req->errorno;
235 356
236 ENTER; 357 ENTER;
237 SAVETMPS; 358 SAVETMPS;
238 PUSHMARK (SP); 359 PUSHMARK (SP);
239 EXTEND (SP, 1); 360 EXTEND (SP, 1);
240 361
241 switch (req->type) 362 switch (req->type)
242 {
243 case REQ_READDIR:
244 { 363 {
245 SV *rv = &PL_sv_undef; 364 case REQ_READDIR:
246
247 if (req->result >= 0)
248 { 365 {
249 char *buf = req->data2ptr; 366 SV *rv = &PL_sv_undef;
250 AV *av = newAV ();
251 367
252 while (req->result) 368 if (req->result >= 0)
253 { 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 {
254 SV *sv = newSVpv (buf, 0); 378 SV *sv = newSVpv (buf, 0);
255 379
256 av_push (av, sv); 380 av_store (av, i, sv);
257 buf += SvCUR (sv) + 1; 381 buf += SvCUR (sv) + 1;
258 req->result--; 382 }
383
384 rv = sv_2mortal (newRV_noinc ((SV *)av));
259 } 385 }
260 386
261 rv = sv_2mortal (newRV_noinc ((SV *)av)); 387 PUSHs (rv);
262 } 388 }
389 break;
263 390
264 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;
265 } 429 }
266 break;
267 430
268 case REQ_OPEN:
269 {
270 /* convert fd to fh */
271 SV *fh;
272 431
273 PUSHs (sv_2mortal (newSViv (req->result)));
274 PUTBACK; 432 PUTBACK;
275 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
276 SPAGAIN;
277
278 fh = SvREFCNT_inc (POPs);
279
280 PUSHMARK (SP);
281 XPUSHs (sv_2mortal (fh));
282 }
283 break;
284
285 case REQ_GROUP:
286 req->fd = 2; /* mark group as finished */
287
288 if (req->data)
289 {
290 int i;
291 AV *av = (AV *)req->data;
292
293 EXTEND (SP, AvFILL (av) + 1);
294 for (i = 0; i <= AvFILL (av); ++i)
295 PUSHs (*av_fetch (av, i, 0));
296 }
297 break;
298
299 case REQ_NOP:
300 case REQ_SLEEP:
301 break;
302
303 default:
304 PUSHs (sv_2mortal (newSViv (req->result)));
305 break;
306 }
307
308
309 PUTBACK;
310 call_sv (req->callback, G_VOID | G_EVAL); 433 call_sv (req->callback, G_VOID | G_EVAL);
311 SPAGAIN; 434 SPAGAIN;
312 435
313 FREETMPS; 436 FREETMPS;
314 LEAVE; 437 LEAVE;
315
316 errno = errorno;
317
318 if (SvTRUE (ERRSV))
319 { 438 }
320 req_free (req);
321 croak (0);
322 }
323}
324 439
325static void req_free (aio_req req)
326{
327 if (req->grp) 440 if (req->grp)
328 { 441 {
329 aio_req grp = req->grp; 442 aio_req grp = req->grp;
330 443
331 /* unlink request */ 444 /* unlink request */
… …
336 grp->grp_first = req->grp_next; 449 grp->grp_first = req->grp_next;
337 450
338 aio_grp_dec (grp); 451 aio_grp_dec (grp);
339 } 452 }
340 453
454 if (SvTRUE (ERRSV))
455 {
456 req_free (req);
457 croak (0);
458 }
459}
460
461static void req_free (aio_req req)
462{
341 if (req->self) 463 if (req->self)
342 { 464 {
343 sv_unmagic (req->self, PERL_MAGIC_ext); 465 sv_unmagic (req->self, PERL_MAGIC_ext);
344 SvREFCNT_dec (req->self); 466 SvREFCNT_dec (req->self);
345 } 467 }
… …
348 SvREFCNT_dec (req->fh); 470 SvREFCNT_dec (req->fh);
349 SvREFCNT_dec (req->fh2); 471 SvREFCNT_dec (req->fh2);
350 SvREFCNT_dec (req->callback); 472 SvREFCNT_dec (req->callback);
351 Safefree (req->statdata); 473 Safefree (req->statdata);
352 474
353 if (req->type == REQ_READDIR && req->result >= 0) 475 if (req->type == REQ_READDIR)
354 free (req->data2ptr); 476 free (req->data2ptr);
355 477
356 Safefree (req); 478 Safefree (req);
357} 479}
358 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
359static void req_cancel (aio_req req) 495static void req_cancel (aio_req req)
360{ 496{
361 req->flags |= FLAG_CANCELLED; 497 req->flags |= FLAG_CANCELLED;
362 498
363 if (req->type == REQ_GROUP) 499 req_cancel_subs (req);
364 {
365 aio_req sub;
366
367 for (sub = req->grp_first; sub; sub = sub->grp_next)
368 req_cancel (sub);
369 }
370} 500}
371 501
372static int poll_cb () 502static int poll_cb (int max)
373{ 503{
374 dSP; 504 dSP;
375 int count = 0; 505 int count = 0;
376 int do_croak = 0; 506 int do_croak = 0;
377 aio_req req; 507 aio_req req;
378 508
379 for (;;) 509 for (;;)
380 { 510 {
381 pthread_mutex_lock (&reslock); 511 while (max <= 0 || count < max)
382 req = ress;
383
384 if (req)
385 { 512 {
386 ress = req->next; 513 LOCK (reslock);
514 req = reqq_shift (&res_queue);
387 515
388 if (!ress) 516 if (req)
389 { 517 {
518 if (!res_queue.size)
519 {
390 /* read any signals sent by the worker threads */ 520 /* read any signals sent by the worker threads */
391 char buf [32]; 521 char buf [32];
392 while (read (respipe [0], buf, 32) == 32) 522 while (read (respipe [0], buf, 32) == 32)
523 ;
393 ; 524 }
394
395 rese = 0;
396 } 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);
397 } 562 }
398 563
399 pthread_mutex_unlock (&reslock); 564 if (nreqs <= max_outstanding)
400
401 if (!req)
402 break; 565 break;
403 566
404 --nreqs; 567 poll_wait ();
405 568
406 if (req->type == REQ_QUIT) 569 max = 0;
407 started--;
408 else if (req->type == REQ_GROUP && req->length)
409 {
410 req->fd = 1; /* mark request as delayed */
411 continue;
412 }
413 else
414 {
415 if (req->type == REQ_READ)
416 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
417
418 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
419 SvREADONLY_off (req->data);
420
421 if (req->statdata)
422 {
423 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
424 PL_laststatval = req->result;
425 PL_statcache = *(req->statdata);
426 }
427
428 req_invoke (req);
429
430 count++;
431 }
432
433 req_free (req);
434 } 570 }
435 571
436 return count; 572 return count;
437} 573}
438 574
439static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
440 576
441static void start_thread (void) 577static void start_thread (void)
442{ 578{
443 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
444 pthread_t tid;
445 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");
446 586
447 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
448 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
449 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
450 590
451 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
592
593 LOCK (wrklock);
452 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
453 595
454 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;
455 started++; 602 ++started;
603 }
604 else
605 free (wrk);
456 606
457 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock);
458} 609}
459 610
460static void req_send (aio_req req) 611static void req_send (aio_req req)
461{ 612{
462 while (started < wanted && nreqs >= started) 613 while (started < wanted && nreqs >= started)
463 start_thread (); 614 start_thread ();
464 615
465 ++nreqs; 616 ++nreqs;
466 617
467 pthread_mutex_lock (&reqlock); 618 LOCK (reqlock);
468 619 reqq_push (&req_queue, req);
469 req->next = 0;
470
471 if (reqe)
472 {
473 reqe->next = req;
474 reqe = req;
475 }
476 else
477 reqe = reqs = req;
478
479 pthread_cond_signal (&reqwait); 620 pthread_cond_signal (&reqwait);
480 pthread_mutex_unlock (&reqlock); 621 UNLOCK (reqlock);
481
482 if (nreqs > max_outstanding)
483 for (;;)
484 {
485 poll_cb ();
486
487 if (nreqs <= max_outstanding)
488 break;
489
490 poll_wait ();
491 }
492} 622}
493 623
494static void end_thread (void) 624static void end_thread (void)
495{ 625{
496 aio_req req; 626 aio_req req;
627
497 Newz (0, req, 1, aio_cb); 628 Newz (0, req, 1, aio_cb);
629
498 req->type = REQ_QUIT; 630 req->type = REQ_QUIT;
631 req->pri = PRI_MAX + PRI_BIAS;
499 632
500 req_send (req); 633 req_send (req);
501} 634}
502 635
503static void min_parallel (int nthreads) 636static void min_parallel (int nthreads)
… …
520 } 653 }
521 654
522 while (started > wanted) 655 while (started > wanted)
523 { 656 {
524 poll_wait (); 657 poll_wait ();
525 poll_cb (); 658 poll_cb (0);
526 } 659 }
527} 660}
528 661
529static void create_pipe () 662static void create_pipe ()
530{ 663{
… …
555static 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)
556{ 689{
557 ssize_t res; 690 ssize_t res;
558 off_t ooffset; 691 off_t ooffset;
559 692
560 pthread_mutex_lock (&preadwritelock); 693 LOCK (preadwritelock);
561 ooffset = lseek (fd, 0, SEEK_CUR); 694 ooffset = lseek (fd, 0, SEEK_CUR);
562 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
563 res = read (fd, buf, count); 696 res = read (fd, buf, count);
564 lseek (fd, ooffset, SEEK_SET); 697 lseek (fd, ooffset, SEEK_SET);
565 pthread_mutex_unlock (&preadwritelock); 698 UNLOCK (preadwritelock);
566 699
567 return res; 700 return res;
568} 701}
569 702
570static 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)
571{ 704{
572 ssize_t res; 705 ssize_t res;
573 off_t ooffset; 706 off_t ooffset;
574 707
575 pthread_mutex_lock (&preadwritelock); 708 LOCK (preadwritelock);
576 ooffset = lseek (fd, 0, SEEK_CUR); 709 ooffset = lseek (fd, 0, SEEK_CUR);
577 lseek (fd, offset, SEEK_SET); 710 lseek (fd, offset, SEEK_SET);
578 res = write (fd, buf, count); 711 res = write (fd, buf, count);
579 lseek (fd, offset, SEEK_SET); 712 lseek (fd, offset, SEEK_SET);
580 pthread_mutex_unlock (&preadwritelock); 713 UNLOCK (preadwritelock);
581 714
582 return res; 715 return res;
583} 716}
584#endif 717#endif
585 718
586#if !HAVE_FDATASYNC 719#if !HAVE_FDATASYNC
587# define fdatasync fsync 720# define fdatasync fsync
588#endif 721#endif
589 722
590#if !HAVE_READAHEAD 723#if !HAVE_READAHEAD
591# define readahead aio_readahead 724# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
592 725
593static 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)
594{ 727{
595 char readahead_buf[4096]; 728 dBUF;
596 729
597 while (count > 0) 730 while (count > 0)
598 { 731 {
599 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 732 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
600 733
601 pread (fd, readahead_buf, len, offset); 734 pread (fd, aio_buf, len, offset);
602 offset += len; 735 offset += len;
603 count -= len; 736 count -= len;
604 } 737 }
605 738
606 errno = 0; 739 errno = 0;
607} 740}
741
608#endif 742#endif
609 743
610#if !HAVE_READDIR_R 744#if !HAVE_READDIR_R
611# define readdir_r aio_readdir_r 745# define readdir_r aio_readdir_r
612 746
… …
615static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 749static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
616{ 750{
617 struct dirent *e; 751 struct dirent *e;
618 int errorno; 752 int errorno;
619 753
620 pthread_mutex_lock (&readdirlock); 754 LOCK (readdirlock);
621 755
622 e = readdir (dirp); 756 e = readdir (dirp);
623 errorno = errno; 757 errorno = errno;
624 758
625 if (e) 759 if (e)
… …
628 strcpy (ent->d_name, e->d_name); 762 strcpy (ent->d_name, e->d_name);
629 } 763 }
630 else 764 else
631 *res = 0; 765 *res = 0;
632 766
633 pthread_mutex_unlock (&readdirlock); 767 UNLOCK (readdirlock);
634 768
635 errno = errorno; 769 errno = errorno;
636 return e ? 0 : -1; 770 return e ? 0 : -1;
637} 771}
638#endif 772#endif
639 773
640/* sendfile always needs emulation */ 774/* sendfile always needs emulation */
641static 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)
642{ 776{
643 ssize_t res; 777 ssize_t res;
644 778
645 if (!count) 779 if (!count)
646 return 0; 780 return 0;
… …
657 { 791 {
658 off_t sbytes; 792 off_t sbytes;
659 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 793 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
660 794
661 if (res < 0 && sbytes) 795 if (res < 0 && sbytes)
662 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 796 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
663 res = sbytes; 797 res = sbytes;
664 } 798 }
665 799
666# elif __hpux 800# elif __hpux
667 res = sendfile (ofd, ifd, offset, count, 0, 0); 801 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
695#endif 829#endif
696 ) 830 )
697 ) 831 )
698 { 832 {
699 /* emulate sendfile. this is a major pain in the ass */ 833 /* emulate sendfile. this is a major pain in the ass */
700 char buf[4096]; 834 dBUF;
835
701 res = 0; 836 res = 0;
702 837
703 while (count) 838 while (count)
704 { 839 {
705 ssize_t cnt; 840 ssize_t cnt;
706 841
707 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 842 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
708 843
709 if (cnt <= 0) 844 if (cnt <= 0)
710 { 845 {
711 if (cnt && !res) res = -1; 846 if (cnt && !res) res = -1;
712 break; 847 break;
713 } 848 }
714 849
715 cnt = write (ofd, buf, cnt); 850 cnt = write (ofd, aio_buf, cnt);
716 851
717 if (cnt <= 0) 852 if (cnt <= 0)
718 { 853 {
719 if (cnt && !res) res = -1; 854 if (cnt && !res) res = -1;
720 break; 855 break;
… …
728 863
729 return res; 864 return res;
730} 865}
731 866
732/* read a full directory */ 867/* read a full directory */
733static int scandir_ (const char *path, void **namesp) 868static void scandir_ (aio_req req, worker *self)
734{ 869{
735 DIR *dirp = opendir (path); 870 DIR *dirp;
736 union 871 union
737 { 872 {
738 struct dirent d; 873 struct dirent d;
739 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 874 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
740 } u; 875 } *u;
741 struct dirent *entp; 876 struct dirent *entp;
742 char *name, *names; 877 char *name, *names;
743 int memlen = 4096; 878 int memlen = 4096;
744 int memofs = 0; 879 int memofs = 0;
745 int res = 0; 880 int res = 0;
746 int errorno; 881 int errorno;
747 882
748 if (!dirp) 883 LOCK (wrklock);
749 return -1; 884 self->dirp = dirp = opendir (req->dataptr);
750 885 self->dbuf = u = malloc (sizeof (*u));
751 names = malloc (memlen); 886 req->data2ptr = names = malloc (memlen);
887 UNLOCK (wrklock);
752 888
889 if (dirp && u && names)
753 for (;;) 890 for (;;)
754 { 891 {
892 errno = 0;
755 errno = 0, readdir_r (dirp, &u.d, &entp); 893 readdir_r (dirp, &u->d, &entp);
756 894
757 if (!entp) 895 if (!entp)
758 break; 896 break;
759 897
760 name = entp->d_name; 898 name = entp->d_name;
761 899
762 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 900 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
763 { 901 {
764 int len = strlen (name) + 1; 902 int len = strlen (name) + 1;
765 903
766 res++; 904 res++;
767 905
768 while (memofs + len > memlen) 906 while (memofs + len > memlen)
769 { 907 {
770 memlen *= 2; 908 memlen *= 2;
909 LOCK (wrklock);
771 names = realloc (names, memlen); 910 req->data2ptr = names = realloc (names, memlen);
911 UNLOCK (wrklock);
912
772 if (!names) 913 if (!names)
773 break; 914 break;
774 } 915 }
775 916
776 memcpy (names + memofs, name, len); 917 memcpy (names + memofs, name, len);
777 memofs += len; 918 memofs += len;
778 } 919 }
779 } 920 }
780 921
781 errorno = errno;
782 closedir (dirp);
783
784 if (errorno) 922 if (errno)
785 {
786 free (names);
787 errno = errorno;
788 res = -1; 923 res = -1;
789 } 924
790 925 req->result = res;
791 *namesp = (void *)names;
792 return res;
793} 926}
794 927
795/*****************************************************************************/ 928/*****************************************************************************/
796 929
797static void *aio_proc (void *thr_arg) 930static void *aio_proc (void *thr_arg)
798{ 931{
799 aio_req req; 932 aio_req req;
800 int type; 933 int type;
934 worker *self = (worker *)thr_arg;
801 935
802 do 936 do
803 { 937 {
804 pthread_mutex_lock (&reqlock); 938 LOCK (reqlock);
805 939
806 for (;;) 940 for (;;)
807 { 941 {
808 req = reqs; 942 self->req = req = reqq_shift (&req_queue);
809
810 if (reqs)
811 {
812 reqs = reqs->next;
813 if (!reqs) reqe = 0;
814 }
815 943
816 if (req) 944 if (req)
817 break; 945 break;
818 946
819 pthread_cond_wait (&reqwait, &reqlock); 947 pthread_cond_wait (&reqwait, &reqlock);
820 } 948 }
821 949
822 pthread_mutex_unlock (&reqlock); 950 UNLOCK (reqlock);
823 951
824 errno = 0; /* strictly unnecessary */ 952 errno = 0; /* strictly unnecessary */
825 type = req->type; /* remember type for QUIT check */ 953 type = req->type; /* remember type for QUIT check */
826 954
827 if (!(req->flags & FLAG_CANCELLED)) 955 if (!(req->flags & FLAG_CANCELLED))
… …
829 { 957 {
830 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;
831 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;
832 960
833 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;
834 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;
835 963
836 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 964 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
837 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 965 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
838 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 966 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
839 967
… …
845 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 973 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
846 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 974 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
847 975
848 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 976 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
849 case REQ_FSYNC: req->result = fsync (req->fd); break; 977 case REQ_FSYNC: req->result = fsync (req->fd); break;
850 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 978 case REQ_READDIR: scandir_ (req, self); break;
851 979
852 case REQ_SLEEP: 980 case REQ_BUSY:
853 { 981 {
854 struct timeval tv; 982 struct timeval tv;
855 983
856 tv.tv_sec = req->fd; 984 tv.tv_sec = req->fd;
857 tv.tv_usec = req->fd2; 985 tv.tv_usec = req->fd2;
… …
869 break; 997 break;
870 } 998 }
871 999
872 req->errorno = errno; 1000 req->errorno = errno;
873 1001
874 pthread_mutex_lock (&reslock); 1002 LOCK (reslock);
875 1003
876 req->next = 0; 1004 if (!reqq_push (&res_queue, req))
877
878 if (rese)
879 {
880 rese->next = req;
881 rese = req;
882 }
883 else
884 {
885 rese = ress = req;
886
887 /* write a dummy byte to the pipe so fh becomes ready */ 1005 /* write a dummy byte to the pipe so fh becomes ready */
888 write (respipe [1], &respipe, 1); 1006 write (respipe [1], &respipe, 1);
889 }
890 1007
891 pthread_mutex_unlock (&reslock); 1008 self->req = 0;
1009 worker_clear (self);
1010
1011 UNLOCK (reslock);
892 } 1012 }
893 while (type != REQ_QUIT); 1013 while (type != REQ_QUIT);
894 1014
1015 LOCK (wrklock);
1016 worker_free (self);
1017 UNLOCK (wrklock);
1018
895 return 0; 1019 return 0;
896} 1020}
897 1021
898/*****************************************************************************/ 1022/*****************************************************************************/
899 1023
900static void atfork_prepare (void) 1024static void atfork_prepare (void)
901{ 1025{
902 pthread_mutex_lock (&reqlock); 1026 LOCK (wrklock);
903 pthread_mutex_lock (&reslock); 1027 LOCK (reqlock);
1028 LOCK (reslock);
904#if !HAVE_PREADWRITE 1029#if !HAVE_PREADWRITE
905 pthread_mutex_lock (&preadwritelock); 1030 LOCK (preadwritelock);
906#endif 1031#endif
907#if !HAVE_READDIR_R 1032#if !HAVE_READDIR_R
908 pthread_mutex_lock (&readdirlock); 1033 LOCK (readdirlock);
909#endif 1034#endif
910} 1035}
911 1036
912static void atfork_parent (void) 1037static void atfork_parent (void)
913{ 1038{
914#if !HAVE_READDIR_R 1039#if !HAVE_READDIR_R
915 pthread_mutex_unlock (&readdirlock); 1040 UNLOCK (readdirlock);
916#endif 1041#endif
917#if !HAVE_PREADWRITE 1042#if !HAVE_PREADWRITE
918 pthread_mutex_unlock (&preadwritelock); 1043 UNLOCK (preadwritelock);
919#endif 1044#endif
920 pthread_mutex_unlock (&reslock); 1045 UNLOCK (reslock);
921 pthread_mutex_unlock (&reqlock); 1046 UNLOCK (reqlock);
1047 UNLOCK (wrklock);
922} 1048}
923 1049
924static void atfork_child (void) 1050static void atfork_child (void)
925{ 1051{
926 aio_req prv; 1052 aio_req prv;
927 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
928 started = 0; 1071 started = 0;
929 1072 nreqs = 0;
930 while (reqs)
931 {
932 prv = reqs;
933 reqs = prv->next;
934 req_free (prv);
935 }
936
937 reqs = reqe = 0;
938
939 while (ress)
940 {
941 prv = ress;
942 ress = prv->next;
943 req_free (prv);
944 }
945
946 ress = rese = 0;
947 1073
948 close (respipe [0]); 1074 close (respipe [0]);
949 close (respipe [1]); 1075 close (respipe [1]);
950 create_pipe (); 1076 create_pipe ();
951 1077
… …
987 create_pipe (); 1113 create_pipe ();
988 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1114 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
989} 1115}
990 1116
991void 1117void
992min_parallel (nthreads) 1118min_parallel (int nthreads)
993 int nthreads
994 PROTOTYPE: $ 1119 PROTOTYPE: $
995 1120
996void 1121void
997max_parallel (nthreads) 1122max_parallel (int nthreads)
998 int nthreads
999 PROTOTYPE: $ 1123 PROTOTYPE: $
1000 1124
1001int 1125int
1002max_outstanding (nreqs) 1126max_outstanding (int maxreqs)
1003 int nreqs 1127 PROTOTYPE: $
1004 PROTOTYPE: $
1005 CODE: 1128 CODE:
1006 RETVAL = max_outstanding; 1129 RETVAL = max_outstanding;
1007 max_outstanding = nreqs; 1130 max_outstanding = maxreqs;
1131 OUTPUT:
1132 RETVAL
1008 1133
1009void 1134void
1010aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1135aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1011 SV * pathname 1136 SV * pathname
1012 int flags 1137 int flags
… …
1227 1352
1228 REQ_SEND; 1353 REQ_SEND;
1229} 1354}
1230 1355
1231void 1356void
1232aio_sleep (delay,callback=&PL_sv_undef) 1357aio_busy (delay,callback=&PL_sv_undef)
1233 double delay 1358 double delay
1234 SV * callback 1359 SV * callback
1235 PPCODE: 1360 PPCODE:
1236{ 1361{
1237 dREQ; 1362 dREQ;
1238 1363
1239 req->type = REQ_SLEEP; 1364 req->type = REQ_BUSY;
1240 req->fd = delay < 0. ? 0 : delay; 1365 req->fd = delay < 0. ? 0 : delay;
1241 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1366 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1242 1367
1243 REQ_SEND; 1368 REQ_SEND;
1244} 1369}
… …
1267 req->type = REQ_NOP; 1392 req->type = REQ_NOP;
1268 1393
1269 REQ_SEND; 1394 REQ_SEND;
1270} 1395}
1271 1396
1272#if 0
1273
1274void 1397void
1275aio_pri (int pri = DEFAULT_PRI) 1398aioreq_pri (int pri = DEFAULT_PRI)
1276 CODE: 1399 CODE:
1277 if (pri < PRI_MIN) pri = PRI_MIN; 1400 if (pri < PRI_MIN) pri = PRI_MIN;
1278 if (pri > PRI_MAX) pri = PRI_MAX; 1401 if (pri > PRI_MAX) pri = PRI_MAX;
1279 next_pri = pri + PRI_BIAS; 1402 next_pri = pri + PRI_BIAS;
1280 1403
1281#endif 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;
1282 1411
1283void 1412void
1284flush () 1413flush ()
1285 PROTOTYPE: 1414 PROTOTYPE:
1286 CODE: 1415 CODE:
1287 while (nreqs) 1416 while (nreqs)
1288 { 1417 {
1289 poll_wait (); 1418 poll_wait ();
1290 poll_cb (); 1419 poll_cb (0);
1291 } 1420 }
1292 1421
1293void 1422void
1294poll() 1423poll()
1295 PROTOTYPE: 1424 PROTOTYPE:
1296 CODE: 1425 CODE:
1297 if (nreqs) 1426 if (nreqs)
1298 { 1427 {
1299 poll_wait (); 1428 poll_wait ();
1300 poll_cb (); 1429 poll_cb (0);
1301 } 1430 }
1302 1431
1303int 1432int
1304poll_fileno() 1433poll_fileno()
1305 PROTOTYPE: 1434 PROTOTYPE:
… …
1310 1439
1311int 1440int
1312poll_cb(...) 1441poll_cb(...)
1313 PROTOTYPE: 1442 PROTOTYPE:
1314 CODE: 1443 CODE:
1315 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);
1316 OUTPUT: 1453 OUTPUT:
1317 RETVAL 1454 RETVAL
1318 1455
1319void 1456void
1320poll_wait() 1457poll_wait()
… …
1335 1472
1336MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1473MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1337 1474
1338void 1475void
1339cancel (aio_req_ornot req) 1476cancel (aio_req_ornot req)
1340 PROTOTYPE:
1341 CODE: 1477 CODE:
1342 req_cancel (req); 1478 req_cancel (req);
1343 1479
1344void 1480void
1345cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1481cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1381 } 1517 }
1382 } 1518 }
1383} 1519}
1384 1520
1385void 1521void
1522cancel_subs (aio_req_ornot req)
1523 CODE:
1524 req_cancel_subs (req);
1525
1526void
1386result (aio_req grp, ...) 1527result (aio_req grp, ...)
1387 CODE: 1528 CODE:
1388{ 1529{
1389 int i; 1530 int i;
1390 AV *av = newAV (); 1531 AV *av = newAV ();
… …
1395 SvREFCNT_dec (grp->data); 1536 SvREFCNT_dec (grp->data);
1396 grp->data = (SV *)av; 1537 grp->data = (SV *)av;
1397} 1538}
1398 1539
1399void 1540void
1400feed_limit (aio_req grp, int limit) 1541limit (aio_req grp, int limit)
1401 CODE: 1542 CODE:
1402 grp->fd2 = limit; 1543 grp->fd2 = limit;
1403 aio_grp_feed (grp); 1544 aio_grp_feed (grp);
1404 1545
1405void 1546void

Diff Legend

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