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.10 by root, Wed Jul 13 00:13:09 2005 UTC vs.
Revision 1.15 by root, Sat Jul 23 18:19:56 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
5#define _XOPEN_SOURCE 500
6 4
7#include <sys/types.h> 5#include <sys/types.h>
8#include <sys/stat.h> 6#include <sys/stat.h>
9 7
10#include <unistd.h> 8#include <unistd.h>
… …
44 off_t offset; 42 off_t offset;
45 size_t length; 43 size_t length;
46 ssize_t result; 44 ssize_t result;
47 mode_t mode; /* open */ 45 mode_t mode; /* open */
48 int errorno; 46 int errorno;
49 SV *data, *callback; 47 SV *data, *callback, *fh;
50 void *dataptr; 48 void *dataptr;
51 STRLEN dataoffset; 49 STRLEN dataoffset;
52 50
53 Stat_t *statdata; 51 Stat_t *statdata;
54} aio_cb; 52} aio_cb;
55 53
56typedef aio_cb *aio_req; 54typedef aio_cb *aio_req;
57 55
58static int started; 56static int started;
59static int nreqs; 57static volatile int nreqs;
60static int max_outstanding = 1<<30; 58static int max_outstanding = 1<<30;
61static int respipe [2]; 59static int respipe [2];
62 60
63static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 61static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
64static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 62static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
… …
68static volatile aio_req ress, rese; /* queue start, queue end */ 66static volatile aio_req ress, rese; /* queue start, queue end */
69 67
70static void 68static void
71poll_wait () 69poll_wait ()
72{ 70{
73 if (!nreqs) 71 if (nreqs && !ress)
74 return; 72 {
75
76 fd_set rfd; 73 fd_set rfd;
77 FD_ZERO(&rfd); 74 FD_ZERO(&rfd);
78 FD_SET(respipe [0], &rfd); 75 FD_SET(respipe [0], &rfd);
79 76
80 select (respipe [0] + 1, &rfd, 0, 0, 0); 77 select (respipe [0] + 1, &rfd, 0, 0, 0);
78 }
81} 79}
82 80
83static int 81static int
84poll_cb () 82poll_cb ()
85{ 83{
86 dSP; 84 dSP;
87 int count = 0; 85 int count = 0;
88 aio_req req; 86 aio_req req, prv;
89 87
88 pthread_mutex_lock (&reslock);
89
90 { 90 {
91 /* read and signals sent by the worker threads */ 91 /* read any signals sent by the worker threads */
92 char buf [32]; 92 char buf [32];
93 while (read (respipe [0], buf, 32) > 0) 93 while (read (respipe [0], buf, 32) > 0)
94 ; 94 ;
95 } 95 }
96 96
97 for (;;) 97 req = ress;
98 ress = rese = 0;
99
100 pthread_mutex_unlock (&reslock);
101
102 while (req)
98 { 103 {
99 pthread_mutex_lock (&reslock);
100
101 req = ress;
102
103 if (ress)
104 {
105 ress = ress->next;
106 if (!ress) rese = 0;
107 }
108
109 pthread_mutex_unlock (&reslock);
110
111 if (!req)
112 break;
113
114 nreqs--; 104 nreqs--;
115 105
116 if (req->type == REQ_QUIT) 106 if (req->type == REQ_QUIT)
117 started--; 107 started--;
118 else 108 else
… …
125 + req->result > 0 ? req->result : 0); 115 + req->result > 0 ? req->result : 0);
126 116
127 if (req->data) 117 if (req->data)
128 SvREFCNT_dec (req->data); 118 SvREFCNT_dec (req->data);
129 119
120 if (req->fh)
121 SvREFCNT_dec (req->fh);
122
130 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) 123 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
131 { 124 {
132 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 125 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
133 PL_laststatval = req->result; 126 PL_laststatval = req->result;
134 PL_statcache = *(req->statdata); 127 PL_statcache = *(req->statdata);
135 128
136 Safefree (req->statdata); 129 Safefree (req->statdata);
137 } 130 }
138 131
132 ENTER;
139 PUSHMARK (SP); 133 PUSHMARK (SP);
140 XPUSHs (sv_2mortal (newSViv (req->result))); 134 XPUSHs (sv_2mortal (newSViv (req->result)));
141 135
142 if (req->type == REQ_OPEN) 136 if (req->type == REQ_OPEN)
143 { 137 {
… …
146 140
147 PUTBACK; 141 PUTBACK;
148 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 142 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
149 SPAGAIN; 143 SPAGAIN;
150 144
151 fh = POPs; 145 fh = SvREFCNT_inc (POPs);
152 146
153 PUSHMARK (SP); 147 PUSHMARK (SP);
154 XPUSHs (fh); 148 XPUSHs (sv_2mortal (fh));
155 } 149 }
156 150
157 if (SvOK (req->callback)) 151 if (SvOK (req->callback))
158 { 152 {
159 PUTBACK; 153 PUTBACK;
160 call_sv (req->callback, G_VOID | G_EVAL); 154 call_sv (req->callback, G_VOID | G_EVAL);
161 SPAGAIN; 155 SPAGAIN;
162 } 156 }
157
158 LEAVE;
163 159
164 if (req->callback) 160 if (req->callback)
165 SvREFCNT_dec (req->callback); 161 SvREFCNT_dec (req->callback);
166 162
167 errno = errorno; 163 errno = errorno;
168 count++; 164 count++;
169 } 165 }
170 166
167 prv = req;
168 req = req->next;
171 Safefree (req); 169 Safefree (prv);
170
171 /* TODO: croak on errors? */
172 } 172 }
173 173
174 return count; 174 return count;
175} 175}
176 176
… …
227end_thread (void) 227end_thread (void)
228{ 228{
229 aio_req req; 229 aio_req req;
230 New (0, req, 1, aio_cb); 230 New (0, req, 1, aio_cb);
231 req->type = REQ_QUIT; 231 req->type = REQ_QUIT;
232
233 send_req (req);
234}
235
236static void
237read_write (int dowrite, int fd, off_t offset, size_t length,
238 SV *data, STRLEN dataoffset, SV *callback)
239{
240 aio_req req;
241 STRLEN svlen;
242 char *svptr = SvPV (data, svlen);
243
244 SvUPGRADE (data, SVt_PV);
245 SvPOK_on (data);
246
247 if (dataoffset < 0)
248 dataoffset += svlen;
249
250 if (dataoffset < 0 || dataoffset > svlen)
251 croak ("data offset outside of string");
252
253 if (dowrite)
254 {
255 /* write: check length and adjust. */
256 if (length < 0 || length + dataoffset > svlen)
257 length = svlen - dataoffset;
258 }
259 else
260 {
261 /* read: grow scalar as necessary */
262 svptr = SvGROW (data, length + dataoffset);
263 }
264
265 if (length < 0)
266 croak ("length must not be negative");
267
268 Newz (0, req, 1, aio_cb);
269
270 if (!req)
271 croak ("out of memory during aio_req allocation");
272
273 req->type = dowrite ? REQ_WRITE : REQ_READ;
274 req->fd = fd;
275 req->offset = offset;
276 req->length = length;
277 req->data = SvREFCNT_inc (data);
278 req->dataptr = (char *)svptr + dataoffset;
279 req->callback = SvREFCNT_inc (callback);
280 232
281 send_req (req); 233 send_req (req);
282} 234}
283 235
284static void * 236static void *
… …
446 send_req (req); 398 send_req (req);
447} 399}
448 400
449void 401void
450aio_close(fh,callback=&PL_sv_undef) 402aio_close(fh,callback=&PL_sv_undef)
451 InputStream fh 403 SV * fh
452 SV * callback 404 SV * callback
453 PROTOTYPE: $;$ 405 PROTOTYPE: $;$
454 ALIAS: 406 ALIAS:
455 aio_close = REQ_CLOSE 407 aio_close = REQ_CLOSE
456 aio_fsync = REQ_FSYNC 408 aio_fsync = REQ_FSYNC
457 aio_fdatasync = REQ_FDATASYNC 409 aio_fdatasync = REQ_FDATASYNC
… …
463 415
464 if (!req) 416 if (!req)
465 croak ("out of memory during aio_req allocation"); 417 croak ("out of memory during aio_req allocation");
466 418
467 req->type = ix; 419 req->type = ix;
420 req->fh = newSVsv (fh);
468 req->fd = PerlIO_fileno (fh); 421 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
469 req->callback = SvREFCNT_inc (callback); 422 req->callback = SvREFCNT_inc (callback);
470 423
471 send_req (req); 424 send_req (req);
472} 425}
473 426
474void 427void
475aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 428aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
476 InputStream fh 429 SV * fh
477 UV offset 430 UV offset
478 IV length 431 IV length
479 SV * data 432 SV * data
480 IV dataoffset 433 IV dataoffset
481 SV * callback 434 SV * callback
435 ALIAS:
436 aio_read = REQ_READ
437 aio_write = REQ_WRITE
482 PROTOTYPE: $$$$$;$ 438 PROTOTYPE: $$$$$;$
483 CODE: 439 CODE:
484 read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 440{
441 aio_req req;
442 STRLEN svlen;
443 char *svptr = SvPV (data, svlen);
485 444
486void 445 SvUPGRADE (data, SVt_PV);
487aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 446 SvPOK_on (data);
488 OutputStream fh 447
489 UV offset 448 if (dataoffset < 0)
490 IV length 449 dataoffset += svlen;
491 SV * data 450
492 IV dataoffset 451 if (dataoffset < 0 || dataoffset > svlen)
493 SV * callback 452 croak ("data offset outside of string");
494 PROTOTYPE: $$$$$;$ 453
495 CODE: 454 if (ix == REQ_WRITE)
496 read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 455 {
456 /* write: check length and adjust. */
457 if (length < 0 || length + dataoffset > svlen)
458 length = svlen - dataoffset;
459 }
460 else
461 {
462 /* read: grow scalar as necessary */
463 svptr = SvGROW (data, length + dataoffset);
464 }
465
466 if (length < 0)
467 croak ("length must not be negative");
468
469 Newz (0, req, 1, aio_cb);
470
471 if (!req)
472 croak ("out of memory during aio_req allocation");
473
474 req->type = ix;
475 req->fh = newSVsv (fh);
476 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
477 : IoOFP (sv_2io (fh)));
478 req->offset = offset;
479 req->length = length;
480 req->data = SvREFCNT_inc (data);
481 req->dataptr = (char *)svptr + dataoffset;
482 req->callback = SvREFCNT_inc (callback);
483
484 send_req (req);
485}
497 486
498void 487void
499aio_readahead(fh,offset,length,callback=&PL_sv_undef) 488aio_readahead(fh,offset,length,callback=&PL_sv_undef)
500 InputStream fh 489 SV * fh
501 UV offset 490 UV offset
502 IV length 491 IV length
503 SV * callback 492 SV * callback
504 PROTOTYPE: $$$;$ 493 PROTOTYPE: $$$;$
505 CODE: 494 CODE:
506{ 495{
507 aio_req req; 496 aio_req req;
508 497
… …
513 502
514 if (!req) 503 if (!req)
515 croak ("out of memory during aio_req allocation"); 504 croak ("out of memory during aio_req allocation");
516 505
517 req->type = REQ_READAHEAD; 506 req->type = REQ_READAHEAD;
507 req->fh = newSVsv (fh);
518 req->fd = PerlIO_fileno (fh); 508 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
519 req->offset = offset; 509 req->offset = offset;
520 req->length = length; 510 req->length = length;
521 req->callback = SvREFCNT_inc (callback); 511 req->callback = SvREFCNT_inc (callback);
522 512
523 send_req (req); 513 send_req (req);
… …
551 req->dataptr = SvPV_nolen (req->data); 541 req->dataptr = SvPV_nolen (req->data);
552 } 542 }
553 else 543 else
554 { 544 {
555 req->type = REQ_FSTAT; 545 req->type = REQ_FSTAT;
546 req->fh = newSVsv (fh_or_path);
556 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 547 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
557 } 548 }
558 549
559 req->callback = SvREFCNT_inc (callback); 550 req->callback = SvREFCNT_inc (callback);
560 551

Diff Legend

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