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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines