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

Diff Legend

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