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

Diff Legend

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