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

Diff Legend

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