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.11 by root, Wed Jul 20 21:55:27 2005 UTC vs.
Revision 1.24 by root, Wed Aug 17 03:01:56 2005 UTC

1#define _XOPEN_SOURCE 500 1#define _REENTRANT 1
2#include <errno.h>
2 3
3#include "EXTERN.h" 4#include "EXTERN.h"
4#include "perl.h" 5#include "perl.h"
5#include "XSUB.h" 6#include "XSUB.h"
7
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
… …
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
… …
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, prv; 92 aio_req req, prv;
89
90 static int rl;//D
91 //printf ("%d ENTER\n", ++rl);//D
92 93
93 pthread_mutex_lock (&reslock); 94 pthread_mutex_lock (&reslock);
94 95
95 { 96 {
96 /* read any signals sent by the worker threads */ 97 /* read any signals sent by the worker threads */
97 char buf [32]; 98 char buf [32];
98 while (read (respipe [0], buf, 32) > 0) 99 while (read (respipe [0], buf, 32) == 32)
99 ; 100 ;
100 } 101 }
101 102
102 req = ress; 103 req = ress;
103 ress = rese = 0; 104 ress = rese = 0;
… …
105 pthread_mutex_unlock (&reslock); 106 pthread_mutex_unlock (&reslock);
106 107
107 while (req) 108 while (req)
108 { 109 {
109 nreqs--; 110 nreqs--;
110 //printf ("%d count %d %p->%p\n", rl, count, req, req->next);//D
111 111
112 if (req->type == REQ_QUIT) 112 if (req->type == REQ_QUIT)
113 started--; 113 started--;
114 else 114 else
115 { 115 {
… …
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;
… …
166 174
167 prv = req; 175 prv = req;
168 req = req->next; 176 req = req->next;
169 Safefree (prv); 177 Safefree (prv);
170 178
171 /* TODO: croak on errors? */ 179 if (do_croak)
180 croak (0);
172 } 181 }
173 182
174 //printf ("%d LEAVE %p %p\n", rl--, ress, rese);//D
175 return count; 183 return count;
176} 184}
177 185
178static void *aio_proc(void *arg); 186static void *aio_proc(void *arg);
179 187
… …
232 req->type = REQ_QUIT; 240 req->type = REQ_QUIT;
233 241
234 send_req (req); 242 send_req (req);
235} 243}
236 244
237static void
238read_write (int dowrite, int fd, off_t offset, size_t length,
239 SV *data, STRLEN dataoffset, SV *callback)
240{
241 aio_req req;
242 STRLEN svlen;
243 char *svptr = SvPV (data, svlen);
244 245
245 SvUPGRADE (data, SVt_PV); 246static void min_parallel (int nthreads)
246 SvPOK_on (data); 247{
248 while (nthreads > started)
249 start_thread ();
250}
247 251
248 if (dataoffset < 0) 252static void max_parallel (int nthreads)
249 dataoffset += svlen; 253{
254 int cur = started;
255 while (cur > nthreads)
256 {
257 end_thread ();
258 cur--;
259 }
250 260
251 if (dataoffset < 0 || dataoffset > svlen) 261 while (started > nthreads)
252 croak ("data offset outside of string");
253
254 if (dowrite)
255 { 262 {
256 /* write: check length and adjust. */ 263 poll_wait ();
257 if (length < 0 || length + dataoffset > svlen) 264 poll_cb ();
258 length = svlen - dataoffset;
259 } 265 }
260 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)
261 { 378 {
262 /* read: grow scalar as necessary */ 379 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
263 svptr = SvGROW (data, length + dataoffset); 380
381 pread (fd, readahead_buf, len, offset);
382 offset += len;
383 count -= len;
264 } 384 }
265 385
266 if (length < 0) 386 errno = 0;
267 croak ("length must not be negative");
268
269 Newz (0, req, 1, aio_cb);
270
271 if (!req)
272 croak ("out of memory during aio_req allocation");
273
274 req->type = dowrite ? REQ_WRITE : REQ_READ;
275 req->fd = fd;
276 req->offset = offset;
277 req->length = length;
278 req->data = SvREFCNT_inc (data);
279 req->dataptr = (char *)svptr + dataoffset;
280 req->callback = SvREFCNT_inc (callback);
281
282 send_req (req);
283} 387}
388#endif
389
390/*****************************************************************************/
284 391
285static void * 392static void *
286aio_proc (void *thr_arg) 393aio_proc (void *thr_arg)
287{ 394{
288 aio_req req; 395 aio_req req;
… …
316 423
317 switch (type) 424 switch (type)
318 { 425 {
319 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;
320 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;
321#if SYS_readahead 428
322 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;
323#else
324 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
325#endif
326 430
327 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 431 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
328 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 432 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
329 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 433 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
330 434
331 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;
332 case REQ_CLOSE: req->result = close (req->fd); break; 436 case REQ_CLOSE: req->result = close (req->fd); break;
333 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;
334 440
441 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
335 case REQ_FSYNC: req->result = fsync (req->fd); break; 442 case REQ_FSYNC: req->result = fsync (req->fd); break;
336 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
337 443
338 case REQ_QUIT: 444 case REQ_QUIT:
339 break; 445 break;
340 446
341 default: 447 default:
… …
367 while (type != REQ_QUIT); 473 while (type != REQ_QUIT);
368 474
369 return 0; 475 return 0;
370} 476}
371 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
372MODULE = IO::AIO PACKAGE = IO::AIO 490MODULE = IO::AIO PACKAGE = IO::AIO
373 491
374PROTOTYPES: ENABLE 492PROTOTYPES: ENABLE
375 493
376BOOT: 494BOOT:
… …
381 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) 499 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
382 croak ("cannot set result pipe to nonblocking mode"); 500 croak ("cannot set result pipe to nonblocking mode");
383 501
384 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 502 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
385 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);
386} 506}
387 507
388void 508void
389min_parallel(nthreads) 509min_parallel(nthreads)
390 int nthreads 510 int nthreads
391 PROTOTYPE: $ 511 PROTOTYPE: $
392 CODE:
393 while (nthreads > started)
394 start_thread ();
395 512
396void 513void
397max_parallel(nthreads) 514max_parallel(nthreads)
398 int nthreads 515 int nthreads
399 PROTOTYPE: $ 516 PROTOTYPE: $
400 CODE:
401{
402 int cur = started;
403 while (cur > nthreads)
404 {
405 end_thread ();
406 cur--;
407 }
408
409 while (started > nthreads)
410 {
411 poll_wait ();
412 poll_cb ();
413 }
414}
415 517
416int 518int
417max_outstanding(nreqs) 519max_outstanding(nreqs)
418 int nreqs 520 int nreqs
419 PROTOTYPE: $ 521 PROTOTYPE: $
… …
428 int mode 530 int mode
429 SV * callback 531 SV * callback
430 PROTOTYPE: $$$;$ 532 PROTOTYPE: $$$;$
431 CODE: 533 CODE:
432{ 534{
433 aio_req req; 535 dREQ;
434
435 Newz (0, req, 1, aio_cb);
436
437 if (!req)
438 croak ("out of memory during aio_req allocation");
439 536
440 req->type = REQ_OPEN; 537 req->type = REQ_OPEN;
441 req->data = newSVsv (pathname); 538 req->data = newSVsv (pathname);
442 req->dataptr = SvPV_nolen (req->data); 539 req->dataptr = SvPVbyte_nolen (req->data);
443 req->fd = flags; 540 req->fd = flags;
444 req->mode = mode; 541 req->mode = mode;
445 req->callback = SvREFCNT_inc (callback);
446 542
447 send_req (req); 543 send_req (req);
448} 544}
449 545
450void 546void
451aio_close(fh,callback=&PL_sv_undef) 547aio_close(fh,callback=&PL_sv_undef)
452 InputStream fh 548 SV * fh
453 SV * callback 549 SV * callback
454 PROTOTYPE: $;$ 550 PROTOTYPE: $;$
455 ALIAS: 551 ALIAS:
456 aio_close = REQ_CLOSE 552 aio_close = REQ_CLOSE
457 aio_fsync = REQ_FSYNC 553 aio_fsync = REQ_FSYNC
458 aio_fdatasync = REQ_FDATASYNC 554 aio_fdatasync = REQ_FDATASYNC
459 CODE: 555 CODE:
460{ 556{
461 aio_req req; 557 dREQ;
462
463 Newz (0, req, 1, aio_cb);
464
465 if (!req)
466 croak ("out of memory during aio_req allocation");
467 558
468 req->type = ix; 559 req->type = ix;
560 req->fh = newSVsv (fh);
469 req->fd = PerlIO_fileno (fh); 561 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
470 req->callback = SvREFCNT_inc (callback);
471 562
472 send_req (req); 563 send_req (req);
473} 564}
474 565
475void 566void
476aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 567aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
477 InputStream fh 568 SV * fh
478 UV offset 569 UV offset
479 IV length 570 IV length
480 SV * data 571 SV * data
481 IV dataoffset 572 IV dataoffset
482 SV * callback 573 SV * callback
574 ALIAS:
575 aio_read = REQ_READ
576 aio_write = REQ_WRITE
483 PROTOTYPE: $$$$$;$ 577 PROTOTYPE: $$$$$;$
484 CODE: 578 CODE:
485 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);
486 583
487void 584 SvUPGRADE (data, SVt_PV);
488aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 585 SvPOK_on (data);
489 OutputStream fh 586
490 UV offset 587 if (dataoffset < 0)
491 IV length 588 dataoffset += svlen;
492 SV * data 589
493 IV dataoffset 590 if (dataoffset < 0 || dataoffset > svlen)
494 SV * callback 591 croak ("data offset outside of string");
495 PROTOTYPE: $$$$$;$ 592
496 CODE: 593 if (ix == REQ_WRITE)
497 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}
498 624
499void 625void
500aio_readahead(fh,offset,length,callback=&PL_sv_undef) 626aio_readahead(fh,offset,length,callback=&PL_sv_undef)
501 InputStream fh 627 SV * fh
502 UV offset 628 UV offset
503 IV length 629 IV length
504 SV * callback 630 SV * callback
505 PROTOTYPE: $$$;$ 631 PROTOTYPE: $$$;$
506 CODE: 632 CODE:
507{ 633{
508 aio_req req; 634 dREQ;
509
510 if (length < 0)
511 croak ("length must not be negative");
512
513 Newz (0, req, 1, aio_cb);
514
515 if (!req)
516 croak ("out of memory during aio_req allocation");
517 635
518 req->type = REQ_READAHEAD; 636 req->type = REQ_READAHEAD;
637 req->fh = newSVsv (fh);
519 req->fd = PerlIO_fileno (fh); 638 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
520 req->offset = offset; 639 req->offset = offset;
521 req->length = length; 640 req->length = length;
522 req->callback = SvREFCNT_inc (callback);
523 641
524 send_req (req); 642 send_req (req);
525} 643}
526 644
527void 645void
… …
531 ALIAS: 649 ALIAS:
532 aio_stat = REQ_STAT 650 aio_stat = REQ_STAT
533 aio_lstat = REQ_LSTAT 651 aio_lstat = REQ_LSTAT
534 CODE: 652 CODE:
535{ 653{
536 aio_req req; 654 dREQ;
537
538 Newz (0, req, 1, aio_cb);
539
540 if (!req)
541 croak ("out of memory during aio_req allocation");
542 655
543 New (0, req->statdata, 1, Stat_t); 656 New (0, req->statdata, 1, Stat_t);
544
545 if (!req->statdata) 657 if (!req->statdata)
546 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)");
547 659
548 if (SvPOK (fh_or_path)) 660 if (SvPOK (fh_or_path))
549 { 661 {
550 req->type = ix; 662 req->type = ix;
551 req->data = newSVsv (fh_or_path); 663 req->data = newSVsv (fh_or_path);
552 req->dataptr = SvPV_nolen (req->data); 664 req->dataptr = SvPVbyte_nolen (req->data);
553 } 665 }
554 else 666 else
555 { 667 {
556 req->type = REQ_FSTAT; 668 req->type = REQ_FSTAT;
669 req->fh = newSVsv (fh_or_path);
557 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 670 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
558 } 671 }
559
560 req->callback = SvREFCNT_inc (callback);
561 672
562 send_req (req); 673 send_req (req);
563} 674}
564 675
565void 676void
566aio_unlink(pathname,callback=&PL_sv_undef) 677aio_unlink(pathname,callback=&PL_sv_undef)
567 SV * pathname 678 SV * pathname
568 SV * callback 679 SV * callback
680 ALIAS:
681 aio_unlink = REQ_UNLINK
682 aio_rmdir = REQ_RMDIR
569 CODE: 683 CODE:
570{ 684{
571 aio_req req; 685 dREQ;
572 686
573 Newz (0, req, 1, aio_cb); 687 req->type = ix;
688 req->data = newSVsv (pathname);
689 req->dataptr = SvPVbyte_nolen (req->data);
574 690
575 if (!req) 691 send_req (req);
576 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;
577 702
578 req->type = REQ_UNLINK; 703 req->type = REQ_SYMLINK;
704 req->fh = newSVsv (oldpath);
705 req->data2ptr = SvPVbyte_nolen (req->fh);
579 req->data = newSVsv (pathname); 706 req->data = newSVsv (newpath);
580 req->dataptr = SvPV_nolen (req->data); 707 req->dataptr = SvPVbyte_nolen (req->data);
581 req->callback = SvREFCNT_inc (callback);
582 708
583 send_req (req); 709 send_req (req);
584} 710}
585 711
586void 712void

Diff Legend

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