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.11 by root, Wed Jul 20 21:55:27 2005 UTC vs.
Revision 1.21 by root, Sun Aug 7 03:26:10 2005 UTC

1#define _XOPEN_SOURCE 500 1#define _REENTRANT 1
2#include <errno.h>
2 3
3#include "EXTERN.h" 4#include "EXTERN.h"
4#include "perl.h" 5#include "perl.h"
5#include "XSUB.h" 6#include "XSUB.h"
7
8#include "autoconf/config.h"
6 9
7#include <sys/types.h> 10#include <sys/types.h>
8#include <sys/stat.h> 11#include <sys/stat.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#if __linux
15#include <sys/syscall.h>
16#endif
17 17
18#include <pthread.h> 18#include <pthread.h>
19 19
20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
… …
44 off_t offset; 44 off_t offset;
45 size_t length; 45 size_t length;
46 ssize_t result; 46 ssize_t result;
47 mode_t mode; /* open */ 47 mode_t mode; /* open */
48 int errorno; 48 int errorno;
49 SV *data, *callback; 49 SV *data, *callback, *fh;
50 void *dataptr; 50 void *dataptr;
51 STRLEN dataoffset; 51 STRLEN dataoffset;
52 52
53 Stat_t *statdata; 53 Stat_t *statdata;
54} aio_cb; 54} aio_cb;
… …
84poll_cb () 84poll_cb ()
85{ 85{
86 dSP; 86 dSP;
87 int count = 0; 87 int count = 0;
88 aio_req req, prv; 88 aio_req req, prv;
89
90 static int rl;//D
91 //printf ("%d ENTER\n", ++rl);//D
92 89
93 pthread_mutex_lock (&reslock); 90 pthread_mutex_lock (&reslock);
94 91
95 { 92 {
96 /* read any signals sent by the worker threads */ 93 /* read any signals sent by the worker threads */
… …
105 pthread_mutex_unlock (&reslock); 102 pthread_mutex_unlock (&reslock);
106 103
107 while (req) 104 while (req)
108 { 105 {
109 nreqs--; 106 nreqs--;
110 //printf ("%d count %d %p->%p\n", rl, count, req, req->next);//D
111 107
112 if (req->type == REQ_QUIT) 108 if (req->type == REQ_QUIT)
113 started--; 109 started--;
114 else 110 else
115 { 111 {
… …
121 + req->result > 0 ? req->result : 0); 117 + req->result > 0 ? req->result : 0);
122 118
123 if (req->data) 119 if (req->data)
124 SvREFCNT_dec (req->data); 120 SvREFCNT_dec (req->data);
125 121
122 if (req->fh)
123 SvREFCNT_dec (req->fh);
124
126 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT) 125 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
127 { 126 {
128 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 127 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
129 PL_laststatval = req->result; 128 PL_laststatval = req->result;
130 PL_statcache = *(req->statdata); 129 PL_statcache = *(req->statdata);
131 130
132 Safefree (req->statdata); 131 Safefree (req->statdata);
133 } 132 }
134 133
134 ENTER;
135 PUSHMARK (SP); 135 PUSHMARK (SP);
136 XPUSHs (sv_2mortal (newSViv (req->result))); 136 XPUSHs (sv_2mortal (newSViv (req->result)));
137 137
138 if (req->type == REQ_OPEN) 138 if (req->type == REQ_OPEN)
139 { 139 {
… …
142 142
143 PUTBACK; 143 PUTBACK;
144 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 144 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
145 SPAGAIN; 145 SPAGAIN;
146 146
147 fh = POPs; 147 fh = SvREFCNT_inc (POPs);
148 148
149 PUSHMARK (SP); 149 PUSHMARK (SP);
150 XPUSHs (fh); 150 XPUSHs (sv_2mortal (fh));
151 } 151 }
152 152
153 if (SvOK (req->callback)) 153 if (SvOK (req->callback))
154 { 154 {
155 PUTBACK; 155 PUTBACK;
156 call_sv (req->callback, G_VOID | G_EVAL); 156 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN; 157 SPAGAIN;
158 } 158 }
159
160 LEAVE;
159 161
160 if (req->callback) 162 if (req->callback)
161 SvREFCNT_dec (req->callback); 163 SvREFCNT_dec (req->callback);
162 164
163 errno = errorno; 165 errno = errorno;
… …
169 Safefree (prv); 171 Safefree (prv);
170 172
171 /* TODO: croak on errors? */ 173 /* TODO: croak on errors? */
172 } 174 }
173 175
174 //printf ("%d LEAVE %p %p\n", rl--, ress, rese);//D
175 return count; 176 return count;
176} 177}
177 178
178static void *aio_proc(void *arg); 179static void *aio_proc(void *arg);
179 180
… …
232 req->type = REQ_QUIT; 233 req->type = REQ_QUIT;
233 234
234 send_req (req); 235 send_req (req);
235} 236}
236 237
237static void 238/* work around various missing functions */
238read_write (int dowrite, int fd, off_t offset, size_t length,
239 SV *data, STRLEN dataoffset, SV *callback)
240{
241 aio_req req;
242 STRLEN svlen;
243 char *svptr = SvPV (data, svlen);
244 239
245 SvUPGRADE (data, SVt_PV); 240#if !HAVE_PREADWRITE
246 SvPOK_on (data); 241# define pread aio_pread
242# define pwrite aio_pwrite
247 243
248 if (dataoffset < 0) 244/*
249 dataoffset += svlen; 245 * make our pread/pwrite safe against themselves, but not against
246 * normal read/write by using a mutex. slows down execution a lot,
247 * but that's your problem, not mine.
248 */
249static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
250 250
251 if (dataoffset < 0 || dataoffset > svlen) 251static ssize_t
252 croak ("data offset outside of string"); 252pread (int fd, void *buf, size_t count, off_t offset)
253{
254 ssize_t res;
255 off_t ooffset;
253 256
254 if (dowrite) 257 pthread_mutex_lock (&iolock);
258 ooffset = lseek (fd, 0, SEEK_CUR);
259 lseek (fd, offset, SEEK_SET);
260 res = read (fd, buf, count);
261 lseek (fd, ooffset, SEEK_SET);
262 pthread_mutex_unlock (&iolock);
263
264 return res;
265}
266
267static ssize_t
268pwrite (int fd, void *buf, size_t count, off_t offset)
269{
270 ssize_t res;
271 off_t ooffset;
272
273 pthread_mutex_lock (&iolock);
274 ooffset = lseek (fd, 0, SEEK_CUR);
275 lseek (fd, offset, SEEK_SET);
276 res = write (fd, buf, count);
277 lseek (fd, offset, SEEK_SET);
278 pthread_mutex_unlock (&iolock);
279
280 return res;
281}
282#endif
283
284#if !HAVE_FDATASYNC
285# define fdatasync fsync
286#endif
287
288#if !HAVE_READAHEAD
289# define readahead aio_readahead
290
291static char readahead_buf[4096];
292
293static ssize_t
294readahead (int fd, off_t offset, size_t count)
295{
296 while (count > 0)
255 { 297 {
256 /* write: check length and adjust. */ 298 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
257 if (length < 0 || length + dataoffset > svlen) 299
258 length = svlen - dataoffset; 300 pread (fd, readahead_buf, len, offset);
301 offset += len;
302 count -= len;
259 } 303 }
260 else
261 {
262 /* read: grow scalar as necessary */
263 svptr = SvGROW (data, length + dataoffset);
264 }
265 304
266 if (length < 0) 305 errno = 0;
267 croak ("length must not be negative");
268
269 Newz (0, req, 1, aio_cb);
270
271 if (!req)
272 croak ("out of memory during aio_req allocation");
273
274 req->type = dowrite ? REQ_WRITE : REQ_READ;
275 req->fd = fd;
276 req->offset = offset;
277 req->length = length;
278 req->data = SvREFCNT_inc (data);
279 req->dataptr = (char *)svptr + dataoffset;
280 req->callback = SvREFCNT_inc (callback);
281
282 send_req (req);
283} 306}
307#endif
284 308
285static void * 309static void *
286aio_proc (void *thr_arg) 310aio_proc (void *thr_arg)
287{ 311{
288 aio_req req; 312 aio_req req;
… …
316 340
317 switch (type) 341 switch (type)
318 { 342 {
319 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 343 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
320 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 344 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
321#if SYS_readahead 345
322 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 346 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
323#else
324 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
325#endif
326 347
327 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 348 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
328 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 349 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
329 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 350 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
330 351
331 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 352 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
332 case REQ_CLOSE: req->result = close (req->fd); break; 353 case REQ_CLOSE: req->result = close (req->fd); break;
333 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 354 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
334 355
356 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
335 case REQ_FSYNC: req->result = fsync (req->fd); break; 357 case REQ_FSYNC: req->result = fsync (req->fd); break;
336 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
337 358
338 case REQ_QUIT: 359 case REQ_QUIT:
339 break; 360 break;
340 361
341 default: 362 default:
… …
447 send_req (req); 468 send_req (req);
448} 469}
449 470
450void 471void
451aio_close(fh,callback=&PL_sv_undef) 472aio_close(fh,callback=&PL_sv_undef)
452 InputStream fh 473 SV * fh
453 SV * callback 474 SV * callback
454 PROTOTYPE: $;$ 475 PROTOTYPE: $;$
455 ALIAS: 476 ALIAS:
456 aio_close = REQ_CLOSE 477 aio_close = REQ_CLOSE
457 aio_fsync = REQ_FSYNC 478 aio_fsync = REQ_FSYNC
458 aio_fdatasync = REQ_FDATASYNC 479 aio_fdatasync = REQ_FDATASYNC
… …
464 485
465 if (!req) 486 if (!req)
466 croak ("out of memory during aio_req allocation"); 487 croak ("out of memory during aio_req allocation");
467 488
468 req->type = ix; 489 req->type = ix;
490 req->fh = newSVsv (fh);
469 req->fd = PerlIO_fileno (fh); 491 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
470 req->callback = SvREFCNT_inc (callback); 492 req->callback = SvREFCNT_inc (callback);
471 493
472 send_req (req); 494 send_req (req);
473} 495}
474 496
475void 497void
476aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 498aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
477 InputStream fh 499 SV * fh
478 UV offset 500 UV offset
479 IV length 501 IV length
480 SV * data 502 SV * data
481 IV dataoffset 503 IV dataoffset
482 SV * callback 504 SV * callback
505 ALIAS:
506 aio_read = REQ_READ
507 aio_write = REQ_WRITE
483 PROTOTYPE: $$$$$;$ 508 PROTOTYPE: $$$$$;$
484 CODE: 509 CODE:
485 read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 510{
511 aio_req req;
512 STRLEN svlen;
513 char *svptr = SvPVbyte (data, svlen);
486 514
487void 515 SvUPGRADE (data, SVt_PV);
488aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 516 SvPOK_on (data);
489 OutputStream fh 517
490 UV offset 518 if (dataoffset < 0)
491 IV length 519 dataoffset += svlen;
492 SV * data 520
493 IV dataoffset 521 if (dataoffset < 0 || dataoffset > svlen)
494 SV * callback 522 croak ("data offset outside of string");
495 PROTOTYPE: $$$$$;$ 523
496 CODE: 524 if (ix == REQ_WRITE)
497 read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 525 {
526 /* write: check length and adjust. */
527 if (length < 0 || length + dataoffset > svlen)
528 length = svlen - dataoffset;
529 }
530 else
531 {
532 /* read: grow scalar as necessary */
533 svptr = SvGROW (data, length + dataoffset);
534 }
535
536 if (length < 0)
537 croak ("length must not be negative");
538
539 Newz (0, req, 1, aio_cb);
540
541 if (!req)
542 croak ("out of memory during aio_req allocation");
543
544 req->type = ix;
545 req->fh = newSVsv (fh);
546 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
547 : IoOFP (sv_2io (fh)));
548 req->offset = offset;
549 req->length = length;
550 req->data = SvREFCNT_inc (data);
551 req->dataptr = (char *)svptr + dataoffset;
552 req->callback = SvREFCNT_inc (callback);
553
554 send_req (req);
555}
498 556
499void 557void
500aio_readahead(fh,offset,length,callback=&PL_sv_undef) 558aio_readahead(fh,offset,length,callback=&PL_sv_undef)
501 InputStream fh 559 SV * fh
502 UV offset 560 UV offset
503 IV length 561 IV length
504 SV * callback 562 SV * callback
505 PROTOTYPE: $$$;$ 563 PROTOTYPE: $$$;$
506 CODE: 564 CODE:
507{ 565{
508 aio_req req; 566 aio_req req;
509 567
… …
514 572
515 if (!req) 573 if (!req)
516 croak ("out of memory during aio_req allocation"); 574 croak ("out of memory during aio_req allocation");
517 575
518 req->type = REQ_READAHEAD; 576 req->type = REQ_READAHEAD;
577 req->fh = newSVsv (fh);
519 req->fd = PerlIO_fileno (fh); 578 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
520 req->offset = offset; 579 req->offset = offset;
521 req->length = length; 580 req->length = length;
522 req->callback = SvREFCNT_inc (callback); 581 req->callback = SvREFCNT_inc (callback);
523 582
524 send_req (req); 583 send_req (req);
… …
552 req->dataptr = SvPV_nolen (req->data); 611 req->dataptr = SvPV_nolen (req->data);
553 } 612 }
554 else 613 else
555 { 614 {
556 req->type = REQ_FSTAT; 615 req->type = REQ_FSTAT;
616 req->fh = newSVsv (fh_or_path);
557 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 617 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
558 } 618 }
559 619
560 req->callback = SvREFCNT_inc (callback); 620 req->callback = SvREFCNT_inc (callback);
561 621

Diff Legend

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