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

Diff Legend

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