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.30 by root, Thu Aug 18 16:32: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
53typedef aio_cb *aio_req; 58typedef aio_cb *aio_req;
54 59
55static int started; 60static int started, wanted;
56static volatile int nreqs; 61static volatile int nreqs;
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;
… …
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 */
66 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}
88
67static void 89static void
68poll_wait () 90poll_wait ()
69{ 91{
70 if (nreqs && !ress) 92 if (nreqs && !ress)
71 { 93 {
… …
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
110 for (;;)
111 {
87 pthread_mutex_lock (&reslock); 112 pthread_mutex_lock (&reslock);
113 req = ress;
88 114
89 { 115 if (req)
116 {
117 ress = req->next;
118
119 if (!ress)
120 {
90 /* read any signals sent by the worker threads */ 121 /* read any signals sent by the worker threads */
91 char buf [32]; 122 char buf [32];
92 while (read (respipe [0], buf, 32) > 0) 123 while (read (respipe [0], buf, 32) == 32)
124 ;
125
126 rese = 0;
127 }
93 ; 128 }
94 }
95 129
96 req = ress;
97 ress = rese = 0;
98
99 pthread_mutex_unlock (&reslock); 130 pthread_mutex_unlock (&reslock);
100 131
101 while (req) 132 if (!req)
102 { 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
… …
182 pthread_t tid; 207 pthread_t tid;
183 pthread_attr_t attr; 208 pthread_attr_t attr;
184 209
185 pthread_attr_init (&attr); 210 pthread_attr_init (&attr);
186 pthread_attr_setstacksize (&attr, STACKSIZE); 211 pthread_attr_setstacksize (&attr, STACKSIZE);
187 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 212// pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
188 213
189 sigfillset (&fullsigset); 214 sigfillset (&fullsigset);
190 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 215 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
191 216
192 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 217 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
… …
196} 221}
197 222
198static void 223static void
199send_req (aio_req req) 224send_req (aio_req req)
200{ 225{
226 while (started < wanted && nreqs >= started)
227 start_thread ();
228
201 nreqs++; 229 nreqs++;
202 230
203 pthread_mutex_lock (&reqlock); 231 pthread_mutex_lock (&reqlock);
204 232
205 req->next = 0; 233 req->next = 0;
… …
213 reqe = reqs = req; 241 reqe = reqs = req;
214 242
215 pthread_cond_signal (&reqwait); 243 pthread_cond_signal (&reqwait);
216 pthread_mutex_unlock (&reqlock); 244 pthread_mutex_unlock (&reqlock);
217 245
218 while (nreqs > max_outstanding) 246 if (nreqs > max_outstanding)
247 for (;;)
248 {
249 poll_cb ();
250
251 if (nreqs <= max_outstanding)
252 break;
253
254 poll_wait ();
255 }
256}
257
258static void
259end_thread (void)
260{
261 aio_req req;
262 Newz (0, req, 1, aio_cb);
263 req->type = REQ_QUIT;
264
265 send_req (req);
266}
267
268static void min_parallel (int nthreads)
269{
270 if (wanted < nthreads)
271 wanted = nthreads;
272}
273
274static void max_parallel (int nthreads)
275{
276 int cur = started;
277
278 if (wanted > nthreads)
279 wanted = nthreads;
280
281 while (cur > wanted)
282 {
283 end_thread ();
284 cur--;
285 }
286
287 while (started > wanted)
219 { 288 {
220 poll_wait (); 289 poll_wait ();
221 poll_cb (); 290 poll_cb ();
222 } 291 }
223} 292}
224 293
225static void 294static void create_pipe ()
226end_thread (void)
227{ 295{
296 if (pipe (respipe))
297 croak ("unable to initialize result pipe");
298
299 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
300 croak ("cannot set result pipe to nonblocking mode");
301
302 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
303 croak ("cannot set result pipe to nonblocking mode");
304}
305
306static void atfork_prepare (void)
307{
308 pthread_mutex_lock (&reqlock);
309 pthread_mutex_lock (&reslock);
310}
311
312static void atfork_parent (void)
313{
314 pthread_mutex_unlock (&reslock);
315 pthread_mutex_unlock (&reqlock);
316}
317
318static void atfork_child (void)
319{
228 aio_req req; 320 aio_req prv;
229 New (0, req, 1, aio_cb);
230 req->type = REQ_QUIT;
231 321
232 send_req (req); 322 started = 0;
233}
234 323
324 while (reqs)
325 {
326 prv = reqs;
327 reqs = prv->next;
328 free_req (prv);
329 }
330
331 reqs = reqe = 0;
332
333 while (ress)
334 {
335 prv = ress;
336 ress = prv->next;
337 free_req (prv);
338 }
339
340 ress = rese = 0;
341
342 close (respipe [0]);
343 close (respipe [1]);
344 create_pipe ();
345
346 atfork_parent ();
347}
348
349/*****************************************************************************/
235/* work around various missing functions */ 350/* work around various missing functions */
236 351
237#if !HAVE_PREADWRITE 352#if !HAVE_PREADWRITE
238# define pread aio_pread 353# define pread aio_pread
239# define pwrite aio_pwrite 354# define pwrite aio_pwrite
… …
301 416
302 errno = 0; 417 errno = 0;
303} 418}
304#endif 419#endif
305 420
421/*****************************************************************************/
422
306static void * 423static void *
307aio_proc (void *thr_arg) 424aio_proc (void *thr_arg)
308{ 425{
309 aio_req req; 426 aio_req req;
310 int type; 427 int type;
… …
347 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 464 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
348 465
349 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 466 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
350 case REQ_CLOSE: req->result = close (req->fd); break; 467 case REQ_CLOSE: req->result = close (req->fd); break;
351 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 468 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
469 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
470 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
352 471
353 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 472 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
354 case REQ_FSYNC: req->result = fsync (req->fd); break; 473 case REQ_FSYNC: req->result = fsync (req->fd); break;
355 474
356 case REQ_QUIT: 475 case REQ_QUIT:
… …
385 while (type != REQ_QUIT); 504 while (type != REQ_QUIT);
386 505
387 return 0; 506 return 0;
388} 507}
389 508
509#define dREQ \
510 aio_req req; \
511 \
512 if (SvOK (callback) && !SvROK (callback)) \
513 croak ("clalback must be undef or of reference type"); \
514 \
515 Newz (0, req, 1, aio_cb); \
516 if (!req) \
517 croak ("out of memory during aio_req allocation"); \
518 \
519 req->callback = newSVsv (callback);
520
390MODULE = IO::AIO PACKAGE = IO::AIO 521MODULE = IO::AIO PACKAGE = IO::AIO
391 522
392PROTOTYPES: ENABLE 523PROTOTYPES: ENABLE
393 524
394BOOT: 525BOOT:
395{ 526{
396 if (pipe (respipe)) 527 create_pipe ();
397 croak ("unable to initialize result pipe"); 528 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} 529}
405 530
406void 531void
407min_parallel(nthreads) 532min_parallel(nthreads)
408 int nthreads 533 int nthreads
409 PROTOTYPE: $ 534 PROTOTYPE: $
410 CODE:
411 while (nthreads > started)
412 start_thread ();
413 535
414void 536void
415max_parallel(nthreads) 537max_parallel(nthreads)
416 int nthreads 538 int nthreads
417 PROTOTYPE: $ 539 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 540
434int 541int
435max_outstanding(nreqs) 542max_outstanding(nreqs)
436 int nreqs 543 int nreqs
437 PROTOTYPE: $ 544 PROTOTYPE: $
… …
446 int mode 553 int mode
447 SV * callback 554 SV * callback
448 PROTOTYPE: $$$;$ 555 PROTOTYPE: $$$;$
449 CODE: 556 CODE:
450{ 557{
451 aio_req req; 558 dREQ;
452
453 Newz (0, req, 1, aio_cb);
454
455 if (!req)
456 croak ("out of memory during aio_req allocation");
457 559
458 req->type = REQ_OPEN; 560 req->type = REQ_OPEN;
459 req->data = newSVsv (pathname); 561 req->data = newSVsv (pathname);
460 req->dataptr = SvPV_nolen (req->data); 562 req->dataptr = SvPVbyte_nolen (req->data);
461 req->fd = flags; 563 req->fd = flags;
462 req->mode = mode; 564 req->mode = mode;
463 req->callback = SvREFCNT_inc (callback);
464 565
465 send_req (req); 566 send_req (req);
466} 567}
467 568
468void 569void
… …
474 aio_close = REQ_CLOSE 575 aio_close = REQ_CLOSE
475 aio_fsync = REQ_FSYNC 576 aio_fsync = REQ_FSYNC
476 aio_fdatasync = REQ_FDATASYNC 577 aio_fdatasync = REQ_FDATASYNC
477 CODE: 578 CODE:
478{ 579{
479 aio_req req; 580 dREQ;
480
481 Newz (0, req, 1, aio_cb);
482
483 if (!req)
484 croak ("out of memory during aio_req allocation");
485 581
486 req->type = ix; 582 req->type = ix;
487 req->fh = newSVsv (fh); 583 req->fh = newSVsv (fh);
488 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 584 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
489 req->callback = SvREFCNT_inc (callback);
490 585
491 send_req (req); 586 send_req (req);
492} 587}
493 588
494void 589void
… …
505 PROTOTYPE: $$$$$;$ 600 PROTOTYPE: $$$$$;$
506 CODE: 601 CODE:
507{ 602{
508 aio_req req; 603 aio_req req;
509 STRLEN svlen; 604 STRLEN svlen;
510 char *svptr = SvPV (data, svlen); 605 char *svptr = SvPVbyte (data, svlen);
511 606
512 SvUPGRADE (data, SVt_PV); 607 SvUPGRADE (data, SVt_PV);
513 SvPOK_on (data); 608 SvPOK_on (data);
514 609
515 if (dataoffset < 0) 610 if (dataoffset < 0)
… …
531 } 626 }
532 627
533 if (length < 0) 628 if (length < 0)
534 croak ("length must not be negative"); 629 croak ("length must not be negative");
535 630
536 Newz (0, req, 1, aio_cb); 631 {
632 dREQ;
537 633
538 if (!req)
539 croak ("out of memory during aio_req allocation");
540
541 req->type = ix; 634 req->type = ix;
542 req->fh = newSVsv (fh); 635 req->fh = newSVsv (fh);
543 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 636 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
544 : IoOFP (sv_2io (fh))); 637 : IoOFP (sv_2io (fh)));
545 req->offset = offset; 638 req->offset = offset;
546 req->length = length; 639 req->length = length;
547 req->data = SvREFCNT_inc (data); 640 req->data = SvREFCNT_inc (data);
548 req->dataptr = (char *)svptr + dataoffset; 641 req->dataptr = (char *)svptr + dataoffset;
549 req->callback = SvREFCNT_inc (callback);
550 642
643 if (!SvREADONLY (data))
644 {
645 SvREADONLY_on (data);
646 req->data2ptr = (void *)data;
647 }
648
551 send_req (req); 649 send_req (req);
650 }
552} 651}
553 652
554void 653void
555aio_readahead(fh,offset,length,callback=&PL_sv_undef) 654aio_readahead(fh,offset,length,callback=&PL_sv_undef)
556 SV * fh 655 SV * fh
… …
558 IV length 657 IV length
559 SV * callback 658 SV * callback
560 PROTOTYPE: $$$;$ 659 PROTOTYPE: $$$;$
561 CODE: 660 CODE:
562{ 661{
563 aio_req req; 662 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 663
573 req->type = REQ_READAHEAD; 664 req->type = REQ_READAHEAD;
574 req->fh = newSVsv (fh); 665 req->fh = newSVsv (fh);
575 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 666 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
576 req->offset = offset; 667 req->offset = offset;
577 req->length = length; 668 req->length = length;
578 req->callback = SvREFCNT_inc (callback);
579 669
580 send_req (req); 670 send_req (req);
581} 671}
582 672
583void 673void
… …
587 ALIAS: 677 ALIAS:
588 aio_stat = REQ_STAT 678 aio_stat = REQ_STAT
589 aio_lstat = REQ_LSTAT 679 aio_lstat = REQ_LSTAT
590 CODE: 680 CODE:
591{ 681{
592 aio_req req; 682 dREQ;
593
594 Newz (0, req, 1, aio_cb);
595
596 if (!req)
597 croak ("out of memory during aio_req allocation");
598 683
599 New (0, req->statdata, 1, Stat_t); 684 New (0, req->statdata, 1, Stat_t);
600
601 if (!req->statdata) 685 if (!req->statdata)
686 {
687 free_req (req);
602 croak ("out of memory during aio_req->statdata allocation"); 688 croak ("out of memory during aio_req->statdata allocation");
689 }
603 690
604 if (SvPOK (fh_or_path)) 691 if (SvPOK (fh_or_path))
605 { 692 {
606 req->type = ix; 693 req->type = ix;
607 req->data = newSVsv (fh_or_path); 694 req->data = newSVsv (fh_or_path);
608 req->dataptr = SvPV_nolen (req->data); 695 req->dataptr = SvPVbyte_nolen (req->data);
609 } 696 }
610 else 697 else
611 { 698 {
612 req->type = REQ_FSTAT; 699 req->type = REQ_FSTAT;
613 req->fh = newSVsv (fh_or_path); 700 req->fh = newSVsv (fh_or_path);
614 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 701 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
615 } 702 }
616 703
617 req->callback = SvREFCNT_inc (callback);
618
619 send_req (req); 704 send_req (req);
620} 705}
621 706
622void 707void
623aio_unlink(pathname,callback=&PL_sv_undef) 708aio_unlink(pathname,callback=&PL_sv_undef)
624 SV * pathname 709 SV * pathname
625 SV * callback 710 SV * callback
711 ALIAS:
712 aio_unlink = REQ_UNLINK
713 aio_rmdir = REQ_RMDIR
626 CODE: 714 CODE:
627{ 715{
628 aio_req req; 716 dREQ;
629 717
630 Newz (0, req, 1, aio_cb); 718 req->type = ix;
719 req->data = newSVsv (pathname);
720 req->dataptr = SvPVbyte_nolen (req->data);
631 721
632 if (!req) 722 send_req (req);
633 croak ("out of memory during aio_req allocation"); 723}
724
725void
726aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
727 SV * oldpath
728 SV * newpath
729 SV * callback
730 CODE:
731{
732 dREQ;
634 733
635 req->type = REQ_UNLINK; 734 req->type = REQ_SYMLINK;
735 req->fh = newSVsv (oldpath);
736 req->data2ptr = SvPVbyte_nolen (req->fh);
636 req->data = newSVsv (pathname); 737 req->data = newSVsv (newpath);
637 req->dataptr = SvPV_nolen (req->data); 738 req->dataptr = SvPVbyte_nolen (req->data);
638 req->callback = SvREFCNT_inc (callback);
639 739
640 send_req (req); 740 send_req (req);
641} 741}
642 742
643void 743void

Diff Legend

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