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

Diff Legend

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