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.15 by root, Sat Jul 23 18:19:56 2005 UTC vs.
Revision 1.30 by root, Thu Aug 18 16:32:10 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"
7
8#include "autoconf/config.h"
4 9
5#include <sys/types.h> 10#include <sys/types.h>
6#include <sys/stat.h> 11#include <sys/stat.h>
7 12
8#include <unistd.h> 13#include <unistd.h>
9#include <fcntl.h> 14#include <fcntl.h>
10#include <signal.h> 15#include <signal.h>
11#include <sched.h> 16#include <sched.h>
12#if __linux
13#include <sys/syscall.h>
14#endif
15 17
16#include <pthread.h> 18#include <pthread.h>
17 19
18typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
19typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
27 29
28enum { 30enum {
29 REQ_QUIT, 31 REQ_QUIT,
30 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
31 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
32 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
33 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
34}; 38};
35 39
36typedef struct aio_cb { 40typedef struct aio_cb {
37 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
38 42
43 size_t length; 47 size_t length;
44 ssize_t result; 48 ssize_t result;
45 mode_t mode; /* open */ 49 mode_t mode; /* open */
46 int errorno; 50 int errorno;
47 SV *data, *callback, *fh; 51 SV *data, *callback, *fh;
48 void *dataptr; 52 void *dataptr, *data2ptr;
49 STRLEN dataoffset; 53 STRLEN dataoffset;
50 54
51 Stat_t *statdata; 55 Stat_t *statdata;
52} aio_cb; 56} aio_cb;
53 57
54typedef aio_cb *aio_req; 58typedef aio_cb *aio_req;
55 59
56static int started; 60static int started, wanted;
57static volatile int nreqs; 61static volatile int nreqs;
58static int max_outstanding = 1<<30; 62static int max_outstanding = 1<<30;
59static int respipe [2]; 63static int respipe [2];
60 64
61static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 65static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
63static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 67static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
64 68
65static volatile aio_req reqs, reqe; /* queue start, queue end */ 69static volatile aio_req reqs, reqe; /* queue start, queue end */
66static volatile aio_req ress, rese; /* queue start, queue end */ 70static volatile aio_req ress, rese; /* queue start, queue end */
67 71
72static void free_req (aio_req req)
73{
74 if (req->data)
75 SvREFCNT_dec (req->data);
76
77 if (req->fh)
78 SvREFCNT_dec (req->fh);
79
80 if (req->statdata)
81 Safefree (req->statdata);
82
83 if (req->callback)
84 SvREFCNT_dec (req->callback);
85
86 Safefree (req);
87}
88
68static void 89static void
69poll_wait () 90poll_wait ()
70{ 91{
71 if (nreqs && !ress) 92 if (nreqs && !ress)
72 { 93 {
81static int 102static int
82poll_cb () 103poll_cb ()
83{ 104{
84 dSP; 105 dSP;
85 int count = 0; 106 int count = 0;
107 int do_croak = 0;
86 aio_req req, prv; 108 aio_req req;
87 109
110 for (;;)
111 {
88 pthread_mutex_lock (&reslock); 112 pthread_mutex_lock (&reslock);
113 req = ress;
89 114
90 { 115 if (req)
116 {
117 ress = req->next;
118
119 if (!ress)
120 {
91 /* read any signals sent by the worker threads */ 121 /* read any signals sent by the worker threads */
92 char buf [32]; 122 char buf [32];
93 while (read (respipe [0], buf, 32) > 0) 123 while (read (respipe [0], buf, 32) == 32)
124 ;
125
126 rese = 0;
127 }
94 ; 128 }
95 }
96 129
97 req = ress;
98 ress = rese = 0;
99
100 pthread_mutex_unlock (&reslock); 130 pthread_mutex_unlock (&reslock);
101 131
102 while (req) 132 if (!req)
103 { 133 break;
134
104 nreqs--; 135 nreqs--;
105 136
106 if (req->type == REQ_QUIT) 137 if (req->type == REQ_QUIT)
107 started--; 138 started--;
108 else 139 else
109 { 140 {
110 int errorno = errno; 141 int errorno = errno;
111 errno = req->errorno; 142 errno = req->errorno;
112 143
113 if (req->type == REQ_READ) 144 if (req->type == REQ_READ)
114 SvCUR_set (req->data, req->dataoffset 145 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
115 + req->result > 0 ? req->result : 0);
116 146
147 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
148 SvREADONLY_off (req->data);
149
117 if (req->data) 150 if (req->statdata)
118 SvREFCNT_dec (req->data);
119
120 if (req->fh)
121 SvREFCNT_dec (req->fh);
122
123 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
124 { 151 {
125 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 152 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
126 PL_laststatval = req->result; 153 PL_laststatval = req->result;
127 PL_statcache = *(req->statdata); 154 PL_statcache = *(req->statdata);
128
129 Safefree (req->statdata);
130 } 155 }
131 156
132 ENTER; 157 ENTER;
133 PUSHMARK (SP); 158 PUSHMARK (SP);
134 XPUSHs (sv_2mortal (newSViv (req->result))); 159 XPUSHs (sv_2mortal (newSViv (req->result)));
151 if (SvOK (req->callback)) 176 if (SvOK (req->callback))
152 { 177 {
153 PUTBACK; 178 PUTBACK;
154 call_sv (req->callback, G_VOID | G_EVAL); 179 call_sv (req->callback, G_VOID | G_EVAL);
155 SPAGAIN; 180 SPAGAIN;
181
182 if (SvTRUE (ERRSV))
183 {
184 free_req (req);
185 croak (0);
186 }
156 } 187 }
157 188
158 LEAVE; 189 LEAVE;
159
160 if (req->callback)
161 SvREFCNT_dec (req->callback);
162 190
163 errno = errorno; 191 errno = errorno;
164 count++; 192 count++;
165 } 193 }
166 194
167 prv = req; 195 free_req (req);
168 req = req->next;
169 Safefree (prv);
170
171 /* TODO: croak on errors? */
172 } 196 }
173 197
174 return count; 198 return count;
175} 199}
176 200
183 pthread_t tid; 207 pthread_t tid;
184 pthread_attr_t attr; 208 pthread_attr_t attr;
185 209
186 pthread_attr_init (&attr); 210 pthread_attr_init (&attr);
187 pthread_attr_setstacksize (&attr, STACKSIZE); 211 pthread_attr_setstacksize (&attr, STACKSIZE);
188 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 212// pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
189 213
190 sigfillset (&fullsigset); 214 sigfillset (&fullsigset);
191 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 215 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
192 216
193 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 217 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
197} 221}
198 222
199static void 223static void
200send_req (aio_req req) 224send_req (aio_req req)
201{ 225{
226 while (started < wanted && nreqs >= started)
227 start_thread ();
228
202 nreqs++; 229 nreqs++;
203 230
204 pthread_mutex_lock (&reqlock); 231 pthread_mutex_lock (&reqlock);
205 232
206 req->next = 0; 233 req->next = 0;
214 reqe = reqs = req; 241 reqe = reqs = req;
215 242
216 pthread_cond_signal (&reqwait); 243 pthread_cond_signal (&reqwait);
217 pthread_mutex_unlock (&reqlock); 244 pthread_mutex_unlock (&reqlock);
218 245
219 while (nreqs > max_outstanding) 246 if (nreqs > max_outstanding)
247 for (;;)
248 {
249 poll_cb ();
250
251 if (nreqs <= max_outstanding)
252 break;
253
254 poll_wait ();
255 }
256}
257
258static void
259end_thread (void)
260{
261 aio_req req;
262 Newz (0, req, 1, aio_cb);
263 req->type = REQ_QUIT;
264
265 send_req (req);
266}
267
268static void min_parallel (int nthreads)
269{
270 if (wanted < nthreads)
271 wanted = nthreads;
272}
273
274static void max_parallel (int nthreads)
275{
276 int cur = started;
277
278 if (wanted > nthreads)
279 wanted = nthreads;
280
281 while (cur > wanted)
282 {
283 end_thread ();
284 cur--;
285 }
286
287 while (started > wanted)
220 { 288 {
221 poll_wait (); 289 poll_wait ();
222 poll_cb (); 290 poll_cb ();
223 } 291 }
224} 292}
225 293
226static void 294static void create_pipe ()
227end_thread (void)
228{ 295{
296 if (pipe (respipe))
297 croak ("unable to initialize result pipe");
298
299 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
300 croak ("cannot set result pipe to nonblocking mode");
301
302 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
303 croak ("cannot set result pipe to nonblocking mode");
304}
305
306static void atfork_prepare (void)
307{
308 pthread_mutex_lock (&reqlock);
309 pthread_mutex_lock (&reslock);
310}
311
312static void atfork_parent (void)
313{
314 pthread_mutex_unlock (&reslock);
315 pthread_mutex_unlock (&reqlock);
316}
317
318static void atfork_child (void)
319{
229 aio_req req; 320 aio_req prv;
230 New (0, req, 1, aio_cb);
231 req->type = REQ_QUIT;
232 321
233 send_req (req); 322 started = 0;
323
324 while (reqs)
325 {
326 prv = reqs;
327 reqs = prv->next;
328 free_req (prv);
329 }
330
331 reqs = reqe = 0;
332
333 while (ress)
334 {
335 prv = ress;
336 ress = prv->next;
337 free_req (prv);
338 }
339
340 ress = rese = 0;
341
342 close (respipe [0]);
343 close (respipe [1]);
344 create_pipe ();
345
346 atfork_parent ();
234} 347}
348
349/*****************************************************************************/
350/* work around various missing functions */
351
352#if !HAVE_PREADWRITE
353# define pread aio_pread
354# define pwrite aio_pwrite
355
356/*
357 * make our pread/pwrite safe against themselves, but not against
358 * normal read/write by using a mutex. slows down execution a lot,
359 * but that's your problem, not mine.
360 */
361static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
362
363static ssize_t
364pread (int fd, void *buf, size_t count, off_t offset)
365{
366 ssize_t res;
367 off_t ooffset;
368
369 pthread_mutex_lock (&iolock);
370 ooffset = lseek (fd, 0, SEEK_CUR);
371 lseek (fd, offset, SEEK_SET);
372 res = read (fd, buf, count);
373 lseek (fd, ooffset, SEEK_SET);
374 pthread_mutex_unlock (&iolock);
375
376 return res;
377}
378
379static ssize_t
380pwrite (int fd, void *buf, size_t count, off_t offset)
381{
382 ssize_t res;
383 off_t ooffset;
384
385 pthread_mutex_lock (&iolock);
386 ooffset = lseek (fd, 0, SEEK_CUR);
387 lseek (fd, offset, SEEK_SET);
388 res = write (fd, buf, count);
389 lseek (fd, offset, SEEK_SET);
390 pthread_mutex_unlock (&iolock);
391
392 return res;
393}
394#endif
395
396#if !HAVE_FDATASYNC
397# define fdatasync fsync
398#endif
399
400#if !HAVE_READAHEAD
401# define readahead aio_readahead
402
403static char readahead_buf[4096];
404
405static ssize_t
406readahead (int fd, off_t offset, size_t count)
407{
408 while (count > 0)
409 {
410 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
411
412 pread (fd, readahead_buf, len, offset);
413 offset += len;
414 count -= len;
415 }
416
417 errno = 0;
418}
419#endif
420
421/*****************************************************************************/
235 422
236static void * 423static void *
237aio_proc (void *thr_arg) 424aio_proc (void *thr_arg)
238{ 425{
239 aio_req req; 426 aio_req req;
267 454
268 switch (type) 455 switch (type)
269 { 456 {
270 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 457 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
271 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 458 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
272#if SYS_readahead 459
273 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 460 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
274#else
275 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
276#endif
277 461
278 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 462 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
279 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 463 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
280 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 464 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
281 465
282 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 466 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
283 case REQ_CLOSE: req->result = close (req->fd); break; 467 case REQ_CLOSE: req->result = close (req->fd); break;
284 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 468 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
469 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
470 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
285 471
472 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
286 case REQ_FSYNC: req->result = fsync (req->fd); break; 473 case REQ_FSYNC: req->result = fsync (req->fd); break;
287 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
288 474
289 case REQ_QUIT: 475 case REQ_QUIT:
290 break; 476 break;
291 477
292 default: 478 default:
318 while (type != REQ_QUIT); 504 while (type != REQ_QUIT);
319 505
320 return 0; 506 return 0;
321} 507}
322 508
509#define dREQ \
510 aio_req req; \
511 \
512 if (SvOK (callback) && !SvROK (callback)) \
513 croak ("clalback must be undef or of reference type"); \
514 \
515 Newz (0, req, 1, aio_cb); \
516 if (!req) \
517 croak ("out of memory during aio_req allocation"); \
518 \
519 req->callback = newSVsv (callback);
520
323MODULE = IO::AIO PACKAGE = IO::AIO 521MODULE = IO::AIO PACKAGE = IO::AIO
324 522
325PROTOTYPES: ENABLE 523PROTOTYPES: ENABLE
326 524
327BOOT: 525BOOT:
328{ 526{
329 if (pipe (respipe)) 527 create_pipe ();
330 croak ("unable to initialize result pipe"); 528 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
331
332 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
333 croak ("cannot set result pipe to nonblocking mode");
334
335 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
336 croak ("cannot set result pipe to nonblocking mode");
337} 529}
338 530
339void 531void
340min_parallel(nthreads) 532min_parallel(nthreads)
341 int nthreads 533 int nthreads
342 PROTOTYPE: $ 534 PROTOTYPE: $
343 CODE:
344 while (nthreads > started)
345 start_thread ();
346 535
347void 536void
348max_parallel(nthreads) 537max_parallel(nthreads)
349 int nthreads 538 int nthreads
350 PROTOTYPE: $ 539 PROTOTYPE: $
351 CODE:
352{
353 int cur = started;
354 while (cur > nthreads)
355 {
356 end_thread ();
357 cur--;
358 }
359
360 while (started > nthreads)
361 {
362 poll_wait ();
363 poll_cb ();
364 }
365}
366 540
367int 541int
368max_outstanding(nreqs) 542max_outstanding(nreqs)
369 int nreqs 543 int nreqs
370 PROTOTYPE: $ 544 PROTOTYPE: $
379 int mode 553 int mode
380 SV * callback 554 SV * callback
381 PROTOTYPE: $$$;$ 555 PROTOTYPE: $$$;$
382 CODE: 556 CODE:
383{ 557{
384 aio_req req; 558 dREQ;
385
386 Newz (0, req, 1, aio_cb);
387
388 if (!req)
389 croak ("out of memory during aio_req allocation");
390 559
391 req->type = REQ_OPEN; 560 req->type = REQ_OPEN;
392 req->data = newSVsv (pathname); 561 req->data = newSVsv (pathname);
393 req->dataptr = SvPV_nolen (req->data); 562 req->dataptr = SvPVbyte_nolen (req->data);
394 req->fd = flags; 563 req->fd = flags;
395 req->mode = mode; 564 req->mode = mode;
396 req->callback = SvREFCNT_inc (callback);
397 565
398 send_req (req); 566 send_req (req);
399} 567}
400 568
401void 569void
407 aio_close = REQ_CLOSE 575 aio_close = REQ_CLOSE
408 aio_fsync = REQ_FSYNC 576 aio_fsync = REQ_FSYNC
409 aio_fdatasync = REQ_FDATASYNC 577 aio_fdatasync = REQ_FDATASYNC
410 CODE: 578 CODE:
411{ 579{
412 aio_req req; 580 dREQ;
413
414 Newz (0, req, 1, aio_cb);
415
416 if (!req)
417 croak ("out of memory during aio_req allocation");
418 581
419 req->type = ix; 582 req->type = ix;
420 req->fh = newSVsv (fh); 583 req->fh = newSVsv (fh);
421 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 584 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
422 req->callback = SvREFCNT_inc (callback);
423 585
424 send_req (req); 586 send_req (req);
425} 587}
426 588
427void 589void
438 PROTOTYPE: $$$$$;$ 600 PROTOTYPE: $$$$$;$
439 CODE: 601 CODE:
440{ 602{
441 aio_req req; 603 aio_req req;
442 STRLEN svlen; 604 STRLEN svlen;
443 char *svptr = SvPV (data, svlen); 605 char *svptr = SvPVbyte (data, svlen);
444 606
445 SvUPGRADE (data, SVt_PV); 607 SvUPGRADE (data, SVt_PV);
446 SvPOK_on (data); 608 SvPOK_on (data);
447 609
448 if (dataoffset < 0) 610 if (dataoffset < 0)
464 } 626 }
465 627
466 if (length < 0) 628 if (length < 0)
467 croak ("length must not be negative"); 629 croak ("length must not be negative");
468 630
469 Newz (0, req, 1, aio_cb); 631 {
632 dREQ;
470 633
471 if (!req)
472 croak ("out of memory during aio_req allocation");
473
474 req->type = ix; 634 req->type = ix;
475 req->fh = newSVsv (fh); 635 req->fh = newSVsv (fh);
476 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 636 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
477 : IoOFP (sv_2io (fh))); 637 : IoOFP (sv_2io (fh)));
478 req->offset = offset; 638 req->offset = offset;
479 req->length = length; 639 req->length = length;
480 req->data = SvREFCNT_inc (data); 640 req->data = SvREFCNT_inc (data);
481 req->dataptr = (char *)svptr + dataoffset; 641 req->dataptr = (char *)svptr + dataoffset;
482 req->callback = SvREFCNT_inc (callback);
483 642
643 if (!SvREADONLY (data))
644 {
645 SvREADONLY_on (data);
646 req->data2ptr = (void *)data;
647 }
648
484 send_req (req); 649 send_req (req);
650 }
485} 651}
486 652
487void 653void
488aio_readahead(fh,offset,length,callback=&PL_sv_undef) 654aio_readahead(fh,offset,length,callback=&PL_sv_undef)
489 SV * fh 655 SV * fh
491 IV length 657 IV length
492 SV * callback 658 SV * callback
493 PROTOTYPE: $$$;$ 659 PROTOTYPE: $$$;$
494 CODE: 660 CODE:
495{ 661{
496 aio_req req; 662 dREQ;
497
498 if (length < 0)
499 croak ("length must not be negative");
500
501 Newz (0, req, 1, aio_cb);
502
503 if (!req)
504 croak ("out of memory during aio_req allocation");
505 663
506 req->type = REQ_READAHEAD; 664 req->type = REQ_READAHEAD;
507 req->fh = newSVsv (fh); 665 req->fh = newSVsv (fh);
508 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 666 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
509 req->offset = offset; 667 req->offset = offset;
510 req->length = length; 668 req->length = length;
511 req->callback = SvREFCNT_inc (callback);
512 669
513 send_req (req); 670 send_req (req);
514} 671}
515 672
516void 673void
520 ALIAS: 677 ALIAS:
521 aio_stat = REQ_STAT 678 aio_stat = REQ_STAT
522 aio_lstat = REQ_LSTAT 679 aio_lstat = REQ_LSTAT
523 CODE: 680 CODE:
524{ 681{
525 aio_req req; 682 dREQ;
526
527 Newz (0, req, 1, aio_cb);
528
529 if (!req)
530 croak ("out of memory during aio_req allocation");
531 683
532 New (0, req->statdata, 1, Stat_t); 684 New (0, req->statdata, 1, Stat_t);
533
534 if (!req->statdata) 685 if (!req->statdata)
686 {
687 free_req (req);
535 croak ("out of memory during aio_req->statdata allocation"); 688 croak ("out of memory during aio_req->statdata allocation");
689 }
536 690
537 if (SvPOK (fh_or_path)) 691 if (SvPOK (fh_or_path))
538 { 692 {
539 req->type = ix; 693 req->type = ix;
540 req->data = newSVsv (fh_or_path); 694 req->data = newSVsv (fh_or_path);
541 req->dataptr = SvPV_nolen (req->data); 695 req->dataptr = SvPVbyte_nolen (req->data);
542 } 696 }
543 else 697 else
544 { 698 {
545 req->type = REQ_FSTAT; 699 req->type = REQ_FSTAT;
546 req->fh = newSVsv (fh_or_path); 700 req->fh = newSVsv (fh_or_path);
547 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 701 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
548 } 702 }
549 703
550 req->callback = SvREFCNT_inc (callback);
551
552 send_req (req); 704 send_req (req);
553} 705}
554 706
555void 707void
556aio_unlink(pathname,callback=&PL_sv_undef) 708aio_unlink(pathname,callback=&PL_sv_undef)
557 SV * pathname 709 SV * pathname
558 SV * callback 710 SV * callback
711 ALIAS:
712 aio_unlink = REQ_UNLINK
713 aio_rmdir = REQ_RMDIR
559 CODE: 714 CODE:
560{ 715{
561 aio_req req; 716 dREQ;
562 717
563 Newz (0, req, 1, aio_cb); 718 req->type = ix;
719 req->data = newSVsv (pathname);
720 req->dataptr = SvPVbyte_nolen (req->data);
564 721
565 if (!req) 722 send_req (req);
566 croak ("out of memory during aio_req allocation"); 723}
724
725void
726aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
727 SV * oldpath
728 SV * newpath
729 SV * callback
730 CODE:
731{
732 dREQ;
567 733
568 req->type = REQ_UNLINK; 734 req->type = REQ_SYMLINK;
735 req->fh = newSVsv (oldpath);
736 req->data2ptr = SvPVbyte_nolen (req->fh);
569 req->data = newSVsv (pathname); 737 req->data = newSVsv (newpath);
570 req->dataptr = SvPV_nolen (req->data); 738 req->dataptr = SvPVbyte_nolen (req->data);
571 req->callback = SvREFCNT_inc (callback);
572 739
573 send_req (req); 740 send_req (req);
574} 741}
575 742
576void 743void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines