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.17 by root, Sun Jul 31 18:45:48 2005 UTC

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

Diff Legend

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