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.19 by root, Sun Jul 31 19:04:45 2005 UTC vs.
Revision 1.36 by root, Tue Aug 23 01:18:04 2005 UTC

1#ifndef _REENTRANT
2# define _REENTRANT 1 1#define _REENTRANT 1
3#endif
4#include <errno.h> 2#include <errno.h>
5 3
6#include "EXTERN.h" 4#include "EXTERN.h"
7#include "perl.h" 5#include "perl.h"
8#include "XSUB.h" 6#include "XSUB.h"
9 7
10#include "autoconf/config.h" 8#include "autoconf/config.h"
9
10#include <pthread.h>
11 11
12#include <sys/types.h> 12#include <sys/types.h>
13#include <sys/stat.h> 13#include <sys/stat.h>
14 14
15#include <unistd.h> 15#include <unistd.h>
16#include <fcntl.h> 16#include <fcntl.h>
17#include <signal.h> 17#include <signal.h>
18#include <sched.h> 18#include <sched.h>
19 19
20#include <pthread.h> 20#if HAVE_SENDFILE
21 21# if __linux
22typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 22# include <sys/sendfile.h>
23typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 23# elif __freebsd
24typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 24# include <sys/socket.h>
25# include <sys/uio.h>
26# elif __hpux
27# include <sys/socket.h>
28# elif __solaris /* not yet */
29# include <sys/sendfile.h>
30# else
31# error sendfile support requested but not available
32# endif
33#endif
25 34
26#if __ia64 35#if __ia64
27# define STACKSIZE 65536 36# define STACKSIZE 65536
28#else 37#else
29# define STACKSIZE 4096 38# define STACKSIZE 4096
31 40
32enum { 41enum {
33 REQ_QUIT, 42 REQ_QUIT,
34 REQ_OPEN, REQ_CLOSE, 43 REQ_OPEN, REQ_CLOSE,
35 REQ_READ, REQ_WRITE, REQ_READAHEAD, 44 REQ_READ, REQ_WRITE, REQ_READAHEAD,
45 REQ_SENDFILE,
36 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 46 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
37 REQ_FSYNC, REQ_FDATASYNC, 47 REQ_FSYNC, REQ_FDATASYNC,
48 REQ_UNLINK, REQ_RMDIR,
49 REQ_SYMLINK,
38}; 50};
39 51
40typedef struct aio_cb { 52typedef struct aio_cb {
41 struct aio_cb *volatile next; 53 struct aio_cb *volatile next;
42 54
43 int type; 55 int type;
44 56
45 int fd; 57 int fd, fd2;
46 off_t offset; 58 off_t offset;
47 size_t length; 59 size_t length;
48 ssize_t result; 60 ssize_t result;
49 mode_t mode; /* open */ 61 mode_t mode; /* open */
50 int errorno; 62 int errorno;
51 SV *data, *callback, *fh; 63 SV *data, *callback;
52 void *dataptr; 64 SV *fh, *fh2;
65 void *dataptr, *data2ptr;
53 STRLEN dataoffset; 66 STRLEN dataoffset;
54 67
55 Stat_t *statdata; 68 Stat_t *statdata;
56} aio_cb; 69} aio_cb;
57 70
58typedef aio_cb *aio_req; 71typedef aio_cb *aio_req;
59 72
60static int started; 73static int started, wanted;
61static volatile int nreqs; 74static volatile int nreqs;
62static int max_outstanding = 1<<30; 75static int max_outstanding = 1<<30;
63static int respipe [2]; 76static int respipe [2];
64 77
65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 78static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 79static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
67static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 80static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
68 81
69static volatile aio_req reqs, reqe; /* queue start, queue end */ 82static volatile aio_req reqs, reqe; /* queue start, queue end */
70static volatile aio_req ress, rese; /* queue start, queue end */ 83static volatile aio_req ress, rese; /* queue start, queue end */
84
85static void free_req (aio_req req)
86{
87 if (req->data)
88 SvREFCNT_dec (req->data);
89
90 if (req->fh)
91 SvREFCNT_dec (req->fh);
92
93 if (req->fh2)
94 SvREFCNT_dec (req->fh2);
95
96 if (req->statdata)
97 Safefree (req->statdata);
98
99 if (req->callback)
100 SvREFCNT_dec (req->callback);
101
102 Safefree (req);
103}
71 104
72static void 105static void
73poll_wait () 106poll_wait ()
74{ 107{
75 if (nreqs && !ress) 108 if (nreqs && !ress)
85static int 118static int
86poll_cb () 119poll_cb ()
87{ 120{
88 dSP; 121 dSP;
89 int count = 0; 122 int count = 0;
123 int do_croak = 0;
90 aio_req req, prv; 124 aio_req req;
91 125
92 pthread_mutex_lock (&reslock); 126 for (;;)
93
94 {
95 /* read any signals sent by the worker threads */
96 char buf [32];
97 while (read (respipe [0], buf, 32) > 0)
98 ;
99 }
100
101 req = ress;
102 ress = rese = 0;
103
104 pthread_mutex_unlock (&reslock);
105
106 while (req)
107 { 127 {
128 pthread_mutex_lock (&reslock);
129 req = ress;
130
131 if (req)
132 {
133 ress = req->next;
134
135 if (!ress)
136 {
137 /* read any signals sent by the worker threads */
138 char buf [32];
139 while (read (respipe [0], buf, 32) == 32)
140 ;
141
142 rese = 0;
143 }
144 }
145
146 pthread_mutex_unlock (&reslock);
147
148 if (!req)
149 break;
150
108 nreqs--; 151 nreqs--;
109 152
110 if (req->type == REQ_QUIT) 153 if (req->type == REQ_QUIT)
111 started--; 154 started--;
112 else 155 else
113 { 156 {
114 int errorno = errno; 157 int errorno = errno;
115 errno = req->errorno; 158 errno = req->errorno;
116 159
117 if (req->type == REQ_READ) 160 if (req->type == REQ_READ)
118 SvCUR_set (req->data, req->dataoffset 161 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
119 + req->result > 0 ? req->result : 0);
120 162
163 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
164 SvREADONLY_off (req->data);
165
121 if (req->data) 166 if (req->statdata)
122 SvREFCNT_dec (req->data);
123
124 if (req->fh)
125 SvREFCNT_dec (req->fh);
126
127 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
128 { 167 {
129 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 168 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
130 PL_laststatval = req->result; 169 PL_laststatval = req->result;
131 PL_statcache = *(req->statdata); 170 PL_statcache = *(req->statdata);
132
133 Safefree (req->statdata);
134 } 171 }
135 172
136 ENTER; 173 ENTER;
137 PUSHMARK (SP); 174 PUSHMARK (SP);
138 XPUSHs (sv_2mortal (newSViv (req->result))); 175 XPUSHs (sv_2mortal (newSViv (req->result)));
155 if (SvOK (req->callback)) 192 if (SvOK (req->callback))
156 { 193 {
157 PUTBACK; 194 PUTBACK;
158 call_sv (req->callback, G_VOID | G_EVAL); 195 call_sv (req->callback, G_VOID | G_EVAL);
159 SPAGAIN; 196 SPAGAIN;
197
198 if (SvTRUE (ERRSV))
199 {
200 free_req (req);
201 croak (0);
202 }
160 } 203 }
161 204
162 LEAVE; 205 LEAVE;
163
164 if (req->callback)
165 SvREFCNT_dec (req->callback);
166 206
167 errno = errorno; 207 errno = errorno;
168 count++; 208 count++;
169 } 209 }
170 210
171 prv = req; 211 free_req (req);
172 req = req->next;
173 Safefree (prv);
174
175 /* TODO: croak on errors? */
176 } 212 }
177 213
178 return count; 214 return count;
179} 215}
180 216
201} 237}
202 238
203static void 239static void
204send_req (aio_req req) 240send_req (aio_req req)
205{ 241{
242 while (started < wanted && nreqs >= started)
243 start_thread ();
244
206 nreqs++; 245 nreqs++;
207 246
208 pthread_mutex_lock (&reqlock); 247 pthread_mutex_lock (&reqlock);
209 248
210 req->next = 0; 249 req->next = 0;
218 reqe = reqs = req; 257 reqe = reqs = req;
219 258
220 pthread_cond_signal (&reqwait); 259 pthread_cond_signal (&reqwait);
221 pthread_mutex_unlock (&reqlock); 260 pthread_mutex_unlock (&reqlock);
222 261
223 while (nreqs > max_outstanding) 262 if (nreqs > max_outstanding)
263 for (;;)
264 {
265 poll_cb ();
266
267 if (nreqs <= max_outstanding)
268 break;
269
270 poll_wait ();
271 }
272}
273
274static void
275end_thread (void)
276{
277 aio_req req;
278 Newz (0, req, 1, aio_cb);
279 req->type = REQ_QUIT;
280
281 send_req (req);
282}
283
284static void min_parallel (int nthreads)
285{
286 if (wanted < nthreads)
287 wanted = nthreads;
288}
289
290static void max_parallel (int nthreads)
291{
292 int cur = started;
293
294 if (wanted > nthreads)
295 wanted = nthreads;
296
297 while (cur > wanted)
298 {
299 end_thread ();
300 cur--;
301 }
302
303 while (started > wanted)
224 { 304 {
225 poll_wait (); 305 poll_wait ();
226 poll_cb (); 306 poll_cb ();
227 } 307 }
228} 308}
229 309
230static void 310static void create_pipe ()
231end_thread (void)
232{ 311{
312 if (pipe (respipe))
313 croak ("unable to initialize result pipe");
314
315 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
316 croak ("cannot set result pipe to nonblocking mode");
317
318 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
319 croak ("cannot set result pipe to nonblocking mode");
320}
321
322static void atfork_prepare (void)
323{
324 pthread_mutex_lock (&reqlock);
325 pthread_mutex_lock (&reslock);
326}
327
328static void atfork_parent (void)
329{
330 pthread_mutex_unlock (&reslock);
331 pthread_mutex_unlock (&reqlock);
332}
333
334static void atfork_child (void)
335{
233 aio_req req; 336 aio_req prv;
234 New (0, req, 1, aio_cb);
235 req->type = REQ_QUIT;
236 337
237 send_req (req); 338 started = 0;
238}
239 339
340 while (reqs)
341 {
342 prv = reqs;
343 reqs = prv->next;
344 free_req (prv);
345 }
346
347 reqs = reqe = 0;
348
349 while (ress)
350 {
351 prv = ress;
352 ress = prv->next;
353 free_req (prv);
354 }
355
356 ress = rese = 0;
357
358 close (respipe [0]);
359 close (respipe [1]);
360 create_pipe ();
361
362 atfork_parent ();
363}
364
365/*****************************************************************************/
240/* work around various missing functions */ 366/* work around various missing functions */
241 367
242#if !HAVE_PREADWRITE 368#if !HAVE_PREADWRITE
243# define pread aio_pread 369# define pread aio_pread
244# define pwrite aio_pwrite 370# define pwrite aio_pwrite
306 432
307 errno = 0; 433 errno = 0;
308} 434}
309#endif 435#endif
310 436
437/* sendfile always needs emulation */
438static ssize_t
439sendfile_ (int ofd, int ifd, off_t offset, size_t count)
440{
441 ssize_t res;
442
443 if (!count)
444 return 0;
445
446#if HAVE_SENDFILE
447# if __linux
448 res = sendfile (ofd, ifd, &offset, count);
449
450# elif __freebsd
451 /*
452 * Of course, the freebsd sendfile is a dire hack with no thoughts
453 * wasted on making it similar to other I/O functions.
454 */
455 {
456 off_t sbytes;
457 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
458
459 if (res < 0 && sbytes)
460 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
461 res = sbytes;
462 }
463
464# elif __hpux
465 res = sendfile (ofd, ifd, offset, count, 0, 0);
466
467# elif __solaris
468 {
469 struct sendfilevec vec;
470 size_t sbytes;
471
472 vec.sfv_fd = ifd;
473 vec.sfv_flag = 0;
474 vec.sfv_off = offset;
475 vec.sfv_len = count;
476
477 res = sendfilev (ofd, &vec, 1, &sbytes);
478
479 if (res < 0 && sbytes)
480 res = sbytes;
481 }
482
483# else
484 res = -1;
485 errno = ENOSYS;
486# endif
487#endif
488
489 if (res < 0
490 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
491#if __solaris
492 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
493#endif
494 )
495 )
496 {
497 /* emulate sendfile. this is a major pain in the ass */
498 char *buf = malloc (4096);
499 res = 0;
500
501 for (;;)
502 {
503 ssize_t cnt;
504
505 cnt = pread (ifd, buf, 4096, offset);
506
507 if (cnt <= 0)
508 {
509 if (cnt && !res) res = -1;
510 break;
511 }
512
513 cnt = write (ofd, buf, cnt);
514
515 if (cnt <= 0)
516 {
517 if (cnt && !res) res = -1;
518 break;
519 }
520
521 offset += cnt;
522 res += cnt;
523 }
524
525 {
526 int errorno = errno;
527 free (buf);
528 errno = errorno;
529 }
530 }
531
532 return res;
533}
534
535/*****************************************************************************/
536
311static void * 537static void *
312aio_proc (void *thr_arg) 538aio_proc (void *thr_arg)
313{ 539{
314 aio_req req; 540 aio_req req;
315 int type; 541 int type;
344 { 570 {
345 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 571 case REQ_READ: req->result = pread (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; 572 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
347 573
348 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 574 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
575 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
349 576
350 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 577 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
351 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 578 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
352 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 579 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
353 580
354 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 581 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
355 case REQ_CLOSE: req->result = close (req->fd); break; 582 case REQ_CLOSE: req->result = close (req->fd); break;
356 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 583 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
584 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
585 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
357 586
358 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 587 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
359 case REQ_FSYNC: req->result = fsync (req->fd); break; 588 case REQ_FSYNC: req->result = fsync (req->fd); break;
360 589
361 case REQ_QUIT: 590 case REQ_QUIT:
390 while (type != REQ_QUIT); 619 while (type != REQ_QUIT);
391 620
392 return 0; 621 return 0;
393} 622}
394 623
624#define dREQ \
625 aio_req req; \
626 \
627 if (SvOK (callback) && !SvROK (callback)) \
628 croak ("clalback must be undef or of reference type"); \
629 \
630 Newz (0, req, 1, aio_cb); \
631 if (!req) \
632 croak ("out of memory during aio_req allocation"); \
633 \
634 req->callback = newSVsv (callback);
635
395MODULE = IO::AIO PACKAGE = IO::AIO 636MODULE = IO::AIO PACKAGE = IO::AIO
396 637
397PROTOTYPES: ENABLE 638PROTOTYPES: ENABLE
398 639
399BOOT: 640BOOT:
400{ 641{
401 if (pipe (respipe)) 642 create_pipe ();
402 croak ("unable to initialize result pipe"); 643 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
403
404 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
405 croak ("cannot set result pipe to nonblocking mode");
406
407 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
408 croak ("cannot set result pipe to nonblocking mode");
409} 644}
410 645
411void 646void
412min_parallel(nthreads) 647min_parallel(nthreads)
413 int nthreads 648 int nthreads
414 PROTOTYPE: $ 649 PROTOTYPE: $
415 CODE:
416 while (nthreads > started)
417 start_thread ();
418 650
419void 651void
420max_parallel(nthreads) 652max_parallel(nthreads)
421 int nthreads 653 int nthreads
422 PROTOTYPE: $ 654 PROTOTYPE: $
423 CODE:
424{
425 int cur = started;
426 while (cur > nthreads)
427 {
428 end_thread ();
429 cur--;
430 }
431
432 while (started > nthreads)
433 {
434 poll_wait ();
435 poll_cb ();
436 }
437}
438 655
439int 656int
440max_outstanding(nreqs) 657max_outstanding(nreqs)
441 int nreqs 658 int nreqs
442 PROTOTYPE: $ 659 PROTOTYPE: $
451 int mode 668 int mode
452 SV * callback 669 SV * callback
453 PROTOTYPE: $$$;$ 670 PROTOTYPE: $$$;$
454 CODE: 671 CODE:
455{ 672{
456 aio_req req; 673 dREQ;
457
458 Newz (0, req, 1, aio_cb);
459
460 if (!req)
461 croak ("out of memory during aio_req allocation");
462 674
463 req->type = REQ_OPEN; 675 req->type = REQ_OPEN;
464 req->data = newSVsv (pathname); 676 req->data = newSVsv (pathname);
465 req->dataptr = SvPV_nolen (req->data); 677 req->dataptr = SvPVbyte_nolen (req->data);
466 req->fd = flags; 678 req->fd = flags;
467 req->mode = mode; 679 req->mode = mode;
468 req->callback = SvREFCNT_inc (callback);
469 680
470 send_req (req); 681 send_req (req);
471} 682}
472 683
473void 684void
479 aio_close = REQ_CLOSE 690 aio_close = REQ_CLOSE
480 aio_fsync = REQ_FSYNC 691 aio_fsync = REQ_FSYNC
481 aio_fdatasync = REQ_FDATASYNC 692 aio_fdatasync = REQ_FDATASYNC
482 CODE: 693 CODE:
483{ 694{
484 aio_req req; 695 dREQ;
485
486 Newz (0, req, 1, aio_cb);
487
488 if (!req)
489 croak ("out of memory during aio_req allocation");
490 696
491 req->type = ix; 697 req->type = ix;
492 req->fh = newSVsv (fh); 698 req->fh = newSVsv (fh);
493 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 699 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
494 req->callback = SvREFCNT_inc (callback);
495 700
496 send_req (req); 701 send_req (req);
497} 702}
498 703
499void 704void
500aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 705aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
501 SV * fh 706 SV * fh
502 UV offset 707 UV offset
503 IV length 708 UV length
504 SV * data 709 SV * data
505 IV dataoffset 710 UV dataoffset
506 SV * callback 711 SV * callback
507 ALIAS: 712 ALIAS:
508 aio_read = REQ_READ 713 aio_read = REQ_READ
509 aio_write = REQ_WRITE 714 aio_write = REQ_WRITE
510 PROTOTYPE: $$$$$;$ 715 PROTOTYPE: $$$$$;$
511 CODE: 716 CODE:
512{ 717{
513 aio_req req; 718 aio_req req;
514 STRLEN svlen; 719 STRLEN svlen;
515 char *svptr = SvPV (data, svlen); 720 char *svptr = SvPVbyte (data, svlen);
516 721
517 SvUPGRADE (data, SVt_PV); 722 SvUPGRADE (data, SVt_PV);
518 SvPOK_on (data); 723 SvPOK_on (data);
519 724
520 if (dataoffset < 0) 725 if (dataoffset < 0)
536 } 741 }
537 742
538 if (length < 0) 743 if (length < 0)
539 croak ("length must not be negative"); 744 croak ("length must not be negative");
540 745
541 Newz (0, req, 1, aio_cb); 746 {
747 dREQ;
542 748
543 if (!req)
544 croak ("out of memory during aio_req allocation");
545
546 req->type = ix; 749 req->type = ix;
547 req->fh = newSVsv (fh); 750 req->fh = newSVsv (fh);
548 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 751 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
549 : IoOFP (sv_2io (fh))); 752 : IoOFP (sv_2io (fh)));
550 req->offset = offset; 753 req->offset = offset;
754 req->length = length;
755 req->data = SvREFCNT_inc (data);
756 req->dataptr = (char *)svptr + dataoffset;
757
758 if (!SvREADONLY (data))
759 {
760 SvREADONLY_on (data);
761 req->data2ptr = (void *)data;
762 }
763
764 send_req (req);
765 }
766}
767
768void
769aio_sendfile(out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
770 SV * out_fh
771 SV * in_fh
772 UV in_offset
773 UV length
774 SV * callback
775 PROTOTYPE: $$$$;$
776 CODE:
777{
778 dREQ;
779
780 req->type = REQ_SENDFILE;
781 req->fh = newSVsv (out_fh);
782 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
783 req->fh2 = newSVsv (in_fh);
784 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
785 req->offset = in_offset;
551 req->length = length; 786 req->length = length;
552 req->data = SvREFCNT_inc (data);
553 req->dataptr = (char *)svptr + dataoffset;
554 req->callback = SvREFCNT_inc (callback);
555 787
556 send_req (req); 788 send_req (req);
557} 789}
558 790
559void 791void
563 IV length 795 IV length
564 SV * callback 796 SV * callback
565 PROTOTYPE: $$$;$ 797 PROTOTYPE: $$$;$
566 CODE: 798 CODE:
567{ 799{
568 aio_req req; 800 dREQ;
569
570 if (length < 0)
571 croak ("length must not be negative");
572
573 Newz (0, req, 1, aio_cb);
574
575 if (!req)
576 croak ("out of memory during aio_req allocation");
577 801
578 req->type = REQ_READAHEAD; 802 req->type = REQ_READAHEAD;
579 req->fh = newSVsv (fh); 803 req->fh = newSVsv (fh);
580 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 804 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
581 req->offset = offset; 805 req->offset = offset;
582 req->length = length; 806 req->length = length;
583 req->callback = SvREFCNT_inc (callback);
584 807
585 send_req (req); 808 send_req (req);
586} 809}
587 810
588void 811void
592 ALIAS: 815 ALIAS:
593 aio_stat = REQ_STAT 816 aio_stat = REQ_STAT
594 aio_lstat = REQ_LSTAT 817 aio_lstat = REQ_LSTAT
595 CODE: 818 CODE:
596{ 819{
597 aio_req req; 820 dREQ;
598
599 Newz (0, req, 1, aio_cb);
600
601 if (!req)
602 croak ("out of memory during aio_req allocation");
603 821
604 New (0, req->statdata, 1, Stat_t); 822 New (0, req->statdata, 1, Stat_t);
605
606 if (!req->statdata) 823 if (!req->statdata)
824 {
825 free_req (req);
607 croak ("out of memory during aio_req->statdata allocation"); 826 croak ("out of memory during aio_req->statdata allocation");
827 }
608 828
609 if (SvPOK (fh_or_path)) 829 if (SvPOK (fh_or_path))
610 { 830 {
611 req->type = ix; 831 req->type = ix;
612 req->data = newSVsv (fh_or_path); 832 req->data = newSVsv (fh_or_path);
613 req->dataptr = SvPV_nolen (req->data); 833 req->dataptr = SvPVbyte_nolen (req->data);
614 } 834 }
615 else 835 else
616 { 836 {
617 req->type = REQ_FSTAT; 837 req->type = REQ_FSTAT;
618 req->fh = newSVsv (fh_or_path); 838 req->fh = newSVsv (fh_or_path);
619 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 839 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
620 } 840 }
621 841
622 req->callback = SvREFCNT_inc (callback);
623
624 send_req (req); 842 send_req (req);
625} 843}
626 844
627void 845void
628aio_unlink(pathname,callback=&PL_sv_undef) 846aio_unlink(pathname,callback=&PL_sv_undef)
629 SV * pathname 847 SV * pathname
630 SV * callback 848 SV * callback
849 ALIAS:
850 aio_unlink = REQ_UNLINK
851 aio_rmdir = REQ_RMDIR
631 CODE: 852 CODE:
632{ 853{
633 aio_req req; 854 dREQ;
634 855
635 Newz (0, req, 1, aio_cb); 856 req->type = ix;
857 req->data = newSVsv (pathname);
858 req->dataptr = SvPVbyte_nolen (req->data);
636 859
637 if (!req) 860 send_req (req);
638 croak ("out of memory during aio_req allocation"); 861}
862
863void
864aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
865 SV * oldpath
866 SV * newpath
867 SV * callback
868 CODE:
869{
870 dREQ;
639 871
640 req->type = REQ_UNLINK; 872 req->type = REQ_SYMLINK;
873 req->fh = newSVsv (oldpath);
874 req->data2ptr = SvPVbyte_nolen (req->fh);
641 req->data = newSVsv (pathname); 875 req->data = newSVsv (newpath);
642 req->dataptr = SvPV_nolen (req->data); 876 req->dataptr = SvPVbyte_nolen (req->data);
643 req->callback = SvREFCNT_inc (callback);
644 877
645 send_req (req); 878 send_req (req);
646} 879}
647 880
648void 881void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines