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

Diff Legend

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