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.172 by root, Sun Sep 12 03:36:27 2010 UTC vs.
Revision 1.207 by root, Fri Dec 30 07:40:54 2011 UTC

… …
11#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h> 12#include <stdlib.h>
13#include <errno.h> 13#include <errno.h>
14#include <sys/types.h> 14#include <sys/types.h>
15#include <sys/stat.h> 15#include <sys/stat.h>
16#include <sys/statvfs.h>
17#include <limits.h> 16#include <limits.h>
18#include <fcntl.h> 17#include <fcntl.h>
19#include <sched.h> 18#include <sched.h>
20 19
21#if _POSIX_MEMLOCK || _POSIX_MAPPED_FILES 20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
22# include <sys/mman.h> 21# include <sys/mman.h>
23#endif 22#endif
24 23
25/* perl namespace pollution */ 24/* perl namespace pollution */
26#undef VERSION 25#undef VERSION
27
28#ifdef _WIN32
29
30# define EIO_STRUCT_DIRENT Direntry_t
31# undef malloc
32# undef free
33
34// perl overrides all those nice win32 functions
35# undef open
36# undef read
37# undef write
38# undef send
39# undef recv
40# undef stat
41# undef fstat
42# define lstat stat
43# undef truncate
44# undef ftruncate
45# undef open
46# undef close
47# undef unlink
48# undef rmdir
49# undef rename
50# undef lseek
51
52# define chown(a,b,c) (errno = ENOSYS, -1)
53# define fchown(a,b,c) (errno = ENOSYS, -1)
54# define fchmod(a,b) (errno = ENOSYS, -1)
55# define symlink(a,b) (errno = ENOSYS, -1)
56# define readlink(a,b,c) (errno = ENOSYS, -1)
57# define mknod(a,b,c) (errno = ENOSYS, -1)
58# define truncate(a,b) (errno = ENOSYS, -1)
59# define ftruncate(fd,o) chsize ((fd), (o))
60# define fsync(fd) _commit (fd)
61# define opendir(fd) (errno = ENOSYS, 0)
62# define readdir(fd) (errno = ENOSYS, -1)
63# define closedir(fd) (errno = ENOSYS, -1)
64# define mkdir(a,b) mkdir (a)
65
66#else
67
68# include <sys/time.h>
69# include <sys/select.h>
70# include <unistd.h>
71# include <utime.h>
72# include <signal.h>
73# define EIO_STRUCT_DIRENT struct dirent
74
75#endif
76 26
77/* perl stupidly overrides readdir and maybe others */ 27/* perl stupidly overrides readdir and maybe others */
78/* with thread-unsafe versions, imagine that :( */ 28/* with thread-unsafe versions, imagine that :( */
79#undef readdir 29#undef readdir
80#undef opendir 30#undef opendir
81#undef closedir 31#undef closedir
32
33#ifdef _WIN32
34
35 // perl overrides all those nice libc functions
36
37 #undef malloc
38 #undef free
39 #undef open
40 #undef read
41 #undef write
42 #undef send
43 #undef recv
44 #undef stat
45 #undef lstat
46 #undef fstat
47 #undef truncate
48 #undef ftruncate
49 #undef open
50 #undef link
51 #undef close
52 #undef unlink
53 #undef mkdir
54 #undef rmdir
55 #undef rename
56 #undef lseek
57 #undef opendir
58 #undef readdir
59 #undef closedir
60 #undef chmod
61 #undef fchmod
62 #undef dup
63 #undef dup2
64 #undef abort
65 #undef pipe
66
67#else
68
69 #include <sys/time.h>
70 #include <sys/select.h>
71 #include <unistd.h>
72 #include <utime.h>
73 #include <signal.h>
74
75#endif
82 76
83#define EIO_STRUCT_STAT Stat_t 77#define EIO_STRUCT_STAT Stat_t
84 78
85/* use NV for 32 bit perls as it allows larger offsets */ 79/* use NV for 32 bit perls as it allows larger offsets */
86#if IVSIZE >= 8 80#if IVSIZE >= 8
… …
108 102
109typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
110typedef int aio_rfd; /* read file desriptor */ 104typedef int aio_rfd; /* read file desriptor */
111typedef int aio_wfd; /* write file descriptor */ 105typedef int aio_wfd; /* write file descriptor */
112 106
113static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 107static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
114 108
115#define EIO_REQ_MEMBERS \ 109#define EIO_REQ_MEMBERS \
116 SV *callback; \ 110 SV *callback; \
117 SV *sv1, *sv2; \ 111 SV *sv1, *sv2; \
112 SV *sv3, *sv4; \
118 STRLEN stroffset; \ 113 STRLEN stroffset; \
119 SV *self; 114 SV *self;
120 115
121#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
122 117
118#include "libeio/config.h"
123#include "libeio/eio.h" 119#include "libeio/eio.h"
120
121static int req_invoke (eio_req *req);
122#define EIO_FINISH(req) req_invoke (req)
123static void req_destroy (eio_req *grp);
124#define EIO_DESTROY(req) req_destroy (req)
125
126#include "libeio/eio.c"
127
128/* Linux/others */
129#ifndef O_ASYNC
130# define O_ASYNC 0
131#endif
132#ifndef O_DIRECT
133# define O_DIRECT 0
134#endif
135#ifndef O_NOATIME
136# define O_NOATIME 0
137#endif
138
139/* POSIX */
140#ifndef O_CLOEXEC
141# define O_CLOEXEC 0
142#endif
143#ifndef O_NOFOLLOW
144# define O_NOFOLLOW 0
145#endif
146#ifndef O_NOCTTY
147# define O_NOCTTY 0
148#endif
149#ifndef O_NONBLOCK
150# define O_NONBLOCK 0
151#endif
152#ifndef O_EXEC
153# define O_EXEC 0
154#endif
155#ifndef O_SEARCH
156# define O_SEARCH 0
157#endif
158#ifndef O_DIRECTORY
159# define O_DIRECTORY 0
160#endif
161#ifndef O_DSYNC
162# define O_DSYNC 0
163#endif
164#ifndef O_RSYNC
165# define O_RSYNC 0
166#endif
167#ifndef O_SYNC
168# define O_SYNC 0
169#endif
170#ifndef O_TTY_INIT
171# define O_TTY_INIT 0
172#endif
124 173
125#ifndef POSIX_FADV_NORMAL 174#ifndef POSIX_FADV_NORMAL
126# define POSIX_FADV_NORMAL 0 175# define POSIX_FADV_NORMAL 0
127# define NO_FADVISE 1
128#endif 176#endif
129#ifndef POSIX_FADV_SEQUENTIAL 177#ifndef POSIX_FADV_SEQUENTIAL
130# define POSIX_FADV_SEQUENTIAL 0 178# define POSIX_FADV_SEQUENTIAL 0
131#endif 179#endif
132#ifndef POSIX_FADV_RANDOM 180#ifndef POSIX_FADV_RANDOM
… …
140#endif 188#endif
141#ifndef POSIX_FADV_DONTNEED 189#ifndef POSIX_FADV_DONTNEED
142# define POSIX_FADV_DONTNEED 0 190# define POSIX_FADV_DONTNEED 0
143#endif 191#endif
144 192
145#if _XOPEN_SOURCE < 600 || NO_FADVISE 193#if !HAVE_POSIX_FADVISE
146# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */ 194# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
147#endif 195#endif
148 196
149#ifndef POSIX_MADV_NORMAL 197#ifndef POSIX_MADV_NORMAL
150# define POSIX_MADV_NORMAL 0 198# define POSIX_MADV_NORMAL 0
151# define NO_MADVISE 1
152#endif 199#endif
153#ifndef POSIX_MADV_SEQUENTIAL 200#ifndef POSIX_MADV_SEQUENTIAL
154# define POSIX_MADV_SEQUENTIAL 0 201# define POSIX_MADV_SEQUENTIAL 0
155#endif 202#endif
156#ifndef POSIX_MADV_RANDOM 203#ifndef POSIX_MADV_RANDOM
… …
161#endif 208#endif
162#ifndef POSIX_MADV_DONTNEED 209#ifndef POSIX_MADV_DONTNEED
163# define POSIX_MADV_DONTNEED 0 210# define POSIX_MADV_DONTNEED 0
164#endif 211#endif
165 212
166#if _XOPEN_SOURCE < 600 || NO_MADVISE 213#if !HAVE_POSIX_MADVISE
167# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */ 214# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
168#endif 215#endif
169 216
170#ifndef PROT_NONE 217#ifndef PROT_NONE
171# define PROT_NONE 0 218# define PROT_NONE 0
… …
178#endif 225#endif
179#ifndef PROT_EXEC 226#ifndef PROT_EXEC
180# define PROT_EXEC 0 227# define PROT_EXEC 0
181#endif 228#endif
182 229
230#ifndef ST_RDONLY
231# define ST_RDONLY 0
232#endif
233#ifndef ST_NOSUID
234# define ST_NOSUID 0
235#endif
183#ifndef ST_NODEV 236#ifndef ST_NODEV
184# define ST_NODEV 0 237# define ST_NODEV 0
185#endif 238#endif
186#ifndef ST_NOEXEC 239#ifndef ST_NOEXEC
187# define ST_NOEXEC 0 240# define ST_NOEXEC 0
… …
207#ifndef ST_NODIRATIME 260#ifndef ST_NODIRATIME
208# define ST_NODIRATIME 0 261# define ST_NODIRATIME 0
209#endif 262#endif
210#ifndef ST_RELATIME 263#ifndef ST_RELATIME
211# define ST_RELATIME 0 264# define ST_RELATIME 0
265#endif
266
267#ifndef S_IFIFO
268# define S_IFIFO 0
269#endif
270#ifndef S_IFCHR
271# define S_IFCHR 0
272#endif
273#ifndef S_IFBLK
274# define S_IFBLK 0
275#endif
276#ifndef S_IFLNK
277# define S_IFLNK 0
278#endif
279#ifndef S_IFREG
280# define S_IFREG 0
281#endif
282#ifndef S_IFDIR
283# define S_IFDIR 0
284#endif
285#ifndef S_IFWHT
286# define S_IFWHT 0
287#endif
288#ifndef S_IFSOCK
289# define S_IFSOCK 0
212#endif 290#endif
213 291
214#ifndef MAP_ANONYMOUS 292#ifndef MAP_ANONYMOUS
215# ifdef MAP_ANON 293# ifdef MAP_ANON
216# define MAP_ANONYMOUS MAP_ANON 294# define MAP_ANONYMOUS MAP_ANON
… …
232#endif 310#endif
233#ifndef MAP_NONBLOCK 311#ifndef MAP_NONBLOCK
234# define MAP_NONBLOCK 0 312# define MAP_NONBLOCK 0
235#endif 313#endif
236 314
315#ifndef makedev
316# define makedev(maj,min) (((maj) << 8) | (min))
317#endif
318#ifndef major
319# define major(dev) ((dev) >> 8)
320#endif
321#ifndef minor
322# define minor(dev) ((dev) & 0xff)
323#endif
324
237#ifndef PAGESIZE 325#ifndef PAGESIZE
238# define PAGESIZE sysconf (_SC_PAGESIZE) 326# define PAGESIZE sysconf (_SC_PAGESIZE)
239#endif 327#endif
240
241static int req_invoke (eio_req *req);
242#define EIO_FINISH(req) req_invoke (req)
243static void req_destroy (eio_req *grp);
244#define EIO_DESTROY(req) req_destroy (req)
245 328
246enum { 329enum {
247 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
248}; 331};
249 332
250#include "libeio/eio.c"
251
252typedef eio_req *aio_req; 333typedef eio_req *aio_req;
253typedef eio_req *aio_req_ornot; 334typedef eio_req *aio_req_ornot;
335typedef eio_wd aio_wd;
254 336
255static SV *on_next_submit; 337static SV *on_next_submit;
256static int next_pri = EIO_PRI_DEFAULT; 338static int next_pri = EIO_PRI_DEFAULT;
257static int max_outstanding; 339static int max_outstanding;
258 340
259static s_epipe respipe; 341static s_epipe respipe;
260 342
261static void req_destroy (aio_req req); 343static void req_destroy (aio_req req);
262static void req_cancel (aio_req req); 344static void req_cancel (aio_req req);
263 345
264static void want_poll (void) 346static void
347want_poll (void)
265{ 348{
266 /* write a dummy byte to the pipe so fh becomes ready */ 349 /* write a dummy byte to the pipe so fh becomes ready */
267 s_epipe_signal (&respipe); 350 s_epipe_signal (&respipe);
268} 351}
269 352
270static void done_poll (void) 353static void
354done_poll (void)
271{ 355{
272 /* read any signals sent by the worker threads */ 356 /* read any signals sent by the worker threads */
273 s_epipe_drain (&respipe); 357 s_epipe_drain (&respipe);
274} 358}
275 359
276/* must be called at most once */ 360/* must be called at most once */
361static SV *
277static SV *req_sv (aio_req req, HV *stash) 362req_sv (aio_req req, HV *stash)
278{ 363{
279 if (!req->self) 364 if (!req->self)
280 { 365 {
281 req->self = (SV *)newHV (); 366 req->self = (SV *)newHV ();
282 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 367 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
283 } 368 }
284 369
285 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 370 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
286} 371}
287 372
288static aio_req SvAIO_REQ (SV *sv) 373static SV *
374newSVaio_wd (aio_wd wd)
375{
376 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
377}
378
379static aio_req
380SvAIO_REQ (SV *sv)
289{ 381{
290 MAGIC *mg; 382 MAGIC *mg;
291 383
292 if (!SvROK (sv) 384 if (!SvROK (sv)
385 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
293 || (SvSTASH (SvRV (sv)) != aio_grp_stash 386 || (SvSTASH (SvRV (sv)) != aio_grp_stash
294 && SvSTASH (SvRV (sv)) != aio_req_stash 387 && SvSTASH (SvRV (sv)) != aio_req_stash
295 && !sv_derived_from (sv, "IO::AIO::REQ"))) 388 && !sv_derived_from (sv, "IO::AIO::REQ")))
296 croak ("object of class IO::AIO::REQ expected"); 389 croak ("object of class IO::AIO::REQ expected");
297 390
298 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 391 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
299 392
300 return mg ? (aio_req)mg->mg_ptr : 0; 393 return mg ? (aio_req)mg->mg_ptr : 0;
301} 394}
302 395
396static aio_wd
397SvAIO_WD (SV *sv)
398{
399 if (!SvROK (sv)
400 || SvTYPE (SvRV (sv)) != SVt_PVMG
401 || SvSTASH (SvRV (sv)) != aio_wd_stash)
402 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
403
404 return (aio_wd)(long)SvIVX (SvRV (sv));
405}
406
407static void
303static void aio_grp_feed (aio_req grp) 408aio_grp_feed (aio_req grp)
304{ 409{
305 if (grp->sv2 && SvOK (grp->sv2)) 410 if (grp->sv2 && SvOK (grp->sv2))
306 { 411 {
307 dSP; 412 dSP;
308 413
… …
316 FREETMPS; 421 FREETMPS;
317 LEAVE; 422 LEAVE;
318 } 423 }
319} 424}
320 425
426static void
321static void req_submit (eio_req *req) 427req_submit (eio_req *req)
322{ 428{
323 eio_submit (req); 429 eio_submit (req);
324 430
325 if (expect_false (on_next_submit)) 431 if (expect_false (on_next_submit))
326 { 432 {
… …
333 PUTBACK; 439 PUTBACK;
334 call_sv (cb, G_DISCARD | G_EVAL); 440 call_sv (cb, G_DISCARD | G_EVAL);
335 } 441 }
336} 442}
337 443
444static int
338static int req_invoke (eio_req *req) 445req_invoke (eio_req *req)
339{ 446{
340 if (req->flags & FLAG_SV2_RO_OFF) 447 if (req->flags & FLAG_SV2_RO_OFF)
341 SvREADONLY_off (req->sv2); 448 SvREADONLY_off (req->sv2);
342 449
343 if (!EIO_CANCELLED (req) && req->callback) 450 if (!EIO_CANCELLED (req) && req->callback)
… …
354 /* do not recreate the result IV from scratch each time */ 461 /* do not recreate the result IV from scratch each time */
355 if (expect_true (sv_result_cache)) 462 if (expect_true (sv_result_cache))
356 { 463 {
357 sv_result = sv_result_cache; sv_result_cache = 0; 464 sv_result = sv_result_cache; sv_result_cache = 0;
358 SvIV_set (sv_result, req->result); 465 SvIV_set (sv_result, req->result);
466 SvIOK_only (sv_result);
359 } 467 }
360 else 468 else
361 { 469 {
362 sv_result = newSViv (req->result); 470 sv_result = newSViv (req->result);
363 SvREADONLY_on (sv_result); 471 SvREADONLY_on (sv_result);
364 } 472 }
365 473
366 switch (req->type) 474 switch (req->type)
367 { 475 {
476 case EIO_WD_OPEN:
477 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
478 break;
479
368 case EIO_READDIR: 480 case EIO_READDIR:
369 { 481 {
370 SV *rv = &PL_sv_undef; 482 SV *rv = &PL_sv_undef;
371 483
372 if (req->result >= 0) 484 if (req->result >= 0)
… …
460 case EIO_STATVFS: 572 case EIO_STATVFS:
461 case EIO_FSTATVFS: 573 case EIO_FSTATVFS:
462 { 574 {
463 SV *rv = &PL_sv_undef; 575 SV *rv = &PL_sv_undef;
464 576
577#ifndef _WIN32
465 if (req->result >= 0) 578 if (req->result >= 0)
466 { 579 {
467 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 580 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
468 HV *hv = newHV (); 581 HV *hv = newHV ();
469 582
… …
479 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 592 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
480 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 593 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
481 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 594 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
482 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 595 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
483 } 596 }
597#endif
484 598
485 PUSHs (rv); 599 PUSHs (rv);
486 } 600 }
487 601
488 break; 602 break;
… …
504 case EIO_NOP: 618 case EIO_NOP:
505 case EIO_BUSY: 619 case EIO_BUSY:
506 break; 620 break;
507 621
508 case EIO_READLINK: 622 case EIO_READLINK:
623 case EIO_REALPATH:
509 if (req->result > 0) 624 if (req->result > 0)
510 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); 625 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
511 break; 626 break;
512 627
513 case EIO_STAT: 628 case EIO_STAT:
514 case EIO_LSTAT: 629 case EIO_LSTAT:
515 case EIO_FSTAT: 630 case EIO_FSTAT:
516 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 631 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
632
517 PL_laststatval = req->result; 633 if (!(PL_laststatval = req->result))
634 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
518 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 635 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
636
519 PUSHs (sv_result); 637 PUSHs (sv_result);
520 break; 638 break;
521 639
522 case EIO_READ: 640 case EIO_READ:
523 { 641 {
… …
527 SvSETMAGIC (req->sv2); 645 SvSETMAGIC (req->sv2);
528 PUSHs (sv_result); 646 PUSHs (sv_result);
529 } 647 }
530 break; 648 break;
531 649
532 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), su fudge result value */ 650 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
533 if (req->result > 0) 651 if (req->result > 0)
534 SvIV_set (sv_result, 0); 652 SvIV_set (sv_result, 0);
535 /* FALLTHROUGH */ 653 /* FALLTHROUGH */
536 654
537 default: 655 default:
… …
557 } 675 }
558 676
559 return !!SvTRUE (ERRSV); 677 return !!SvTRUE (ERRSV);
560} 678}
561 679
680static void
562static void req_destroy (aio_req req) 681req_destroy (aio_req req)
563{ 682{
564 if (req->self) 683 if (req->self)
565 { 684 {
566 sv_unmagic (req->self, PERL_MAGIC_ext); 685 sv_unmagic (req->self, PERL_MAGIC_ext);
567 SvREFCNT_dec (req->self); 686 SvREFCNT_dec (req->self);
568 } 687 }
569 688
570 SvREFCNT_dec (req->sv1); 689 SvREFCNT_dec (req->sv1);
571 SvREFCNT_dec (req->sv2); 690 SvREFCNT_dec (req->sv2);
691 SvREFCNT_dec (req->sv3);
692 SvREFCNT_dec (req->sv4);
572 SvREFCNT_dec (req->callback); 693 SvREFCNT_dec (req->callback);
573 694
574 Safefree (req); 695 free (req);
575} 696}
576 697
698static void
577static void req_cancel_subs (aio_req grp) 699req_cancel_subs (aio_req grp)
578{ 700{
579 aio_req sub;
580
581 if (grp->type != EIO_GROUP) 701 if (grp->type != EIO_GROUP)
582 return; 702 return;
583 703
584 SvREFCNT_dec (grp->sv2); 704 SvREFCNT_dec (grp->sv2);
585 grp->sv2 = 0; 705 grp->sv2 = 0;
586 706
587 eio_grp_cancel (grp); 707 eio_grp_cancel (grp);
588} 708}
589 709
590static void 710static void ecb_cold
591create_respipe (void) 711create_respipe (void)
592{ 712{
593 if (s_epipe_renew (&respipe)) 713 if (s_epipe_renew (&respipe))
594 croak ("IO::AIO: unable to initialize result pipe"); 714 croak ("IO::AIO: unable to initialize result pipe");
595} 715}
596 716
597static void poll_wait (void) 717static void
718poll_wait (void)
598{ 719{
599 while (eio_nreqs ()) 720 while (eio_nreqs ())
600 { 721 {
601 int size; 722 int size;
602 723
… …
611 732
612 s_epipe_wait (&respipe); 733 s_epipe_wait (&respipe);
613 } 734 }
614} 735}
615 736
616static int poll_cb (void) 737static int
738poll_cb (void)
617{ 739{
618 for (;;) 740 for (;;)
619 { 741 {
620 int res = eio_poll (); 742 int res = eio_poll ();
621 743
… …
627 749
628 poll_wait (); 750 poll_wait ();
629 } 751 }
630} 752}
631 753
632static void atfork_child (void) 754static void ecb_cold
755reinit (void)
633{ 756{
634 create_respipe (); 757 create_respipe ();
758
759 if (eio_init (want_poll, done_poll) < 0)
760 croak ("IO::AIO: unable to initialise eio library");
635} 761}
636 762
637/*****************************************************************************/ 763/*****************************************************************************/
638 764
639#if !_POSIX_MAPPED_FILES 765#if !_POSIX_MAPPED_FILES
640# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 766# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
641# define munmap(addr,length) (errno = ENOSYS, -1) 767# define munmap(addr,length) (errno = ENOSYS, -1)
768#endif
769
770#if !_POSIX_MEMORY_PROTECTION
642# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 771# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
772# define PROT_NONE 0
773# define PROT_WRITE 0
774# define MAP_PRIVATE 0
775# define MAP_SHARED 0
776# define MAP_FIXED 0
643#endif 777#endif
644 778
645#define MMAP_MAGIC PERL_MAGIC_ext 779#define MMAP_MAGIC PERL_MAGIC_ext
646 780
647static int 781static int ecb_cold
648mmap_free (pTHX_ SV *sv, MAGIC *mg) 782mmap_free (pTHX_ SV *sv, MAGIC *mg)
649{ 783{
650 int old_errno = errno; 784 int old_errno = errno;
651 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 785 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
652 errno = old_errno; 786 errno = old_errno;
… …
676{ 810{
677 SvGETMAGIC (cb_sv); 811 SvGETMAGIC (cb_sv);
678 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 812 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
679} 813}
680 814
815static aio_req ecb_noinline
816dreq (SV *callback)
817{
818 SV *cb_cv;
819 aio_req req;
820 int req_pri = next_pri;
821 next_pri = EIO_PRI_DEFAULT;
822
823 cb_cv = get_cb (callback);
824
825 req = calloc (sizeof (*req), 1);
826 if (!req)
827 croak ("out of memory during eio_req allocation");
828
829 req->callback = SvREFCNT_inc (cb_cv);
830 req->pri = req_pri;
831
832 return req;
833}
834
681#define dREQ \ 835#define dREQ \
682 SV *cb_cv; \ 836 aio_req req = dreq (callback); \
683 aio_req req; \
684 int req_pri = next_pri; \
685 next_pri = EIO_PRI_DEFAULT; \
686 \
687 cb_cv = get_cb (callback); \
688 \
689 Newz (0, req, 1, eio_req); \
690 if (!req) \
691 croak ("out of memory during eio_req allocation"); \
692 \
693 req->callback = SvREFCNT_inc (cb_cv); \
694 req->pri = req_pri
695 837
696#define REQ_SEND \ 838#define REQ_SEND \
697 PUTBACK; \ 839 PUTBACK; \
698 req_submit (req); \ 840 req_submit (req); \
699 SPAGAIN; \ 841 SPAGAIN; \
700 \ 842 \
701 if (GIMME_V != G_VOID) \ 843 if (GIMME_V != G_VOID) \
702 XPUSHs (req_sv (req, aio_req_stash)); 844 XPUSHs (req_sv (req, aio_req_stash));
845
846ecb_inline void
847req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
848{
849 if (expect_false (SvROK (path)))
850 {
851 SV *rv = SvRV (path);
852 SV *wdob;
853
854 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
855 {
856 path = AvARRAY (rv)[1];
857 wdob = AvARRAY (rv)[0];
858
859 if (SvOK (wdob))
860 {
861 *wd = SvAIO_WD (wdob);
862 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
863 }
864 else
865 *wd = EIO_INVALID_WD;
866 }
867 else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash)
868 {
869 *wd = (aio_wd)(long)SvIVX (rv);
870 *wdsv = SvREFCNT_inc_NN (rv);
871 *ptr = ".";
872 return; /* path set to "." */
873 }
874 else
875 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
876 }
877
878 *pathsv = newSVsv (path);
879 *ptr = SvPVbyte_nolen (*pathsv);
880}
881
882static void ecb_noinline
883req_set_path1 (aio_req req, SV *path)
884{
885 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
886}
887
888static void ecb_noinline
889req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
890{
891 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
892
893 switch (SvTYPE (rv))
894 {
895 case SVt_PVIO:
896 case SVt_PVLV:
897 case SVt_PVGV:
898 req->type = type_fh;
899 req->sv1 = newSVsv (fh_or_path);
900 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
901 break;
902
903 default:
904 req->type = type_path;
905 req_set_path1 (req, fh_or_path);
906 break;
907 }
908}
909
910XS(boot_IO__AIO) ecb_cold;
703 911
704MODULE = IO::AIO PACKAGE = IO::AIO 912MODULE = IO::AIO PACKAGE = IO::AIO
705 913
706PROTOTYPES: ENABLE 914PROTOTYPES: ENABLE
707 915
… …
721 const_iv (O_RDWR) 929 const_iv (O_RDWR)
722 const_iv (O_CREAT) 930 const_iv (O_CREAT)
723 const_iv (O_TRUNC) 931 const_iv (O_TRUNC)
724 const_iv (O_EXCL) 932 const_iv (O_EXCL)
725 const_iv (O_APPEND) 933 const_iv (O_APPEND)
726#ifndef _WIN32 934
935 const_iv (O_ASYNC)
936 const_iv (O_DIRECT)
937 const_iv (O_NOATIME)
938
939 const_iv (O_CLOEXEC)
940 const_iv (O_NOCTTY)
941 const_iv (O_NOFOLLOW)
942 const_iv (O_NONBLOCK)
943 const_iv (O_EXEC)
944 const_iv (O_SEARCH)
945 const_iv (O_DIRECTORY)
946 const_iv (O_DSYNC)
947 const_iv (O_RSYNC)
948 const_iv (O_SYNC)
949 const_iv (O_TTY_INIT)
950
727 const_iv (S_IFIFO) 951 const_iv (S_IFIFO)
728#endif 952 const_iv (S_IFCHR)
953 const_iv (S_IFBLK)
954 const_iv (S_IFLNK)
955 const_iv (S_IFREG)
956 const_iv (S_IFDIR)
957 const_iv (S_IFWHT)
958 const_iv (S_IFSOCK)
959 const_iv (S_IFMT)
960
729 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL) 961 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
730 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL) 962 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
731 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM) 963 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
732 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 964 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
733 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 965 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
… …
780 1012
781 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1013 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
782 const_eio (SYNC_FILE_RANGE_WRITE) 1014 const_eio (SYNC_FILE_RANGE_WRITE)
783 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1015 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
784 1016
1017 const_eio (FALLOC_FL_KEEP_SIZE)
1018
785 const_eio (READDIR_DENTS) 1019 const_eio (READDIR_DENTS)
786 const_eio (READDIR_DIRS_FIRST) 1020 const_eio (READDIR_DIRS_FIRST)
787 const_eio (READDIR_STAT_ORDER) 1021 const_eio (READDIR_STAT_ORDER)
788 const_eio (READDIR_FOUND_UNKNOWN) 1022 const_eio (READDIR_FOUND_UNKNOWN)
789 1023
… …
799 }; 1033 };
800 1034
801 aio_stash = gv_stashpv ("IO::AIO" , 1); 1035 aio_stash = gv_stashpv ("IO::AIO" , 1);
802 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1036 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
803 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1037 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1038 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
804 1039
805 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1040 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
806 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 1041 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
807 1042
808 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1043 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
809 1044
810 create_respipe (); 1045 reinit ();
811
812 if (eio_init (want_poll, done_poll) < 0)
813 croak ("IO::AIO: unable to initialise eio library");
814
815 /* atfork child called in fifo order, so before eio's handler */
816 X_THREAD_ATFORK (0, 0, atfork_child);
817} 1046}
818 1047
819void 1048void
1049reinit ()
1050 PROTOTYPE:
1051
1052void
820max_poll_reqs (int nreqs) 1053max_poll_reqs (unsigned int nreqs)
821 PROTOTYPE: $ 1054 PROTOTYPE: $
822 CODE: 1055 CODE:
823 eio_set_max_poll_reqs (nreqs); 1056 eio_set_max_poll_reqs (nreqs);
824 1057
825void 1058void
… …
827 PROTOTYPE: $ 1060 PROTOTYPE: $
828 CODE: 1061 CODE:
829 eio_set_max_poll_time (nseconds); 1062 eio_set_max_poll_time (nseconds);
830 1063
831void 1064void
832min_parallel (int nthreads) 1065min_parallel (unsigned int nthreads)
833 PROTOTYPE: $ 1066 PROTOTYPE: $
834 CODE: 1067 CODE:
835 eio_set_min_parallel (nthreads); 1068 eio_set_min_parallel (nthreads);
836 1069
837void 1070void
838max_parallel (int nthreads) 1071max_parallel (unsigned int nthreads)
839 PROTOTYPE: $ 1072 PROTOTYPE: $
840 CODE: 1073 CODE:
841 eio_set_max_parallel (nthreads); 1074 eio_set_max_parallel (nthreads);
842 1075
843void 1076void
844max_idle (int nthreads) 1077max_idle (unsigned int nthreads)
845 PROTOTYPE: $ 1078 PROTOTYPE: $
846 CODE: 1079 CODE:
847 eio_set_max_idle (nthreads); 1080 eio_set_max_idle (nthreads);
848 1081
849void 1082void
1083idle_timeout (unsigned int seconds)
1084 PROTOTYPE: $
1085 CODE:
1086 eio_set_idle_timeout (seconds);
1087
1088void
850max_outstanding (int maxreqs) 1089max_outstanding (unsigned int maxreqs)
851 PROTOTYPE: $ 1090 PROTOTYPE: $
852 CODE: 1091 CODE:
853 max_outstanding = maxreqs; 1092 max_outstanding = maxreqs;
854 1093
855void 1094void
1095aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1096 PPCODE:
1097{
1098 dREQ;
1099
1100 req->type = EIO_WD_OPEN;
1101 req_set_path1 (req, pathname);
1102
1103 REQ_SEND;
1104}
1105
1106void
856aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1107aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
857 PPCODE: 1108 PPCODE:
858{ 1109{
859 dREQ; 1110 dREQ;
860 1111
861 req->type = EIO_OPEN; 1112 req->type = EIO_OPEN;
862 req->sv1 = newSVsv (pathname); 1113 req_set_path1 (req, pathname);
863 req->ptr1 = SvPVbyte_nolen (req->sv1);
864 req->int1 = flags; 1114 req->int1 = flags;
865 req->int2 = mode; 1115 req->int2 = mode;
866 1116
867 REQ_SEND; 1117 REQ_SEND;
868} 1118}
… …
870void 1120void
871aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1121aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
872 ALIAS: 1122 ALIAS:
873 aio_fsync = EIO_FSYNC 1123 aio_fsync = EIO_FSYNC
874 aio_fdatasync = EIO_FDATASYNC 1124 aio_fdatasync = EIO_FDATASYNC
1125 aio_syncfs = EIO_SYNCFS
875 PPCODE: 1126 PPCODE:
876{ 1127{
877 int fd = s_fileno_croak (fh, 0); 1128 int fd = s_fileno_croak (fh, 0);
878 dREQ; 1129 dREQ;
879 1130
… …
900 1151
901 REQ_SEND (req); 1152 REQ_SEND (req);
902} 1153}
903 1154
904void 1155void
1156aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1157 PPCODE:
1158{
1159 int fd = s_fileno_croak (fh, 0);
1160 dREQ;
1161
1162 req->type = EIO_FALLOCATE;
1163 req->sv1 = newSVsv (fh);
1164 req->int1 = fd;
1165 req->int2 = mode;
1166 req->offs = offset;
1167 req->size = len;
1168
1169 REQ_SEND (req);
1170}
1171
1172void
905aio_close (SV *fh, SV *callback=&PL_sv_undef) 1173aio_close (SV *fh, SV *callback=&PL_sv_undef)
906 PPCODE: 1174 PPCODE:
907{ 1175{
908 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1176 static int close_fd = -1; /* dummy fd to close fds via dup2 */
909 int fd = s_fileno_croak (fh, 0); 1177 int fd = s_fileno_croak (fh, 0);
910 dREQ; 1178 dREQ;
911 1179
912 if (close_pipe < 0) 1180 if (expect_false (close_fd < 0))
913 { 1181 {
914 int pipefd [2]; 1182 int pipefd [2];
915 1183
1184 if (
1185#ifdef _WIN32
1186 _pipe (pipefd, 1, _O_BINARY) < 0
1187#else
916 if (pipe (pipefd) < 0 1188 pipe (pipefd) < 0
917 || close (pipefd [1]) < 0
918 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1189 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1190#endif
1191 || close (pipefd [1]) < 0
1192 )
919 abort (); /*D*/ 1193 abort (); /*D*/
920 1194
921 close_pipe = pipefd [0]; 1195 close_fd = pipefd [0];
922 } 1196 }
923 1197
924 req->type = EIO_DUP2; 1198 req->type = EIO_DUP2;
925 req->int1 = close_pipe; 1199 req->int1 = close_fd;
926 req->sv2 = newSVsv (fh); 1200 req->sv2 = newSVsv (fh);
927 req->int2 = fd; 1201 req->int2 = fd;
928 1202
929 REQ_SEND (req); 1203 REQ_SEND (req);
930} 1204}
… …
981 REQ_SEND; 1255 REQ_SEND;
982 } 1256 }
983} 1257}
984 1258
985void 1259void
986aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1260aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1261 ALIAS:
1262 aio_readlink = EIO_READLINK
1263 aio_realpath = EIO_REALPATH
987 PPCODE: 1264 PPCODE:
988{ 1265{
989 SV *data;
990 dREQ; 1266 dREQ;
991 1267
992 req->type = EIO_READLINK; 1268 req->type = ix;
993 req->sv1 = newSVsv (path); 1269 req_set_path1 (req, pathname);
994 req->ptr1 = SvPVbyte_nolen (req->sv1);
995 1270
996 REQ_SEND; 1271 REQ_SEND;
997} 1272}
998 1273
999void 1274void
… …
1039 aio_statvfs = EIO_STATVFS 1314 aio_statvfs = EIO_STATVFS
1040 PPCODE: 1315 PPCODE:
1041{ 1316{
1042 dREQ; 1317 dREQ;
1043 1318
1044 req->sv1 = newSVsv (fh_or_path); 1319 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1045
1046 if (SvPOK (req->sv1))
1047 {
1048 req->type = ix;
1049 req->ptr1 = SvPVbyte_nolen (req->sv1);
1050 }
1051 else
1052 {
1053 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1054 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1055 }
1056 1320
1057 REQ_SEND; 1321 REQ_SEND;
1058} 1322}
1323
1324UV
1325major (UV dev)
1326 ALIAS:
1327 minor = 1
1328 CODE:
1329 RETVAL = ix ? major (dev) : minor (dev);
1330 OUTPUT:
1331 RETVAL
1332
1333UV
1334makedev (UV maj, UV min)
1335 CODE:
1336 RETVAL = makedev (maj, min);
1337 OUTPUT:
1338 RETVAL
1059 1339
1060void 1340void
1061aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1341aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
1062 PPCODE: 1342 PPCODE:
1063{ 1343{
1064 dREQ; 1344 dREQ;
1065 1345
1066 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1346 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1067 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1347 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1068 req->sv1 = newSVsv (fh_or_path); 1348 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1069
1070 if (SvPOK (req->sv1))
1071 {
1072 req->type = EIO_UTIME;
1073 req->ptr1 = SvPVbyte_nolen (req->sv1);
1074 }
1075 else
1076 {
1077 req->type = EIO_FUTIME;
1078 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1079 }
1080 1349
1081 REQ_SEND; 1350 REQ_SEND;
1082} 1351}
1083 1352
1084void 1353void
1085aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1354aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1086 PPCODE: 1355 PPCODE:
1087{ 1356{
1088 dREQ; 1357 dREQ;
1089 1358
1090 req->sv1 = newSVsv (fh_or_path);
1091 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1359 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1092 1360 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1093 if (SvPOK (req->sv1))
1094 {
1095 req->type = EIO_TRUNCATE;
1096 req->ptr1 = SvPVbyte_nolen (req->sv1);
1097 }
1098 else
1099 {
1100 req->type = EIO_FTRUNCATE;
1101 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1102 }
1103 1361
1104 REQ_SEND; 1362 REQ_SEND;
1105} 1363}
1106 1364
1107void 1365void
1108aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1366aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1109 ALIAS:
1110 aio_chmod = EIO_CHMOD
1111 aio_mkdir = EIO_MKDIR
1112 PPCODE: 1367 PPCODE:
1113{ 1368{
1114 dREQ; 1369 dREQ;
1115 1370
1116 req->int2 = mode; 1371 req->int2 = mode;
1117 req->sv1 = newSVsv (fh_or_path); 1372 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1118
1119 if (SvPOK (req->sv1))
1120 {
1121 req->type = ix;
1122 req->ptr1 = SvPVbyte_nolen (req->sv1);
1123 }
1124 else
1125 {
1126 req->type = EIO_FCHMOD;
1127 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1128 }
1129 1373
1130 REQ_SEND; 1374 REQ_SEND;
1131} 1375}
1132 1376
1133void 1377void
… …
1136{ 1380{
1137 dREQ; 1381 dREQ;
1138 1382
1139 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1383 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1140 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1384 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1141 req->sv1 = newSVsv (fh_or_path); 1385 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1142
1143 if (SvPOK (req->sv1))
1144 {
1145 req->type = EIO_CHOWN;
1146 req->ptr1 = SvPVbyte_nolen (req->sv1);
1147 }
1148 else
1149 {
1150 req->type = EIO_FCHOWN;
1151 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1152 }
1153 1386
1154 REQ_SEND; 1387 REQ_SEND;
1155} 1388}
1156 1389
1157void 1390void
… …
1159 PPCODE: 1392 PPCODE:
1160{ 1393{
1161 dREQ; 1394 dREQ;
1162 1395
1163 req->type = EIO_READDIR; 1396 req->type = EIO_READDIR;
1164 req->sv1 = newSVsv (pathname);
1165 req->ptr1 = SvPVbyte_nolen (req->sv1);
1166 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1397 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1167 1398
1168 if (flags & EIO_READDIR_DENTS) 1399 if (flags & EIO_READDIR_DENTS)
1169 req->int1 |= EIO_READDIR_CUSTOM2; 1400 req->int1 |= EIO_READDIR_CUSTOM2;
1170 1401
1402 req_set_path1 (req, pathname);
1403
1171 REQ_SEND; 1404 REQ_SEND;
1405}
1406
1407void
1408aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1409 PPCODE:
1410{
1411 dREQ;
1412
1413 req->type = EIO_MKDIR;
1414 req->int2 = mode;
1415 req_set_path1 (req, pathname);
1416
1417 REQ_SEND;
1172} 1418}
1173 1419
1174void 1420void
1175aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1421aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1176 ALIAS: 1422 ALIAS:
… …
1180 PPCODE: 1426 PPCODE:
1181{ 1427{
1182 dREQ; 1428 dREQ;
1183 1429
1184 req->type = ix; 1430 req->type = ix;
1185 req->sv1 = newSVsv (pathname); 1431 req_set_path1 (req, pathname);
1186 req->ptr1 = SvPVbyte_nolen (req->sv1);
1187 1432
1188 REQ_SEND; 1433 REQ_SEND;
1189} 1434}
1190 1435
1191void 1436void
… …
1194 aio_link = EIO_LINK 1439 aio_link = EIO_LINK
1195 aio_symlink = EIO_SYMLINK 1440 aio_symlink = EIO_SYMLINK
1196 aio_rename = EIO_RENAME 1441 aio_rename = EIO_RENAME
1197 PPCODE: 1442 PPCODE:
1198{ 1443{
1444 eio_wd wd2 = 0;
1199 dREQ; 1445 dREQ;
1200 1446
1201 req->type = ix; 1447 req->type = ix;
1202 req->sv1 = newSVsv (oldpath); 1448 req_set_path1 (req, oldpath);
1203 req->ptr1 = SvPVbyte_nolen (req->sv1); 1449 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1204 req->sv2 = newSVsv (newpath); 1450 req->int3 = (long)wd2;
1205 req->ptr2 = SvPVbyte_nolen (req->sv2);
1206 1451
1207 REQ_SEND; 1452 REQ_SEND;
1208} 1453}
1209 1454
1210void 1455void
… …
1212 PPCODE: 1457 PPCODE:
1213{ 1458{
1214 dREQ; 1459 dREQ;
1215 1460
1216 req->type = EIO_MKNOD; 1461 req->type = EIO_MKNOD;
1217 req->sv1 = newSVsv (pathname);
1218 req->ptr1 = SvPVbyte_nolen (req->sv1);
1219 req->int2 = (mode_t)mode; 1462 req->int2 = (mode_t)mode;
1220 req->offs = dev; 1463 req->offs = dev;
1464 req_set_path1 (req, pathname);
1221 1465
1222 REQ_SEND; 1466 REQ_SEND;
1223} 1467}
1224 1468
1225void 1469void
… …
1257 1501
1258void 1502void
1259aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef) 1503aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef)
1260 PPCODE: 1504 PPCODE:
1261{ 1505{
1262
1263 STRLEN svlen; 1506 STRLEN svlen;
1264 char *svptr = SvPVbyte (data, svlen); 1507 char *svptr = SvPVbyte (data, svlen);
1265 UV len = SvUV (length); 1508 UV len = SvUV (length);
1266 1509
1267 if (offset < 0) 1510 if (offset < 0)
… …
1426 CODE: 1669 CODE:
1427 RETVAL = posix_fadvise (fh, offset, length, advice); 1670 RETVAL = posix_fadvise (fh, offset, length, advice);
1428 OUTPUT: 1671 OUTPUT:
1429 RETVAL 1672 RETVAL
1430 1673
1431ssize_t 1674IV
1432sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1675sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1433 CODE: 1676 CODE:
1434 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1677 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1435 OUTPUT: 1678 OUTPUT:
1436 RETVAL 1679 RETVAL
… …
1520 if (!SvOK (length) || len + offset > svlen) 1763 if (!SvOK (length) || len + offset > svlen)
1521 len = svlen - offset; 1764 len = svlen - offset;
1522 1765
1523 addr = (void *)(((intptr_t)addr) + offset); 1766 addr = (void *)(((intptr_t)addr) + offset);
1524 eio_page_align (&addr, &len); 1767 eio_page_align (&addr, &len);
1525#if _POSIX_MEMLOCK 1768#if _POSIX_MEMLOCK_RANGE
1526 RETVAL = munlock (addr, len); 1769 RETVAL = munlock (addr, len);
1527#else 1770#else
1528 RETVAL = ((errno = ENOSYS), -1); 1771 RETVAL = ((errno = ENOSYS), -1);
1529#endif 1772#endif
1530} 1773}
… …
1548 SvREFCNT_dec (on_next_submit); 1791 SvREFCNT_dec (on_next_submit);
1549 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1792 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1550 1793
1551PROTOTYPES: DISABLE 1794PROTOTYPES: DISABLE
1552 1795
1796MODULE = IO::AIO PACKAGE = IO::AIO::WD
1797
1798BOOT:
1799{
1800 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1801 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1802}
1803
1804void
1805DESTROY (SV *self)
1806 CODE:
1807{
1808 aio_wd wd = SvAIO_WD (self);
1809#if HAVE_AT
1810 {
1811 SV *callback = &PL_sv_undef;
1812 dREQ; /* clobbers next_pri :/ */
1813 next_pri = req->pri; /* restore next_pri */
1814 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1815 req->type = EIO_WD_CLOSE;
1816 req->wd = wd;
1817 REQ_SEND;
1818 }
1819#else
1820 eio_wd_close_sync (wd);
1821#endif
1822}
1823
1553MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1824MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1554 1825
1555void 1826void
1556cancel (aio_req_ornot req) 1827cancel (aio_req_ornot req)
1557 CODE: 1828 CODE:

Diff Legend

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