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

Diff Legend

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