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.23 by root, Tue Aug 16 23:33:34 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;
88 aio_req req; 91 aio_req req, prv;
89 92
93 pthread_mutex_lock (&reslock);
94
90 { 95 {
91 /* read and signals sent by the worker threads */ 96 /* read any signals sent by the worker threads */
92 char buf [32]; 97 char buf [32];
93 while (read (respipe [0], buf, 32) > 0) 98 while (read (respipe [0], buf, 32) == 32)
94 ; 99 ;
95 } 100 }
96 101
97 for (;;) 102 req = ress;
103 ress = rese = 0;
104
105 pthread_mutex_unlock (&reslock);
106
107 while (req)
98 { 108 {
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--; 109 nreqs--;
115 110
116 if (req->type == REQ_QUIT) 111 if (req->type == REQ_QUIT)
117 started--; 112 started--;
118 else 113 else
… …
125 + req->result > 0 ? req->result : 0); 120 + req->result > 0 ? req->result : 0);
126 121
127 if (req->data) 122 if (req->data)
128 SvREFCNT_dec (req->data); 123 SvREFCNT_dec (req->data);
129 124
125 if (req->fh)
126 SvREFCNT_dec (req->fh);
127
130 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)
131 { 129 {
132 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 130 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
133 PL_laststatval = req->result; 131 PL_laststatval = req->result;
134 PL_statcache = *(req->statdata); 132 PL_statcache = *(req->statdata);
135 133
136 Safefree (req->statdata); 134 Safefree (req->statdata);
137 } 135 }
138 136
137 ENTER;
139 PUSHMARK (SP); 138 PUSHMARK (SP);
140 XPUSHs (sv_2mortal (newSViv (req->result))); 139 XPUSHs (sv_2mortal (newSViv (req->result)));
141 140
142 if (req->type == REQ_OPEN) 141 if (req->type == REQ_OPEN)
143 { 142 {
… …
146 145
147 PUTBACK; 146 PUTBACK;
148 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 147 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
149 SPAGAIN; 148 SPAGAIN;
150 149
151 fh = POPs; 150 fh = SvREFCNT_inc (POPs);
152 151
153 PUSHMARK (SP); 152 PUSHMARK (SP);
154 XPUSHs (fh); 153 XPUSHs (sv_2mortal (fh));
155 } 154 }
156 155
157 if (SvOK (req->callback)) 156 if (SvOK (req->callback))
158 { 157 {
159 PUTBACK; 158 PUTBACK;
160 call_sv (req->callback, G_VOID | G_EVAL); 159 call_sv (req->callback, G_VOID | G_EVAL);
161 SPAGAIN; 160 SPAGAIN;
162 } 161 }
162
163 LEAVE;
163 164
164 if (req->callback) 165 if (req->callback)
165 SvREFCNT_dec (req->callback); 166 SvREFCNT_dec (req->callback);
166 167
167 errno = errorno; 168 errno = errorno;
168 count++; 169 count++;
169 } 170 }
170 171
172 prv = req;
173 req = req->next;
171 Safefree (req); 174 Safefree (prv);
175
176 /* TODO: croak on errors? */
172 } 177 }
173 178
174 return count; 179 return count;
175} 180}
176 181
… …
231 req->type = REQ_QUIT; 236 req->type = REQ_QUIT;
232 237
233 send_req (req); 238 send_req (req);
234} 239}
235 240
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 241
244 SvUPGRADE (data, SVt_PV); 242static void min_parallel (int nthreads)
245 SvPOK_on (data); 243{
244 while (nthreads > started)
245 start_thread ();
246}
246 247
247 if (dataoffset < 0) 248static void max_parallel (int nthreads)
248 dataoffset += svlen; 249{
250 int cur = started;
251 while (cur > nthreads)
252 {
253 end_thread ();
254 cur--;
255 }
249 256
250 if (dataoffset < 0 || dataoffset > svlen) 257 while (started > nthreads)
251 croak ("data offset outside of string");
252
253 if (dowrite)
254 { 258 {
255 /* write: check length and adjust. */ 259 poll_wait ();
256 if (length < 0 || length + dataoffset > svlen) 260 poll_cb ();
257 length = svlen - dataoffset;
258 } 261 }
259 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)
260 { 374 {
261 /* read: grow scalar as necessary */ 375 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
262 svptr = SvGROW (data, length + dataoffset); 376
377 pread (fd, readahead_buf, len, offset);
378 offset += len;
379 count -= len;
263 } 380 }
264 381
265 if (length < 0) 382 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} 383}
384#endif
385
386/*****************************************************************************/
283 387
284static void * 388static void *
285aio_proc (void *thr_arg) 389aio_proc (void *thr_arg)
286{ 390{
287 aio_req req; 391 aio_req req;
… …
315 419
316 switch (type) 420 switch (type)
317 { 421 {
318 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;
319 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;
320#if SYS_readahead 424
321 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;
322#else
323 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
324#endif
325 426
326 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 427 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
327 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 428 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
328 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 429 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
329 430
330 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;
331 case REQ_CLOSE: req->result = close (req->fd); break; 432 case REQ_CLOSE: req->result = close (req->fd); break;
332 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;
333 436
437 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
334 case REQ_FSYNC: req->result = fsync (req->fd); break; 438 case REQ_FSYNC: req->result = fsync (req->fd); break;
335 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
336 439
337 case REQ_QUIT: 440 case REQ_QUIT:
338 break; 441 break;
339 442
340 default: 443 default:
… …
366 while (type != REQ_QUIT); 469 while (type != REQ_QUIT);
367 470
368 return 0; 471 return 0;
369} 472}
370 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
371MODULE = IO::AIO PACKAGE = IO::AIO 486MODULE = IO::AIO PACKAGE = IO::AIO
372 487
373PROTOTYPES: ENABLE 488PROTOTYPES: ENABLE
374 489
375BOOT: 490BOOT:
… …
380 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)) 495 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
381 croak ("cannot set result pipe to nonblocking mode"); 496 croak ("cannot set result pipe to nonblocking mode");
382 497
383 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 498 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
384 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);
385} 502}
386 503
387void 504void
388min_parallel(nthreads) 505min_parallel(nthreads)
389 int nthreads 506 int nthreads
390 PROTOTYPE: $ 507 PROTOTYPE: $
391 CODE:
392 while (nthreads > started)
393 start_thread ();
394 508
395void 509void
396max_parallel(nthreads) 510max_parallel(nthreads)
397 int nthreads 511 int nthreads
398 PROTOTYPE: $ 512 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 513
415int 514int
416max_outstanding(nreqs) 515max_outstanding(nreqs)
417 int nreqs 516 int nreqs
418 PROTOTYPE: $ 517 PROTOTYPE: $
… …
427 int mode 526 int mode
428 SV * callback 527 SV * callback
429 PROTOTYPE: $$$;$ 528 PROTOTYPE: $$$;$
430 CODE: 529 CODE:
431{ 530{
432 aio_req req; 531 dREQ;
433
434 Newz (0, req, 1, aio_cb);
435
436 if (!req)
437 croak ("out of memory during aio_req allocation");
438 532
439 req->type = REQ_OPEN; 533 req->type = REQ_OPEN;
440 req->data = newSVsv (pathname); 534 req->data = newSVsv (pathname);
441 req->dataptr = SvPV_nolen (req->data); 535 req->dataptr = SvPVbyte_nolen (req->data);
442 req->fd = flags; 536 req->fd = flags;
443 req->mode = mode; 537 req->mode = mode;
444 req->callback = SvREFCNT_inc (callback);
445 538
446 send_req (req); 539 send_req (req);
447} 540}
448 541
449void 542void
450aio_close(fh,callback=&PL_sv_undef) 543aio_close(fh,callback=&PL_sv_undef)
451 InputStream fh 544 SV * fh
452 SV * callback 545 SV * callback
453 PROTOTYPE: $;$ 546 PROTOTYPE: $;$
454 ALIAS: 547 ALIAS:
455 aio_close = REQ_CLOSE 548 aio_close = REQ_CLOSE
456 aio_fsync = REQ_FSYNC 549 aio_fsync = REQ_FSYNC
457 aio_fdatasync = REQ_FDATASYNC 550 aio_fdatasync = REQ_FDATASYNC
458 CODE: 551 CODE:
459{ 552{
460 aio_req req; 553 dREQ;
461
462 Newz (0, req, 1, aio_cb);
463
464 if (!req)
465 croak ("out of memory during aio_req allocation");
466 554
467 req->type = ix; 555 req->type = ix;
556 req->fh = newSVsv (fh);
468 req->fd = PerlIO_fileno (fh); 557 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
469 req->callback = SvREFCNT_inc (callback);
470 558
471 send_req (req); 559 send_req (req);
472} 560}
473 561
474void 562void
475aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 563aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
476 InputStream fh 564 SV * fh
477 UV offset 565 UV offset
478 IV length 566 IV length
479 SV * data 567 SV * data
480 IV dataoffset 568 IV dataoffset
481 SV * callback 569 SV * callback
570 ALIAS:
571 aio_read = REQ_READ
572 aio_write = REQ_WRITE
482 PROTOTYPE: $$$$$;$ 573 PROTOTYPE: $$$$$;$
483 CODE: 574 CODE:
484 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);
485 579
486void 580 SvUPGRADE (data, SVt_PV);
487aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 581 SvPOK_on (data);
488 OutputStream fh 582
489 UV offset 583 if (dataoffset < 0)
490 IV length 584 dataoffset += svlen;
491 SV * data 585
492 IV dataoffset 586 if (dataoffset < 0 || dataoffset > svlen)
493 SV * callback 587 croak ("data offset outside of string");
494 PROTOTYPE: $$$$$;$ 588
495 CODE: 589 if (ix == REQ_WRITE)
496 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}
497 620
498void 621void
499aio_readahead(fh,offset,length,callback=&PL_sv_undef) 622aio_readahead(fh,offset,length,callback=&PL_sv_undef)
500 InputStream fh 623 SV * fh
501 UV offset 624 UV offset
502 IV length 625 IV length
503 SV * callback 626 SV * callback
504 PROTOTYPE: $$$;$ 627 PROTOTYPE: $$$;$
505 CODE: 628 CODE:
506{ 629{
507 aio_req req; 630 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 631
517 req->type = REQ_READAHEAD; 632 req->type = REQ_READAHEAD;
633 req->fh = newSVsv (fh);
518 req->fd = PerlIO_fileno (fh); 634 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
519 req->offset = offset; 635 req->offset = offset;
520 req->length = length; 636 req->length = length;
521 req->callback = SvREFCNT_inc (callback);
522 637
523 send_req (req); 638 send_req (req);
524} 639}
525 640
526void 641void
… …
530 ALIAS: 645 ALIAS:
531 aio_stat = REQ_STAT 646 aio_stat = REQ_STAT
532 aio_lstat = REQ_LSTAT 647 aio_lstat = REQ_LSTAT
533 CODE: 648 CODE:
534{ 649{
535 aio_req req; 650 dREQ;
536
537 Newz (0, req, 1, aio_cb);
538
539 if (!req)
540 croak ("out of memory during aio_req allocation");
541 651
542 New (0, req->statdata, 1, Stat_t); 652 New (0, req->statdata, 1, Stat_t);
543
544 if (!req->statdata) 653 if (!req->statdata)
545 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)");
546 655
547 if (SvPOK (fh_or_path)) 656 if (SvPOK (fh_or_path))
548 { 657 {
549 req->type = ix; 658 req->type = ix;
550 req->data = newSVsv (fh_or_path); 659 req->data = newSVsv (fh_or_path);
551 req->dataptr = SvPV_nolen (req->data); 660 req->dataptr = SvPVbyte_nolen (req->data);
552 } 661 }
553 else 662 else
554 { 663 {
555 req->type = REQ_FSTAT; 664 req->type = REQ_FSTAT;
665 req->fh = newSVsv (fh_or_path);
556 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 666 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
557 } 667 }
558
559 req->callback = SvREFCNT_inc (callback);
560 668
561 send_req (req); 669 send_req (req);
562} 670}
563 671
564void 672void
565aio_unlink(pathname,callback=&PL_sv_undef) 673aio_unlink(pathname,callback=&PL_sv_undef)
566 SV * pathname 674 SV * pathname
567 SV * callback 675 SV * callback
676 ALIAS:
677 aio_unlink = REQ_UNLINK
678 aio_rmdir = REQ_RMDIR
568 CODE: 679 CODE:
569{ 680{
570 aio_req req; 681 dREQ;
571 682
572 Newz (0, req, 1, aio_cb); 683 req->type = ix;
684 req->data = newSVsv (pathname);
685 req->dataptr = SvPVbyte_nolen (req->data);
573 686
574 if (!req) 687 send_req (req);
575 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;
576 698
577 req->type = REQ_UNLINK; 699 req->type = REQ_SYMLINK;
700 req->fh = newSVsv (oldpath);
701 req->data2ptr = SvPVbyte_nolen (req->fh);
578 req->data = newSVsv (pathname); 702 req->data = newSVsv (newpath);
579 req->dataptr = SvPV_nolen (req->data); 703 req->dataptr = SvPVbyte_nolen (req->data);
580 req->callback = SvREFCNT_inc (callback);
581 704
582 send_req (req); 705 send_req (req);
583} 706}
584 707
585void 708void

Diff Legend

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