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.6 by root, Mon Jul 11 01:03:17 2005 UTC vs.
Revision 1.16 by root, Sun Jul 31 18:20:07 2005 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "autoconf/config.h"
6
5#include <sys/types.h> 7#include <sys/types.h>
6#include <sys/stat.h> 8#include <sys/stat.h>
9
7#include <unistd.h> 10#include <unistd.h>
8#include <fcntl.h> 11#include <fcntl.h>
9#include <signal.h> 12#include <signal.h>
10#include <sched.h> 13#include <sched.h>
11#include <endian.h>
12 14
13#include <pthread.h> 15#include <pthread.h>
14#include <sys/syscall.h>
15 16
16typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 17typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
17typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 18typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
18typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 19typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */
19 20
… …
40 off_t offset; 41 off_t offset;
41 size_t length; 42 size_t length;
42 ssize_t result; 43 ssize_t result;
43 mode_t mode; /* open */ 44 mode_t mode; /* open */
44 int errorno; 45 int errorno;
45 SV *data, *callback; 46 SV *data, *callback, *fh;
46 void *dataptr; 47 void *dataptr;
47 STRLEN dataoffset; 48 STRLEN dataoffset;
48 49
49 Stat_t *statdata; 50 Stat_t *statdata;
50} aio_cb; 51} aio_cb;
51 52
52typedef aio_cb *aio_req; 53typedef aio_cb *aio_req;
53 54
54static int started; 55static int started;
55static int nreqs; 56static volatile int nreqs;
56static int max_outstanding = 1<<30; 57static int max_outstanding = 1<<30;
57static int respipe [2]; 58static int respipe [2];
58 59
59static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 60static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
60static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 61static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
… …
64static volatile aio_req ress, rese; /* queue start, queue end */ 65static volatile aio_req ress, rese; /* queue start, queue end */
65 66
66static void 67static void
67poll_wait () 68poll_wait ()
68{ 69{
69 if (!nreqs) 70 if (nreqs && !ress)
70 return; 71 {
71
72 fd_set rfd; 72 fd_set rfd;
73 FD_ZERO(&rfd); 73 FD_ZERO(&rfd);
74 FD_SET(respipe [0], &rfd); 74 FD_SET(respipe [0], &rfd);
75 75
76 select (respipe [0] + 1, &rfd, 0, 0, 0); 76 select (respipe [0] + 1, &rfd, 0, 0, 0);
77 }
77} 78}
78 79
79static int 80static int
80poll_cb () 81poll_cb ()
81{ 82{
82 dSP; 83 dSP;
83 int count = 0; 84 int count = 0;
84 aio_req req; 85 aio_req req, prv;
85 86
87 pthread_mutex_lock (&reslock);
88
86 { 89 {
87 /* read and signals sent by the worker threads */ 90 /* read any signals sent by the worker threads */
88 char buf [32]; 91 char buf [32];
89 while (read (respipe [0], buf, 32) > 0) 92 while (read (respipe [0], buf, 32) > 0)
90 ; 93 ;
91 } 94 }
92 95
93 for (;;) 96 req = ress;
97 ress = rese = 0;
98
99 pthread_mutex_unlock (&reslock);
100
101 while (req)
94 { 102 {
95 pthread_mutex_lock (&reslock);
96
97 req = ress;
98
99 if (ress)
100 {
101 ress = ress->next;
102 if (!ress) rese = 0;
103 }
104
105 pthread_mutex_unlock (&reslock);
106
107 if (!req)
108 break;
109
110 nreqs--; 103 nreqs--;
111 104
112 if (req->type == REQ_QUIT) 105 if (req->type == REQ_QUIT)
113 started--; 106 started--;
114 else 107 else
… …
121 + req->result > 0 ? req->result : 0); 114 + req->result > 0 ? req->result : 0);
122 115
123 if (req->data) 116 if (req->data)
124 SvREFCNT_dec (req->data); 117 SvREFCNT_dec (req->data);
125 118
119 if (req->fh)
120 SvREFCNT_dec (req->fh);
121
126 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) 122 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
127 { 123 {
128 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 124 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
129 PL_laststatval = req->result; 125 PL_laststatval = req->result;
130 PL_statcache = *(req->statdata); 126 PL_statcache = *(req->statdata);
131 127
132 Safefree (req->statdata); 128 Safefree (req->statdata);
133 } 129 }
134 130
131 ENTER;
135 PUSHMARK (SP); 132 PUSHMARK (SP);
136 XPUSHs (sv_2mortal (newSViv (req->result))); 133 XPUSHs (sv_2mortal (newSViv (req->result)));
137 134
138 if (req->type == REQ_OPEN) 135 if (req->type == REQ_OPEN)
139 { 136 {
… …
142 139
143 PUTBACK; 140 PUTBACK;
144 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 141 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
145 SPAGAIN; 142 SPAGAIN;
146 143
147 fh = POPs; 144 fh = SvREFCNT_inc (POPs);
148 145
149 PUSHMARK (SP); 146 PUSHMARK (SP);
150 XPUSHs (fh); 147 XPUSHs (sv_2mortal (fh));
151 } 148 }
152 149
150 if (SvOK (req->callback))
151 {
153 PUTBACK; 152 PUTBACK;
154 call_sv (req->callback, G_VOID | G_EVAL); 153 call_sv (req->callback, G_VOID | G_EVAL);
155 SPAGAIN; 154 SPAGAIN;
155 }
156
157 LEAVE;
156 158
157 if (req->callback) 159 if (req->callback)
158 SvREFCNT_dec (req->callback); 160 SvREFCNT_dec (req->callback);
159 161
160 errno = errorno; 162 errno = errorno;
161 count++; 163 count++;
162 } 164 }
163 165
166 prv = req;
167 req = req->next;
164 Safefree (req); 168 Safefree (prv);
169
170 /* TODO: croak on errors? */
165 } 171 }
166 172
167 return count; 173 return count;
168} 174}
169 175
… …
224 req->type = REQ_QUIT; 230 req->type = REQ_QUIT;
225 231
226 send_req (req); 232 send_req (req);
227} 233}
228 234
229static void
230read_write (int dowrite, int fd, off_t offset, size_t length,
231 SV *data, STRLEN dataoffset, SV *callback)
232{
233 aio_req req;
234 STRLEN svlen;
235 char *svptr = SvPV (data, svlen);
236
237 SvUPGRADE (data, SVt_PV);
238 SvPOK_on (data);
239
240 if (dataoffset < 0)
241 dataoffset += svlen;
242
243 if (dataoffset < 0 || dataoffset > svlen)
244 croak ("data offset outside of string");
245
246 if (dowrite)
247 {
248 /* write: check length and adjust. */
249 if (length < 0 || length + dataoffset > svlen)
250 length = svlen - dataoffset;
251 }
252 else
253 {
254 /* read: grow scalar as necessary */
255 svptr = SvGROW (data, length + dataoffset);
256 }
257
258 if (length < 0)
259 croak ("length must not be negative");
260
261 Newz (0, req, 1, aio_cb);
262
263 if (!req)
264 croak ("out of memory during aio_req allocation");
265
266 req->type = dowrite ? REQ_WRITE : REQ_READ;
267 req->fd = fd;
268 req->offset = offset;
269 req->length = length;
270 req->data = SvREFCNT_inc (data);
271 req->dataptr = (char *)svptr + dataoffset;
272 req->callback = SvREFCNT_inc (callback);
273
274 send_req (req);
275}
276
277static void * 235static void *
278aio_proc (void *thr_arg) 236aio_proc (void *thr_arg)
279{ 237{
280 aio_req req; 238 aio_req req;
281 int type; 239 int type;
… …
306 264
307 type = req->type; 265 type = req->type;
308 266
309 switch (type) 267 switch (type)
310 { 268 {
269#if HAVE_PREADWRITE
311 case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break; 270 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
312 case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break; 271 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
313#if SYS_readahead 272#else
273# error "pread/pwrite cannot be emulated, fix your os"
274#endif
275
276#if HAVE_READAHEAD
314 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 277 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
315#else 278#else
279 // TODO: emulate
316 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break; 280 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
317#endif 281#endif
318 282
319 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 283 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
320 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 284 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
… …
322 286
323 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 287 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
324 case REQ_CLOSE: req->result = close (req->fd); break; 288 case REQ_CLOSE: req->result = close (req->fd); break;
325 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 289 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
326 290
291 case REQ_FDATASYNC:
292#if HAVE_FDATASYNC
293 req->result = fdatasync (req->fd); break;
294#endif
327 case REQ_FSYNC: req->result = fsync (req->fd); break; 295 case REQ_FSYNC: req->result = fsync (req->fd); break;
328 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
329 296
330 case REQ_QUIT: 297 case REQ_QUIT:
331 break; 298 break;
332 299
333 default: 300 default:
… …
361 return 0; 328 return 0;
362} 329}
363 330
364MODULE = IO::AIO PACKAGE = IO::AIO 331MODULE = IO::AIO PACKAGE = IO::AIO
365 332
333PROTOTYPES: ENABLE
334
366BOOT: 335BOOT:
367{ 336{
368 if (pipe (respipe)) 337 if (pipe (respipe))
369 croak ("unable to initialize result pipe"); 338 croak ("unable to initialize result pipe");
370 339
… …
410 CODE: 379 CODE:
411 RETVAL = max_outstanding; 380 RETVAL = max_outstanding;
412 max_outstanding = nreqs; 381 max_outstanding = nreqs;
413 382
414void 383void
415aio_open(pathname,flags,mode,callback) 384aio_open(pathname,flags,mode,callback=&PL_sv_undef)
416 SV * pathname 385 SV * pathname
417 int flags 386 int flags
418 int mode 387 int mode
419 SV * callback 388 SV * callback
420 PROTOTYPE: $$$$ 389 PROTOTYPE: $$$;$
421 CODE: 390 CODE:
422{ 391{
423 aio_req req; 392 aio_req req;
424 393
425 Newz (0, req, 1, aio_cb); 394 Newz (0, req, 1, aio_cb);
… …
436 405
437 send_req (req); 406 send_req (req);
438} 407}
439 408
440void 409void
441aio_close(fh,callback) 410aio_close(fh,callback=&PL_sv_undef)
442 InputStream fh 411 SV * fh
443 SV * callback 412 SV * callback
444 PROTOTYPE: $$ 413 PROTOTYPE: $;$
445 ALIAS: 414 ALIAS:
446 aio_close = REQ_CLOSE 415 aio_close = REQ_CLOSE
447 aio_fsync = REQ_FSYNC 416 aio_fsync = REQ_FSYNC
448 aio_fdatasync = REQ_FDATASYNC 417 aio_fdatasync = REQ_FDATASYNC
449 CODE: 418 CODE:
… …
454 423
455 if (!req) 424 if (!req)
456 croak ("out of memory during aio_req allocation"); 425 croak ("out of memory during aio_req allocation");
457 426
458 req->type = ix; 427 req->type = ix;
428 req->fh = newSVsv (fh);
459 req->fd = PerlIO_fileno (fh); 429 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
460 req->callback = SvREFCNT_inc (callback); 430 req->callback = SvREFCNT_inc (callback);
461 431
462 send_req (req); 432 send_req (req);
463} 433}
464 434
465void 435void
466aio_read(fh,offset,length,data,dataoffset,callback) 436aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
467 InputStream fh 437 SV * fh
468 UV offset 438 UV offset
469 IV length 439 IV length
470 SV * data 440 SV * data
471 IV dataoffset 441 IV dataoffset
472 SV * callback 442 SV * callback
443 ALIAS:
444 aio_read = REQ_READ
445 aio_write = REQ_WRITE
473 PROTOTYPE: $$$$$$ 446 PROTOTYPE: $$$$$;$
474 CODE: 447 CODE:
475 read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
476
477void
478aio_write(fh,offset,length,data,dataoffset,callback)
479 OutputStream fh
480 UV offset
481 IV length
482 SV * data
483 IV dataoffset
484 SV * callback
485 PROTOTYPE: $$$$$$
486 CODE:
487 read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
488
489void
490aio_readahead(fh,offset,length,callback)
491 InputStream fh
492 UV offset
493 IV length
494 SV * callback
495 PROTOTYPE: $$$$
496 CODE:
497{ 448{
498 aio_req req; 449 aio_req req;
450 STRLEN svlen;
451 char *svptr = SvPV (data, svlen);
452
453 SvUPGRADE (data, SVt_PV);
454 SvPOK_on (data);
455
456 if (dataoffset < 0)
457 dataoffset += svlen;
458
459 if (dataoffset < 0 || dataoffset > svlen)
460 croak ("data offset outside of string");
461
462 if (ix == REQ_WRITE)
463 {
464 /* write: check length and adjust. */
465 if (length < 0 || length + dataoffset > svlen)
466 length = svlen - dataoffset;
467 }
468 else
469 {
470 /* read: grow scalar as necessary */
471 svptr = SvGROW (data, length + dataoffset);
472 }
499 473
500 if (length < 0) 474 if (length < 0)
501 croak ("length must not be negative"); 475 croak ("length must not be negative");
502 476
503 Newz (0, req, 1, aio_cb); 477 Newz (0, req, 1, aio_cb);
504 478
505 if (!req) 479 if (!req)
506 croak ("out of memory during aio_req allocation"); 480 croak ("out of memory during aio_req allocation");
507 481
482 req->type = ix;
483 req->fh = newSVsv (fh);
484 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
485 : IoOFP (sv_2io (fh)));
486 req->offset = offset;
487 req->length = length;
488 req->data = SvREFCNT_inc (data);
489 req->dataptr = (char *)svptr + dataoffset;
490 req->callback = SvREFCNT_inc (callback);
491
492 send_req (req);
493}
494
495void
496aio_readahead(fh,offset,length,callback=&PL_sv_undef)
497 SV * fh
498 UV offset
499 IV length
500 SV * callback
501 PROTOTYPE: $$$;$
502 CODE:
503{
504 aio_req req;
505
506 if (length < 0)
507 croak ("length must not be negative");
508
509 Newz (0, req, 1, aio_cb);
510
511 if (!req)
512 croak ("out of memory during aio_req allocation");
513
508 req->type = REQ_READAHEAD; 514 req->type = REQ_READAHEAD;
515 req->fh = newSVsv (fh);
509 req->fd = PerlIO_fileno (fh); 516 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
510 req->offset = offset; 517 req->offset = offset;
511 req->length = length; 518 req->length = length;
512 req->callback = SvREFCNT_inc (callback); 519 req->callback = SvREFCNT_inc (callback);
513 520
514 send_req (req); 521 send_req (req);
515} 522}
516 523
517void 524void
518aio_stat(fh_or_path,callback) 525aio_stat(fh_or_path,callback=&PL_sv_undef)
519 SV * fh_or_path 526 SV * fh_or_path
520 SV * callback 527 SV * callback
521 PROTOTYPE: $$
522 ALIAS: 528 ALIAS:
529 aio_stat = REQ_STAT
523 aio_lstat = 1 530 aio_lstat = REQ_LSTAT
524 CODE: 531 CODE:
525{ 532{
526 aio_req req; 533 aio_req req;
527 534
528 Newz (0, req, 1, aio_cb); 535 Newz (0, req, 1, aio_cb);
… …
535 if (!req->statdata) 542 if (!req->statdata)
536 croak ("out of memory during aio_req->statdata allocation"); 543 croak ("out of memory during aio_req->statdata allocation");
537 544
538 if (SvPOK (fh_or_path)) 545 if (SvPOK (fh_or_path))
539 { 546 {
540 req->type = ix ? REQ_LSTAT : REQ_STAT; 547 req->type = ix;
541 req->data = newSVsv (fh_or_path); 548 req->data = newSVsv (fh_or_path);
542 req->dataptr = SvPV_nolen (req->data); 549 req->dataptr = SvPV_nolen (req->data);
543 } 550 }
544 else 551 else
545 { 552 {
546 req->type = REQ_FSTAT; 553 req->type = REQ_FSTAT;
554 req->fh = newSVsv (fh_or_path);
547 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 555 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
548 } 556 }
549 557
550 req->callback = SvREFCNT_inc (callback); 558 req->callback = SvREFCNT_inc (callback);
551 559
552 send_req (req); 560 send_req (req);
553} 561}
554 562
555void 563void
556aio_unlink(pathname,callback) 564aio_unlink(pathname,callback=&PL_sv_undef)
557 SV * pathname 565 SV * pathname
558 SV * callback 566 SV * callback
559 PROTOTYPE: $$
560 CODE: 567 CODE:
561{ 568{
562 aio_req req; 569 aio_req req;
563 570
564 Newz (0, req, 1, aio_cb); 571 Newz (0, req, 1, aio_cb);
… …
582 { 589 {
583 poll_wait (); 590 poll_wait ();
584 poll_cb (); 591 poll_cb ();
585 } 592 }
586 593
594void
595poll()
596 PROTOTYPE:
597 CODE:
598 if (nreqs)
599 {
600 poll_wait ();
601 poll_cb ();
602 }
603
587int 604int
588poll_fileno() 605poll_fileno()
589 PROTOTYPE: 606 PROTOTYPE:
590 CODE: 607 CODE:
591 RETVAL = respipe [0]; 608 RETVAL = respipe [0];

Diff Legend

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