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.19 by root, Sun Jul 31 19:04:45 2005 UTC

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

Diff Legend

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