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.116 by root, Sat May 10 19:25:33 2008 UTC vs.
Revision 1.186 by root, Thu Jul 14 22:36:17 2011 UTC

3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
13#include <sys/stat.h> 15#include <sys/stat.h>
14#include <limits.h> 16#include <limits.h>
15#include <fcntl.h> 17#include <fcntl.h>
16#include <sched.h> 18#include <sched.h>
19
20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
21# include <sys/mman.h>
22#endif
23
24/* perl namespace pollution */
25#undef VERSION
17 26
18#ifdef _WIN32 27#ifdef _WIN32
19 28
20# define EIO_STRUCT_DIRENT Direntry_t 29# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 30# undef malloc
37# undef unlink 46# undef unlink
38# undef rmdir 47# undef rmdir
39# undef rename 48# undef rename
40# undef lseek 49# undef lseek
41 50
42# define chown(a,b,c) (errno = ENOSYS, -1)
43# define fchown(a,b,c) (errno = ENOSYS, -1)
44# define fchmod(a,b) (errno = ENOSYS, -1)
45# define symlink(a,b) (errno = ENOSYS, -1)
46# define readlink(a,b,c) (errno = ENOSYS, -1)
47# define mknod(a,b,c) (errno = ENOSYS, -1)
48# define truncate(a,b) (errno = ENOSYS, -1)
49# define ftruncate(fd,o) chsize ((fd), (o))
50# define fsync(fd) _commit (fd)
51# define opendir(fd) (errno = ENOSYS, 0) 51# define opendir(fd) (errno = ENOSYS, 0)
52# define readdir(fd) (errno = ENOSYS, -1) 52# define readdir(fd) (errno = ENOSYS, -1)
53# define closedir(fd) (errno = ENOSYS, -1) 53# define closedir(fd) (errno = ENOSYS, -1)
54# define mkdir(a,b) mkdir (a)
55 54
56#else 55#else
57 56
58# include <sys/time.h> 57# include <sys/time.h>
59# include <sys/select.h> 58# include <sys/select.h>
62# include <signal.h> 61# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent 62# define EIO_STRUCT_DIRENT struct dirent
64 63
65#endif 64#endif
66 65
66/* perl stupidly overrides readdir and maybe others */
67/* with thread-unsafe versions, imagine that :( */
68#undef readdir
69#undef opendir
70#undef closedir
71
67#define EIO_STRUCT_STAT Stat_t 72#define EIO_STRUCT_STAT Stat_t
68 73
69/* use NV for 32 bit perls as it allows larger offsets */ 74/* use NV for 32 bit perls as it allows larger offsets */
70#if IVSIZE >= 8 75#if IVSIZE >= 8
76# define VAL64 IV
71# define SvVAL64 SvIV 77# define SvVAL64 SvIV
78# define newSVval64 newSViv
72#else 79#else
80# define VAL64 NV
73# define SvVAL64 SvNV 81# define SvVAL64 SvNV
82# define newSVval64 newSVnv
74#endif 83#endif
75 84
76static HV *stash; 85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
77typedef SV SV8; /* byte-sv, used for argument-checking */ 98typedef SV SV8; /* byte-sv, used for argument-checking */
99typedef int aio_rfd; /* read file desriptor */
100typedef int aio_wfd; /* write file descriptor */
78 101
79#define AIO_REQ_KLASS "IO::AIO::REQ" 102static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
80#define AIO_GRP_KLASS "IO::AIO::GRP"
81 103
82#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
83 SV *callback; \ 105 SV *callback; \
84 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 107 STRLEN stroffset; \
86 SV *self 108 SV *self;
87 109
110#define EIO_NO_WRAPPERS 1
111
112#include "libeio/config.h"
88#include "libeio/eio.h" 113#include "libeio/eio.h"
114
115/* Linux/others */
116#ifndef O_ASYNC
117# define O_ASYNC 0
118#endif
119#ifndef O_DIRECT
120# define O_DIRECT 0
121#endif
122#ifndef O_NOATIME
123# define O_NOATIME 0
124#endif
125
126/* POSIX */
127#ifndef O_CLOEXEC
128# define O_CLOEXEC 0
129#endif
130#ifndef O_NOFOLLOW
131# define O_NOFOLLOW 0
132#endif
133#ifndef O_NOCTTY
134# define O_NOCTTY 0
135#endif
136#ifndef O_NONBLOCK
137# define O_NONBLOCK 0
138#endif
139#ifndef O_EXEC
140# define O_EXEC 0
141#endif
142#ifndef O_SEARCH
143# define O_SEARCH 0
144#endif
145#ifndef O_DIRECTORY
146# define O_DIRECTORY 0
147#endif
148#ifndef O_DSYNC
149# define O_DSYNC 0
150#endif
151#ifndef O_RSYNC
152# define O_RSYNC 0
153#endif
154#ifndef O_SYNC
155# define O_SYNC 0
156#endif
157#ifndef O_TTY_INIT
158# define O_TTY_INIT 0
159#endif
160
161#ifndef POSIX_FADV_NORMAL
162# define POSIX_FADV_NORMAL 0
163#endif
164#ifndef POSIX_FADV_SEQUENTIAL
165# define POSIX_FADV_SEQUENTIAL 0
166#endif
167#ifndef POSIX_FADV_RANDOM
168# define POSIX_FADV_RANDOM 0
169#endif
170#ifndef POSIX_FADV_NOREUSE
171# define POSIX_FADV_NOREUSE 0
172#endif
173#ifndef POSIX_FADV_WILLNEED
174# define POSIX_FADV_WILLNEED 0
175#endif
176#ifndef POSIX_FADV_DONTNEED
177# define POSIX_FADV_DONTNEED 0
178#endif
179
180#if !HAVE_POSIX_FADVISE
181# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
182#endif
183
184#ifndef POSIX_MADV_NORMAL
185# define POSIX_MADV_NORMAL 0
186#endif
187#ifndef POSIX_MADV_SEQUENTIAL
188# define POSIX_MADV_SEQUENTIAL 0
189#endif
190#ifndef POSIX_MADV_RANDOM
191# define POSIX_MADV_RANDOM 0
192#endif
193#ifndef POSIX_MADV_WILLNEED
194# define POSIX_MADV_WILLNEED 0
195#endif
196#ifndef POSIX_MADV_DONTNEED
197# define POSIX_MADV_DONTNEED 0
198#endif
199
200#if !HAVE_POSIX_MADVISE
201# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
202#endif
203
204#ifndef PROT_NONE
205# define PROT_NONE 0
206#endif
207#ifndef PROT_READ
208# define PROT_READ 0
209#endif
210#ifndef PROT_WRITE
211# define PROT_READ 0
212#endif
213#ifndef PROT_EXEC
214# define PROT_EXEC 0
215#endif
216
217#ifndef ST_NODEV
218# define ST_NODEV 0
219#endif
220#ifndef ST_NOEXEC
221# define ST_NOEXEC 0
222#endif
223#ifndef ST_SYNCHRONOUS
224# define ST_SYNCHRONOUS 0
225#endif
226#ifndef ST_MANDLOCK
227# define ST_MANDLOCK 0
228#endif
229#ifndef ST_WRITE
230# define ST_WRITE 0
231#endif
232#ifndef ST_APPEND
233# define ST_APPEND 0
234#endif
235#ifndef ST_IMMUTABLE
236# define ST_IMMUTABLE 0
237#endif
238#ifndef ST_NOATIME
239# define ST_NOATIME 0
240#endif
241#ifndef ST_NODIRATIME
242# define ST_NODIRATIME 0
243#endif
244#ifndef ST_RELATIME
245# define ST_RELATIME 0
246#endif
247
248#ifndef S_IFIFO
249# define S_IFIFO 0
250#endif
251#ifndef S_IFCHR
252# define S_IFCHR 0
253#endif
254#ifndef S_IFBLK
255# define S_IFBLK 0
256#endif
257#ifndef S_IFLNK
258# define S_IFLNK 0
259#endif
260#ifndef S_IFREG
261# define S_IFREG 0
262#endif
263#ifndef S_IFDIR
264# define S_IFDIR 0
265#endif
266#ifndef S_IFWHT
267# define S_IFWHT 0
268#endif
269#ifndef S_IFSOCK
270# define S_IFSOCK 0
271#endif
272
273#ifndef MAP_ANONYMOUS
274# ifdef MAP_ANON
275# define MAP_ANONYMOUS MAP_ANON
276# else
277# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
278# endif
279#endif
280#ifndef MAP_HUGETLB
281# define MAP_HUGETLB 0
282#endif
283#ifndef MAP_LOCKED
284# define MAP_LOCKED 0
285#endif
286#ifndef MAP_NORESERVE
287# define MAP_NORESERVE 0
288#endif
289#ifndef MAP_POPULATE
290# define MAP_POPULATE 0
291#endif
292#ifndef MAP_NONBLOCK
293# define MAP_NONBLOCK 0
294#endif
295
296#ifndef makedev
297# define makedev(maj,min) (((maj) << 8) | (min))
298#endif
299#ifndef major
300# define major(dev) ((dev) >> 8)
301#endif
302#ifndef minor
303# define minor(dev) ((dev) & 0xff)
304#endif
305
306#ifndef PAGESIZE
307# define PAGESIZE sysconf (_SC_PAGESIZE)
308#endif
89 309
90static int req_invoke (eio_req *req); 310static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 311#define EIO_FINISH(req) req_invoke (req)
92static void aio_grp_feed (eio_req *grp);
93#define EIO_FEED(req) aio_grp_feed (req)
94static void req_destroy (eio_req *grp); 312static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 313#define EIO_DESTROY(req) req_destroy (req)
96 314
97enum { 315enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 316 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
101#include "libeio/eio.c" 319#include "libeio/eio.c"
102 320
103typedef eio_req *aio_req; 321typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 322typedef eio_req *aio_req_ornot;
105 323
324static SV *on_next_submit;
325static int next_pri = EIO_PRI_DEFAULT;
106static int max_outstanding = 0; 326static int max_outstanding;
107 327
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 328static s_epipe respipe;
109
110static int respipe_osf [2], respipe [2] = { -1, -1 };
111 329
112static void req_destroy (aio_req req); 330static void req_destroy (aio_req req);
113static void req_cancel (aio_req req); 331static void req_cancel (aio_req req);
114 332
115static void want_poll (void) 333static void want_poll (void)
116{ 334{
117 /* write a dummy byte to the pipe so fh becomes ready */ 335 /* write a dummy byte to the pipe so fh becomes ready */
118 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 336 s_epipe_signal (&respipe);
119} 337}
120 338
121static void done_poll (void) 339static void done_poll (void)
122{ 340{
123 /* read any signals sent by the worker threads */ 341 /* read any signals sent by the worker threads */
124 char buf [4]; 342 s_epipe_drain (&respipe);
125 while (respipe_read (respipe [0], buf, 4) == 4)
126 ;
127} 343}
128 344
129/* must be called at most once */ 345/* must be called at most once */
130static SV *req_sv (aio_req req, const char *klass) 346static SV *req_sv (aio_req req, HV *stash)
131{ 347{
132 if (!req->self) 348 if (!req->self)
133 { 349 {
134 req->self = (SV *)newHV (); 350 req->self = (SV *)newHV ();
135 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 351 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
136 } 352 }
137 353
138 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 354 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
139} 355}
140 356
141static aio_req SvAIO_REQ (SV *sv) 357static aio_req SvAIO_REQ (SV *sv)
142{ 358{
143 MAGIC *mg; 359 MAGIC *mg;
144 360
145 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 361 if (!SvROK (sv)
362 || (SvSTASH (SvRV (sv)) != aio_grp_stash
363 && SvSTASH (SvRV (sv)) != aio_req_stash
364 && !sv_derived_from (sv, "IO::AIO::REQ")))
146 croak ("object of class " AIO_REQ_KLASS " expected"); 365 croak ("object of class IO::AIO::REQ expected");
147 366
148 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 367 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
149 368
150 return mg ? (aio_req)mg->mg_ptr : 0; 369 return mg ? (aio_req)mg->mg_ptr : 0;
151} 370}
157 dSP; 376 dSP;
158 377
159 ENTER; 378 ENTER;
160 SAVETMPS; 379 SAVETMPS;
161 PUSHMARK (SP); 380 PUSHMARK (SP);
162 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 381 XPUSHs (req_sv (grp, aio_grp_stash));
163 PUTBACK; 382 PUTBACK;
164 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 383 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
165 SPAGAIN; 384 SPAGAIN;
166 FREETMPS; 385 FREETMPS;
167 LEAVE; 386 LEAVE;
168 } 387 }
169} 388}
170 389
390static void req_submit (eio_req *req)
391{
392 eio_submit (req);
393
394 if (expect_false (on_next_submit))
395 {
396 dSP;
397 SV *cb = sv_2mortal (on_next_submit);
398
399 on_next_submit = 0;
400
401 PUSHMARK (SP);
402 PUTBACK;
403 call_sv (cb, G_DISCARD | G_EVAL);
404 }
405}
406
171static int req_invoke (eio_req *req) 407static int req_invoke (eio_req *req)
172{ 408{
173 dSP;
174
175 if (req->flags & FLAG_SV2_RO_OFF) 409 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 410 SvREADONLY_off (req->sv2);
177 411
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 412 if (!EIO_CANCELLED (req) && req->callback)
179 { 413 {
414 dSP;
415 static SV *sv_result_cache; /* caches the result integer SV */
416 SV *sv_result;
417
180 ENTER; 418 ENTER;
181 SAVETMPS; 419 SAVETMPS;
182 PUSHMARK (SP); 420 PUSHMARK (SP);
183 EXTEND (SP, 1); 421 EXTEND (SP, 1);
422
423 /* do not recreate the result IV from scratch each time */
424 if (expect_true (sv_result_cache))
425 {
426 sv_result = sv_result_cache; sv_result_cache = 0;
427 SvIV_set (sv_result, req->result);
428 SvIOK_only (sv_result);
429 }
430 else
431 {
432 sv_result = newSViv (req->result);
433 SvREADONLY_on (sv_result);
434 }
184 435
185 switch (req->type) 436 switch (req->type)
186 { 437 {
187 case EIO_READDIR: 438 case EIO_READDIR:
188 { 439 {
189 SV *rv = &PL_sv_undef; 440 SV *rv = &PL_sv_undef;
190 441
191 if (req->result >= 0) 442 if (req->result >= 0)
192 { 443 {
193 int i; 444 int i;
194 char *buf = req->ptr2; 445 char *names = (char *)req->ptr2;
446 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
195 AV *av = newAV (); 447 AV *av = newAV ();
196 448
197 av_extend (av, req->result - 1); 449 av_extend (av, req->result - 1);
198 450
199 for (i = 0; i < req->result; ++i) 451 for (i = 0; i < req->result; ++i)
200 { 452 {
201 SV *sv = newSVpv (buf, 0); 453 if (req->int1 & EIO_READDIR_DENTS)
454 {
455 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
202 456
457 if (req->int1 & EIO_READDIR_CUSTOM2)
458 {
459 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
460 AV *avent = newAV ();
461
462 av_extend (avent, 2);
463
464 if (!sv_type [ent->type])
465 {
466 sv_type [ent->type] = newSViv (ent->type);
467 SvREADONLY_on (sv_type [ent->type]);
468 }
469
470 av_store (avent, 0, namesv);
471 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
472 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
473
474 av_store (av, i, newRV_noinc ((SV *)avent));
475 }
476 else
203 av_store (av, i, sv); 477 av_store (av, i, namesv);
478
479 ++ent;
480 }
481 else
482 {
483 SV *name = newSVpv (names, 0);
484 av_store (av, i, name);
204 buf += SvCUR (sv) + 1; 485 names += SvCUR (name) + 1;
486 }
205 } 487 }
206 488
207 rv = sv_2mortal (newRV_noinc ((SV *)av)); 489 rv = sv_2mortal (newRV_noinc ((SV *)av));
208 } 490 }
209 491
210 PUSHs (rv); 492 PUSHs (rv);
493
494 if (req->int1 & EIO_READDIR_CUSTOM1)
495 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
211 } 496 }
212 break; 497 break;
213 498
214 case EIO_OPEN: 499 case EIO_OPEN:
215 { 500 {
221 GV *gv = (GV *)sv_newmortal (); 506 GV *gv = (GV *)sv_newmortal ();
222 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 507 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
223 char sym [64]; 508 char sym [64];
224 int symlen; 509 int symlen;
225 510
226 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 511 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
227 gv_init (gv, stash, sym, symlen, 0); 512 gv_init (gv, aio_stash, sym, symlen, 0);
228 513
229 symlen = snprintf ( 514 symlen = snprintf (
230 sym, 515 sym,
231 sizeof (sym), 516 sizeof (sym),
232 "%s&=%d", 517 "%s&=%d",
233 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 518 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
234 req->result 519 (int)req->result
235 ); 520 );
236 521
237 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 522 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
238 fh = (SV *)gv; 523 fh = (SV *)gv;
239 } 524 }
240 525
241 PUSHs (fh); 526 PUSHs (fh);
242 } 527 }
528 break;
529
530 case EIO_STATVFS:
531 case EIO_FSTATVFS:
532 {
533 SV *rv = &PL_sv_undef;
534
535 if (req->result >= 0)
536 {
537 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
538 HV *hv = newHV ();
539
540 rv = sv_2mortal (newRV_noinc ((SV *)hv));
541
542 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
543 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
544 hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
545 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
546 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
547 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
548 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
549 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
550 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
551 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
552 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
553 }
554
555 PUSHs (rv);
556 }
557
243 break; 558 break;
244 559
245 case EIO_GROUP: 560 case EIO_GROUP:
246 req->int1 = 2; /* mark group as finished */ 561 req->int1 = 2; /* mark group as finished */
247 562
259 case EIO_NOP: 574 case EIO_NOP:
260 case EIO_BUSY: 575 case EIO_BUSY:
261 break; 576 break;
262 577
263 case EIO_READLINK: 578 case EIO_READLINK:
579 case EIO_REALPATH:
264 if (req->result > 0) 580 if (req->result > 0)
265 { 581 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266 SvCUR_set (req->sv2, req->result);
267 *SvEND (req->sv2) = 0;
268 PUSHs (req->sv2);
269 }
270 break; 582 break;
271 583
272 case EIO_STAT: 584 case EIO_STAT:
273 case EIO_LSTAT: 585 case EIO_LSTAT:
274 case EIO_FSTAT: 586 case EIO_FSTAT:
275 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 587 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
276 PL_laststatval = req->result; 588 PL_laststatval = req->result;
277 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 589 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
278 PUSHs (sv_2mortal (newSViv (req->result))); 590 PUSHs (sv_result);
279 break; 591 break;
280 592
281 case EIO_READ: 593 case EIO_READ:
594 {
282 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 595 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
283 *SvEND (req->sv2) = 0; 596 *SvEND (req->sv2) = 0;
284 PUSHs (sv_2mortal (newSViv (req->result))); 597 SvPOK_only (req->sv2);
598 SvSETMAGIC (req->sv2);
599 PUSHs (sv_result);
600 }
285 break; 601 break;
286 602
287 case EIO_DUP2: 603 case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
288 if (req->result > 0) 604 if (req->result > 0)
289 req->result = 0; 605 SvIV_set (sv_result, 0);
290 /* FALLTHROUGH */ 606 /* FALLTHROUGH */
291 607
292 default: 608 default:
293 PUSHs (sv_2mortal (newSViv (req->result))); 609 PUSHs (sv_result);
294 break; 610 break;
295 } 611 }
296 612
297 errno = req->errorno; 613 errno = req->errorno;
298 614
299 PUTBACK; 615 PUTBACK;
300 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD); 616 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
301 SPAGAIN; 617 SPAGAIN;
618
619 if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
620 SvREFCNT_dec (sv_result);
621 else
622 sv_result_cache = sv_result;
302 623
303 FREETMPS; 624 FREETMPS;
304 LEAVE; 625 LEAVE;
305 626
306 PUTBACK; 627 PUTBACK;
335 grp->sv2 = 0; 656 grp->sv2 = 0;
336 657
337 eio_grp_cancel (grp); 658 eio_grp_cancel (grp);
338} 659}
339 660
340#ifdef USE_SOCKETS_AS_HANDLES
341# define TO_SOCKET(x) (win32_get_osfhandle (x))
342#else
343# define TO_SOCKET(x) (x)
344#endif
345
346static void
347create_respipe (void) 661static void create_respipe (void)
348{ 662{
349 int old_readfd = respipe [0];
350
351 if (respipe [1] >= 0)
352 respipe_close (TO_SOCKET (respipe [1]));
353
354#ifdef _WIN32
355 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
356#else
357 if (pipe (respipe)) 663 if (s_epipe_renew (&respipe))
358#endif
359 croak ("unable to initialize result pipe"); 664 croak ("IO::AIO: unable to initialize result pipe");
360
361 if (old_readfd >= 0)
362 {
363 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
364 croak ("unable to initialize result pipe(2)");
365
366 respipe_close (respipe [0]);
367 respipe [0] = old_readfd;
368 }
369
370#ifdef _WIN32
371 int arg = 1;
372 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
373 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
374#else
375 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
376 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
377#endif
378 croak ("unable to initialize result pipe(3)");
379
380 respipe_osf [0] = TO_SOCKET (respipe [0]);
381 respipe_osf [1] = TO_SOCKET (respipe [1]);
382} 665}
383 666
384static void poll_wait (void) 667static void poll_wait (void)
385{ 668{
386 fd_set rfd;
387
388 while (eio_nreqs ()) 669 while (eio_nreqs ())
389 { 670 {
390 int size; 671 int size;
391 672
392 X_LOCK (reslock); 673 X_LOCK (reslock);
394 X_UNLOCK (reslock); 675 X_UNLOCK (reslock);
395 676
396 if (size) 677 if (size)
397 return; 678 return;
398 679
399 maybe_start_thread (); 680 etp_maybe_start_thread ();
400 681
401 FD_ZERO (&rfd); 682 s_epipe_wait (&respipe);
402 FD_SET (respipe [0], &rfd);
403
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 683 }
406} 684}
407 685
408static int poll_cb (void) 686static int poll_cb (void)
409{ 687{
410 int res; 688 for (;;)
411
412 do
413 { 689 {
414 res = eio_poll (); 690 int res = eio_poll ();
415 691
416 if (res > 0) 692 if (res > 0)
417 croak (0); 693 croak (0);
694
695 if (!max_outstanding || max_outstanding > eio_nreqs ())
696 return res;
697
698 poll_wait ();
418 } 699 }
419 while (max_outstanding && max_outstanding <= eio_nreqs ());
420
421 return res;
422} 700}
423 701
424static void atfork_child (void) 702static void atfork_child (void)
425{ 703{
426 create_respipe (); 704 create_respipe ();
427} 705}
428 706
707/*****************************************************************************/
708
709#if !_POSIX_MAPPED_FILES
710# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
711# define munmap(addr,length) (errno = ENOSYS, -1)
712#endif
713
714#if !_POSIX_MEMORY_PROTECTION
715# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
716# define PROT_NONE 0
717# define PROT_WRITE 0
718# define MAP_PRIVATE 0
719# define MAP_SHARED 0
720# define MAP_FIXED 0
721#endif
722
723#define MMAP_MAGIC PERL_MAGIC_ext
724
725static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
726{
727 int old_errno = errno;
728 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
729 errno = old_errno;
730
731 mg->mg_obj = 0; /* just in case */
732
733 SvREADONLY_off (sv);
734
735 if (SvPVX (sv) != mg->mg_ptr)
736 croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
737
738 SvCUR_set (sv, 0);
739 SvPVX (sv) = 0;
740 SvOK_off (sv);
741
742 return 0;
743}
744
745static MGVTBL mmap_vtbl = {
746 0, 0, 0, 0, mmap_free
747};
748
749/*****************************************************************************/
750
751static SV * get_cb (SV *cb_sv)
752{
753 SvGETMAGIC (cb_sv);
754 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
755}
756
429#define dREQ \ 757#define dREQ \
758 SV *cb_cv; \
430 aio_req req; \ 759 aio_req req; \
431 int req_pri = next_pri; \ 760 int req_pri = next_pri; \
432 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 761 next_pri = EIO_PRI_DEFAULT; \
433 \ 762 \
434 if (SvOK (callback) && !SvROK (callback)) \ 763 cb_cv = get_cb (callback); \
435 croak ("callback must be undef or of reference type"); \
436 \ 764 \
437 Newz (0, req, 1, eio_req); \ 765 Newz (0, req, 1, eio_req); \
438 if (!req) \ 766 if (!req) \
439 croak ("out of memory during eio_req allocation"); \ 767 croak ("out of memory during eio_req allocation"); \
440 \ 768 \
441 req->callback = newSVsv (callback); \ 769 req->callback = SvREFCNT_inc (cb_cv); \
442 req->pri = req_pri 770 req->pri = req_pri
443 771
444#define REQ_SEND \ 772#define REQ_SEND \
773 PUTBACK; \
445 eio_submit (req); \ 774 req_submit (req); \
775 SPAGAIN; \
446 \ 776 \
447 if (GIMME_V != G_VOID) \ 777 if (GIMME_V != G_VOID) \
448 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 778 XPUSHs (req_sv (req, aio_req_stash));
449 779
450MODULE = IO::AIO PACKAGE = IO::AIO 780MODULE = IO::AIO PACKAGE = IO::AIO
451 781
452PROTOTYPES: ENABLE 782PROTOTYPES: ENABLE
453 783
454BOOT: 784BOOT:
455{ 785{
786 static const struct {
787 const char *name;
788 IV iv;
789 } *civ, const_iv[] = {
790# define const_niv(name, value) { # name, (IV) value },
791# define const_iv(name) { # name, (IV) name },
792# define const_eio(name) { # name, (IV) EIO_ ## name },
793 const_iv (EXDEV)
794 const_iv (ENOSYS)
795 const_iv (O_RDONLY)
796 const_iv (O_WRONLY)
797 const_iv (O_RDWR)
798 const_iv (O_CREAT)
799 const_iv (O_TRUNC)
800 const_iv (O_EXCL)
801 const_iv (O_APPEND)
802
803 const_iv (O_ASYNC)
804 const_iv (O_DIRECT)
805 const_iv (O_NOATIME)
806
807 const_iv (O_CLOEXEC)
808 const_iv (O_NOCTTY)
809 const_iv (O_NOFOLLOW)
810 const_iv (O_NONBLOCK)
811 const_iv (O_EXEC)
812 const_iv (O_SEARCH)
813 const_iv (O_DIRECTORY)
814 const_iv (O_DSYNC)
815 const_iv (O_RSYNC)
816 const_iv (O_SYNC)
817 const_iv (O_TTY_INIT)
818
819 const_iv (S_IFIFO)
820 const_iv (S_IFCHR)
821 const_iv (S_IFBLK)
822 const_iv (S_IFLNK)
823 const_iv (S_IFREG)
824 const_iv (S_IFDIR)
825 const_iv (S_IFWHT)
826 const_iv (S_IFSOCK)
827 const_iv (S_IFMT)
828
829 const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
830 const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
831 const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
832 const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
833 const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
834 const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
835
836 const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
837 const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
838 const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
839 const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
840 const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
841
842 const_iv (ST_RDONLY)
843 const_iv (ST_NOSUID)
844 const_iv (ST_NODEV)
845 const_iv (ST_NOEXEC)
846 const_iv (ST_SYNCHRONOUS)
847 const_iv (ST_MANDLOCK)
848 const_iv (ST_WRITE)
849 const_iv (ST_APPEND)
850 const_iv (ST_IMMUTABLE)
851 const_iv (ST_NOATIME)
852 const_iv (ST_NODIRATIME)
853 const_iv (ST_RELATIME)
854
855 const_iv (PROT_NONE)
856 const_iv (PROT_EXEC)
857 const_iv (PROT_READ)
858 const_iv (PROT_WRITE)
859
860 /*const_iv (MAP_FIXED)*/
861 const_iv (MAP_PRIVATE)
862 const_iv (MAP_SHARED)
863 const_iv (MAP_ANONYMOUS)
864
865 /* linuxish */
866 const_iv (MAP_HUGETLB)
867 const_iv (MAP_LOCKED)
868 const_iv (MAP_NORESERVE)
869 const_iv (MAP_POPULATE)
870 const_iv (MAP_NONBLOCK)
871
872 const_eio (MCL_FUTURE)
873 const_eio (MCL_CURRENT)
874
875 const_eio (MS_ASYNC)
876 const_eio (MS_INVALIDATE)
877 const_eio (MS_SYNC)
878
879 const_eio (MT_MODIFY)
880
881 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
882 const_eio (SYNC_FILE_RANGE_WRITE)
883 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
884
885 const_eio (FALLOC_FL_KEEP_SIZE)
886
887 const_eio (READDIR_DENTS)
888 const_eio (READDIR_DIRS_FIRST)
889 const_eio (READDIR_STAT_ORDER)
890 const_eio (READDIR_FOUND_UNKNOWN)
891
892 const_eio (DT_UNKNOWN)
893 const_eio (DT_FIFO)
894 const_eio (DT_CHR)
895 const_eio (DT_DIR)
896 const_eio (DT_BLK)
897 const_eio (DT_REG)
898 const_eio (DT_LNK)
899 const_eio (DT_SOCK)
900 const_eio (DT_WHT)
901 };
902
456 stash = gv_stashpv ("IO::AIO", 1); 903 aio_stash = gv_stashpv ("IO::AIO" , 1);
904 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
905 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
457 906
458 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 907 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
459 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 908 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
460 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
461 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
462 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
463#ifdef _WIN32
464 X_MUTEX_CHECK (wrklock);
465 X_MUTEX_CHECK (reslock);
466 X_MUTEX_CHECK (reqlock);
467 X_MUTEX_CHECK (reqwait);
468 X_MUTEX_CHECK (preadwritelock);
469 X_MUTEX_CHECK (readdirlock);
470 909
471 X_COND_CHECK (reqwait); 910 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
472#else
473 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
474#endif
475 911
476 create_respipe (); 912 create_respipe ();
477 913
478 if (eio_init (want_poll, done_poll) < 0) 914 if (eio_init (want_poll, done_poll) < 0)
479 croak ("IO::AIO: unable to initialise eio library"); 915 croak ("IO::AIO: unable to initialise eio library");
480 916
481 /* atfork child called in fifo order, so before eio's handler */ 917 /* atfork child called in fifo order, so before eio's handler */
482 X_THREAD_ATFORK (0, 0, atfork_child); 918 X_THREAD_ATFORK (0, 0, atfork_child);
483} 919}
484 920
485void 921void
486max_poll_reqs (int nreqs) 922max_poll_reqs (unsigned int nreqs)
487 PROTOTYPE: $ 923 PROTOTYPE: $
488 CODE: 924 CODE:
489 eio_set_max_poll_reqs (nreqs); 925 eio_set_max_poll_reqs (nreqs);
490 926
491void 927void
493 PROTOTYPE: $ 929 PROTOTYPE: $
494 CODE: 930 CODE:
495 eio_set_max_poll_time (nseconds); 931 eio_set_max_poll_time (nseconds);
496 932
497void 933void
498min_parallel (int nthreads) 934min_parallel (unsigned int nthreads)
499 PROTOTYPE: $ 935 PROTOTYPE: $
500 CODE: 936 CODE:
501 eio_set_min_parallel (nthreads); 937 eio_set_min_parallel (nthreads);
502 938
503void 939void
504max_parallel (int nthreads) 940max_parallel (unsigned int nthreads)
505 PROTOTYPE: $ 941 PROTOTYPE: $
506 CODE: 942 CODE:
507 eio_set_max_parallel (nthreads); 943 eio_set_max_parallel (nthreads);
508 944
509void 945void
510max_idle (int nthreads) 946max_idle (unsigned int nthreads)
511 PROTOTYPE: $ 947 PROTOTYPE: $
512 CODE: 948 CODE:
513 eio_set_max_idle (nthreads); 949 eio_set_max_idle (nthreads);
514 950
515void 951void
952idle_timeout (unsigned int seconds)
953 PROTOTYPE: $
954 CODE:
955 eio_set_idle_timeout (seconds);
956
957void
516max_outstanding (int maxreqs) 958max_outstanding (unsigned int maxreqs)
517 PROTOTYPE: $ 959 PROTOTYPE: $
518 CODE: 960 CODE:
519 max_outstanding = maxreqs; 961 max_outstanding = maxreqs;
520 962
521void 963void
522aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 964aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
523 PROTOTYPE: $$$;$
524 PPCODE: 965 PPCODE:
525{ 966{
526 dREQ; 967 dREQ;
527 968
528 req->type = EIO_OPEN; 969 req->type = EIO_OPEN;
534 REQ_SEND; 975 REQ_SEND;
535} 976}
536 977
537void 978void
538aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 979aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
539 PROTOTYPE: $;$
540 ALIAS: 980 ALIAS:
541 aio_fsync = EIO_FSYNC 981 aio_fsync = EIO_FSYNC
542 aio_fdatasync = EIO_FDATASYNC 982 aio_fdatasync = EIO_FDATASYNC
543 PPCODE: 983 PPCODE:
544{ 984{
985 int fd = s_fileno_croak (fh, 0);
545 dREQ; 986 dREQ;
546 987
547 req->type = ix; 988 req->type = ix;
548 req->sv1 = newSVsv (fh); 989 req->sv1 = newSVsv (fh);
549 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 990 req->int1 = fd;
550 991
551 REQ_SEND (req); 992 REQ_SEND (req);
552} 993}
553 994
554void 995void
996aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
997 PPCODE:
998{
999 int fd = s_fileno_croak (fh, 0);
1000 dREQ;
1001
1002 req->type = EIO_SYNC_FILE_RANGE;
1003 req->sv1 = newSVsv (fh);
1004 req->int1 = fd;
1005 req->offs = offset;
1006 req->size = nbytes;
1007 req->int2 = flags;
1008
1009 REQ_SEND (req);
1010}
1011
1012void
1013aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1014 PPCODE:
1015{
1016 int fd = s_fileno_croak (fh, 0);
1017 dREQ;
1018
1019 req->type = EIO_FALLOCATE;
1020 req->sv1 = newSVsv (fh);
1021 req->int1 = fd;
1022 req->int2 = mode;
1023 req->offs = offset;
1024 req->size = len;
1025
1026 REQ_SEND (req);
1027}
1028
1029void
555aio_close (SV *fh, SV *callback=&PL_sv_undef) 1030aio_close (SV *fh, SV *callback=&PL_sv_undef)
556 PROTOTYPE: $;$
557 PPCODE: 1031 PPCODE:
558{ 1032{
559 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1033 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1034 int fd = s_fileno_croak (fh, 0);
560 dREQ; 1035 dREQ;
561 1036
562 if (close_pipe < 0) 1037 if (close_pipe < 0)
563 { 1038 {
564 int pipefd [2]; 1039 int pipefd [2];
572 } 1047 }
573 1048
574 req->type = EIO_DUP2; 1049 req->type = EIO_DUP2;
575 req->int1 = close_pipe; 1050 req->int1 = close_pipe;
576 req->sv2 = newSVsv (fh); 1051 req->sv2 = newSVsv (fh);
577 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1052 req->int2 = fd;
578 1053
579 REQ_SEND (req); 1054 REQ_SEND (req);
580} 1055}
581 1056
582void 1057void
583aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1058aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
584 ALIAS: 1059 ALIAS:
585 aio_read = EIO_READ 1060 aio_read = EIO_READ
586 aio_write = EIO_WRITE 1061 aio_write = EIO_WRITE
587 PROTOTYPE: $$$$$;$
588 PPCODE: 1062 PPCODE:
589{ 1063{
590 STRLEN svlen; 1064 STRLEN svlen;
1065 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
591 char *svptr = SvPVbyte (data, svlen); 1066 char *svptr = SvPVbyte (data, svlen);
592 UV len = SvUV (length); 1067 UV len = SvUV (length);
593
594 SvUPGRADE (data, SVt_PV);
595 SvPOK_on (data);
596 1068
597 if (dataoffset < 0) 1069 if (dataoffset < 0)
598 dataoffset += svlen; 1070 dataoffset += svlen;
599 1071
600 if (dataoffset < 0 || dataoffset > svlen) 1072 if (dataoffset < 0 || dataoffset > svlen)
606 if (!SvOK (length) || len + dataoffset > svlen) 1078 if (!SvOK (length) || len + dataoffset > svlen)
607 len = svlen - dataoffset; 1079 len = svlen - dataoffset;
608 } 1080 }
609 else 1081 else
610 { 1082 {
611 /* read: grow scalar as necessary */ 1083 /* read: check type and grow scalar as necessary */
1084 SvUPGRADE (data, SVt_PV);
612 svptr = SvGROW (data, len + dataoffset + 1); 1085 svptr = SvGROW (data, len + dataoffset + 1);
613 } 1086 }
614 1087
615 if (len < 0)
616 croak ("length must not be negative");
617
618 { 1088 {
619 dREQ; 1089 dREQ;
620 1090
621 req->type = ix; 1091 req->type = ix;
622 req->sv1 = newSVsv (fh); 1092 req->sv1 = newSVsv (fh);
623 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 1093 req->int1 = fd;
624 : IoOFP (sv_2io (fh)));
625 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1094 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
626 req->size = len; 1095 req->size = len;
627 req->sv2 = SvREFCNT_inc (data); 1096 req->sv2 = SvREFCNT_inc (data);
628 req->ptr2 = (char *)svptr + dataoffset; 1097 req->ptr2 = (char *)svptr + dataoffset;
629 req->stroffset = dataoffset; 1098 req->stroffset = dataoffset;
638 } 1107 }
639} 1108}
640 1109
641void 1110void
642aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1111aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
643 PROTOTYPE: $$;$ 1112 ALIAS:
1113 aio_readlink = EIO_READLINK
1114 aio_realpath = EIO_REALPATH
644 PPCODE: 1115 PPCODE:
645{ 1116{
646 SV *data; 1117 SV *data;
647 dREQ; 1118 dREQ;
648 1119
649 data = newSV (NAME_MAX);
650 SvPOK_on (data);
651
652 req->type = EIO_READLINK; 1120 req->type = ix;
653 req->sv1 = newSVsv (path); 1121 req->sv1 = newSVsv (path);
654 req->ptr1 = SvPVbyte_nolen (req->sv1); 1122 req->ptr1 = SvPVbyte_nolen (req->sv1);
655 req->sv2 = data;
656 req->ptr2 = SvPVbyte_nolen (data);
657 1123
658 REQ_SEND; 1124 REQ_SEND;
659} 1125}
660 1126
661void 1127void
662aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 1128aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
663 PROTOTYPE: $$$$;$
664 PPCODE: 1129 PPCODE:
665{ 1130{
1131 int ifd = s_fileno_croak (in_fh , 0);
1132 int ofd = s_fileno_croak (out_fh, 1);
666 dREQ; 1133 dREQ;
667 1134
668 req->type = EIO_SENDFILE; 1135 req->type = EIO_SENDFILE;
669 req->sv1 = newSVsv (out_fh); 1136 req->sv1 = newSVsv (out_fh);
670 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1137 req->int1 = ofd;
671 req->sv2 = newSVsv (in_fh); 1138 req->sv2 = newSVsv (in_fh);
672 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1139 req->int2 = ifd;
673 req->offs = SvVAL64 (in_offset); 1140 req->offs = in_offset;
674 req->size = length; 1141 req->size = length;
675 1142
676 REQ_SEND; 1143 REQ_SEND;
677} 1144}
678 1145
679void 1146void
680aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 1147aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
681 PROTOTYPE: $$$;$
682 PPCODE: 1148 PPCODE:
683{ 1149{
1150 int fd = s_fileno_croak (fh, 0);
684 dREQ; 1151 dREQ;
685 1152
686 req->type = EIO_READAHEAD; 1153 req->type = EIO_READAHEAD;
687 req->sv1 = newSVsv (fh); 1154 req->sv1 = newSVsv (fh);
688 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1155 req->int1 = fd;
689 req->offs = SvVAL64 (offset); 1156 req->offs = offset;
690 req->size = length; 1157 req->size = length;
691 1158
692 REQ_SEND; 1159 REQ_SEND;
693} 1160}
694 1161
695void 1162void
696aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1163aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
697 ALIAS: 1164 ALIAS:
698 aio_stat = EIO_STAT 1165 aio_stat = EIO_STAT
699 aio_lstat = EIO_LSTAT 1166 aio_lstat = EIO_LSTAT
1167 aio_statvfs = EIO_STATVFS
700 PPCODE: 1168 PPCODE:
701{ 1169{
702 dREQ; 1170 dREQ;
703 1171
704 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
705 if (!req->ptr2)
706 {
707 req_destroy (req);
708 croak ("out of memory during aio_stat statdata allocation");
709 }
710
711 req->flags |= EIO_FLAG_PTR2_FREE;
712 req->sv1 = newSVsv (fh_or_path); 1172 req->sv1 = newSVsv (fh_or_path);
713 1173
714 if (SvPOK (fh_or_path)) 1174 if (SvPOK (req->sv1))
715 { 1175 {
716 req->type = ix; 1176 req->type = ix;
717 req->ptr1 = SvPVbyte_nolen (req->sv1); 1177 req->ptr1 = SvPVbyte_nolen (req->sv1);
718 } 1178 }
719 else 1179 else
720 { 1180 {
721 req->type = EIO_FSTAT; 1181 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
722 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1182 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
723 } 1183 }
724 1184
725 REQ_SEND; 1185 REQ_SEND;
726} 1186}
1187
1188UV
1189major (UV dev)
1190 ALIAS:
1191 minor = 1
1192 CODE:
1193 RETVAL = ix ? major (dev) : minor (dev);
1194 OUTPUT:
1195 RETVAL
1196
1197UV
1198makedev (UV maj, UV min)
1199 CODE:
1200 RETVAL = makedev (maj, min);
1201 OUTPUT:
1202 RETVAL
727 1203
728void 1204void
729aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1205aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
730 PPCODE: 1206 PPCODE:
731{ 1207{
733 1209
734 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1210 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
735 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1211 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
736 req->sv1 = newSVsv (fh_or_path); 1212 req->sv1 = newSVsv (fh_or_path);
737 1213
738 if (SvPOK (fh_or_path)) 1214 if (SvPOK (req->sv1))
739 { 1215 {
740 req->type = EIO_UTIME; 1216 req->type = EIO_UTIME;
741 req->ptr1 = SvPVbyte_nolen (req->sv1); 1217 req->ptr1 = SvPVbyte_nolen (req->sv1);
742 } 1218 }
743 else 1219 else
756 dREQ; 1232 dREQ;
757 1233
758 req->sv1 = newSVsv (fh_or_path); 1234 req->sv1 = newSVsv (fh_or_path);
759 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1235 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
760 1236
761 if (SvPOK (fh_or_path)) 1237 if (SvPOK (req->sv1))
762 { 1238 {
763 req->type = EIO_TRUNCATE; 1239 req->type = EIO_TRUNCATE;
764 req->ptr1 = SvPVbyte_nolen (req->sv1); 1240 req->ptr1 = SvPVbyte_nolen (req->sv1);
765 } 1241 }
766 else 1242 else
774 1250
775void 1251void
776aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1252aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
777 ALIAS: 1253 ALIAS:
778 aio_chmod = EIO_CHMOD 1254 aio_chmod = EIO_CHMOD
779 aio_fchmod = EIO_FCHMOD
780 aio_mkdir = EIO_MKDIR 1255 aio_mkdir = EIO_MKDIR
781 PPCODE: 1256 PPCODE:
782{ 1257{
783 dREQ; 1258 dREQ;
784 1259
785 req->type = ix;
786 req->int2 = mode; 1260 req->int2 = mode;
787 req->sv1 = newSVsv (fh_or_path); 1261 req->sv1 = newSVsv (fh_or_path);
788 1262
789 if (ix == EIO_FCHMOD) 1263 if (SvPOK (req->sv1))
790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1264 {
1265 req->type = ix;
1266 req->ptr1 = SvPVbyte_nolen (req->sv1);
1267 }
791 else 1268 else
792 req->ptr1 = SvPVbyte_nolen (req->sv1); 1269 {
1270 req->type = EIO_FCHMOD;
1271 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1272 }
793 1273
794 REQ_SEND; 1274 REQ_SEND;
795} 1275}
796 1276
797void 1277void
802 1282
803 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1283 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
804 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1284 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
805 req->sv1 = newSVsv (fh_or_path); 1285 req->sv1 = newSVsv (fh_or_path);
806 1286
807 if (SvPOK (fh_or_path)) 1287 if (SvPOK (req->sv1))
808 { 1288 {
809 req->type = EIO_CHOWN; 1289 req->type = EIO_CHOWN;
810 req->ptr1 = SvPVbyte_nolen (req->sv1); 1290 req->ptr1 = SvPVbyte_nolen (req->sv1);
811 } 1291 }
812 else 1292 else
817 1297
818 REQ_SEND; 1298 REQ_SEND;
819} 1299}
820 1300
821void 1301void
1302aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
1303 PPCODE:
1304{
1305 dREQ;
1306
1307 req->type = EIO_READDIR;
1308 req->sv1 = newSVsv (pathname);
1309 req->ptr1 = SvPVbyte_nolen (req->sv1);
1310 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1311
1312 if (flags & EIO_READDIR_DENTS)
1313 req->int1 |= EIO_READDIR_CUSTOM2;
1314
1315 REQ_SEND;
1316}
1317
1318void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1319aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 1320 ALIAS:
824 aio_unlink = EIO_UNLINK 1321 aio_unlink = EIO_UNLINK
825 aio_rmdir = EIO_RMDIR 1322 aio_rmdir = EIO_RMDIR
826 aio_readdir = EIO_READDIR 1323 aio_readdir = EIO_READDIR
868 1365
869 REQ_SEND; 1366 REQ_SEND;
870} 1367}
871 1368
872void 1369void
1370aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1371 ALIAS:
1372 aio_mtouch = EIO_MTOUCH
1373 aio_msync = EIO_MSYNC
1374 PPCODE:
1375{
1376 STRLEN svlen;
1377 char *svptr = SvPVbyte (data, svlen);
1378 UV len = SvUV (length);
1379
1380 if (offset < 0)
1381 offset += svlen;
1382
1383 if (offset < 0 || offset > svlen)
1384 croak ("offset outside of scalar");
1385
1386 if (!SvOK (length) || len + offset > svlen)
1387 len = svlen - offset;
1388
1389 {
1390 dREQ;
1391
1392 req->type = ix;
1393 req->sv2 = SvREFCNT_inc (data);
1394 req->ptr2 = (char *)svptr + offset;
1395 req->size = len;
1396 req->int1 = flags;
1397
1398 REQ_SEND;
1399 }
1400}
1401
1402void
1403aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef)
1404 PPCODE:
1405{
1406 STRLEN svlen;
1407 char *svptr = SvPVbyte (data, svlen);
1408 UV len = SvUV (length);
1409
1410 if (offset < 0)
1411 offset += svlen;
1412
1413 if (offset < 0 || offset > svlen)
1414 croak ("offset outside of scalar");
1415
1416 if (!SvOK (length) || len + offset > svlen)
1417 len = svlen - offset;
1418
1419 {
1420 dREQ;
1421
1422 req->type = EIO_MLOCK;
1423 req->sv2 = SvREFCNT_inc (data);
1424 req->ptr2 = (char *)svptr + offset;
1425 req->size = len;
1426
1427 REQ_SEND;
1428 }
1429}
1430
1431void
1432aio_mlockall (IV flags, SV *callback=&PL_sv_undef)
1433 PPCODE:
1434{
1435 dREQ;
1436
1437 req->type = EIO_MLOCKALL;
1438 req->int1 = flags;
1439
1440 REQ_SEND;
1441}
1442
1443void
873aio_busy (double delay, SV *callback=&PL_sv_undef) 1444aio_busy (double delay, SV *callback=&PL_sv_undef)
874 PPCODE: 1445 PPCODE:
875{ 1446{
876 dREQ; 1447 dREQ;
877 1448
881 REQ_SEND; 1452 REQ_SEND;
882} 1453}
883 1454
884void 1455void
885aio_group (SV *callback=&PL_sv_undef) 1456aio_group (SV *callback=&PL_sv_undef)
886 PROTOTYPE: ;$
887 PPCODE: 1457 PPCODE:
888{ 1458{
889 dREQ; 1459 dREQ;
890 1460
891 req->type = EIO_GROUP; 1461 req->type = EIO_GROUP;
892 1462
893 eio_submit (req); 1463 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1464 XPUSHs (req_sv (req, aio_grp_stash));
895} 1465}
896 1466
897void 1467void
898aio_nop (SV *callback=&PL_sv_undef) 1468aio_nop (SV *callback=&PL_sv_undef)
899 ALIAS: 1469 ALIAS:
908 REQ_SEND; 1478 REQ_SEND;
909} 1479}
910 1480
911int 1481int
912aioreq_pri (int pri = 0) 1482aioreq_pri (int pri = 0)
913 PROTOTYPE: ;$
914 CODE: 1483 CODE:
915 RETVAL = next_pri - EIO_PRI_BIAS; 1484 RETVAL = next_pri;
916 if (items > 0) 1485 if (items > 0)
917 { 1486 {
918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1487 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1488 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
920 next_pri = pri + EIO_PRI_BIAS; 1489 next_pri = pri;
921 } 1490 }
922 OUTPUT: 1491 OUTPUT:
923 RETVAL 1492 RETVAL
924 1493
925void 1494void
926aioreq_nice (int nice = 0) 1495aioreq_nice (int nice = 0)
927 CODE: 1496 CODE:
928 nice = next_pri - nice; 1497 nice = next_pri - nice;
929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1498 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1499 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
931 next_pri = nice + EIO_PRI_BIAS; 1500 next_pri = nice;
932 1501
933void 1502void
934flush () 1503flush ()
935 PROTOTYPE:
936 CODE: 1504 CODE:
937 while (eio_nreqs ()) 1505 while (eio_nreqs ())
938 { 1506 {
939 poll_wait (); 1507 poll_wait ();
940 poll_cb (); 1508 poll_cb ();
941 } 1509 }
942 1510
943int 1511int
944poll() 1512poll ()
945 PROTOTYPE:
946 CODE: 1513 CODE:
947 poll_wait (); 1514 poll_wait ();
948 RETVAL = poll_cb (); 1515 RETVAL = poll_cb ();
949 OUTPUT: 1516 OUTPUT:
950 RETVAL 1517 RETVAL
951 1518
952int 1519int
953poll_fileno() 1520poll_fileno ()
954 PROTOTYPE:
955 CODE: 1521 CODE:
956 RETVAL = respipe [0]; 1522 RETVAL = s_epipe_fd (&respipe);
957 OUTPUT: 1523 OUTPUT:
958 RETVAL 1524 RETVAL
959 1525
960int 1526int
961poll_cb(...) 1527poll_cb (...)
962 PROTOTYPE: 1528 PROTOTYPE:
963 CODE: 1529 CODE:
964 RETVAL = poll_cb (); 1530 RETVAL = poll_cb ();
965 OUTPUT: 1531 OUTPUT:
966 RETVAL 1532 RETVAL
967 1533
968void 1534void
969poll_wait() 1535poll_wait ()
970 PROTOTYPE:
971 CODE: 1536 CODE:
972 poll_wait (); 1537 poll_wait ();
973 1538
974int 1539int
975nreqs() 1540nreqs ()
976 PROTOTYPE:
977 CODE: 1541 CODE:
978 RETVAL = eio_nreqs (); 1542 RETVAL = eio_nreqs ();
979 OUTPUT: 1543 OUTPUT:
980 RETVAL 1544 RETVAL
981 1545
982int 1546int
983nready() 1547nready ()
984 PROTOTYPE:
985 CODE: 1548 CODE:
986 RETVAL = eio_nready (); 1549 RETVAL = eio_nready ();
987 OUTPUT: 1550 OUTPUT:
988 RETVAL 1551 RETVAL
989 1552
990int 1553int
991npending() 1554npending ()
992 PROTOTYPE:
993 CODE: 1555 CODE:
994 RETVAL = eio_npending (); 1556 RETVAL = eio_npending ();
995 OUTPUT: 1557 OUTPUT:
996 RETVAL 1558 RETVAL
997 1559
998int 1560int
999nthreads() 1561nthreads ()
1000 PROTOTYPE:
1001 CODE: 1562 CODE:
1002 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1563 RETVAL = eio_nthreads ();
1003 RETVAL = started;
1004 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1005 OUTPUT: 1564 OUTPUT:
1006 RETVAL 1565 RETVAL
1007 1566
1567int
1568fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1569 CODE:
1570 RETVAL = posix_fadvise (fh, offset, length, advice);
1571 OUTPUT:
1572 RETVAL
1573
1574ssize_t
1575sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1576 CODE:
1577 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1578 OUTPUT:
1579 RETVAL
1580
1581void
1582mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
1583 PPCODE:
1584 sv_unmagic (scalar, MMAP_MAGIC);
1585{
1586 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1587 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
1588 if (addr == (void *)-1)
1589 XSRETURN_NO;
1590
1591 sv_force_normal (scalar);
1592
1593 /* we store the length in mg_obj, as namlen is I32 :/ */
1594 sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
1595 ->mg_obj = (SV *)length;
1596
1597 SvUPGRADE (scalar, SVt_PV); /* nop... */
1598
1599 if (!(prot & PROT_WRITE))
1600 SvREADONLY_on (scalar);
1601
1602 if (SvLEN (scalar))
1603 Safefree (SvPVX (scalar));
1604
1605 SvPVX (scalar) = (char *)addr;
1606 SvCUR_set (scalar, length);
1607 SvLEN_set (scalar, 0);
1608 SvPOK_only (scalar);
1609
1610 XSRETURN_YES;
1611}
1612
1613void
1614munmap (SV *scalar)
1615 CODE:
1616 sv_unmagic (scalar, MMAP_MAGIC);
1617
1618int
1619madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
1620 ALIAS:
1621 mprotect = 1
1622 CODE:
1623{
1624 STRLEN svlen;
1625 void *addr = SvPVbyte (scalar, svlen);
1626 size_t len = SvUV (length);
1627
1628 if (offset < 0)
1629 offset += svlen;
1630
1631 if (offset < 0 || offset > svlen)
1632 croak ("offset outside of scalar");
1633
1634 if (!SvOK (length) || len + offset > svlen)
1635 len = svlen - offset;
1636
1637 addr = (void *)(((intptr_t)addr) + offset);
1638 eio_page_align (&addr, &len);
1639
1640 switch (ix)
1641 {
1642 case 0: RETVAL = posix_madvise (addr, len, advice_or_prot); break;
1643 case 1: RETVAL = mprotect (addr, len, advice_or_prot); break;
1644 }
1645}
1646 OUTPUT:
1647 RETVAL
1648
1649int
1650munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1651 CODE:
1652{
1653 STRLEN svlen;
1654 void *addr = SvPVbyte (scalar, svlen);
1655 size_t len = SvUV (length);
1656
1657 if (offset < 0)
1658 offset += svlen;
1659
1660 if (offset < 0 || offset > svlen)
1661 croak ("offset outside of scalar");
1662
1663 if (!SvOK (length) || len + offset > svlen)
1664 len = svlen - offset;
1665
1666 addr = (void *)(((intptr_t)addr) + offset);
1667 eio_page_align (&addr, &len);
1668#if _POSIX_MEMLOCK_RANGE
1669 RETVAL = munlock (addr, len);
1670#else
1671 RETVAL = ((errno = ENOSYS), -1);
1672#endif
1673}
1674 OUTPUT:
1675 RETVAL
1676
1677int
1678munlockall ()
1679 CODE:
1680#if _POSIX_MEMLOCK
1681 munlockall ();
1682#else
1683 RETVAL = -1;
1684 errno = ENOSYS;
1685#endif
1686 OUTPUT:
1687 RETVAL
1688
1689void _on_next_submit (SV *cb)
1690 CODE:
1691 SvREFCNT_dec (on_next_submit);
1692 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1693
1008PROTOTYPES: DISABLE 1694PROTOTYPES: DISABLE
1009 1695
1010MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1696MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1011 1697
1012void 1698void
1014 CODE: 1700 CODE:
1015 eio_cancel (req); 1701 eio_cancel (req);
1016 1702
1017void 1703void
1018cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1704cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1019 CODE: 1705 PPCODE:
1706{
1707 if (GIMME_V != G_VOID)
1708 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1709
1710 if (items > 1)
1711 {
1712 SV *cb_cv =get_cb (callback);
1713
1020 SvREFCNT_dec (req->callback); 1714 SvREFCNT_dec (req->callback);
1021 req->callback = newSVsv (callback); 1715 req->callback = SvREFCNT_inc (cb_cv);
1716 }
1717}
1022 1718
1023MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1719MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1024 1720
1025void 1721void
1026add (aio_req grp, ...) 1722add (aio_req grp, ...)
1058 AV *av; 1754 AV *av;
1059 1755
1060 grp->errorno = errno; 1756 grp->errorno = errno;
1061 1757
1062 av = newAV (); 1758 av = newAV ();
1759 av_extend (av, items - 1);
1063 1760
1064 for (i = 1; i < items; ++i ) 1761 for (i = 1; i < items; ++i )
1065 av_push (av, newSVsv (ST (i))); 1762 av_push (av, newSVsv (ST (i)));
1066 1763
1067 SvREFCNT_dec (grp->sv1); 1764 SvREFCNT_dec (grp->sv1);
1081void 1778void
1082feed (aio_req grp, SV *callback=&PL_sv_undef) 1779feed (aio_req grp, SV *callback=&PL_sv_undef)
1083 CODE: 1780 CODE:
1084{ 1781{
1085 SvREFCNT_dec (grp->sv2); 1782 SvREFCNT_dec (grp->sv2);
1086 grp->sv2 = newSVsv (callback); 1783 grp->sv2 = newSVsv (callback);
1784 grp->feed = aio_grp_feed;
1087 1785
1088 if (grp->int2 <= 0) 1786 if (grp->int2 <= 0)
1089 grp->int2 = 2; 1787 grp->int2 = 2;
1090 1788
1091 eio_grp_limit (grp, grp->int2); 1789 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines