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.9 by root, Tue Jul 12 11:02:54 2005 UTC vs.
Revision 1.27 by root, Wed Aug 17 04:47:02 2005 UTC

1#define _REENTRANT 1
2#include <errno.h>
3
1#include "EXTERN.h" 4#include "EXTERN.h"
2#include "perl.h" 5#include "perl.h"
3#include "XSUB.h" 6#include "XSUB.h"
4 7
8#include "autoconf/config.h"
9
5#include <sys/types.h> 10#include <sys/types.h>
6#include <sys/stat.h> 11#include <sys/stat.h>
12
7#include <unistd.h> 13#include <unistd.h>
8#include <fcntl.h> 14#include <fcntl.h>
9#include <signal.h> 15#include <signal.h>
10#include <sched.h> 16#include <sched.h>
11 17
12#include <pthread.h> 18#include <pthread.h>
13#include <sys/syscall.h>
14 19
15typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
16typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
17typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 22typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */
18 23
24 29
25enum { 30enum {
26 REQ_QUIT, 31 REQ_QUIT,
27 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
28 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
29 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
30 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
31}; 38};
32 39
33typedef struct aio_cb { 40typedef struct aio_cb {
34 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
35 42
39 off_t offset; 46 off_t offset;
40 size_t length; 47 size_t length;
41 ssize_t result; 48 ssize_t result;
42 mode_t mode; /* open */ 49 mode_t mode; /* open */
43 int errorno; 50 int errorno;
44 SV *data, *callback; 51 SV *data, *callback, *fh;
45 void *dataptr; 52 void *dataptr, *data2ptr;
46 STRLEN dataoffset; 53 STRLEN dataoffset;
47 54
48 Stat_t *statdata; 55 Stat_t *statdata;
49} aio_cb; 56} aio_cb;
50 57
51typedef aio_cb *aio_req; 58typedef aio_cb *aio_req;
52 59
53static int started; 60static int started;
54static int nreqs; 61static volatile int nreqs;
55static int max_outstanding = 1<<30; 62static int max_outstanding = 1<<30;
56static int respipe [2]; 63static int respipe [2];
57 64
58static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
59static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
60static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 67static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
61 68
62static volatile aio_req reqs, reqe; /* queue start, queue end */ 69static volatile aio_req reqs, reqe; /* queue start, queue end */
63static volatile aio_req ress, rese; /* queue start, queue end */ 70static volatile aio_req ress, rese; /* queue start, queue end */
64 71
72static void free_req (aio_req req)
73{
74 if (req->data)
75 SvREFCNT_dec (req->data);
76
77 if (req->fh)
78 SvREFCNT_dec (req->fh);
79
80 if (req->statdata)
81 Safefree (req->statdata);
82
83 if (req->callback)
84 SvREFCNT_dec (req->callback);
85
86 Safefree (req);
87}
88
65static void 89static void
66poll_wait () 90poll_wait ()
67{ 91{
68 if (!nreqs) 92 if (nreqs && !ress)
69 return; 93 {
70
71 fd_set rfd; 94 fd_set rfd;
72 FD_ZERO(&rfd); 95 FD_ZERO(&rfd);
73 FD_SET(respipe [0], &rfd); 96 FD_SET(respipe [0], &rfd);
74 97
75 select (respipe [0] + 1, &rfd, 0, 0, 0); 98 select (respipe [0] + 1, &rfd, 0, 0, 0);
99 }
76} 100}
77 101
78static int 102static int
79poll_cb () 103poll_cb ()
80{ 104{
81 dSP; 105 dSP;
82 int count = 0; 106 int count = 0;
107 int do_croak = 0;
83 aio_req req; 108 aio_req req;
84
85 {
86 /* read and signals sent by the worker threads */
87 char buf [32];
88 while (read (respipe [0], buf, 32) > 0)
89 ;
90 }
91 109
92 for (;;) 110 for (;;)
93 { 111 {
94 pthread_mutex_lock (&reslock); 112 pthread_mutex_lock (&reslock);
95
96 req = ress; 113 req = ress;
97 114
98 if (ress) 115 if (req)
99 { 116 {
100 ress = ress->next; 117 ress = req->next;
118
101 if (!ress) rese = 0; 119 if (!ress)
120 {
121 rese = 0;
122
123 /* read any signals sent by the worker threads */
124 char buf [32];
125 while (read (respipe [0], buf, 32) == 32)
126 ;
127 }
102 } 128 }
103 129
104 pthread_mutex_unlock (&reslock); 130 pthread_mutex_unlock (&reslock);
105 131
106 if (!req) 132 if (!req)
114 { 140 {
115 int errorno = errno; 141 int errorno = errno;
116 errno = req->errorno; 142 errno = req->errorno;
117 143
118 if (req->type == REQ_READ) 144 if (req->type == REQ_READ)
119 SvCUR_set (req->data, req->dataoffset 145 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
120 + req->result > 0 ? req->result : 0);
121 146
122 if (req->data) 147 if (req->statdata)
123 SvREFCNT_dec (req->data);
124
125 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
126 { 148 {
127 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 149 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
128 PL_laststatval = req->result; 150 PL_laststatval = req->result;
129 PL_statcache = *(req->statdata); 151 PL_statcache = *(req->statdata);
130
131 Safefree (req->statdata);
132 } 152 }
133 153
154 ENTER;
134 PUSHMARK (SP); 155 PUSHMARK (SP);
135 XPUSHs (sv_2mortal (newSViv (req->result))); 156 XPUSHs (sv_2mortal (newSViv (req->result)));
136 157
137 if (req->type == REQ_OPEN) 158 if (req->type == REQ_OPEN)
138 { 159 {
141 162
142 PUTBACK; 163 PUTBACK;
143 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 164 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
144 SPAGAIN; 165 SPAGAIN;
145 166
146 fh = POPs; 167 fh = SvREFCNT_inc (POPs);
147 168
148 PUSHMARK (SP); 169 PUSHMARK (SP);
149 XPUSHs (fh); 170 XPUSHs (sv_2mortal (fh));
150 } 171 }
151 172
152 if (SvOK (req->callback)) 173 if (SvOK (req->callback))
153 { 174 {
154 PUTBACK; 175 PUTBACK;
155 call_sv (req->callback, G_VOID | G_EVAL); 176 call_sv (req->callback, G_VOID | G_EVAL);
156 SPAGAIN; 177 SPAGAIN;
178
179 if (SvTRUE (ERRSV))
180 {
181 free_req (req);
182 croak (0);
183 }
157 } 184 }
185
158 186 LEAVE;
159 if (req->callback)
160 SvREFCNT_dec (req->callback);
161 187
162 errno = errorno; 188 errno = errorno;
163 count++; 189 count++;
164 } 190 }
165 191
166 Safefree (req); 192 free_req (req);
167 } 193 }
168 194
169 return count; 195 return count;
170} 196}
171 197
209 reqe = reqs = req; 235 reqe = reqs = req;
210 236
211 pthread_cond_signal (&reqwait); 237 pthread_cond_signal (&reqwait);
212 pthread_mutex_unlock (&reqlock); 238 pthread_mutex_unlock (&reqlock);
213 239
214 while (nreqs > max_outstanding) 240 if (nreqs > max_outstanding)
241 for (;;)
242 {
243 poll_cb ();
244
245 if (nreqs <= max_outstanding)
246 break;
247
248 poll_wait ();
249 }
250}
251
252static void
253end_thread (void)
254{
255 aio_req req;
256 Newz (0, req, 1, aio_cb);
257 req->type = REQ_QUIT;
258
259 send_req (req);
260}
261
262static void min_parallel (int nthreads)
263{
264 while (nthreads > started)
265 start_thread ();
266}
267
268static void max_parallel (int nthreads)
269{
270 int cur = started;
271
272 while (cur > nthreads)
273 {
274 end_thread ();
275 cur--;
276 }
277
278 while (started > nthreads)
215 { 279 {
216 poll_wait (); 280 poll_wait ();
217 poll_cb (); 281 poll_cb ();
218 } 282 }
219} 283}
220 284
221static void 285static void create_pipe ()
222end_thread (void)
223{ 286{
224 aio_req req; 287 if (pipe (respipe))
225 New (0, req, 1, aio_cb); 288 croak ("unable to initialize result pipe");
226 req->type = REQ_QUIT;
227 289
228 send_req (req); 290 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
229} 291 croak ("cannot set result pipe to nonblocking mode");
230 292
231static void 293 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
232read_write (int dowrite, int fd, off_t offset, size_t length, 294 croak ("cannot set result pipe to nonblocking mode");
233 SV *data, STRLEN dataoffset, SV *callback) 295}
234{
235 aio_req req;
236 STRLEN svlen;
237 char *svptr = SvPV (data, svlen);
238 296
239 SvUPGRADE (data, SVt_PV); 297static void atfork_prepare (void)
240 SvPOK_on (data); 298{
299 for (;;) {
241 300
242 if (dataoffset < 0) 301 for (;;)
243 dataoffset += svlen; 302 {
303 poll_cb ();
244 304
245 if (dataoffset < 0 || dataoffset > svlen) 305 if (!nreqs)
246 croak ("data offset outside of string"); 306 break;
247 307
248 if (dowrite) 308 poll_wait ();
309 }
310
311 pthread_mutex_lock (&reqlock);
312
313 if (!nreqs)
314 break;
315
316 pthread_mutex_unlock (&reqlock);
317 }
318
319 pthread_mutex_lock (&reslock);
320
321 assert (!nreqs && !reqs && !ress);
322}
323
324static void atfork_parent (void)
325{
326 pthread_mutex_unlock (&reslock);
327 pthread_mutex_unlock (&reqlock);
328}
329
330static void atfork_child (void)
331{
332 int restart = started;
333 started = 0;
334
335 atfork_parent ();
336
337 min_parallel (restart);
338}
339
340/*****************************************************************************/
341/* work around various missing functions */
342
343#if !HAVE_PREADWRITE
344# define pread aio_pread
345# define pwrite aio_pwrite
346
347/*
348 * make our pread/pwrite safe against themselves, but not against
349 * normal read/write by using a mutex. slows down execution a lot,
350 * but that's your problem, not mine.
351 */
352static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
353
354static ssize_t
355pread (int fd, void *buf, size_t count, off_t offset)
356{
357 ssize_t res;
358 off_t ooffset;
359
360 pthread_mutex_lock (&iolock);
361 ooffset = lseek (fd, 0, SEEK_CUR);
362 lseek (fd, offset, SEEK_SET);
363 res = read (fd, buf, count);
364 lseek (fd, ooffset, SEEK_SET);
365 pthread_mutex_unlock (&iolock);
366
367 return res;
368}
369
370static ssize_t
371pwrite (int fd, void *buf, size_t count, off_t offset)
372{
373 ssize_t res;
374 off_t ooffset;
375
376 pthread_mutex_lock (&iolock);
377 ooffset = lseek (fd, 0, SEEK_CUR);
378 lseek (fd, offset, SEEK_SET);
379 res = write (fd, buf, count);
380 lseek (fd, offset, SEEK_SET);
381 pthread_mutex_unlock (&iolock);
382
383 return res;
384}
385#endif
386
387#if !HAVE_FDATASYNC
388# define fdatasync fsync
389#endif
390
391#if !HAVE_READAHEAD
392# define readahead aio_readahead
393
394static char readahead_buf[4096];
395
396static ssize_t
397readahead (int fd, off_t offset, size_t count)
398{
399 while (count > 0)
249 { 400 {
250 /* write: check length and adjust. */ 401 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
251 if (length < 0 || length + dataoffset > svlen) 402
252 length = svlen - dataoffset; 403 pread (fd, readahead_buf, len, offset);
404 offset += len;
405 count -= len;
253 } 406 }
254 else
255 {
256 /* read: grow scalar as necessary */
257 svptr = SvGROW (data, length + dataoffset);
258 }
259 407
260 if (length < 0) 408 errno = 0;
261 croak ("length must not be negative");
262
263 Newz (0, req, 1, aio_cb);
264
265 if (!req)
266 croak ("out of memory during aio_req allocation");
267
268 req->type = dowrite ? REQ_WRITE : REQ_READ;
269 req->fd = fd;
270 req->offset = offset;
271 req->length = length;
272 req->data = SvREFCNT_inc (data);
273 req->dataptr = (char *)svptr + dataoffset;
274 req->callback = SvREFCNT_inc (callback);
275
276 send_req (req);
277} 409}
410#endif
411
412/*****************************************************************************/
278 413
279static void * 414static void *
280aio_proc (void *thr_arg) 415aio_proc (void *thr_arg)
281{ 416{
282 aio_req req; 417 aio_req req;
308 443
309 type = req->type; 444 type = req->type;
310 445
311 switch (type) 446 switch (type)
312 { 447 {
313 case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break; 448 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
314 case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break; 449 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
315#if SYS_readahead 450
316 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 451 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
317#else
318 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
319#endif
320 452
321 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 453 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
322 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 454 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
323 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 455 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
324 456
325 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 457 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
326 case REQ_CLOSE: req->result = close (req->fd); break; 458 case REQ_CLOSE: req->result = close (req->fd); break;
327 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 459 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
460 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
461 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
328 462
463 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
329 case REQ_FSYNC: req->result = fsync (req->fd); break; 464 case REQ_FSYNC: req->result = fsync (req->fd); break;
330 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
331 465
332 case REQ_QUIT: 466 case REQ_QUIT:
333 break; 467 break;
334 468
335 default: 469 default:
361 while (type != REQ_QUIT); 495 while (type != REQ_QUIT);
362 496
363 return 0; 497 return 0;
364} 498}
365 499
500#define dREQ \
501 aio_req req; \
502 \
503 if (SvOK (callback) && !SvROK (callback)) \
504 croak ("clalback must be undef or of reference type"); \
505 \
506 Newz (0, req, 1, aio_cb); \
507 if (!req) \
508 croak ("out of memory during aio_req allocation"); \
509 \
510 req->callback = newSVsv (callback);
511
366MODULE = IO::AIO PACKAGE = IO::AIO 512MODULE = IO::AIO PACKAGE = IO::AIO
367 513
368PROTOTYPES: ENABLE 514PROTOTYPES: ENABLE
369 515
370BOOT: 516BOOT:
371{ 517{
372 if (pipe (respipe)) 518 create_pipe ();
373 croak ("unable to initialize result pipe"); 519 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
374
375 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
376 croak ("cannot set result pipe to nonblocking mode");
377
378 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
379 croak ("cannot set result pipe to nonblocking mode");
380} 520}
381 521
382void 522void
383min_parallel(nthreads) 523min_parallel(nthreads)
384 int nthreads 524 int nthreads
385 PROTOTYPE: $ 525 PROTOTYPE: $
386 CODE:
387 while (nthreads > started)
388 start_thread ();
389 526
390void 527void
391max_parallel(nthreads) 528max_parallel(nthreads)
392 int nthreads 529 int nthreads
393 PROTOTYPE: $ 530 PROTOTYPE: $
394 CODE:
395{
396 int cur = started;
397 while (cur > nthreads)
398 {
399 end_thread ();
400 cur--;
401 }
402
403 while (started > nthreads)
404 {
405 poll_wait ();
406 poll_cb ();
407 }
408}
409 531
410int 532int
411max_outstanding(nreqs) 533max_outstanding(nreqs)
412 int nreqs 534 int nreqs
413 PROTOTYPE: $ 535 PROTOTYPE: $
422 int mode 544 int mode
423 SV * callback 545 SV * callback
424 PROTOTYPE: $$$;$ 546 PROTOTYPE: $$$;$
425 CODE: 547 CODE:
426{ 548{
427 aio_req req; 549 dREQ;
428
429 Newz (0, req, 1, aio_cb);
430
431 if (!req)
432 croak ("out of memory during aio_req allocation");
433 550
434 req->type = REQ_OPEN; 551 req->type = REQ_OPEN;
435 req->data = newSVsv (pathname); 552 req->data = newSVsv (pathname);
436 req->dataptr = SvPV_nolen (req->data); 553 req->dataptr = SvPVbyte_nolen (req->data);
437 req->fd = flags; 554 req->fd = flags;
438 req->mode = mode; 555 req->mode = mode;
439 req->callback = SvREFCNT_inc (callback);
440 556
441 send_req (req); 557 send_req (req);
442} 558}
443 559
444void 560void
445aio_close(fh,callback=&PL_sv_undef) 561aio_close(fh,callback=&PL_sv_undef)
446 InputStream fh 562 SV * fh
447 SV * callback 563 SV * callback
448 PROTOTYPE: $;$ 564 PROTOTYPE: $;$
449 ALIAS: 565 ALIAS:
450 aio_close = REQ_CLOSE 566 aio_close = REQ_CLOSE
451 aio_fsync = REQ_FSYNC 567 aio_fsync = REQ_FSYNC
452 aio_fdatasync = REQ_FDATASYNC 568 aio_fdatasync = REQ_FDATASYNC
453 CODE: 569 CODE:
454{ 570{
455 aio_req req; 571 dREQ;
456
457 Newz (0, req, 1, aio_cb);
458
459 if (!req)
460 croak ("out of memory during aio_req allocation");
461 572
462 req->type = ix; 573 req->type = ix;
574 req->fh = newSVsv (fh);
463 req->fd = PerlIO_fileno (fh); 575 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
464 req->callback = SvREFCNT_inc (callback);
465 576
466 send_req (req); 577 send_req (req);
467} 578}
468 579
469void 580void
470aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 581aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
471 InputStream fh 582 SV * fh
472 UV offset 583 UV offset
473 IV length 584 IV length
474 SV * data 585 SV * data
475 IV dataoffset 586 IV dataoffset
476 SV * callback 587 SV * callback
588 ALIAS:
589 aio_read = REQ_READ
590 aio_write = REQ_WRITE
477 PROTOTYPE: $$$$$;$ 591 PROTOTYPE: $$$$$;$
478 CODE: 592 CODE:
479 read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 593{
594 aio_req req;
595 STRLEN svlen;
596 char *svptr = SvPVbyte (data, svlen);
480 597
481void 598 SvUPGRADE (data, SVt_PV);
482aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 599 SvPOK_on (data);
483 OutputStream fh 600
484 UV offset 601 if (dataoffset < 0)
485 IV length 602 dataoffset += svlen;
486 SV * data 603
487 IV dataoffset 604 if (dataoffset < 0 || dataoffset > svlen)
488 SV * callback 605 croak ("data offset outside of string");
489 PROTOTYPE: $$$$$;$ 606
490 CODE: 607 if (ix == REQ_WRITE)
491 read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 608 {
609 /* write: check length and adjust. */
610 if (length < 0 || length + dataoffset > svlen)
611 length = svlen - dataoffset;
612 }
613 else
614 {
615 /* read: grow scalar as necessary */
616 svptr = SvGROW (data, length + dataoffset);
617 }
618
619 if (length < 0)
620 croak ("length must not be negative");
621
622 {
623 dREQ;
624
625 req->type = ix;
626 req->fh = newSVsv (fh);
627 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
628 : IoOFP (sv_2io (fh)));
629 req->offset = offset;
630 req->length = length;
631 req->data = SvREFCNT_inc (data);
632 req->dataptr = (char *)svptr + dataoffset;
633
634 send_req (req);
635 }
636}
492 637
493void 638void
494aio_readahead(fh,offset,length,callback=&PL_sv_undef) 639aio_readahead(fh,offset,length,callback=&PL_sv_undef)
495 InputStream fh 640 SV * fh
496 UV offset 641 UV offset
497 IV length 642 IV length
498 SV * callback 643 SV * callback
499 PROTOTYPE: $$$;$ 644 PROTOTYPE: $$$;$
500 CODE: 645 CODE:
501{ 646{
502 aio_req req; 647 dREQ;
503
504 if (length < 0)
505 croak ("length must not be negative");
506
507 Newz (0, req, 1, aio_cb);
508
509 if (!req)
510 croak ("out of memory during aio_req allocation");
511 648
512 req->type = REQ_READAHEAD; 649 req->type = REQ_READAHEAD;
650 req->fh = newSVsv (fh);
513 req->fd = PerlIO_fileno (fh); 651 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
514 req->offset = offset; 652 req->offset = offset;
515 req->length = length; 653 req->length = length;
516 req->callback = SvREFCNT_inc (callback);
517 654
518 send_req (req); 655 send_req (req);
519} 656}
520 657
521void 658void
525 ALIAS: 662 ALIAS:
526 aio_stat = REQ_STAT 663 aio_stat = REQ_STAT
527 aio_lstat = REQ_LSTAT 664 aio_lstat = REQ_LSTAT
528 CODE: 665 CODE:
529{ 666{
530 aio_req req; 667 dREQ;
531
532 Newz (0, req, 1, aio_cb);
533
534 if (!req)
535 croak ("out of memory during aio_req allocation");
536 668
537 New (0, req->statdata, 1, Stat_t); 669 New (0, req->statdata, 1, Stat_t);
538
539 if (!req->statdata) 670 if (!req->statdata)
671 {
672 free_req (req);
540 croak ("out of memory during aio_req->statdata allocation"); 673 croak ("out of memory during aio_req->statdata allocation");
674 }
541 675
542 if (SvPOK (fh_or_path)) 676 if (SvPOK (fh_or_path))
543 { 677 {
544 req->type = ix; 678 req->type = ix;
545 req->data = newSVsv (fh_or_path); 679 req->data = newSVsv (fh_or_path);
546 req->dataptr = SvPV_nolen (req->data); 680 req->dataptr = SvPVbyte_nolen (req->data);
547 } 681 }
548 else 682 else
549 { 683 {
550 req->type = REQ_FSTAT; 684 req->type = REQ_FSTAT;
685 req->fh = newSVsv (fh_or_path);
551 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 686 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
552 } 687 }
553
554 req->callback = SvREFCNT_inc (callback);
555 688
556 send_req (req); 689 send_req (req);
557} 690}
558 691
559void 692void
560aio_unlink(pathname,callback=&PL_sv_undef) 693aio_unlink(pathname,callback=&PL_sv_undef)
561 SV * pathname 694 SV * pathname
562 SV * callback 695 SV * callback
696 ALIAS:
697 aio_unlink = REQ_UNLINK
698 aio_rmdir = REQ_RMDIR
563 CODE: 699 CODE:
564{ 700{
565 aio_req req; 701 dREQ;
566 702
567 Newz (0, req, 1, aio_cb); 703 req->type = ix;
704 req->data = newSVsv (pathname);
705 req->dataptr = SvPVbyte_nolen (req->data);
568 706
569 if (!req) 707 send_req (req);
570 croak ("out of memory during aio_req allocation"); 708}
709
710void
711aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
712 SV * oldpath
713 SV * newpath
714 SV * callback
715 CODE:
716{
717 dREQ;
571 718
572 req->type = REQ_UNLINK; 719 req->type = REQ_SYMLINK;
720 req->fh = newSVsv (oldpath);
721 req->data2ptr = SvPVbyte_nolen (req->fh);
573 req->data = newSVsv (pathname); 722 req->data = newSVsv (newpath);
574 req->dataptr = SvPV_nolen (req->data); 723 req->dataptr = SvPVbyte_nolen (req->data);
575 req->callback = SvREFCNT_inc (callback);
576 724
577 send_req (req); 725 send_req (req);
578} 726}
579 727
580void 728void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines