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.20 by root, Sun Jul 31 19:08:39 2005 UTC vs.
Revision 1.24 by root, Wed Aug 17 03:01:56 2005 UTC

… …
29 29
30enum { 30enum {
31 REQ_QUIT, 31 REQ_QUIT,
32 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
36}; 38};
37 39
38typedef struct aio_cb { 40typedef struct aio_cb {
39 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
40 42
… …
45 size_t length; 47 size_t length;
46 ssize_t result; 48 ssize_t result;
47 mode_t mode; /* open */ 49 mode_t mode; /* open */
48 int errorno; 50 int errorno;
49 SV *data, *callback, *fh; 51 SV *data, *callback, *fh;
50 void *dataptr; 52 void *dataptr, *data2ptr;
51 STRLEN dataoffset; 53 STRLEN dataoffset;
52 54
53 Stat_t *statdata; 55 Stat_t *statdata;
54} aio_cb; 56} aio_cb;
55 57
… …
60static int max_outstanding = 1<<30; 62static int max_outstanding = 1<<30;
61static int respipe [2]; 63static int respipe [2];
62 64
63static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
64static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
67static pthread_mutex_t frklock = PTHREAD_MUTEX_INITIALIZER;
65static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 68static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
66 69
67static volatile aio_req reqs, reqe; /* queue start, queue end */ 70static volatile aio_req reqs, reqe; /* queue start, queue end */
68static volatile aio_req ress, rese; /* queue start, queue end */ 71static volatile aio_req ress, rese; /* queue start, queue end */
69 72
… …
83static int 86static int
84poll_cb () 87poll_cb ()
85{ 88{
86 dSP; 89 dSP;
87 int count = 0; 90 int count = 0;
91 int do_croak = 0;
88 aio_req req, prv; 92 aio_req req, prv;
89 93
90 pthread_mutex_lock (&reslock); 94 pthread_mutex_lock (&reslock);
91 95
92 { 96 {
93 /* read any signals sent by the worker threads */ 97 /* read any signals sent by the worker threads */
94 char buf [32]; 98 char buf [32];
95 while (read (respipe [0], buf, 32) > 0) 99 while (read (respipe [0], buf, 32) == 32)
96 ; 100 ;
97 } 101 }
98 102
99 req = ress; 103 req = ress;
100 ress = rese = 0; 104 ress = rese = 0;
… …
155 PUTBACK; 159 PUTBACK;
156 call_sv (req->callback, G_VOID | G_EVAL); 160 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN; 161 SPAGAIN;
158 } 162 }
159 163
164 do_croak = SvTRUE (ERRSV);
165
160 LEAVE; 166 LEAVE;
161 167
162 if (req->callback) 168 if (req->callback)
163 SvREFCNT_dec (req->callback); 169 SvREFCNT_dec (req->callback);
164 170
… …
168 174
169 prv = req; 175 prv = req;
170 req = req->next; 176 req = req->next;
171 Safefree (prv); 177 Safefree (prv);
172 178
173 /* TODO: croak on errors? */ 179 if (do_croak)
180 croak (0);
174 } 181 }
175 182
176 return count; 183 return count;
177} 184}
178 185
… …
233 req->type = REQ_QUIT; 240 req->type = REQ_QUIT;
234 241
235 send_req (req); 242 send_req (req);
236} 243}
237 244
245
246static void min_parallel (int nthreads)
247{
248 while (nthreads > started)
249 start_thread ();
250}
251
252static void max_parallel (int nthreads)
253{
254 int cur = started;
255 while (cur > nthreads)
256 {
257 end_thread ();
258 cur--;
259 }
260
261 while (started > nthreads)
262 {
263 poll_wait ();
264 poll_cb ();
265 }
266}
267
268static int fork_started;
269
270static void atfork_prepare (void)
271{
272 pthread_mutex_lock (&frklock);
273
274 fork_started = started;
275
276 for (;;) {
277 while (nreqs)
278 {
279 poll_wait ();
280 poll_cb ();
281 }
282
283 max_parallel (0);
284
285 pthread_mutex_lock (&reqlock);
286
287 if (!nreqs && !started)
288 break;
289
290 pthread_mutex_unlock (&reqlock);
291
292 min_parallel (fork_started);
293 }
294
295 pthread_mutex_lock (&reslock);
296
297 assert (!started);
298 assert (!nreqs);
299 assert (!reqs && !reqe);
300 assert (!ress && !rese);
301}
302
303static void atfork_parent (void)
304{
305 pthread_mutex_unlock (&reslock);
306 min_parallel (fork_started);
307 pthread_mutex_unlock (&reqlock);
308 pthread_mutex_unlock (&frklock);
309}
310
311static void atfork_child (void)
312{
313 reqs = reqe = 0;
314
315 atfork_parent ();
316}
317
318/*****************************************************************************/
238/* work around various missing functions */ 319/* work around various missing functions */
239 320
240#if !HAVE_PREADWRITE 321#if !HAVE_PREADWRITE
241# define pread aio_pread 322# define pread aio_pread
242# define pwrite aio_pwrite 323# define pwrite aio_pwrite
… …
304 385
305 errno = 0; 386 errno = 0;
306} 387}
307#endif 388#endif
308 389
390/*****************************************************************************/
391
309static void * 392static void *
310aio_proc (void *thr_arg) 393aio_proc (void *thr_arg)
311{ 394{
312 aio_req req; 395 aio_req req;
313 int type; 396 int type;
… …
350 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 433 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
351 434
352 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 435 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
353 case REQ_CLOSE: req->result = close (req->fd); break; 436 case REQ_CLOSE: req->result = close (req->fd); break;
354 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 437 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
438 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
439 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
355 440
356 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 441 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
357 case REQ_FSYNC: req->result = fsync (req->fd); break; 442 case REQ_FSYNC: req->result = fsync (req->fd); break;
358 443
359 case REQ_QUIT: 444 case REQ_QUIT:
… …
388 while (type != REQ_QUIT); 473 while (type != REQ_QUIT);
389 474
390 return 0; 475 return 0;
391} 476}
392 477
478#define dREQ \
479 aio_req req; \
480 \
481 if (SvOK (callback) && !SvROK (callback)) \
482 croak ("clalback must be undef or of reference type"); \
483 \
484 Newz (0, req, 1, aio_cb); \
485 if (!req) \
486 croak ("out of memory during aio_req allocation"); \
487 \
488 req->callback = SvREFCNT_inc (callback);
489
393MODULE = IO::AIO PACKAGE = IO::AIO 490MODULE = IO::AIO PACKAGE = IO::AIO
394 491
395PROTOTYPES: ENABLE 492PROTOTYPES: ENABLE
396 493
397BOOT: 494BOOT:
… …
402 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) 499 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
403 croak ("cannot set result pipe to nonblocking mode"); 500 croak ("cannot set result pipe to nonblocking mode");
404 501
405 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 502 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
406 croak ("cannot set result pipe to nonblocking mode"); 503 croak ("cannot set result pipe to nonblocking mode");
504
505 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
407} 506}
408 507
409void 508void
410min_parallel(nthreads) 509min_parallel(nthreads)
411 int nthreads 510 int nthreads
412 PROTOTYPE: $ 511 PROTOTYPE: $
413 CODE:
414 while (nthreads > started)
415 start_thread ();
416 512
417void 513void
418max_parallel(nthreads) 514max_parallel(nthreads)
419 int nthreads 515 int nthreads
420 PROTOTYPE: $ 516 PROTOTYPE: $
421 CODE:
422{
423 int cur = started;
424 while (cur > nthreads)
425 {
426 end_thread ();
427 cur--;
428 }
429
430 while (started > nthreads)
431 {
432 poll_wait ();
433 poll_cb ();
434 }
435}
436 517
437int 518int
438max_outstanding(nreqs) 519max_outstanding(nreqs)
439 int nreqs 520 int nreqs
440 PROTOTYPE: $ 521 PROTOTYPE: $
… …
449 int mode 530 int mode
450 SV * callback 531 SV * callback
451 PROTOTYPE: $$$;$ 532 PROTOTYPE: $$$;$
452 CODE: 533 CODE:
453{ 534{
454 aio_req req; 535 dREQ;
455
456 Newz (0, req, 1, aio_cb);
457
458 if (!req)
459 croak ("out of memory during aio_req allocation");
460 536
461 req->type = REQ_OPEN; 537 req->type = REQ_OPEN;
462 req->data = newSVsv (pathname); 538 req->data = newSVsv (pathname);
463 req->dataptr = SvPV_nolen (req->data); 539 req->dataptr = SvPVbyte_nolen (req->data);
464 req->fd = flags; 540 req->fd = flags;
465 req->mode = mode; 541 req->mode = mode;
466 req->callback = SvREFCNT_inc (callback);
467 542
468 send_req (req); 543 send_req (req);
469} 544}
470 545
471void 546void
… …
477 aio_close = REQ_CLOSE 552 aio_close = REQ_CLOSE
478 aio_fsync = REQ_FSYNC 553 aio_fsync = REQ_FSYNC
479 aio_fdatasync = REQ_FDATASYNC 554 aio_fdatasync = REQ_FDATASYNC
480 CODE: 555 CODE:
481{ 556{
482 aio_req req; 557 dREQ;
483
484 Newz (0, req, 1, aio_cb);
485
486 if (!req)
487 croak ("out of memory during aio_req allocation");
488 558
489 req->type = ix; 559 req->type = ix;
490 req->fh = newSVsv (fh); 560 req->fh = newSVsv (fh);
491 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 561 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
492 req->callback = SvREFCNT_inc (callback);
493 562
494 send_req (req); 563 send_req (req);
495} 564}
496 565
497void 566void
… …
508 PROTOTYPE: $$$$$;$ 577 PROTOTYPE: $$$$$;$
509 CODE: 578 CODE:
510{ 579{
511 aio_req req; 580 aio_req req;
512 STRLEN svlen; 581 STRLEN svlen;
513 char *svptr = SvPV (data, svlen); 582 char *svptr = SvPVbyte (data, svlen);
514 583
515 SvUPGRADE (data, SVt_PV); 584 SvUPGRADE (data, SVt_PV);
516 SvPOK_on (data); 585 SvPOK_on (data);
517 586
518 if (dataoffset < 0) 587 if (dataoffset < 0)
… …
534 } 603 }
535 604
536 if (length < 0) 605 if (length < 0)
537 croak ("length must not be negative"); 606 croak ("length must not be negative");
538 607
539 Newz (0, req, 1, aio_cb); 608 {
609 dREQ;
540 610
541 if (!req)
542 croak ("out of memory during aio_req allocation");
543
544 req->type = ix; 611 req->type = ix;
545 req->fh = newSVsv (fh); 612 req->fh = newSVsv (fh);
546 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 613 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
547 : IoOFP (sv_2io (fh))); 614 : IoOFP (sv_2io (fh)));
548 req->offset = offset; 615 req->offset = offset;
549 req->length = length; 616 req->length = length;
550 req->data = SvREFCNT_inc (data); 617 req->data = SvREFCNT_inc (data);
551 req->dataptr = (char *)svptr + dataoffset; 618 req->dataptr = (char *)svptr + dataoffset;
552 req->callback = SvREFCNT_inc (callback); 619 req->callback = SvREFCNT_inc (callback);
553 620
554 send_req (req); 621 send_req (req);
622 }
555} 623}
556 624
557void 625void
558aio_readahead(fh,offset,length,callback=&PL_sv_undef) 626aio_readahead(fh,offset,length,callback=&PL_sv_undef)
559 SV * fh 627 SV * fh
… …
561 IV length 629 IV length
562 SV * callback 630 SV * callback
563 PROTOTYPE: $$$;$ 631 PROTOTYPE: $$$;$
564 CODE: 632 CODE:
565{ 633{
566 aio_req req; 634 dREQ;
567
568 if (length < 0)
569 croak ("length must not be negative");
570
571 Newz (0, req, 1, aio_cb);
572
573 if (!req)
574 croak ("out of memory during aio_req allocation");
575 635
576 req->type = REQ_READAHEAD; 636 req->type = REQ_READAHEAD;
577 req->fh = newSVsv (fh); 637 req->fh = newSVsv (fh);
578 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 638 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
579 req->offset = offset; 639 req->offset = offset;
580 req->length = length; 640 req->length = length;
581 req->callback = SvREFCNT_inc (callback);
582 641
583 send_req (req); 642 send_req (req);
584} 643}
585 644
586void 645void
… …
590 ALIAS: 649 ALIAS:
591 aio_stat = REQ_STAT 650 aio_stat = REQ_STAT
592 aio_lstat = REQ_LSTAT 651 aio_lstat = REQ_LSTAT
593 CODE: 652 CODE:
594{ 653{
595 aio_req req; 654 dREQ;
596
597 Newz (0, req, 1, aio_cb);
598
599 if (!req)
600 croak ("out of memory during aio_req allocation");
601 655
602 New (0, req->statdata, 1, Stat_t); 656 New (0, req->statdata, 1, Stat_t);
603
604 if (!req->statdata) 657 if (!req->statdata)
605 croak ("out of memory during aio_req->statdata allocation"); 658 croak ("out of memory during aio_req->statdata allocation (sorry, i just leaked memory, too)");
606 659
607 if (SvPOK (fh_or_path)) 660 if (SvPOK (fh_or_path))
608 { 661 {
609 req->type = ix; 662 req->type = ix;
610 req->data = newSVsv (fh_or_path); 663 req->data = newSVsv (fh_or_path);
611 req->dataptr = SvPV_nolen (req->data); 664 req->dataptr = SvPVbyte_nolen (req->data);
612 } 665 }
613 else 666 else
614 { 667 {
615 req->type = REQ_FSTAT; 668 req->type = REQ_FSTAT;
616 req->fh = newSVsv (fh_or_path); 669 req->fh = newSVsv (fh_or_path);
617 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 670 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
618 } 671 }
619 672
620 req->callback = SvREFCNT_inc (callback);
621
622 send_req (req); 673 send_req (req);
623} 674}
624 675
625void 676void
626aio_unlink(pathname,callback=&PL_sv_undef) 677aio_unlink(pathname,callback=&PL_sv_undef)
627 SV * pathname 678 SV * pathname
628 SV * callback 679 SV * callback
680 ALIAS:
681 aio_unlink = REQ_UNLINK
682 aio_rmdir = REQ_RMDIR
629 CODE: 683 CODE:
630{ 684{
631 aio_req req; 685 dREQ;
632 686
633 Newz (0, req, 1, aio_cb); 687 req->type = ix;
688 req->data = newSVsv (pathname);
689 req->dataptr = SvPVbyte_nolen (req->data);
634 690
635 if (!req) 691 send_req (req);
636 croak ("out of memory during aio_req allocation"); 692}
693
694void
695aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
696 SV * oldpath
697 SV * newpath
698 SV * callback
699 CODE:
700{
701 dREQ;
637 702
638 req->type = REQ_UNLINK; 703 req->type = REQ_SYMLINK;
704 req->fh = newSVsv (oldpath);
705 req->data2ptr = SvPVbyte_nolen (req->fh);
639 req->data = newSVsv (pathname); 706 req->data = newSVsv (newpath);
640 req->dataptr = SvPV_nolen (req->data); 707 req->dataptr = SvPVbyte_nolen (req->data);
641 req->callback = SvREFCNT_inc (callback);
642 708
643 send_req (req); 709 send_req (req);
644} 710}
645 711
646void 712void

Diff Legend

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