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.21 by root, Sun Aug 7 03:26:10 2005 UTC vs.
Revision 1.34 by root, Tue Aug 23 00:03:14 2005 UTC

4#include "EXTERN.h" 4#include "EXTERN.h"
5#include "perl.h" 5#include "perl.h"
6#include "XSUB.h" 6#include "XSUB.h"
7 7
8#include "autoconf/config.h" 8#include "autoconf/config.h"
9
10#include <pthread.h>
9 11
10#include <sys/types.h> 12#include <sys/types.h>
11#include <sys/stat.h> 13#include <sys/stat.h>
12 14
13#include <unistd.h> 15#include <unistd.h>
14#include <fcntl.h> 16#include <fcntl.h>
15#include <signal.h> 17#include <signal.h>
16#include <sched.h> 18#include <sched.h>
17 19
18#include <pthread.h> 20#if HAVE_SENDFILE
19 21# if __linux
20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 22# include <sys/sendfile.h>
21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 23# elif __freebsd
22typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */ 24# include <sys/socket.h>
25# include <sys/uio.h>
26# elif __hpux
27# include <sys/socket.h>
28# else
29# error sendfile support requested but not available
30# endif
31#endif
23 32
24#if __ia64 33#if __ia64
25# define STACKSIZE 65536 34# define STACKSIZE 65536
26#else 35#else
27# define STACKSIZE 4096 36# define STACKSIZE 4096
29 38
30enum { 39enum {
31 REQ_QUIT, 40 REQ_QUIT,
32 REQ_OPEN, REQ_CLOSE, 41 REQ_OPEN, REQ_CLOSE,
33 REQ_READ, REQ_WRITE, REQ_READAHEAD, 42 REQ_READ, REQ_WRITE, REQ_READAHEAD,
43 REQ_SENDFILE,
34 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 44 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35 REQ_FSYNC, REQ_FDATASYNC, 45 REQ_FSYNC, REQ_FDATASYNC,
46 REQ_UNLINK, REQ_RMDIR,
47 REQ_SYMLINK,
36}; 48};
37 49
38typedef struct aio_cb { 50typedef struct aio_cb {
39 struct aio_cb *volatile next; 51 struct aio_cb *volatile next;
40 52
41 int type; 53 int type;
42 54
43 int fd; 55 int fd, fd2;
44 off_t offset; 56 off_t offset;
45 size_t length; 57 size_t length;
46 ssize_t result; 58 ssize_t result;
47 mode_t mode; /* open */ 59 mode_t mode; /* open */
48 int errorno; 60 int errorno;
49 SV *data, *callback, *fh; 61 SV *data, *callback;
50 void *dataptr; 62 SV *fh, *fh2;
63 void *dataptr, *data2ptr;
51 STRLEN dataoffset; 64 STRLEN dataoffset;
52 65
53 Stat_t *statdata; 66 Stat_t *statdata;
54} aio_cb; 67} aio_cb;
55 68
56typedef aio_cb *aio_req; 69typedef aio_cb *aio_req;
57 70
58static int started; 71static int started, wanted;
59static volatile int nreqs; 72static volatile int nreqs;
60static int max_outstanding = 1<<30; 73static int max_outstanding = 1<<30;
61static int respipe [2]; 74static int respipe [2];
62 75
63static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 76static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
64static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 77static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
65static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 78static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
66 79
67static volatile aio_req reqs, reqe; /* queue start, queue end */ 80static volatile aio_req reqs, reqe; /* queue start, queue end */
68static volatile aio_req ress, rese; /* queue start, queue end */ 81static volatile aio_req ress, rese; /* queue start, queue end */
82
83static void free_req (aio_req req)
84{
85 if (req->data)
86 SvREFCNT_dec (req->data);
87
88 if (req->fh)
89 SvREFCNT_dec (req->fh);
90
91 if (req->fh2)
92 SvREFCNT_dec (req->fh2);
93
94 if (req->statdata)
95 Safefree (req->statdata);
96
97 if (req->callback)
98 SvREFCNT_dec (req->callback);
99
100 Safefree (req);
101}
69 102
70static void 103static void
71poll_wait () 104poll_wait ()
72{ 105{
73 if (nreqs && !ress) 106 if (nreqs && !ress)
83static int 116static int
84poll_cb () 117poll_cb ()
85{ 118{
86 dSP; 119 dSP;
87 int count = 0; 120 int count = 0;
121 int do_croak = 0;
88 aio_req req, prv; 122 aio_req req;
89 123
90 pthread_mutex_lock (&reslock); 124 for (;;)
91
92 {
93 /* read any signals sent by the worker threads */
94 char buf [32];
95 while (read (respipe [0], buf, 32) > 0)
96 ;
97 }
98
99 req = ress;
100 ress = rese = 0;
101
102 pthread_mutex_unlock (&reslock);
103
104 while (req)
105 { 125 {
126 pthread_mutex_lock (&reslock);
127 req = ress;
128
129 if (req)
130 {
131 ress = req->next;
132
133 if (!ress)
134 {
135 /* read any signals sent by the worker threads */
136 char buf [32];
137 while (read (respipe [0], buf, 32) == 32)
138 ;
139
140 rese = 0;
141 }
142 }
143
144 pthread_mutex_unlock (&reslock);
145
146 if (!req)
147 break;
148
106 nreqs--; 149 nreqs--;
107 150
108 if (req->type == REQ_QUIT) 151 if (req->type == REQ_QUIT)
109 started--; 152 started--;
110 else 153 else
111 { 154 {
112 int errorno = errno; 155 int errorno = errno;
113 errno = req->errorno; 156 errno = req->errorno;
114 157
115 if (req->type == REQ_READ) 158 if (req->type == REQ_READ)
116 SvCUR_set (req->data, req->dataoffset 159 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
117 + req->result > 0 ? req->result : 0);
118 160
161 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
162 SvREADONLY_off (req->data);
163
119 if (req->data) 164 if (req->statdata)
120 SvREFCNT_dec (req->data);
121
122 if (req->fh)
123 SvREFCNT_dec (req->fh);
124
125 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
126 { 165 {
127 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 166 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
128 PL_laststatval = req->result; 167 PL_laststatval = req->result;
129 PL_statcache = *(req->statdata); 168 PL_statcache = *(req->statdata);
130
131 Safefree (req->statdata);
132 } 169 }
133 170
134 ENTER; 171 ENTER;
135 PUSHMARK (SP); 172 PUSHMARK (SP);
136 XPUSHs (sv_2mortal (newSViv (req->result))); 173 XPUSHs (sv_2mortal (newSViv (req->result)));
153 if (SvOK (req->callback)) 190 if (SvOK (req->callback))
154 { 191 {
155 PUTBACK; 192 PUTBACK;
156 call_sv (req->callback, G_VOID | G_EVAL); 193 call_sv (req->callback, G_VOID | G_EVAL);
157 SPAGAIN; 194 SPAGAIN;
195
196 if (SvTRUE (ERRSV))
197 {
198 free_req (req);
199 croak (0);
200 }
158 } 201 }
159 202
160 LEAVE; 203 LEAVE;
161
162 if (req->callback)
163 SvREFCNT_dec (req->callback);
164 204
165 errno = errorno; 205 errno = errorno;
166 count++; 206 count++;
167 } 207 }
168 208
169 prv = req; 209 free_req (req);
170 req = req->next;
171 Safefree (prv);
172
173 /* TODO: croak on errors? */
174 } 210 }
175 211
176 return count; 212 return count;
177} 213}
178 214
199} 235}
200 236
201static void 237static void
202send_req (aio_req req) 238send_req (aio_req req)
203{ 239{
240 while (started < wanted && nreqs >= started)
241 start_thread ();
242
204 nreqs++; 243 nreqs++;
205 244
206 pthread_mutex_lock (&reqlock); 245 pthread_mutex_lock (&reqlock);
207 246
208 req->next = 0; 247 req->next = 0;
216 reqe = reqs = req; 255 reqe = reqs = req;
217 256
218 pthread_cond_signal (&reqwait); 257 pthread_cond_signal (&reqwait);
219 pthread_mutex_unlock (&reqlock); 258 pthread_mutex_unlock (&reqlock);
220 259
221 while (nreqs > max_outstanding) 260 if (nreqs > max_outstanding)
261 for (;;)
262 {
263 poll_cb ();
264
265 if (nreqs <= max_outstanding)
266 break;
267
268 poll_wait ();
269 }
270}
271
272static void
273end_thread (void)
274{
275 aio_req req;
276 Newz (0, req, 1, aio_cb);
277 req->type = REQ_QUIT;
278
279 send_req (req);
280}
281
282static void min_parallel (int nthreads)
283{
284 if (wanted < nthreads)
285 wanted = nthreads;
286}
287
288static void max_parallel (int nthreads)
289{
290 int cur = started;
291
292 if (wanted > nthreads)
293 wanted = nthreads;
294
295 while (cur > wanted)
296 {
297 end_thread ();
298 cur--;
299 }
300
301 while (started > wanted)
222 { 302 {
223 poll_wait (); 303 poll_wait ();
224 poll_cb (); 304 poll_cb ();
225 } 305 }
226} 306}
227 307
228static void 308static void create_pipe ()
229end_thread (void)
230{ 309{
310 if (pipe (respipe))
311 croak ("unable to initialize result pipe");
312
313 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
314 croak ("cannot set result pipe to nonblocking mode");
315
316 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
317 croak ("cannot set result pipe to nonblocking mode");
318}
319
320static void atfork_prepare (void)
321{
322 pthread_mutex_lock (&reqlock);
323 pthread_mutex_lock (&reslock);
324}
325
326static void atfork_parent (void)
327{
328 pthread_mutex_unlock (&reslock);
329 pthread_mutex_unlock (&reqlock);
330}
331
332static void atfork_child (void)
333{
231 aio_req req; 334 aio_req prv;
232 New (0, req, 1, aio_cb);
233 req->type = REQ_QUIT;
234 335
235 send_req (req); 336 started = 0;
236}
237 337
338 while (reqs)
339 {
340 prv = reqs;
341 reqs = prv->next;
342 free_req (prv);
343 }
344
345 reqs = reqe = 0;
346
347 while (ress)
348 {
349 prv = ress;
350 ress = prv->next;
351 free_req (prv);
352 }
353
354 ress = rese = 0;
355
356 close (respipe [0]);
357 close (respipe [1]);
358 create_pipe ();
359
360 atfork_parent ();
361}
362
363/*****************************************************************************/
238/* work around various missing functions */ 364/* work around various missing functions */
239 365
240#if !HAVE_PREADWRITE 366#if !HAVE_PREADWRITE
241# define pread aio_pread 367# define pread aio_pread
242# define pwrite aio_pwrite 368# define pwrite aio_pwrite
304 430
305 errno = 0; 431 errno = 0;
306} 432}
307#endif 433#endif
308 434
435/* sendfile always needs emulation */
436static ssize_t
437sendfile_ (int ofd, int ifd, off_t offset, size_t count)
438{
439 ssize_t res;
440
441 if (!count)
442 return 0;
443
444#if __linux
445 res = sendfile (ofd, ifd, &offset, count);
446
447#elif __freebsd
448 /*
449 * Of course, the freebsd sendfile is a dire hack with no thoughts
450 * wasted on making it similar to other i/o functions.
451 */
452 {
453 off_t sbytes;
454 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
455
456 if (!res && errno == EAGAIN)
457 /* maybe on others, too, as usual, the manpage leaves you guessing */
458 res = sbytes;
459 }
460
461#elif __hpux
462 res = sendfile (ofd, ifd, offset, count, 0, 0);
463
464#else
465 res = -1;
466 errno = ENOSYS;
467#endif
468
469 if (res < 0 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK))
470 {
471 /* emulate sendfile. this is a major pain in the ass */
472 char *buf = malloc (4096);
473 res = 0;
474
475 for (;;)
476 {
477 ssize_t cnt;
478
479 cnt = pread (ifd, buf, 4096, offset);
480
481 if (cnt <= 0)
482 {
483 if (cnt && !res) res = -1;
484 break;
485 }
486
487 cnt = write (ofd, buf, cnt);
488
489 if (cnt <= 0)
490 {
491 if (cnt && !res) res = -1;
492 break;
493 }
494
495 offset += cnt;
496 res += cnt;
497 }
498
499 {
500 int errorno = errno;
501 free (buf);
502 errno = errorno;
503 }
504 }
505
506 return res;
507}
508
509/*****************************************************************************/
510
309static void * 511static void *
310aio_proc (void *thr_arg) 512aio_proc (void *thr_arg)
311{ 513{
312 aio_req req; 514 aio_req req;
313 int type; 515 int type;
342 { 544 {
343 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 545 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
344 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 546 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
345 547
346 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 548 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
549 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
347 550
348 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 551 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
349 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 552 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
350 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 553 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
351 554
352 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 555 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
353 case REQ_CLOSE: req->result = close (req->fd); break; 556 case REQ_CLOSE: req->result = close (req->fd); break;
354 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 557 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
558 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
559 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
355 560
356 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 561 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
357 case REQ_FSYNC: req->result = fsync (req->fd); break; 562 case REQ_FSYNC: req->result = fsync (req->fd); break;
358 563
359 case REQ_QUIT: 564 case REQ_QUIT:
388 while (type != REQ_QUIT); 593 while (type != REQ_QUIT);
389 594
390 return 0; 595 return 0;
391} 596}
392 597
598#define dREQ \
599 aio_req req; \
600 \
601 if (SvOK (callback) && !SvROK (callback)) \
602 croak ("clalback must be undef or of reference type"); \
603 \
604 Newz (0, req, 1, aio_cb); \
605 if (!req) \
606 croak ("out of memory during aio_req allocation"); \
607 \
608 req->callback = newSVsv (callback);
609
393MODULE = IO::AIO PACKAGE = IO::AIO 610MODULE = IO::AIO PACKAGE = IO::AIO
394 611
395PROTOTYPES: ENABLE 612PROTOTYPES: ENABLE
396 613
397BOOT: 614BOOT:
398{ 615{
399 if (pipe (respipe)) 616 create_pipe ();
400 croak ("unable to initialize result pipe"); 617 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
401
402 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
403 croak ("cannot set result pipe to nonblocking mode");
404
405 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
406 croak ("cannot set result pipe to nonblocking mode");
407} 618}
408 619
409void 620void
410min_parallel(nthreads) 621min_parallel(nthreads)
411 int nthreads 622 int nthreads
412 PROTOTYPE: $ 623 PROTOTYPE: $
413 CODE:
414 while (nthreads > started)
415 start_thread ();
416 624
417void 625void
418max_parallel(nthreads) 626max_parallel(nthreads)
419 int nthreads 627 int nthreads
420 PROTOTYPE: $ 628 PROTOTYPE: $
421 CODE:
422{
423 int cur = started;
424 while (cur > nthreads)
425 {
426 end_thread ();
427 cur--;
428 }
429
430 while (started > nthreads)
431 {
432 poll_wait ();
433 poll_cb ();
434 }
435}
436 629
437int 630int
438max_outstanding(nreqs) 631max_outstanding(nreqs)
439 int nreqs 632 int nreqs
440 PROTOTYPE: $ 633 PROTOTYPE: $
449 int mode 642 int mode
450 SV * callback 643 SV * callback
451 PROTOTYPE: $$$;$ 644 PROTOTYPE: $$$;$
452 CODE: 645 CODE:
453{ 646{
454 aio_req req; 647 dREQ;
455
456 Newz (0, req, 1, aio_cb);
457
458 if (!req)
459 croak ("out of memory during aio_req allocation");
460 648
461 req->type = REQ_OPEN; 649 req->type = REQ_OPEN;
462 req->data = newSVsv (pathname); 650 req->data = newSVsv (pathname);
463 req->dataptr = SvPV_nolen (req->data); 651 req->dataptr = SvPVbyte_nolen (req->data);
464 req->fd = flags; 652 req->fd = flags;
465 req->mode = mode; 653 req->mode = mode;
466 req->callback = SvREFCNT_inc (callback);
467 654
468 send_req (req); 655 send_req (req);
469} 656}
470 657
471void 658void
477 aio_close = REQ_CLOSE 664 aio_close = REQ_CLOSE
478 aio_fsync = REQ_FSYNC 665 aio_fsync = REQ_FSYNC
479 aio_fdatasync = REQ_FDATASYNC 666 aio_fdatasync = REQ_FDATASYNC
480 CODE: 667 CODE:
481{ 668{
482 aio_req req; 669 dREQ;
483
484 Newz (0, req, 1, aio_cb);
485
486 if (!req)
487 croak ("out of memory during aio_req allocation");
488 670
489 req->type = ix; 671 req->type = ix;
490 req->fh = newSVsv (fh); 672 req->fh = newSVsv (fh);
491 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 673 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
492 req->callback = SvREFCNT_inc (callback);
493 674
494 send_req (req); 675 send_req (req);
495} 676}
496 677
497void 678void
498aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 679aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
499 SV * fh 680 SV * fh
500 UV offset 681 UV offset
501 IV length 682 UV length
502 SV * data 683 SV * data
503 IV dataoffset 684 UV dataoffset
504 SV * callback 685 SV * callback
505 ALIAS: 686 ALIAS:
506 aio_read = REQ_READ 687 aio_read = REQ_READ
507 aio_write = REQ_WRITE 688 aio_write = REQ_WRITE
508 PROTOTYPE: $$$$$;$ 689 PROTOTYPE: $$$$$;$
534 } 715 }
535 716
536 if (length < 0) 717 if (length < 0)
537 croak ("length must not be negative"); 718 croak ("length must not be negative");
538 719
539 Newz (0, req, 1, aio_cb); 720 {
721 dREQ;
540 722
541 if (!req)
542 croak ("out of memory during aio_req allocation");
543
544 req->type = ix; 723 req->type = ix;
545 req->fh = newSVsv (fh); 724 req->fh = newSVsv (fh);
546 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 725 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
547 : IoOFP (sv_2io (fh))); 726 : IoOFP (sv_2io (fh)));
548 req->offset = offset; 727 req->offset = offset;
728 req->length = length;
729 req->data = SvREFCNT_inc (data);
730 req->dataptr = (char *)svptr + dataoffset;
731
732 if (!SvREADONLY (data))
733 {
734 SvREADONLY_on (data);
735 req->data2ptr = (void *)data;
736 }
737
738 send_req (req);
739 }
740}
741
742void
743aio_sendfile(out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
744 SV * out_fh
745 SV * in_fh
746 UV in_offset
747 UV length
748 SV * callback
749 PROTOTYPE: $$$$;$
750 CODE:
751{
752 dREQ;
753
754 req->type = REQ_SENDFILE;
755 req->fh = newSVsv (out_fh);
756 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
757 req->fh2 = newSVsv (in_fh);
758 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
759 req->offset = in_offset;
549 req->length = length; 760 req->length = length;
550 req->data = SvREFCNT_inc (data);
551 req->dataptr = (char *)svptr + dataoffset;
552 req->callback = SvREFCNT_inc (callback);
553 761
554 send_req (req); 762 send_req (req);
555} 763}
556 764
557void 765void
561 IV length 769 IV length
562 SV * callback 770 SV * callback
563 PROTOTYPE: $$$;$ 771 PROTOTYPE: $$$;$
564 CODE: 772 CODE:
565{ 773{
566 aio_req req; 774 dREQ;
567
568 if (length < 0)
569 croak ("length must not be negative");
570
571 Newz (0, req, 1, aio_cb);
572
573 if (!req)
574 croak ("out of memory during aio_req allocation");
575 775
576 req->type = REQ_READAHEAD; 776 req->type = REQ_READAHEAD;
577 req->fh = newSVsv (fh); 777 req->fh = newSVsv (fh);
578 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 778 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
579 req->offset = offset; 779 req->offset = offset;
580 req->length = length; 780 req->length = length;
581 req->callback = SvREFCNT_inc (callback);
582 781
583 send_req (req); 782 send_req (req);
584} 783}
585 784
586void 785void
590 ALIAS: 789 ALIAS:
591 aio_stat = REQ_STAT 790 aio_stat = REQ_STAT
592 aio_lstat = REQ_LSTAT 791 aio_lstat = REQ_LSTAT
593 CODE: 792 CODE:
594{ 793{
595 aio_req req; 794 dREQ;
596
597 Newz (0, req, 1, aio_cb);
598
599 if (!req)
600 croak ("out of memory during aio_req allocation");
601 795
602 New (0, req->statdata, 1, Stat_t); 796 New (0, req->statdata, 1, Stat_t);
603
604 if (!req->statdata) 797 if (!req->statdata)
798 {
799 free_req (req);
605 croak ("out of memory during aio_req->statdata allocation"); 800 croak ("out of memory during aio_req->statdata allocation");
801 }
606 802
607 if (SvPOK (fh_or_path)) 803 if (SvPOK (fh_or_path))
608 { 804 {
609 req->type = ix; 805 req->type = ix;
610 req->data = newSVsv (fh_or_path); 806 req->data = newSVsv (fh_or_path);
611 req->dataptr = SvPV_nolen (req->data); 807 req->dataptr = SvPVbyte_nolen (req->data);
612 } 808 }
613 else 809 else
614 { 810 {
615 req->type = REQ_FSTAT; 811 req->type = REQ_FSTAT;
616 req->fh = newSVsv (fh_or_path); 812 req->fh = newSVsv (fh_or_path);
617 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 813 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
618 } 814 }
619 815
620 req->callback = SvREFCNT_inc (callback);
621
622 send_req (req); 816 send_req (req);
623} 817}
624 818
625void 819void
626aio_unlink(pathname,callback=&PL_sv_undef) 820aio_unlink(pathname,callback=&PL_sv_undef)
627 SV * pathname 821 SV * pathname
628 SV * callback 822 SV * callback
823 ALIAS:
824 aio_unlink = REQ_UNLINK
825 aio_rmdir = REQ_RMDIR
629 CODE: 826 CODE:
630{ 827{
631 aio_req req; 828 dREQ;
632 829
633 Newz (0, req, 1, aio_cb); 830 req->type = ix;
831 req->data = newSVsv (pathname);
832 req->dataptr = SvPVbyte_nolen (req->data);
634 833
635 if (!req) 834 send_req (req);
636 croak ("out of memory during aio_req allocation"); 835}
836
837void
838aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
839 SV * oldpath
840 SV * newpath
841 SV * callback
842 CODE:
843{
844 dREQ;
637 845
638 req->type = REQ_UNLINK; 846 req->type = REQ_SYMLINK;
847 req->fh = newSVsv (oldpath);
848 req->data2ptr = SvPVbyte_nolen (req->fh);
639 req->data = newSVsv (pathname); 849 req->data = newSVsv (newpath);
640 req->dataptr = SvPV_nolen (req->data); 850 req->dataptr = SvPVbyte_nolen (req->data);
641 req->callback = SvREFCNT_inc (callback);
642 851
643 send_req (req); 852 send_req (req);
644} 853}
645 854
646void 855void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines