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.18 by root, Sun Jul 31 19:00:31 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"
… …
9 12
10#include <unistd.h> 13#include <unistd.h>
11#include <fcntl.h> 14#include <fcntl.h>
12#include <signal.h> 15#include <signal.h>
13#include <sched.h> 16#include <sched.h>
14
15#ifndef _REENTRANT
16# define _REENTRANT 1
17#endif
18#include <errno.h>
19 17
20#include <pthread.h> 18#include <pthread.h>
21 19
22typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
23typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
… …
31 29
32enum { 30enum {
33 REQ_QUIT, 31 REQ_QUIT,
34 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
35 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
36 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
37 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
38}; 38};
39 39
40typedef struct aio_cb { 40typedef struct aio_cb {
41 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
42 42
… …
47 size_t length; 47 size_t length;
48 ssize_t result; 48 ssize_t result;
49 mode_t mode; /* open */ 49 mode_t mode; /* open */
50 int errorno; 50 int errorno;
51 SV *data, *callback, *fh; 51 SV *data, *callback, *fh;
52 void *dataptr; 52 void *dataptr, *data2ptr;
53 STRLEN dataoffset; 53 STRLEN dataoffset;
54 54
55 Stat_t *statdata; 55 Stat_t *statdata;
56} aio_cb; 56} aio_cb;
57 57
… …
66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
67static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 67static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
68 68
69static volatile aio_req reqs, reqe; /* queue start, queue end */ 69static volatile aio_req reqs, reqe; /* queue start, queue end */
70static 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}
71 88
72static void 89static void
73poll_wait () 90poll_wait ()
74{ 91{
75 if (nreqs && !ress) 92 if (nreqs && !ress)
… …
85static int 102static int
86poll_cb () 103poll_cb ()
87{ 104{
88 dSP; 105 dSP;
89 int count = 0; 106 int count = 0;
107 int do_croak = 0;
90 aio_req req, prv; 108 aio_req req;
91 109
92 pthread_mutex_lock (&reslock); 110 for (;;)
93
94 {
95 /* read any signals sent by the worker threads */
96 char buf [32];
97 while (read (respipe [0], buf, 32) > 0)
98 ;
99 }
100
101 req = ress;
102 ress = rese = 0;
103
104 pthread_mutex_unlock (&reslock);
105
106 while (req)
107 { 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
108 nreqs--; 135 nreqs--;
109 136
110 if (req->type == REQ_QUIT) 137 if (req->type == REQ_QUIT)
111 started--; 138 started--;
112 else 139 else
113 { 140 {
114 int errorno = errno; 141 int errorno = errno;
115 errno = req->errorno; 142 errno = req->errorno;
116 143
117 if (req->type == REQ_READ) 144 if (req->type == REQ_READ)
118 SvCUR_set (req->data, req->dataoffset 145 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
119 + req->result > 0 ? req->result : 0);
120 146
147 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
148 SvREADONLY_off (req->data);
149
121 if (req->data) 150 if (req->statdata)
122 SvREFCNT_dec (req->data);
123
124 if (req->fh)
125 SvREFCNT_dec (req->fh);
126
127 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
128 { 151 {
129 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 152 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
130 PL_laststatval = req->result; 153 PL_laststatval = req->result;
131 PL_statcache = *(req->statdata); 154 PL_statcache = *(req->statdata);
132
133 Safefree (req->statdata);
134 } 155 }
135 156
136 ENTER; 157 ENTER;
137 PUSHMARK (SP); 158 PUSHMARK (SP);
138 XPUSHs (sv_2mortal (newSViv (req->result))); 159 XPUSHs (sv_2mortal (newSViv (req->result)));
… …
155 if (SvOK (req->callback)) 176 if (SvOK (req->callback))
156 { 177 {
157 PUTBACK; 178 PUTBACK;
158 call_sv (req->callback, G_VOID | G_EVAL); 179 call_sv (req->callback, G_VOID | G_EVAL);
159 SPAGAIN; 180 SPAGAIN;
181
182 if (SvTRUE (ERRSV))
183 {
184 free_req (req);
185 croak (0);
186 }
160 } 187 }
161 188
162 LEAVE; 189 LEAVE;
163
164 if (req->callback)
165 SvREFCNT_dec (req->callback);
166 190
167 errno = errorno; 191 errno = errorno;
168 count++; 192 count++;
169 } 193 }
170 194
171 prv = req; 195 free_req (req);
172 req = req->next;
173 Safefree (prv);
174
175 /* TODO: croak on errors? */
176 } 196 }
177 197
178 return count; 198 return count;
179} 199}
180 200
… …
218 reqe = reqs = req; 238 reqe = reqs = req;
219 239
220 pthread_cond_signal (&reqwait); 240 pthread_cond_signal (&reqwait);
221 pthread_mutex_unlock (&reqlock); 241 pthread_mutex_unlock (&reqlock);
222 242
223 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)
224 { 282 {
225 poll_wait (); 283 poll_wait ();
226 poll_cb (); 284 poll_cb ();
227 } 285 }
228} 286}
229 287
230static void 288static void create_pipe ()
231end_thread (void)
232{ 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{
233 aio_req req; 314 aio_req prv;
234 New (0, req, 1, aio_cb);
235 req->type = REQ_QUIT;
236 315
237 send_req (req); 316 int restart = started;
238} 317 started = 0;
239 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/*****************************************************************************/
240/* work around various missing functions */ 347/* work around various missing functions */
241 348
242#if !HAVE_PREADWRITE 349#if !HAVE_PREADWRITE
243# define pread aio_pread 350# define pread aio_pread
244# define pwrite aio_pwrite 351# define pwrite aio_pwrite
… …
306 413
307 errno = 0; 414 errno = 0;
308} 415}
309#endif 416#endif
310 417
418/*****************************************************************************/
419
311static void * 420static void *
312aio_proc (void *thr_arg) 421aio_proc (void *thr_arg)
313{ 422{
314 aio_req req; 423 aio_req req;
315 int type; 424 int type;
… …
352 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 461 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
353 462
354 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;
355 case REQ_CLOSE: req->result = close (req->fd); break; 464 case REQ_CLOSE: req->result = close (req->fd); break;
356 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;
357 468
358 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 469 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
359 case REQ_FSYNC: req->result = fsync (req->fd); break; 470 case REQ_FSYNC: req->result = fsync (req->fd); break;
360 471
361 case REQ_QUIT: 472 case REQ_QUIT:
… …
390 while (type != REQ_QUIT); 501 while (type != REQ_QUIT);
391 502
392 return 0; 503 return 0;
393} 504}
394 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
395MODULE = IO::AIO PACKAGE = IO::AIO 518MODULE = IO::AIO PACKAGE = IO::AIO
396 519
397PROTOTYPES: ENABLE 520PROTOTYPES: ENABLE
398 521
399BOOT: 522BOOT:
400{ 523{
401 if (pipe (respipe)) 524 create_pipe ();
402 croak ("unable to initialize result pipe"); 525 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
403
404 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
405 croak ("cannot set result pipe to nonblocking mode");
406
407 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
408 croak ("cannot set result pipe to nonblocking mode");
409} 526}
410 527
411void 528void
412min_parallel(nthreads) 529min_parallel(nthreads)
413 int nthreads 530 int nthreads
414 PROTOTYPE: $ 531 PROTOTYPE: $
415 CODE:
416 while (nthreads > started)
417 start_thread ();
418 532
419void 533void
420max_parallel(nthreads) 534max_parallel(nthreads)
421 int nthreads 535 int nthreads
422 PROTOTYPE: $ 536 PROTOTYPE: $
423 CODE:
424{
425 int cur = started;
426 while (cur > nthreads)
427 {
428 end_thread ();
429 cur--;
430 }
431
432 while (started > nthreads)
433 {
434 poll_wait ();
435 poll_cb ();
436 }
437}
438 537
439int 538int
440max_outstanding(nreqs) 539max_outstanding(nreqs)
441 int nreqs 540 int nreqs
442 PROTOTYPE: $ 541 PROTOTYPE: $
… …
451 int mode 550 int mode
452 SV * callback 551 SV * callback
453 PROTOTYPE: $$$;$ 552 PROTOTYPE: $$$;$
454 CODE: 553 CODE:
455{ 554{
456 aio_req req; 555 dREQ;
457
458 Newz (0, req, 1, aio_cb);
459
460 if (!req)
461 croak ("out of memory during aio_req allocation");
462 556
463 req->type = REQ_OPEN; 557 req->type = REQ_OPEN;
464 req->data = newSVsv (pathname); 558 req->data = newSVsv (pathname);
465 req->dataptr = SvPV_nolen (req->data); 559 req->dataptr = SvPVbyte_nolen (req->data);
466 req->fd = flags; 560 req->fd = flags;
467 req->mode = mode; 561 req->mode = mode;
468 req->callback = SvREFCNT_inc (callback);
469 562
470 send_req (req); 563 send_req (req);
471} 564}
472 565
473void 566void
… …
479 aio_close = REQ_CLOSE 572 aio_close = REQ_CLOSE
480 aio_fsync = REQ_FSYNC 573 aio_fsync = REQ_FSYNC
481 aio_fdatasync = REQ_FDATASYNC 574 aio_fdatasync = REQ_FDATASYNC
482 CODE: 575 CODE:
483{ 576{
484 aio_req req; 577 dREQ;
485
486 Newz (0, req, 1, aio_cb);
487
488 if (!req)
489 croak ("out of memory during aio_req allocation");
490 578
491 req->type = ix; 579 req->type = ix;
492 req->fh = newSVsv (fh); 580 req->fh = newSVsv (fh);
493 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 581 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
494 req->callback = SvREFCNT_inc (callback);
495 582
496 send_req (req); 583 send_req (req);
497} 584}
498 585
499void 586void
… …
510 PROTOTYPE: $$$$$;$ 597 PROTOTYPE: $$$$$;$
511 CODE: 598 CODE:
512{ 599{
513 aio_req req; 600 aio_req req;
514 STRLEN svlen; 601 STRLEN svlen;
515 char *svptr = SvPV (data, svlen); 602 char *svptr = SvPVbyte (data, svlen);
516 603
517 SvUPGRADE (data, SVt_PV); 604 SvUPGRADE (data, SVt_PV);
518 SvPOK_on (data); 605 SvPOK_on (data);
519 606
520 if (dataoffset < 0) 607 if (dataoffset < 0)
… …
536 } 623 }
537 624
538 if (length < 0) 625 if (length < 0)
539 croak ("length must not be negative"); 626 croak ("length must not be negative");
540 627
541 Newz (0, req, 1, aio_cb); 628 {
629 dREQ;
542 630
543 if (!req)
544 croak ("out of memory during aio_req allocation");
545
546 req->type = ix; 631 req->type = ix;
547 req->fh = newSVsv (fh); 632 req->fh = newSVsv (fh);
548 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 633 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
549 : IoOFP (sv_2io (fh))); 634 : IoOFP (sv_2io (fh)));
550 req->offset = offset; 635 req->offset = offset;
551 req->length = length; 636 req->length = length;
552 req->data = SvREFCNT_inc (data); 637 req->data = SvREFCNT_inc (data);
553 req->dataptr = (char *)svptr + dataoffset; 638 req->dataptr = (char *)svptr + dataoffset;
554 req->callback = SvREFCNT_inc (callback);
555 639
640 if (!SvREADONLY (data))
641 {
642 SvREADONLY_on (data);
643 req->data2ptr = (void *)data;
644 }
645
556 send_req (req); 646 send_req (req);
647 }
557} 648}
558 649
559void 650void
560aio_readahead(fh,offset,length,callback=&PL_sv_undef) 651aio_readahead(fh,offset,length,callback=&PL_sv_undef)
561 SV * fh 652 SV * fh
… …
563 IV length 654 IV length
564 SV * callback 655 SV * callback
565 PROTOTYPE: $$$;$ 656 PROTOTYPE: $$$;$
566 CODE: 657 CODE:
567{ 658{
568 aio_req req; 659 dREQ;
569
570 if (length < 0)
571 croak ("length must not be negative");
572
573 Newz (0, req, 1, aio_cb);
574
575 if (!req)
576 croak ("out of memory during aio_req allocation");
577 660
578 req->type = REQ_READAHEAD; 661 req->type = REQ_READAHEAD;
579 req->fh = newSVsv (fh); 662 req->fh = newSVsv (fh);
580 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 663 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
581 req->offset = offset; 664 req->offset = offset;
582 req->length = length; 665 req->length = length;
583 req->callback = SvREFCNT_inc (callback);
584 666
585 send_req (req); 667 send_req (req);
586} 668}
587 669
588void 670void
… …
592 ALIAS: 674 ALIAS:
593 aio_stat = REQ_STAT 675 aio_stat = REQ_STAT
594 aio_lstat = REQ_LSTAT 676 aio_lstat = REQ_LSTAT
595 CODE: 677 CODE:
596{ 678{
597 aio_req req; 679 dREQ;
598
599 Newz (0, req, 1, aio_cb);
600
601 if (!req)
602 croak ("out of memory during aio_req allocation");
603 680
604 New (0, req->statdata, 1, Stat_t); 681 New (0, req->statdata, 1, Stat_t);
605
606 if (!req->statdata) 682 if (!req->statdata)
683 {
684 free_req (req);
607 croak ("out of memory during aio_req->statdata allocation"); 685 croak ("out of memory during aio_req->statdata allocation");
686 }
608 687
609 if (SvPOK (fh_or_path)) 688 if (SvPOK (fh_or_path))
610 { 689 {
611 req->type = ix; 690 req->type = ix;
612 req->data = newSVsv (fh_or_path); 691 req->data = newSVsv (fh_or_path);
613 req->dataptr = SvPV_nolen (req->data); 692 req->dataptr = SvPVbyte_nolen (req->data);
614 } 693 }
615 else 694 else
616 { 695 {
617 req->type = REQ_FSTAT; 696 req->type = REQ_FSTAT;
618 req->fh = newSVsv (fh_or_path); 697 req->fh = newSVsv (fh_or_path);
619 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 698 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
620 } 699 }
621 700
622 req->callback = SvREFCNT_inc (callback);
623
624 send_req (req); 701 send_req (req);
625} 702}
626 703
627void 704void
628aio_unlink(pathname,callback=&PL_sv_undef) 705aio_unlink(pathname,callback=&PL_sv_undef)
629 SV * pathname 706 SV * pathname
630 SV * callback 707 SV * callback
708 ALIAS:
709 aio_unlink = REQ_UNLINK
710 aio_rmdir = REQ_RMDIR
631 CODE: 711 CODE:
632{ 712{
633 aio_req req; 713 dREQ;
634 714
635 Newz (0, req, 1, aio_cb); 715 req->type = ix;
716 req->data = newSVsv (pathname);
717 req->dataptr = SvPVbyte_nolen (req->data);
636 718
637 if (!req) 719 send_req (req);
638 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;
639 730
640 req->type = REQ_UNLINK; 731 req->type = REQ_SYMLINK;
732 req->fh = newSVsv (oldpath);
733 req->data2ptr = SvPVbyte_nolen (req->fh);
641 req->data = newSVsv (pathname); 734 req->data = newSVsv (newpath);
642 req->dataptr = SvPV_nolen (req->data); 735 req->dataptr = SvPVbyte_nolen (req->data);
643 req->callback = SvREFCNT_inc (callback);
644 736
645 send_req (req); 737 send_req (req);
646} 738}
647 739
648void 740void

Diff Legend

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