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

Diff Legend

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