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.8 by root, Mon Jul 11 02:53:59 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
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#include <endian.h>
12 17
13#include <pthread.h> 18#include <pthread.h>
14#include <sys/syscall.h>
15 19
16typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
17typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
18typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 22typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */
19 23
… …
25 29
26enum { 30enum {
27 REQ_QUIT, 31 REQ_QUIT,
28 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
29 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
30 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
31 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
32}; 38};
33 39
34typedef struct aio_cb { 40typedef struct aio_cb {
35 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
36 42
… …
40 off_t offset; 46 off_t offset;
41 size_t length; 47 size_t length;
42 ssize_t result; 48 ssize_t result;
43 mode_t mode; /* open */ 49 mode_t mode; /* open */
44 int errorno; 50 int errorno;
45 SV *data, *callback; 51 SV *data, *callback, *fh;
46 void *dataptr; 52 void *dataptr, *data2ptr;
47 STRLEN dataoffset; 53 STRLEN dataoffset;
48 54
49 Stat_t *statdata; 55 Stat_t *statdata;
50} aio_cb; 56} aio_cb;
51 57
52typedef aio_cb *aio_req; 58typedef aio_cb *aio_req;
53 59
54static int started; 60static int started;
55static int nreqs; 61static volatile int nreqs;
56static int max_outstanding = 1<<30; 62static int max_outstanding = 1<<30;
57static int respipe [2]; 63static int respipe [2];
58 64
59static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
60static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
67static pthread_mutex_t frklock = PTHREAD_MUTEX_INITIALIZER;
61static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 68static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
62 69
63static volatile aio_req reqs, reqe; /* queue start, queue end */ 70static volatile aio_req reqs, reqe; /* queue start, queue end */
64static volatile aio_req ress, rese; /* queue start, queue end */ 71static volatile aio_req ress, rese; /* queue start, queue end */
65 72
66static void 73static void
67poll_wait () 74poll_wait ()
68{ 75{
69 if (!nreqs) 76 if (nreqs && !ress)
70 return; 77 {
71
72 fd_set rfd; 78 fd_set rfd;
73 FD_ZERO(&rfd); 79 FD_ZERO(&rfd);
74 FD_SET(respipe [0], &rfd); 80 FD_SET(respipe [0], &rfd);
75 81
76 select (respipe [0] + 1, &rfd, 0, 0, 0); 82 select (respipe [0] + 1, &rfd, 0, 0, 0);
83 }
77} 84}
78 85
79static int 86static int
80poll_cb () 87poll_cb ()
81{ 88{
82 dSP; 89 dSP;
83 int count = 0; 90 int count = 0;
91 int do_croak = 0;
84 aio_req req; 92 aio_req req, prv;
85 93
94 pthread_mutex_lock (&reslock);
95
86 { 96 {
87 /* read and signals sent by the worker threads */ 97 /* read any signals sent by the worker threads */
88 char buf [32]; 98 char buf [32];
89 while (read (respipe [0], buf, 32) > 0) 99 while (read (respipe [0], buf, 32) == 32)
90 ; 100 ;
91 } 101 }
92 102
93 for (;;) 103 req = ress;
104 ress = rese = 0;
105
106 pthread_mutex_unlock (&reslock);
107
108 while (req)
94 { 109 {
95 pthread_mutex_lock (&reslock);
96
97 req = ress;
98
99 if (ress)
100 {
101 ress = ress->next;
102 if (!ress) rese = 0;
103 }
104
105 pthread_mutex_unlock (&reslock);
106
107 if (!req)
108 break;
109
110 nreqs--; 110 nreqs--;
111 111
112 if (req->type == REQ_QUIT) 112 if (req->type == REQ_QUIT)
113 started--; 113 started--;
114 else 114 else
… …
121 + req->result > 0 ? req->result : 0); 121 + req->result > 0 ? req->result : 0);
122 122
123 if (req->data) 123 if (req->data)
124 SvREFCNT_dec (req->data); 124 SvREFCNT_dec (req->data);
125 125
126 if (req->fh)
127 SvREFCNT_dec (req->fh);
128
126 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)
127 { 130 {
128 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 131 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
129 PL_laststatval = req->result; 132 PL_laststatval = req->result;
130 PL_statcache = *(req->statdata); 133 PL_statcache = *(req->statdata);
131 134
132 Safefree (req->statdata); 135 Safefree (req->statdata);
133 } 136 }
134 137
138 ENTER;
135 PUSHMARK (SP); 139 PUSHMARK (SP);
136 XPUSHs (sv_2mortal (newSViv (req->result))); 140 XPUSHs (sv_2mortal (newSViv (req->result)));
137 141
138 if (req->type == REQ_OPEN) 142 if (req->type == REQ_OPEN)
139 { 143 {
… …
142 146
143 PUTBACK; 147 PUTBACK;
144 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 148 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
145 SPAGAIN; 149 SPAGAIN;
146 150
147 fh = POPs; 151 fh = SvREFCNT_inc (POPs);
148 152
149 PUSHMARK (SP); 153 PUSHMARK (SP);
150 XPUSHs (fh); 154 XPUSHs (sv_2mortal (fh));
151 } 155 }
152 156
153 if (SvOK (req->callback)) 157 if (SvOK (req->callback))
154 { 158 {
155 PUTBACK; 159 PUTBACK;
156 call_sv (req->callback, G_VOID | G_EVAL); 160 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN; 161 SPAGAIN;
158 } 162 }
163
164 do_croak = SvTRUE (ERRSV);
165
166 LEAVE;
159 167
160 if (req->callback) 168 if (req->callback)
161 SvREFCNT_dec (req->callback); 169 SvREFCNT_dec (req->callback);
162 170
163 errno = errorno; 171 errno = errorno;
164 count++; 172 count++;
165 } 173 }
166 174
175 prv = req;
176 req = req->next;
167 Safefree (req); 177 Safefree (prv);
178
179 if (do_croak)
180 croak (0);
168 } 181 }
169 182
170 return count; 183 return count;
171} 184}
172 185
… …
227 req->type = REQ_QUIT; 240 req->type = REQ_QUIT;
228 241
229 send_req (req); 242 send_req (req);
230} 243}
231 244
232static void
233read_write (int dowrite, int fd, off_t offset, size_t length,
234 SV *data, STRLEN dataoffset, SV *callback)
235{
236 aio_req req;
237 STRLEN svlen;
238 char *svptr = SvPV (data, svlen);
239 245
240 SvUPGRADE (data, SVt_PV); 246static void min_parallel (int nthreads)
241 SvPOK_on (data); 247{
248 while (nthreads > started)
249 start_thread ();
250}
242 251
243 if (dataoffset < 0) 252static void max_parallel (int nthreads)
244 dataoffset += svlen; 253{
254 int cur = started;
255 while (cur > nthreads)
256 {
257 end_thread ();
258 cur--;
259 }
245 260
246 if (dataoffset < 0 || dataoffset > svlen) 261 while (started > nthreads)
247 croak ("data offset outside of string");
248
249 if (dowrite)
250 { 262 {
251 /* write: check length and adjust. */ 263 poll_wait ();
252 if (length < 0 || length + dataoffset > svlen) 264 poll_cb ();
253 length = svlen - dataoffset;
254 } 265 }
255 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)
256 { 378 {
257 /* read: grow scalar as necessary */ 379 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
258 svptr = SvGROW (data, length + dataoffset); 380
381 pread (fd, readahead_buf, len, offset);
382 offset += len;
383 count -= len;
259 } 384 }
260 385
261 if (length < 0) 386 errno = 0;
262 croak ("length must not be negative");
263
264 Newz (0, req, 1, aio_cb);
265
266 if (!req)
267 croak ("out of memory during aio_req allocation");
268
269 req->type = dowrite ? REQ_WRITE : REQ_READ;
270 req->fd = fd;
271 req->offset = offset;
272 req->length = length;
273 req->data = SvREFCNT_inc (data);
274 req->dataptr = (char *)svptr + dataoffset;
275 req->callback = SvREFCNT_inc (callback);
276
277 send_req (req);
278} 387}
388#endif
389
390/*****************************************************************************/
279 391
280static void * 392static void *
281aio_proc (void *thr_arg) 393aio_proc (void *thr_arg)
282{ 394{
283 aio_req req; 395 aio_req req;
… …
309 421
310 type = req->type; 422 type = req->type;
311 423
312 switch (type) 424 switch (type)
313 { 425 {
314 case REQ_READ: req->result = pread64 (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;
315 case REQ_WRITE: req->result = pwrite64 (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;
316#if SYS_readahead 428
317 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;
318#else
319 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
320#endif
321 430
322 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 431 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
323 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 432 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
324 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 433 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
325 434
326 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;
327 case REQ_CLOSE: req->result = close (req->fd); break; 436 case REQ_CLOSE: req->result = close (req->fd); break;
328 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;
329 440
441 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
330 case REQ_FSYNC: req->result = fsync (req->fd); break; 442 case REQ_FSYNC: req->result = fsync (req->fd); break;
331 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
332 443
333 case REQ_QUIT: 444 case REQ_QUIT:
334 break; 445 break;
335 446
336 default: 447 default:
… …
362 while (type != REQ_QUIT); 473 while (type != REQ_QUIT);
363 474
364 return 0; 475 return 0;
365} 476}
366 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
367MODULE = IO::AIO PACKAGE = IO::AIO 490MODULE = IO::AIO PACKAGE = IO::AIO
368 491
369PROTOTYPES: ENABLE 492PROTOTYPES: ENABLE
370 493
371BOOT: 494BOOT:
… …
376 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) 499 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
377 croak ("cannot set result pipe to nonblocking mode"); 500 croak ("cannot set result pipe to nonblocking mode");
378 501
379 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 502 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
380 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);
381} 506}
382 507
383void 508void
384min_parallel(nthreads) 509min_parallel(nthreads)
385 int nthreads 510 int nthreads
386 PROTOTYPE: $ 511 PROTOTYPE: $
387 CODE:
388 while (nthreads > started)
389 start_thread ();
390 512
391void 513void
392max_parallel(nthreads) 514max_parallel(nthreads)
393 int nthreads 515 int nthreads
394 PROTOTYPE: $ 516 PROTOTYPE: $
395 CODE:
396{
397 int cur = started;
398 while (cur > nthreads)
399 {
400 end_thread ();
401 cur--;
402 }
403
404 while (started > nthreads)
405 {
406 poll_wait ();
407 poll_cb ();
408 }
409}
410 517
411int 518int
412max_outstanding(nreqs) 519max_outstanding(nreqs)
413 int nreqs 520 int nreqs
414 PROTOTYPE: $ 521 PROTOTYPE: $
… …
423 int mode 530 int mode
424 SV * callback 531 SV * callback
425 PROTOTYPE: $$$;$ 532 PROTOTYPE: $$$;$
426 CODE: 533 CODE:
427{ 534{
428 aio_req req; 535 dREQ;
429
430 Newz (0, req, 1, aio_cb);
431
432 if (!req)
433 croak ("out of memory during aio_req allocation");
434 536
435 req->type = REQ_OPEN; 537 req->type = REQ_OPEN;
436 req->data = newSVsv (pathname); 538 req->data = newSVsv (pathname);
437 req->dataptr = SvPV_nolen (req->data); 539 req->dataptr = SvPVbyte_nolen (req->data);
438 req->fd = flags; 540 req->fd = flags;
439 req->mode = mode; 541 req->mode = mode;
440 req->callback = SvREFCNT_inc (callback);
441 542
442 send_req (req); 543 send_req (req);
443} 544}
444 545
445void 546void
446aio_close(fh,callback=&PL_sv_undef) 547aio_close(fh,callback=&PL_sv_undef)
447 InputStream fh 548 SV * fh
448 SV * callback 549 SV * callback
449 PROTOTYPE: $;$ 550 PROTOTYPE: $;$
450 ALIAS: 551 ALIAS:
451 aio_close = REQ_CLOSE 552 aio_close = REQ_CLOSE
452 aio_fsync = REQ_FSYNC 553 aio_fsync = REQ_FSYNC
453 aio_fdatasync = REQ_FDATASYNC 554 aio_fdatasync = REQ_FDATASYNC
454 CODE: 555 CODE:
455{ 556{
456 aio_req req; 557 dREQ;
457
458 Newz (0, req, 1, aio_cb);
459
460 if (!req)
461 croak ("out of memory during aio_req allocation");
462 558
463 req->type = ix; 559 req->type = ix;
560 req->fh = newSVsv (fh);
464 req->fd = PerlIO_fileno (fh); 561 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
465 req->callback = SvREFCNT_inc (callback);
466 562
467 send_req (req); 563 send_req (req);
468} 564}
469 565
470void 566void
471aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 567aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
472 InputStream fh 568 SV * fh
473 UV offset 569 UV offset
474 IV length 570 IV length
475 SV * data 571 SV * data
476 IV dataoffset 572 IV dataoffset
477 SV * callback 573 SV * callback
574 ALIAS:
575 aio_read = REQ_READ
576 aio_write = REQ_WRITE
478 PROTOTYPE: $$$$$;$ 577 PROTOTYPE: $$$$$;$
479 CODE: 578 CODE:
480 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);
481 583
482void 584 SvUPGRADE (data, SVt_PV);
483aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 585 SvPOK_on (data);
484 OutputStream fh 586
485 UV offset 587 if (dataoffset < 0)
486 IV length 588 dataoffset += svlen;
487 SV * data 589
488 IV dataoffset 590 if (dataoffset < 0 || dataoffset > svlen)
489 SV * callback 591 croak ("data offset outside of string");
490 PROTOTYPE: $$$$$;$ 592
491 CODE: 593 if (ix == REQ_WRITE)
492 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}
493 624
494void 625void
495aio_readahead(fh,offset,length,callback=&PL_sv_undef) 626aio_readahead(fh,offset,length,callback=&PL_sv_undef)
496 InputStream fh 627 SV * fh
497 UV offset 628 UV offset
498 IV length 629 IV length
499 SV * callback 630 SV * callback
500 PROTOTYPE: $$$;$ 631 PROTOTYPE: $$$;$
501 CODE: 632 CODE:
502{ 633{
503 aio_req req; 634 dREQ;
504
505 if (length < 0)
506 croak ("length must not be negative");
507
508 Newz (0, req, 1, aio_cb);
509
510 if (!req)
511 croak ("out of memory during aio_req allocation");
512 635
513 req->type = REQ_READAHEAD; 636 req->type = REQ_READAHEAD;
637 req->fh = newSVsv (fh);
514 req->fd = PerlIO_fileno (fh); 638 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
515 req->offset = offset; 639 req->offset = offset;
516 req->length = length; 640 req->length = length;
517 req->callback = SvREFCNT_inc (callback);
518 641
519 send_req (req); 642 send_req (req);
520} 643}
521 644
522void 645void
… …
526 ALIAS: 649 ALIAS:
527 aio_stat = REQ_STAT 650 aio_stat = REQ_STAT
528 aio_lstat = REQ_LSTAT 651 aio_lstat = REQ_LSTAT
529 CODE: 652 CODE:
530{ 653{
531 aio_req req; 654 dREQ;
532
533 Newz (0, req, 1, aio_cb);
534
535 if (!req)
536 croak ("out of memory during aio_req allocation");
537 655
538 New (0, req->statdata, 1, Stat_t); 656 New (0, req->statdata, 1, Stat_t);
539
540 if (!req->statdata) 657 if (!req->statdata)
541 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)");
542 659
543 if (SvPOK (fh_or_path)) 660 if (SvPOK (fh_or_path))
544 { 661 {
545 req->type = ix; 662 req->type = ix;
546 req->data = newSVsv (fh_or_path); 663 req->data = newSVsv (fh_or_path);
547 req->dataptr = SvPV_nolen (req->data); 664 req->dataptr = SvPVbyte_nolen (req->data);
548 } 665 }
549 else 666 else
550 { 667 {
551 req->type = REQ_FSTAT; 668 req->type = REQ_FSTAT;
669 req->fh = newSVsv (fh_or_path);
552 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 670 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
553 } 671 }
554
555 req->callback = SvREFCNT_inc (callback);
556 672
557 send_req (req); 673 send_req (req);
558} 674}
559 675
560void 676void
561aio_unlink(pathname,callback=&PL_sv_undef) 677aio_unlink(pathname,callback=&PL_sv_undef)
562 SV * pathname 678 SV * pathname
563 SV * callback 679 SV * callback
680 ALIAS:
681 aio_unlink = REQ_UNLINK
682 aio_rmdir = REQ_RMDIR
564 CODE: 683 CODE:
565{ 684{
566 aio_req req; 685 dREQ;
567 686
568 Newz (0, req, 1, aio_cb); 687 req->type = ix;
688 req->data = newSVsv (pathname);
689 req->dataptr = SvPVbyte_nolen (req->data);
569 690
570 if (!req) 691 send_req (req);
571 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;
572 702
573 req->type = REQ_UNLINK; 703 req->type = REQ_SYMLINK;
704 req->fh = newSVsv (oldpath);
705 req->data2ptr = SvPVbyte_nolen (req->fh);
574 req->data = newSVsv (pathname); 706 req->data = newSVsv (newpath);
575 req->dataptr = SvPV_nolen (req->data); 707 req->dataptr = SvPVbyte_nolen (req->data);
576 req->callback = SvREFCNT_inc (callback);
577 708
578 send_req (req); 709 send_req (req);
579} 710}
580 711
581void 712void

Diff Legend

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