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.25 by root, Wed Aug 17 03:16: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 int nstarted;
273
274 for (;;) {
275 while (nreqs)
276 {
277 poll_wait ();
278 poll_cb ();
279 }
280
281 nstarted = started;
282 max_parallel (0);
283
284 pthread_mutex_lock (&reqlock);
285
286 if (!nreqs && !started)
287 break;
288
289 pthread_mutex_unlock (&reqlock);
290
291 min_parallel (fork_started);
292 }
293
294 pthread_mutex_lock (&frklock);
295 fork_started = nstarted;
296 pthread_mutex_lock (&reslock);
297
298 assert (!started);
299 assert (!nreqs);
300 assert (!reqs && !reqe);
301 assert (!ress && !rese);
302}
303
304static void atfork_parent (void)
305{
306 pthread_mutex_unlock (&reslock);
307 pthread_mutex_unlock (&frklock);
308 pthread_mutex_unlock (&reqlock);
309
310 min_parallel (fork_started);
311}
312
313#define atfork_child atfork_parent
314
315/*****************************************************************************/
316/* work around various missing functions */
317
318#if !HAVE_PREADWRITE
319# define pread aio_pread
320# define pwrite aio_pwrite
321
322/*
323 * make our pread/pwrite safe against themselves, but not against
324 * normal read/write by using a mutex. slows down execution a lot,
325 * but that's your problem, not mine.
326 */
327static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
328
329static ssize_t
330pread (int fd, void *buf, size_t count, off_t offset)
331{
332 ssize_t res;
333 off_t ooffset;
334
335 pthread_mutex_lock (&iolock);
336 ooffset = lseek (fd, 0, SEEK_CUR);
337 lseek (fd, offset, SEEK_SET);
338 res = read (fd, buf, count);
339 lseek (fd, ooffset, SEEK_SET);
340 pthread_mutex_unlock (&iolock);
341
342 return res;
343}
344
345static ssize_t
346pwrite (int fd, void *buf, size_t count, off_t offset)
347{
348 ssize_t res;
349 off_t ooffset;
350
351 pthread_mutex_lock (&iolock);
352 ooffset = lseek (fd, 0, SEEK_CUR);
353 lseek (fd, offset, SEEK_SET);
354 res = write (fd, buf, count);
355 lseek (fd, offset, SEEK_SET);
356 pthread_mutex_unlock (&iolock);
357
358 return res;
359}
360#endif
361
362#if !HAVE_FDATASYNC
363# define fdatasync fsync
364#endif
365
366#if !HAVE_READAHEAD
367# define readahead aio_readahead
368
369static char readahead_buf[4096];
370
371static ssize_t
372readahead (int fd, off_t offset, size_t count)
373{
374 while (count > 0)
261 { 375 {
262 /* read: grow scalar as necessary */ 376 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
263 svptr = SvGROW (data, length + dataoffset); 377
378 pread (fd, readahead_buf, len, offset);
379 offset += len;
380 count -= len;
264 } 381 }
265 382
266 if (length < 0) 383 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} 384}
385#endif
386
387/*****************************************************************************/
284 388
285static void * 389static void *
286aio_proc (void *thr_arg) 390aio_proc (void *thr_arg)
287{ 391{
288 aio_req req; 392 aio_req req;
… …
316 420
317 switch (type) 421 switch (type)
318 { 422 {
319 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 423 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; 424 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
321#if SYS_readahead 425
322 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 426 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 427
327 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 428 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
328 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 429 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
329 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 430 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
330 431
331 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 432 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
332 case REQ_CLOSE: req->result = close (req->fd); break; 433 case REQ_CLOSE: req->result = close (req->fd); break;
333 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 434 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
435 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
436 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
334 437
438 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
335 case REQ_FSYNC: req->result = fsync (req->fd); break; 439 case REQ_FSYNC: req->result = fsync (req->fd); break;
336 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
337 440
338 case REQ_QUIT: 441 case REQ_QUIT:
339 break; 442 break;
340 443
341 default: 444 default:
… …
367 while (type != REQ_QUIT); 470 while (type != REQ_QUIT);
368 471
369 return 0; 472 return 0;
370} 473}
371 474
475#define dREQ \
476 aio_req req; \
477 \
478 if (SvOK (callback) && !SvROK (callback)) \
479 croak ("clalback must be undef or of reference type"); \
480 \
481 Newz (0, req, 1, aio_cb); \
482 if (!req) \
483 croak ("out of memory during aio_req allocation"); \
484 \
485 req->callback = SvREFCNT_inc (callback);
486
372MODULE = IO::AIO PACKAGE = IO::AIO 487MODULE = IO::AIO PACKAGE = IO::AIO
373 488
374PROTOTYPES: ENABLE 489PROTOTYPES: ENABLE
375 490
376BOOT: 491BOOT:
… …
381 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) 496 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
382 croak ("cannot set result pipe to nonblocking mode"); 497 croak ("cannot set result pipe to nonblocking mode");
383 498
384 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 499 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
385 croak ("cannot set result pipe to nonblocking mode"); 500 croak ("cannot set result pipe to nonblocking mode");
501
502 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
386} 503}
387 504
388void 505void
389min_parallel(nthreads) 506min_parallel(nthreads)
390 int nthreads 507 int nthreads
391 PROTOTYPE: $ 508 PROTOTYPE: $
392 CODE:
393 while (nthreads > started)
394 start_thread ();
395 509
396void 510void
397max_parallel(nthreads) 511max_parallel(nthreads)
398 int nthreads 512 int nthreads
399 PROTOTYPE: $ 513 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 514
416int 515int
417max_outstanding(nreqs) 516max_outstanding(nreqs)
418 int nreqs 517 int nreqs
419 PROTOTYPE: $ 518 PROTOTYPE: $
… …
428 int mode 527 int mode
429 SV * callback 528 SV * callback
430 PROTOTYPE: $$$;$ 529 PROTOTYPE: $$$;$
431 CODE: 530 CODE:
432{ 531{
433 aio_req req; 532 dREQ;
434
435 Newz (0, req, 1, aio_cb);
436
437 if (!req)
438 croak ("out of memory during aio_req allocation");
439 533
440 req->type = REQ_OPEN; 534 req->type = REQ_OPEN;
441 req->data = newSVsv (pathname); 535 req->data = newSVsv (pathname);
442 req->dataptr = SvPV_nolen (req->data); 536 req->dataptr = SvPVbyte_nolen (req->data);
443 req->fd = flags; 537 req->fd = flags;
444 req->mode = mode; 538 req->mode = mode;
445 req->callback = SvREFCNT_inc (callback);
446 539
447 send_req (req); 540 send_req (req);
448} 541}
449 542
450void 543void
451aio_close(fh,callback=&PL_sv_undef) 544aio_close(fh,callback=&PL_sv_undef)
452 InputStream fh 545 SV * fh
453 SV * callback 546 SV * callback
454 PROTOTYPE: $;$ 547 PROTOTYPE: $;$
455 ALIAS: 548 ALIAS:
456 aio_close = REQ_CLOSE 549 aio_close = REQ_CLOSE
457 aio_fsync = REQ_FSYNC 550 aio_fsync = REQ_FSYNC
458 aio_fdatasync = REQ_FDATASYNC 551 aio_fdatasync = REQ_FDATASYNC
459 CODE: 552 CODE:
460{ 553{
461 aio_req req; 554 dREQ;
462
463 Newz (0, req, 1, aio_cb);
464
465 if (!req)
466 croak ("out of memory during aio_req allocation");
467 555
468 req->type = ix; 556 req->type = ix;
557 req->fh = newSVsv (fh);
469 req->fd = PerlIO_fileno (fh); 558 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
470 req->callback = SvREFCNT_inc (callback);
471 559
472 send_req (req); 560 send_req (req);
473} 561}
474 562
475void 563void
476aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 564aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
477 InputStream fh 565 SV * fh
478 UV offset 566 UV offset
479 IV length 567 IV length
480 SV * data 568 SV * data
481 IV dataoffset 569 IV dataoffset
482 SV * callback 570 SV * callback
571 ALIAS:
572 aio_read = REQ_READ
573 aio_write = REQ_WRITE
483 PROTOTYPE: $$$$$;$ 574 PROTOTYPE: $$$$$;$
484 CODE: 575 CODE:
485 read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 576{
577 aio_req req;
578 STRLEN svlen;
579 char *svptr = SvPVbyte (data, svlen);
486 580
487void 581 SvUPGRADE (data, SVt_PV);
488aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 582 SvPOK_on (data);
489 OutputStream fh 583
490 UV offset 584 if (dataoffset < 0)
491 IV length 585 dataoffset += svlen;
492 SV * data 586
493 IV dataoffset 587 if (dataoffset < 0 || dataoffset > svlen)
494 SV * callback 588 croak ("data offset outside of string");
495 PROTOTYPE: $$$$$;$ 589
496 CODE: 590 if (ix == REQ_WRITE)
497 read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback); 591 {
592 /* write: check length and adjust. */
593 if (length < 0 || length + dataoffset > svlen)
594 length = svlen - dataoffset;
595 }
596 else
597 {
598 /* read: grow scalar as necessary */
599 svptr = SvGROW (data, length + dataoffset);
600 }
601
602 if (length < 0)
603 croak ("length must not be negative");
604
605 {
606 dREQ;
607
608 req->type = ix;
609 req->fh = newSVsv (fh);
610 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
611 : IoOFP (sv_2io (fh)));
612 req->offset = offset;
613 req->length = length;
614 req->data = SvREFCNT_inc (data);
615 req->dataptr = (char *)svptr + dataoffset;
616 req->callback = SvREFCNT_inc (callback);
617
618 send_req (req);
619 }
620}
498 621
499void 622void
500aio_readahead(fh,offset,length,callback=&PL_sv_undef) 623aio_readahead(fh,offset,length,callback=&PL_sv_undef)
501 InputStream fh 624 SV * fh
502 UV offset 625 UV offset
503 IV length 626 IV length
504 SV * callback 627 SV * callback
505 PROTOTYPE: $$$;$ 628 PROTOTYPE: $$$;$
506 CODE: 629 CODE:
507{ 630{
508 aio_req req; 631 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 632
518 req->type = REQ_READAHEAD; 633 req->type = REQ_READAHEAD;
634 req->fh = newSVsv (fh);
519 req->fd = PerlIO_fileno (fh); 635 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
520 req->offset = offset; 636 req->offset = offset;
521 req->length = length; 637 req->length = length;
522 req->callback = SvREFCNT_inc (callback);
523 638
524 send_req (req); 639 send_req (req);
525} 640}
526 641
527void 642void
… …
531 ALIAS: 646 ALIAS:
532 aio_stat = REQ_STAT 647 aio_stat = REQ_STAT
533 aio_lstat = REQ_LSTAT 648 aio_lstat = REQ_LSTAT
534 CODE: 649 CODE:
535{ 650{
536 aio_req req; 651 dREQ;
537
538 Newz (0, req, 1, aio_cb);
539
540 if (!req)
541 croak ("out of memory during aio_req allocation");
542 652
543 New (0, req->statdata, 1, Stat_t); 653 New (0, req->statdata, 1, Stat_t);
544
545 if (!req->statdata) 654 if (!req->statdata)
546 croak ("out of memory during aio_req->statdata allocation"); 655 croak ("out of memory during aio_req->statdata allocation (sorry, i just leaked memory, too)");
547 656
548 if (SvPOK (fh_or_path)) 657 if (SvPOK (fh_or_path))
549 { 658 {
550 req->type = ix; 659 req->type = ix;
551 req->data = newSVsv (fh_or_path); 660 req->data = newSVsv (fh_or_path);
552 req->dataptr = SvPV_nolen (req->data); 661 req->dataptr = SvPVbyte_nolen (req->data);
553 } 662 }
554 else 663 else
555 { 664 {
556 req->type = REQ_FSTAT; 665 req->type = REQ_FSTAT;
666 req->fh = newSVsv (fh_or_path);
557 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 667 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
558 } 668 }
559
560 req->callback = SvREFCNT_inc (callback);
561 669
562 send_req (req); 670 send_req (req);
563} 671}
564 672
565void 673void
566aio_unlink(pathname,callback=&PL_sv_undef) 674aio_unlink(pathname,callback=&PL_sv_undef)
567 SV * pathname 675 SV * pathname
568 SV * callback 676 SV * callback
677 ALIAS:
678 aio_unlink = REQ_UNLINK
679 aio_rmdir = REQ_RMDIR
569 CODE: 680 CODE:
570{ 681{
571 aio_req req; 682 dREQ;
572 683
573 Newz (0, req, 1, aio_cb); 684 req->type = ix;
685 req->data = newSVsv (pathname);
686 req->dataptr = SvPVbyte_nolen (req->data);
574 687
575 if (!req) 688 send_req (req);
576 croak ("out of memory during aio_req allocation"); 689}
690
691void
692aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
693 SV * oldpath
694 SV * newpath
695 SV * callback
696 CODE:
697{
698 dREQ;
577 699
578 req->type = REQ_UNLINK; 700 req->type = REQ_SYMLINK;
701 req->fh = newSVsv (oldpath);
702 req->data2ptr = SvPVbyte_nolen (req->fh);
579 req->data = newSVsv (pathname); 703 req->data = newSVsv (newpath);
580 req->dataptr = SvPV_nolen (req->data); 704 req->dataptr = SvPVbyte_nolen (req->data);
581 req->callback = SvREFCNT_inc (callback);
582 705
583 send_req (req); 706 send_req (req);
584} 707}
585 708
586void 709void

Diff Legend

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