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.17 by root, Sun Jul 31 18:45:48 2005 UTC vs.
Revision 1.26 by root, Wed Aug 17 03:52:20 2005 UTC

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

Diff Legend

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