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.64 by root, Mon Oct 23 23:54:41 2006 UTC vs.
Revision 1.152 by root, Tue Jul 14 00:32:27 2009 UTC

1#if __linux 1#include "libeio/xthread.h"
2# define _GNU_SOURCE
3#endif
4
5#define _REENTRANT 1
6 2
7#include <errno.h> 3#include <errno.h>
8 4
9#include "EXTERN.h" 5#include "EXTERN.h"
10#include "perl.h" 6#include "perl.h"
11#include "XSUB.h" 7#include "XSUB.h"
12 8
13#include "autoconf/config.h" 9#include "schmorp.h"
14
15#include <pthread.h>
16 10
17#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h>
18#include <errno.h> 13#include <errno.h>
19#include <sys/time.h>
20#include <sys/select.h>
21#include <sys/types.h> 14#include <sys/types.h>
22#include <sys/stat.h> 15#include <sys/stat.h>
23#include <limits.h> 16#include <limits.h>
24#include <unistd.h>
25#include <fcntl.h> 17#include <fcntl.h>
26#include <signal.h>
27#include <sched.h> 18#include <sched.h>
28 19
29#if HAVE_SENDFILE 20/* perl namespace pollution */
30# if __linux 21#undef VERSION
31# include <sys/sendfile.h>
32# elif __freebsd
33# include <sys/socket.h>
34# include <sys/uio.h>
35# elif __hpux
36# include <sys/socket.h>
37# elif __solaris /* not yet */
38# include <sys/sendfile.h>
39# else
40# error sendfile support requested but not available
41# endif
42#endif
43 22
44/* used for struct dirent, AIX doesn't provide it */ 23#ifdef _WIN32
45#ifndef NAME_MAX
46# define NAME_MAX 4096
47#endif
48 24
49#if __ia64 25# define EIO_STRUCT_DIRENT Direntry_t
50# define STACKSIZE 65536 26# undef malloc
27# undef free
28
29// perl overrides all those nice win32 functions
30# undef open
31# undef read
32# undef write
33# undef send
34# undef recv
35# undef stat
36# undef fstat
37# define lstat stat
38# undef truncate
39# undef ftruncate
40# undef open
41# undef close
42# undef unlink
43# undef rmdir
44# undef rename
45# undef lseek
46
47# define chown(a,b,c) (errno = ENOSYS, -1)
48# define fchown(a,b,c) (errno = ENOSYS, -1)
49# define fchmod(a,b) (errno = ENOSYS, -1)
50# define symlink(a,b) (errno = ENOSYS, -1)
51# define readlink(a,b,c) (errno = ENOSYS, -1)
52# define mknod(a,b,c) (errno = ENOSYS, -1)
53# define truncate(a,b) (errno = ENOSYS, -1)
54# define ftruncate(fd,o) chsize ((fd), (o))
55# define fsync(fd) _commit (fd)
56# define opendir(fd) (errno = ENOSYS, 0)
57# define readdir(fd) (errno = ENOSYS, -1)
58# define closedir(fd) (errno = ENOSYS, -1)
59# define mkdir(a,b) mkdir (a)
60
51#else 61#else
52# define STACKSIZE 8192
53#endif
54 62
55enum { 63# include <sys/time.h>
56 REQ_QUIT, 64# include <sys/select.h>
57 REQ_OPEN, REQ_CLOSE, 65# include <unistd.h>
58 REQ_READ, REQ_WRITE, REQ_READAHEAD, 66# include <utime.h>
59 REQ_SENDFILE, 67# include <signal.h>
60 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 68# define EIO_STRUCT_DIRENT struct dirent
61 REQ_FSYNC, REQ_FDATASYNC, 69
62 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 70#endif
63 REQ_READDIR, 71
64 REQ_LINK, REQ_SYMLINK, 72/* perl stupidly overrides readdir and maybe others */
65 REQ_GROUP, REQ_NOP, 73/* with thread-unsafe versions, imagine that :( */
66 REQ_SLEEP, 74#undef readdir
67}; 75#undef opendir
76#undef closedir
77
78#define EIO_STRUCT_STAT Stat_t
79
80/* use NV for 32 bit perls as it allows larger offsets */
81#if IVSIZE >= 8
82# define VAL64 IV
83# define SvVAL64 SvIV
84# define newSVval64 newSViv
85#else
86# define VAL64 NV
87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
89#endif
90
91/*****************************************************************************/
92
93#if __GNUC__ >= 3
94# define expect(expr,value) __builtin_expect ((expr),(value))
95#else
96# define expect(expr,value) (expr)
97#endif
98
99#define expect_false(expr) expect ((expr) != 0, 0)
100#define expect_true(expr) expect ((expr) != 0, 1)
101
102/*****************************************************************************/
103
104static HV *stash;
105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */
68 108
69#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
70#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
71 111
72typedef struct aio_cb 112#define EIO_REQ_MEMBERS \
73{
74 struct aio_cb *volatile next;
75
76 SV *data, *callback; 113 SV *callback; \
77 SV *fh, *fh2; 114 SV *sv1, *sv2; \
78 void *dataptr, *data2ptr;
79 Stat_t *statdata;
80 off_t offset;
81 size_t length;
82 ssize_t result;
83
84 STRLEN dataoffset; 115 STRLEN stroffset; \
85 int type; 116 SV *self;
86 int fd, fd2;
87 int errorno;
88 mode_t mode; /* open */
89 117
90 unsigned char flags; 118#define EIO_NO_WRAPPERS 1
91 unsigned char pri;
92 119
93 SV *self; /* the perl counterpart of this request, if any */ 120#include "libeio/eio.h"
94 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 121
95} aio_cb; 122#ifndef POSIX_FADV_NORMAL
123# define POSIX_FADV_NORMAL 0
124# define NO_FADVISE 1
125#endif
126
127#ifndef POSIX_FADV_SEQUENTIAL
128# define POSIX_FADV_SEQUENTIAL 0
129#endif
130
131#ifndef POSIX_FADV_RANDOM
132# define POSIX_FADV_RANDOM 0
133#endif
134
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138
139#ifndef POSIX_FADV_WILLNEED
140# define POSIX_FADV_WILLNEED 0
141#endif
142
143#ifndef POSIX_FADV_DONTNEED
144# define POSIX_FADV_DONTNEED 0
145#endif
146
147static int req_invoke (eio_req *req);
148#define EIO_FINISH(req) req_invoke (req)
149static void req_destroy (eio_req *grp);
150#define EIO_DESTROY(req) req_destroy (req)
96 151
97enum { 152enum {
98 FLAG_CANCELLED = 0x01, 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
99}; 154};
100 155
156#include "libeio/eio.c"
157
101typedef aio_cb *aio_req; 158typedef eio_req *aio_req;
102typedef aio_cb *aio_req_ornot; 159typedef eio_req *aio_req_ornot;
103 160
104enum { 161static SV *on_next_submit;
105 PRI_MIN = -4, 162static int next_pri = EIO_PRI_DEFAULT;
106 PRI_MAX = 4,
107
108 DEFAULT_PRI = 0,
109 PRI_BIAS = -PRI_MIN,
110};
111
112static int next_pri = DEFAULT_PRI + PRI_BIAS;
113
114static int started, wanted;
115static volatile int nreqs;
116static int max_outstanding = 1<<30; 163static int max_outstanding;
117static int respipe [2];
118 164
119#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 165static int respipe_osf [2], respipe [2] = { -1, -1 };
120# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121#else
122# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123#endif
124 166
125static pthread_mutex_t reslock = AIO_MUTEX_INIT; 167static void req_destroy (aio_req req);
126static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128
129static volatile aio_req reqs, reqe; /* queue start, queue end */
130static volatile aio_req ress, rese; /* queue start, queue end */
131
132static void req_invoke (aio_req req); 168static void req_cancel (aio_req req);
133static void req_free (aio_req req); 169
170static void want_poll (void)
171{
172 /* write a dummy byte to the pipe so fh becomes ready */
173 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);
174}
175
176static void done_poll (void)
177{
178 /* read any signals sent by the worker threads */
179 char buf [4];
180 while (respipe_read (respipe [0], buf, 4) == 4)
181 ;
182}
134 183
135/* must be called at most once */ 184/* must be called at most once */
136static SV *req_sv (aio_req req, const char *klass) 185static SV *req_sv (aio_req req, const char *klass)
137{ 186{
138 if (!req->self) 187 if (!req->self)
156 return mg ? (aio_req)mg->mg_ptr : 0; 205 return mg ? (aio_req)mg->mg_ptr : 0;
157} 206}
158 207
159static void aio_grp_feed (aio_req grp) 208static void aio_grp_feed (aio_req grp)
160{ 209{
161 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 210 if (grp->sv2 && SvOK (grp->sv2))
162 { 211 {
163 int old_len = grp->length; 212 dSP;
164 213
165 if (grp->fh2 && SvOK (grp->fh2)) 214 ENTER;
215 SAVETMPS;
216 PUSHMARK (SP);
217 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
218 PUTBACK;
219 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
220 SPAGAIN;
221 FREETMPS;
222 LEAVE;
223 }
224}
225
226static void req_submit (eio_req *req)
227{
228 eio_submit (req);
229
230 if (expect_false (on_next_submit))
231 {
232 dSP;
233 SV *cb = sv_2mortal (on_next_submit);
234
235 on_next_submit = 0;
236
237 PUSHMARK (SP);
238 PUTBACK;
239 call_sv (cb, G_DISCARD | G_EVAL);
240 }
241}
242
243static int req_invoke (eio_req *req)
244{
245 dSP;
246
247 if (req->flags & FLAG_SV2_RO_OFF)
248 SvREADONLY_off (req->sv2);
249
250 if (!EIO_CANCELLED (req) && req->callback)
251 {
252 ENTER;
253 SAVETMPS;
254 PUSHMARK (SP);
255 EXTEND (SP, 1);
256
257 switch (req->type)
166 { 258 {
167 dSP; 259 case EIO_READDIR:
260 {
261 SV *rv = &PL_sv_undef;
168 262
169 ENTER; 263 if (req->result >= 0)
170 SAVETMPS; 264 {
171 PUSHMARK (SP); 265 int i;
172 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 266 char *names = (char *)req->ptr2;
173 PUTBACK; 267 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
174 call_sv (grp->fh2, G_VOID | G_EVAL); 268 AV *av = newAV ();
175 SPAGAIN; 269
176 FREETMPS; 270 av_extend (av, req->result - 1);
177 LEAVE; 271
272 for (i = 0; i < req->result; ++i)
273 {
274 if (req->int1 & EIO_READDIR_DENTS)
275 {
276 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
277
278 if (req->int1 & EIO_READDIR_CUSTOM2)
279 {
280 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
281 AV *avent = newAV ();
282
283 av_extend (avent, 2);
284
285 if (!sv_type [ent->type])
286 {
287 sv_type [ent->type] = newSViv (ent->type);
288 SvREADONLY_on (sv_type [ent->type]);
289 }
290
291 av_store (avent, 0, namesv);
292 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
293 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
294
295 av_store (av, i, newRV_noinc ((SV *)avent));
296 }
297 else
298 av_store (av, i, namesv);
299
300 ++ent;
301 }
302 else
303 {
304 SV *name = newSVpv (names, 0);
305 av_store (av, i, name);
306 names += SvCUR (name) + 1;
307 }
308 }
309
310 rv = sv_2mortal (newRV_noinc ((SV *)av));
311 }
312
313 PUSHs (rv);
314
315 if (req->int1 & EIO_READDIR_CUSTOM1)
316 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
317 }
318 break;
319
320 case EIO_OPEN:
321 {
322 /* convert fd to fh */
323 SV *fh = &PL_sv_undef;
324
325 if (req->result >= 0)
326 {
327 GV *gv = (GV *)sv_newmortal ();
328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
329 char sym [64];
330 int symlen;
331
332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
333 gv_init (gv, stash, sym, symlen, 0);
334
335 symlen = snprintf (
336 sym,
337 sizeof (sym),
338 "%s&=%d",
339 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
340 (int)req->result
341 );
342
343 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
344 fh = (SV *)gv;
345 }
346
347 PUSHs (fh);
348 }
349 break;
350
351 case EIO_GROUP:
352 req->int1 = 2; /* mark group as finished */
353
354 if (req->sv1)
355 {
356 int i;
357 AV *av = (AV *)req->sv1;
358
359 EXTEND (SP, AvFILL (av) + 1);
360 for (i = 0; i <= AvFILL (av); ++i)
361 PUSHs (*av_fetch (av, i, 0));
362 }
363 break;
364
365 case EIO_NOP:
366 case EIO_BUSY:
367 break;
368
369 case EIO_READLINK:
370 if (req->result > 0)
371 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
372 break;
373
374 case EIO_STAT:
375 case EIO_LSTAT:
376 case EIO_FSTAT:
377 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
378 PL_laststatval = req->result;
379 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
380 PUSHs (sv_2mortal (newSViv (req->result)));
381 break;
382
383 case EIO_READ:
384 {
385 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
386 *SvEND (req->sv2) = 0;
387 SvPOK_only (req->sv2);
388 SvSETMAGIC (req->sv2);
389 PUSHs (sv_2mortal (newSViv (req->result)));
390 }
391 break;
392
393 case EIO_DUP2:
394 if (req->result > 0)
395 req->result = 0;
396 /* FALLTHROUGH */
397
398 default:
399 PUSHs (sv_2mortal (newSViv (req->result)));
400 break;
178 } 401 }
179 402
180 /* stop if no progress has been made */ 403 errno = req->errorno;
181 if (old_len == grp->length) 404
182 { 405 PUTBACK;
183 SvREFCNT_dec (grp->fh2); 406 call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
184 grp->fh2 = 0; 407 SPAGAIN;
185 break; 408
186 } 409 FREETMPS;
410 LEAVE;
411
412 PUTBACK;
187 } 413 }
188}
189 414
190static void aio_grp_dec (aio_req grp) 415 return !!SvTRUE (ERRSV);
191{
192 --grp->length;
193
194 /* call feeder, if applicable */
195 aio_grp_feed (grp);
196
197 /* finish, if done */
198 if (!grp->length && grp->fd)
199 {
200 req_invoke (grp);
201 req_free (grp);
202 }
203} 416}
204 417
205static void poll_wait ()
206{
207 fd_set rfd;
208
209 while (nreqs)
210 {
211 aio_req req;
212#if !(__x86 || __x86_64) /* safe without sempahore on this archs */
213 pthread_mutex_lock (&reslock);
214#endif
215 req = ress;
216#if !(__x86 || __x86_64) /* safe without sempahore on this archs */
217 pthread_mutex_unlock (&reslock);
218#endif
219
220 if (req)
221 return;
222
223 FD_ZERO(&rfd);
224 FD_SET(respipe [0], &rfd);
225
226 select (respipe [0] + 1, &rfd, 0, 0, 0);
227 }
228}
229
230static void req_invoke (aio_req req)
231{
232 dSP;
233 int errorno = errno;
234
235 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
236 return;
237
238 errno = req->errorno;
239
240 ENTER;
241 SAVETMPS;
242 PUSHMARK (SP);
243 EXTEND (SP, 1);
244
245 switch (req->type)
246 {
247 case REQ_READDIR:
248 {
249 SV *rv = &PL_sv_undef;
250
251 if (req->result >= 0)
252 {
253 char *buf = req->data2ptr;
254 AV *av = newAV ();
255
256 while (req->result)
257 {
258 SV *sv = newSVpv (buf, 0);
259
260 av_push (av, sv);
261 buf += SvCUR (sv) + 1;
262 req->result--;
263 }
264
265 rv = sv_2mortal (newRV_noinc ((SV *)av));
266 }
267
268 PUSHs (rv);
269 }
270 break;
271
272 case REQ_OPEN:
273 {
274 /* convert fd to fh */
275 SV *fh;
276
277 PUSHs (sv_2mortal (newSViv (req->result)));
278 PUTBACK;
279 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
280 SPAGAIN;
281
282 fh = SvREFCNT_inc (POPs);
283
284 PUSHMARK (SP);
285 XPUSHs (sv_2mortal (fh));
286 }
287 break;
288
289 case REQ_GROUP:
290 req->fd = 2; /* mark group as finished */
291
292 if (req->data)
293 {
294 int i;
295 AV *av = (AV *)req->data;
296
297 EXTEND (SP, AvFILL (av) + 1);
298 for (i = 0; i <= AvFILL (av); ++i)
299 PUSHs (*av_fetch (av, i, 0));
300 }
301 break;
302
303 case REQ_NOP:
304 case REQ_SLEEP:
305 break;
306
307 default:
308 PUSHs (sv_2mortal (newSViv (req->result)));
309 break;
310 }
311
312
313 PUTBACK;
314 call_sv (req->callback, G_VOID | G_EVAL);
315 SPAGAIN;
316
317 FREETMPS;
318 LEAVE;
319
320 errno = errorno;
321
322 if (SvTRUE (ERRSV))
323 {
324 req_free (req);
325 croak (0);
326 }
327}
328
329static void req_free (aio_req req) 418static void req_destroy (aio_req req)
330{ 419{
331 if (req->grp)
332 {
333 aio_req grp = req->grp;
334
335 /* unlink request */
336 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
337 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
338
339 if (grp->grp_first == req)
340 grp->grp_first = req->grp_next;
341
342 aio_grp_dec (grp);
343 }
344
345 if (req->self) 420 if (req->self)
346 { 421 {
347 sv_unmagic (req->self, PERL_MAGIC_ext); 422 sv_unmagic (req->self, PERL_MAGIC_ext);
348 SvREFCNT_dec (req->self); 423 SvREFCNT_dec (req->self);
349 } 424 }
350 425
351 SvREFCNT_dec (req->data);
352 SvREFCNT_dec (req->fh); 426 SvREFCNT_dec (req->sv1);
353 SvREFCNT_dec (req->fh2); 427 SvREFCNT_dec (req->sv2);
354 SvREFCNT_dec (req->callback); 428 SvREFCNT_dec (req->callback);
355 Safefree (req->statdata);
356
357 if (req->type == REQ_READDIR && req->result >= 0)
358 free (req->data2ptr);
359 429
360 Safefree (req); 430 Safefree (req);
361} 431}
362 432
363static void req_cancel (aio_req req) 433static void req_cancel_subs (aio_req grp)
364{ 434{
365 req->flags |= FLAG_CANCELLED; 435 aio_req sub;
366 436
367 if (req->type == REQ_GROUP) 437 if (grp->type != EIO_GROUP)
438 return;
439
440 SvREFCNT_dec (grp->sv2);
441 grp->sv2 = 0;
442
443 eio_grp_cancel (grp);
444}
445
446#ifdef USE_SOCKETS_AS_HANDLES
447# define TO_SOCKET(x) (win32_get_osfhandle (x))
448#else
449# define TO_SOCKET(x) (x)
450#endif
451
452static void
453create_respipe (void)
454{
455 int old_readfd = respipe [0];
456
457 if (respipe [1] >= 0)
458 respipe_close (TO_SOCKET (respipe [1]));
459
460#ifdef _WIN32
461 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
462#else
463 if (pipe (respipe))
464#endif
465 croak ("unable to initialize result pipe");
466
467 if (old_readfd >= 0)
368 { 468 {
369 aio_req sub; 469 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
470 croak ("unable to initialize result pipe(2)");
370 471
371 for (sub = req->grp_first; sub; sub = sub->grp_next) 472 respipe_close (respipe [0]);
372 req_cancel (sub); 473 respipe [0] = old_readfd;
373 } 474 }
374}
375 475
476#ifdef _WIN32
477 int arg = 1;
478 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
479 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
480#else
481 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
482 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
483#endif
484 croak ("unable to initialize result pipe(3)");
485
486 respipe_osf [0] = TO_SOCKET (respipe [0]);
487 respipe_osf [1] = TO_SOCKET (respipe [1]);
488}
489
490static void poll_wait (void)
491{
492 fd_set rfd;
493
494 while (eio_nreqs ())
495 {
496 int size;
497
498 X_LOCK (reslock);
499 size = res_queue.size;
500 X_UNLOCK (reslock);
501
502 if (size)
503 return;
504
505 etp_maybe_start_thread ();
506
507 FD_ZERO (&rfd);
508 FD_SET (respipe [0], &rfd);
509
510 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
511 }
512}
513
376static int poll_cb () 514static int poll_cb (void)
377{ 515{
378 dSP;
379 int count = 0;
380 int do_croak = 0;
381 aio_req req;
382
383 for (;;) 516 for (;;)
384 { 517 {
385 pthread_mutex_lock (&reslock); 518 int res = eio_poll ();
386 req = ress;
387 519
388 if (req) 520 if (res > 0)
389 {
390 ress = req->next;
391
392 if (!ress)
393 {
394 /* read any signals sent by the worker threads */
395 char buf [32];
396 while (read (respipe [0], buf, 32) == 32)
397 ;
398
399 rese = 0;
400 }
401 }
402
403 pthread_mutex_unlock (&reslock);
404
405 if (!req)
406 break; 521 croak (0);
407 522
408 --nreqs; 523 if (!max_outstanding || max_outstanding > eio_nreqs ())
524 return res;
409 525
410 if (req->type == REQ_QUIT) 526 poll_wait ();
411 started--;
412 else if (req->type == REQ_GROUP && req->length)
413 {
414 req->fd = 1; /* mark request as delayed */
415 continue;
416 }
417 else
418 {
419 if (req->type == REQ_READ)
420 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
421
422 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
423 SvREADONLY_off (req->data);
424
425 if (req->statdata)
426 {
427 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
428 PL_laststatval = req->result;
429 PL_statcache = *(req->statdata);
430 }
431
432 req_invoke (req);
433
434 count++;
435 }
436
437 req_free (req);
438 } 527 }
439
440 return count;
441}
442
443static void *aio_proc(void *arg);
444
445static void start_thread (void)
446{
447 sigset_t fullsigset, oldsigset;
448 pthread_t tid;
449 pthread_attr_t attr;
450
451 pthread_attr_init (&attr);
452 pthread_attr_setstacksize (&attr, STACKSIZE);
453 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
454
455 sigfillset (&fullsigset);
456 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
457
458 if (pthread_create (&tid, &attr, aio_proc, 0) == 0)
459 started++;
460
461 sigprocmask (SIG_SETMASK, &oldsigset, 0);
462}
463
464static void req_send (aio_req req)
465{
466 while (started < wanted && nreqs >= started)
467 start_thread ();
468
469 ++nreqs;
470
471 pthread_mutex_lock (&reqlock);
472
473 req->next = 0;
474
475 if (reqe)
476 {
477 reqe->next = req;
478 reqe = req;
479 }
480 else
481 reqe = reqs = req;
482
483 pthread_cond_signal (&reqwait);
484 pthread_mutex_unlock (&reqlock);
485
486 if (nreqs > max_outstanding)
487 for (;;)
488 {
489 poll_cb ();
490
491 if (nreqs <= max_outstanding)
492 break;
493
494 poll_wait ();
495 }
496}
497
498static void end_thread (void)
499{
500 aio_req req;
501 Newz (0, req, 1, aio_cb);
502 req->type = REQ_QUIT;
503
504 req_send (req);
505}
506
507static void min_parallel (int nthreads)
508{
509 if (wanted < nthreads)
510 wanted = nthreads;
511}
512
513static void max_parallel (int nthreads)
514{
515 int cur = started;
516
517 if (wanted > nthreads)
518 wanted = nthreads;
519
520 while (cur > wanted)
521 {
522 end_thread ();
523 cur--;
524 }
525
526 while (started > wanted)
527 {
528 poll_wait ();
529 poll_cb ();
530 }
531}
532
533static void create_pipe ()
534{
535 if (pipe (respipe))
536 croak ("unable to initialize result pipe");
537
538 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
539 croak ("cannot set result pipe to nonblocking mode");
540
541 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
542 croak ("cannot set result pipe to nonblocking mode");
543}
544
545/*****************************************************************************/
546/* work around various missing functions */
547
548#if !HAVE_PREADWRITE
549# define pread aio_pread
550# define pwrite aio_pwrite
551
552/*
553 * make our pread/pwrite safe against themselves, but not against
554 * normal read/write by using a mutex. slows down execution a lot,
555 * but that's your problem, not mine.
556 */
557static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
558
559static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
560{
561 ssize_t res;
562 off_t ooffset;
563
564 pthread_mutex_lock (&preadwritelock);
565 ooffset = lseek (fd, 0, SEEK_CUR);
566 lseek (fd, offset, SEEK_SET);
567 res = read (fd, buf, count);
568 lseek (fd, ooffset, SEEK_SET);
569 pthread_mutex_unlock (&preadwritelock);
570
571 return res;
572}
573
574static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
575{
576 ssize_t res;
577 off_t ooffset;
578
579 pthread_mutex_lock (&preadwritelock);
580 ooffset = lseek (fd, 0, SEEK_CUR);
581 lseek (fd, offset, SEEK_SET);
582 res = write (fd, buf, count);
583 lseek (fd, offset, SEEK_SET);
584 pthread_mutex_unlock (&preadwritelock);
585
586 return res;
587}
588#endif
589
590#if !HAVE_FDATASYNC
591# define fdatasync fsync
592#endif
593
594#if !HAVE_READAHEAD
595# define readahead aio_readahead
596
597static ssize_t readahead (int fd, off_t offset, size_t count)
598{
599 char readahead_buf[4096];
600
601 while (count > 0)
602 {
603 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
604
605 pread (fd, readahead_buf, len, offset);
606 offset += len;
607 count -= len;
608 }
609
610 errno = 0;
611}
612#endif
613
614#if !HAVE_READDIR_R
615# define readdir_r aio_readdir_r
616
617static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
618
619static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
620{
621 struct dirent *e;
622 int errorno;
623
624 pthread_mutex_lock (&readdirlock);
625
626 e = readdir (dirp);
627 errorno = errno;
628
629 if (e)
630 {
631 *res = ent;
632 strcpy (ent->d_name, e->d_name);
633 }
634 else
635 *res = 0;
636
637 pthread_mutex_unlock (&readdirlock);
638
639 errno = errorno;
640 return e ? 0 : -1;
641}
642#endif
643
644/* sendfile always needs emulation */
645static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
646{
647 ssize_t res;
648
649 if (!count)
650 return 0;
651
652#if HAVE_SENDFILE
653# if __linux
654 res = sendfile (ofd, ifd, &offset, count);
655
656# elif __freebsd
657 /*
658 * Of course, the freebsd sendfile is a dire hack with no thoughts
659 * wasted on making it similar to other I/O functions.
660 */
661 {
662 off_t sbytes;
663 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
664
665 if (res < 0 && sbytes)
666 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
667 res = sbytes;
668 }
669
670# elif __hpux
671 res = sendfile (ofd, ifd, offset, count, 0, 0);
672
673# elif __solaris
674 {
675 struct sendfilevec vec;
676 size_t sbytes;
677
678 vec.sfv_fd = ifd;
679 vec.sfv_flag = 0;
680 vec.sfv_off = offset;
681 vec.sfv_len = count;
682
683 res = sendfilev (ofd, &vec, 1, &sbytes);
684
685 if (res < 0 && sbytes)
686 res = sbytes;
687 }
688
689# endif
690#else
691 res = -1;
692 errno = ENOSYS;
693#endif
694
695 if (res < 0
696 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
697#if __solaris
698 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
699#endif
700 )
701 )
702 {
703 /* emulate sendfile. this is a major pain in the ass */
704 char buf[4096];
705 res = 0;
706
707 while (count)
708 {
709 ssize_t cnt;
710
711 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);
712
713 if (cnt <= 0)
714 {
715 if (cnt && !res) res = -1;
716 break;
717 }
718
719 cnt = write (ofd, buf, cnt);
720
721 if (cnt <= 0)
722 {
723 if (cnt && !res) res = -1;
724 break;
725 }
726
727 offset += cnt;
728 res += cnt;
729 count -= cnt;
730 }
731 }
732
733 return res;
734}
735
736/* read a full directory */
737static int scandir_ (const char *path, void **namesp)
738{
739 DIR *dirp = opendir (path);
740 union
741 {
742 struct dirent d;
743 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
744 } u;
745 struct dirent *entp;
746 char *name, *names;
747 int memlen = 4096;
748 int memofs = 0;
749 int res = 0;
750 int errorno;
751
752 if (!dirp)
753 return -1;
754
755 names = malloc (memlen);
756
757 for (;;)
758 {
759 errno = 0, readdir_r (dirp, &u.d, &entp);
760
761 if (!entp)
762 break;
763
764 name = entp->d_name;
765
766 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
767 {
768 int len = strlen (name) + 1;
769
770 res++;
771
772 while (memofs + len > memlen)
773 {
774 memlen *= 2;
775 names = realloc (names, memlen);
776 if (!names)
777 break;
778 }
779
780 memcpy (names + memofs, name, len);
781 memofs += len;
782 }
783 }
784
785 errorno = errno;
786 closedir (dirp);
787
788 if (errorno)
789 {
790 free (names);
791 errno = errorno;
792 res = -1;
793 }
794
795 *namesp = (void *)names;
796 return res;
797}
798
799/*****************************************************************************/
800
801static void *aio_proc (void *thr_arg)
802{
803 aio_req req;
804 int type;
805
806 do
807 {
808 pthread_mutex_lock (&reqlock);
809
810 for (;;)
811 {
812 req = reqs;
813
814 if (reqs)
815 {
816 reqs = reqs->next;
817 if (!reqs) reqe = 0;
818 }
819
820 if (req)
821 break;
822
823 pthread_cond_wait (&reqwait, &reqlock);
824 }
825
826 pthread_mutex_unlock (&reqlock);
827
828 errno = 0; /* strictly unnecessary */
829 type = req->type; /* remember type for QUIT check */
830
831 if (!(req->flags & FLAG_CANCELLED))
832 switch (type)
833 {
834 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
835 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
836
837 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
838 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
839
840 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
841 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
842 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
843
844 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
845 case REQ_CLOSE: req->result = close (req->fd); break;
846 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
847 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
848 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
849 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
850 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
851
852 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
853 case REQ_FSYNC: req->result = fsync (req->fd); break;
854 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
855
856 case REQ_SLEEP:
857 {
858 struct timeval tv;
859
860 tv.tv_sec = req->fd;
861 tv.tv_usec = req->fd2;
862
863 req->result = select (0, 0, 0, 0, &tv);
864 }
865
866 case REQ_GROUP:
867 case REQ_NOP:
868 case REQ_QUIT:
869 break;
870
871 default:
872 req->result = ENOSYS;
873 break;
874 }
875
876 req->errorno = errno;
877
878 pthread_mutex_lock (&reslock);
879
880 req->next = 0;
881
882 if (rese)
883 {
884 rese->next = req;
885 rese = req;
886 }
887 else
888 {
889 rese = ress = req;
890
891 /* write a dummy byte to the pipe so fh becomes ready */
892 write (respipe [1], &respipe, 1);
893 }
894
895 pthread_mutex_unlock (&reslock);
896 }
897 while (type != REQ_QUIT);
898
899 return 0;
900}
901
902/*****************************************************************************/
903
904static void atfork_prepare (void)
905{
906 pthread_mutex_lock (&reqlock);
907 pthread_mutex_lock (&reslock);
908#if !HAVE_PREADWRITE
909 pthread_mutex_lock (&preadwritelock);
910#endif
911#if !HAVE_READDIR_R
912 pthread_mutex_lock (&readdirlock);
913#endif
914}
915
916static void atfork_parent (void)
917{
918#if !HAVE_READDIR_R
919 pthread_mutex_unlock (&readdirlock);
920#endif
921#if !HAVE_PREADWRITE
922 pthread_mutex_unlock (&preadwritelock);
923#endif
924 pthread_mutex_unlock (&reslock);
925 pthread_mutex_unlock (&reqlock);
926} 528}
927 529
928static void atfork_child (void) 530static void atfork_child (void)
929{ 531{
930 aio_req prv;
931
932 started = 0;
933
934 while (reqs)
935 {
936 prv = reqs;
937 reqs = prv->next;
938 req_free (prv);
939 }
940
941 reqs = reqe = 0;
942
943 while (ress)
944 {
945 prv = ress;
946 ress = prv->next;
947 req_free (prv);
948 }
949
950 ress = rese = 0;
951
952 close (respipe [0]);
953 close (respipe [1]);
954 create_pipe (); 532 create_respipe ();
533}
955 534
956 atfork_parent (); 535static SV *
536get_cb (SV *cb_sv)
537{
538 SvGETMAGIC (cb_sv);
539 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
957} 540}
958 541
959#define dREQ \ 542#define dREQ \
543 SV *cb_cv; \
960 aio_req req; \ 544 aio_req req; \
961 int req_pri = next_pri; \ 545 int req_pri = next_pri; \
962 next_pri = DEFAULT_PRI + PRI_BIAS; \ 546 next_pri = EIO_PRI_DEFAULT; \
963 \ 547 \
964 if (SvOK (callback) && !SvROK (callback)) \ 548 cb_cv = get_cb (callback); \
965 croak ("callback must be undef or of reference type"); \
966 \ 549 \
967 Newz (0, req, 1, aio_cb); \ 550 Newz (0, req, 1, eio_req); \
968 if (!req) \ 551 if (!req) \
969 croak ("out of memory during aio_req allocation"); \ 552 croak ("out of memory during eio_req allocation"); \
970 \ 553 \
971 req->callback = newSVsv (callback); \ 554 req->callback = SvREFCNT_inc (cb_cv); \
972 req->pri = req_pri 555 req->pri = req_pri
973 556
974#define REQ_SEND \ 557#define REQ_SEND \
558 PUTBACK; \
975 req_send (req); \ 559 req_submit (req); \
560 SPAGAIN; \
976 \ 561 \
977 if (GIMME_V != G_VOID) \ 562 if (GIMME_V != G_VOID) \
978 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 563 XPUSHs (req_sv (req, AIO_REQ_KLASS));
979 564
980MODULE = IO::AIO PACKAGE = IO::AIO 565MODULE = IO::AIO PACKAGE = IO::AIO
981 566
982PROTOTYPES: ENABLE 567PROTOTYPES: ENABLE
983 568
984BOOT: 569BOOT:
985{ 570{
571 static const struct {
572 const char *name;
573 IV iv;
574 } *civ, const_iv[] = {
575# define const_iv(name, value) { # name, (IV) value },
576# define const_eio(name) { # name, (IV) EIO_ ## name },
577 const_iv (EXDEV , EXDEV)
578 const_iv (ENOSYS , ENOSYS)
579 const_iv (O_RDONLY, O_RDONLY)
580 const_iv (O_WRONLY, O_WRONLY)
581 const_iv (O_CREAT , O_CREAT)
582 const_iv (O_TRUNC , O_TRUNC)
583#ifndef _WIN32
584 const_iv (S_IFIFO , S_IFIFO)
585#endif
586 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
587 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
588 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
589 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
590 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
591 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
592
593 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
594 const_eio (SYNC_FILE_RANGE_WRITE)
595 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
596
597 const_eio (READDIR_DENTS)
598 const_eio (READDIR_DIRS_FIRST)
599 const_eio (READDIR_STAT_ORDER)
600 const_eio (READDIR_FOUND_UNKNOWN)
601
602 const_eio (DT_UNKNOWN)
603 const_eio (DT_FIFO)
604 const_eio (DT_CHR)
605 const_eio (DT_DIR)
606 const_eio (DT_BLK)
607 const_eio (DT_REG)
608 const_eio (DT_LNK)
609 const_eio (DT_SOCK)
610 const_eio (DT_WHT)
611 };
612
986 HV *stash = gv_stashpv ("IO::AIO", 1); 613 stash = gv_stashpv ("IO::AIO", 1);
987 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
988 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
989 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
990 614
615 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
616 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
617
991 create_pipe (); 618 create_respipe ();
992 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
993}
994 619
620 if (eio_init (want_poll, done_poll) < 0)
621 croak ("IO::AIO: unable to initialise eio library");
622
623 /* atfork child called in fifo order, so before eio's handler */
624 X_THREAD_ATFORK (0, 0, atfork_child);
625}
626
995void 627void
996min_parallel (nthreads) 628max_poll_reqs (int nreqs)
997 int nthreads
998 PROTOTYPE: $ 629 PROTOTYPE: $
630 CODE:
631 eio_set_max_poll_reqs (nreqs);
999 632
1000void 633void
1001max_parallel (nthreads) 634max_poll_time (double nseconds)
1002 int nthreads
1003 PROTOTYPE: $ 635 PROTOTYPE: $
1004
1005int
1006max_outstanding (nreqs)
1007 int nreqs
1008 PROTOTYPE: $
1009 CODE: 636 CODE:
1010 RETVAL = max_outstanding; 637 eio_set_max_poll_time (nseconds);
638
639void
640min_parallel (int nthreads)
641 PROTOTYPE: $
642 CODE:
643 eio_set_min_parallel (nthreads);
644
645void
646max_parallel (int nthreads)
647 PROTOTYPE: $
648 CODE:
649 eio_set_max_parallel (nthreads);
650
651void
652max_idle (int nthreads)
653 PROTOTYPE: $
654 CODE:
655 eio_set_max_idle (nthreads);
656
657void
658max_outstanding (int maxreqs)
659 PROTOTYPE: $
660 CODE:
1011 max_outstanding = nreqs; 661 max_outstanding = maxreqs;
1012 662
1013void 663void
1014aio_open (pathname,flags,mode,callback=&PL_sv_undef) 664aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
1015 SV * pathname
1016 int flags
1017 int mode
1018 SV * callback
1019 PROTOTYPE: $$$;$ 665 PROTOTYPE: $$$;$
1020 PPCODE: 666 PPCODE:
1021{ 667{
1022 dREQ; 668 dREQ;
1023 669
1024 req->type = REQ_OPEN; 670 req->type = EIO_OPEN;
1025 req->data = newSVsv (pathname); 671 req->sv1 = newSVsv (pathname);
1026 req->dataptr = SvPVbyte_nolen (req->data); 672 req->ptr1 = SvPVbyte_nolen (req->sv1);
1027 req->fd = flags; 673 req->int1 = flags;
1028 req->mode = mode; 674 req->int2 = mode;
1029 675
1030 REQ_SEND; 676 REQ_SEND;
1031} 677}
1032 678
1033void 679void
1034aio_close (fh,callback=&PL_sv_undef) 680aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
1035 SV * fh
1036 SV * callback
1037 PROTOTYPE: $;$ 681 PROTOTYPE: $;$
1038 ALIAS: 682 ALIAS:
1039 aio_close = REQ_CLOSE
1040 aio_fsync = REQ_FSYNC 683 aio_fsync = EIO_FSYNC
1041 aio_fdatasync = REQ_FDATASYNC 684 aio_fdatasync = EIO_FDATASYNC
1042 PPCODE: 685 PPCODE:
1043{ 686{
687 int fd = s_fileno_croak (fh, 0);
1044 dREQ; 688 dREQ;
1045 689
1046 req->type = ix; 690 req->type = ix;
1047 req->fh = newSVsv (fh); 691 req->sv1 = newSVsv (fh);
1048 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 692 req->int1 = fd;
1049 693
1050 REQ_SEND (req); 694 REQ_SEND (req);
1051} 695}
1052 696
1053void 697void
698aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
699 PROTOTYPE: $$$$;$
700 PPCODE:
701{
702 int fd = s_fileno_croak (fh, 0);
703 dREQ;
704
705 req->type = EIO_SYNC_FILE_RANGE;
706 req->sv1 = newSVsv (fh);
707 req->int1 = fd;
708 req->offs = offset;
709 req->size = nbytes;
710 req->int2 = flags;
711
712 REQ_SEND (req);
713}
714
715void
716aio_close (SV *fh, SV *callback=&PL_sv_undef)
717 PROTOTYPE: $;$
718 PPCODE:
719{
720 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
721 int fd = s_fileno_croak (fh, 0);
722 dREQ;
723
724 if (close_pipe < 0)
725 {
726 int pipefd [2];
727
728 if (pipe (pipefd) < 0
729 || close (pipefd [1]) < 0
730 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
731 abort (); /*D*/
732
733 close_pipe = pipefd [0];
734 }
735
736 req->type = EIO_DUP2;
737 req->int1 = close_pipe;
738 req->sv2 = newSVsv (fh);
739 req->int2 = fd;
740
741 REQ_SEND (req);
742}
743
744void
1054aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 745aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
1055 SV * fh
1056 UV offset
1057 UV length
1058 SV * data
1059 UV dataoffset
1060 SV * callback
1061 ALIAS: 746 ALIAS:
1062 aio_read = REQ_READ 747 aio_read = EIO_READ
1063 aio_write = REQ_WRITE 748 aio_write = EIO_WRITE
1064 PROTOTYPE: $$$$$;$ 749 PROTOTYPE: $$$$$;$
1065 PPCODE: 750 PPCODE:
1066{ 751{
1067 aio_req req;
1068 STRLEN svlen; 752 STRLEN svlen;
753 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
1069 char *svptr = SvPVbyte (data, svlen); 754 char *svptr = SvPVbyte (data, svlen);
1070 755 UV len = SvUV (length);
1071 SvUPGRADE (data, SVt_PV);
1072 SvPOK_on (data);
1073 756
1074 if (dataoffset < 0) 757 if (dataoffset < 0)
1075 dataoffset += svlen; 758 dataoffset += svlen;
1076 759
1077 if (dataoffset < 0 || dataoffset > svlen) 760 if (dataoffset < 0 || dataoffset > svlen)
1078 croak ("data offset outside of string"); 761 croak ("dataoffset outside of data scalar");
1079 762
1080 if (ix == REQ_WRITE) 763 if (ix == EIO_WRITE)
1081 { 764 {
1082 /* write: check length and adjust. */ 765 /* write: check length and adjust. */
1083 if (length < 0 || length + dataoffset > svlen) 766 if (!SvOK (length) || len + dataoffset > svlen)
1084 length = svlen - dataoffset; 767 len = svlen - dataoffset;
1085 } 768 }
1086 else 769 else
1087 { 770 {
1088 /* read: grow scalar as necessary */ 771 /* read: check type and grow scalar as necessary */
772 SvUPGRADE (data, SVt_PV);
1089 svptr = SvGROW (data, length + dataoffset); 773 svptr = SvGROW (data, len + dataoffset + 1);
1090 } 774 }
1091
1092 if (length < 0)
1093 croak ("length must not be negative");
1094 775
1095 { 776 {
1096 dREQ; 777 dREQ;
1097 778
1098 req->type = ix; 779 req->type = ix;
1099 req->fh = newSVsv (fh); 780 req->sv1 = newSVsv (fh);
1100 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 781 req->int1 = fd;
1101 : IoOFP (sv_2io (fh))); 782 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1102 req->offset = offset; 783 req->size = len;
1103 req->length = length;
1104 req->data = SvREFCNT_inc (data); 784 req->sv2 = SvREFCNT_inc (data);
1105 req->dataptr = (char *)svptr + dataoffset; 785 req->ptr2 = (char *)svptr + dataoffset;
786 req->stroffset = dataoffset;
1106 787
1107 if (!SvREADONLY (data)) 788 if (!SvREADONLY (data))
1108 { 789 {
1109 SvREADONLY_on (data); 790 SvREADONLY_on (data);
1110 req->data2ptr = (void *)data; 791 req->flags |= FLAG_SV2_RO_OFF;
1111 } 792 }
1112 793
1113 REQ_SEND; 794 REQ_SEND;
1114 } 795 }
1115} 796}
1116 797
1117void 798void
799aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
800 PROTOTYPE: $$;$
801 PPCODE:
802{
803 SV *data;
804 dREQ;
805
806 req->type = EIO_READLINK;
807 req->sv1 = newSVsv (path);
808 req->ptr1 = SvPVbyte_nolen (req->sv1);
809
810 REQ_SEND;
811}
812
813void
1118aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 814aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1119 SV * out_fh
1120 SV * in_fh
1121 UV in_offset
1122 UV length
1123 SV * callback
1124 PROTOTYPE: $$$$;$ 815 PROTOTYPE: $$$$;$
1125 PPCODE: 816 PPCODE:
1126{ 817{
818 int ifd = s_fileno_croak (in_fh , 0);
819 int ofd = s_fileno_croak (out_fh, 1);
1127 dREQ; 820 dREQ;
1128 821
1129 req->type = REQ_SENDFILE; 822 req->type = EIO_SENDFILE;
1130 req->fh = newSVsv (out_fh); 823 req->sv1 = newSVsv (out_fh);
1131 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 824 req->int1 = ofd;
1132 req->fh2 = newSVsv (in_fh); 825 req->sv2 = newSVsv (in_fh);
1133 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 826 req->int2 = ifd;
1134 req->offset = in_offset; 827 req->offs = in_offset;
1135 req->length = length; 828 req->size = length;
1136 829
1137 REQ_SEND; 830 REQ_SEND;
1138} 831}
1139 832
1140void 833void
1141aio_readahead (fh,offset,length,callback=&PL_sv_undef) 834aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1142 SV * fh
1143 UV offset
1144 IV length
1145 SV * callback
1146 PROTOTYPE: $$$;$ 835 PROTOTYPE: $$$;$
1147 PPCODE: 836 PPCODE:
1148{ 837{
838 int fd = s_fileno_croak (fh, 0);
1149 dREQ; 839 dREQ;
1150 840
1151 req->type = REQ_READAHEAD; 841 req->type = EIO_READAHEAD;
1152 req->fh = newSVsv (fh); 842 req->sv1 = newSVsv (fh);
1153 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 843 req->int1 = fd;
1154 req->offset = offset; 844 req->offs = offset;
1155 req->length = length; 845 req->size = length;
1156 846
1157 REQ_SEND; 847 REQ_SEND;
1158} 848}
1159 849
1160void 850void
1161aio_stat (fh_or_path,callback=&PL_sv_undef) 851aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
1162 SV * fh_or_path
1163 SV * callback
1164 ALIAS: 852 ALIAS:
1165 aio_stat = REQ_STAT 853 aio_stat = EIO_STAT
1166 aio_lstat = REQ_LSTAT 854 aio_lstat = EIO_LSTAT
1167 PPCODE: 855 PPCODE:
1168{ 856{
1169 dREQ; 857 dREQ;
1170 858
1171 New (0, req->statdata, 1, Stat_t); 859 req->sv1 = newSVsv (fh_or_path);
1172 if (!req->statdata)
1173 {
1174 req_free (req);
1175 croak ("out of memory during aio_req->statdata allocation");
1176 }
1177 860
1178 if (SvPOK (fh_or_path)) 861 if (SvPOK (req->sv1))
1179 { 862 {
1180 req->type = ix; 863 req->type = ix;
1181 req->data = newSVsv (fh_or_path);
1182 req->dataptr = SvPVbyte_nolen (req->data); 864 req->ptr1 = SvPVbyte_nolen (req->sv1);
1183 } 865 }
1184 else 866 else
1185 { 867 {
1186 req->type = REQ_FSTAT; 868 req->type = EIO_FSTAT;
1187 req->fh = newSVsv (fh_or_path);
1188 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 869 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1189 } 870 }
1190 871
1191 REQ_SEND; 872 REQ_SEND;
1192} 873}
1193 874
1194void 875void
876aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
877 PPCODE:
878{
879 dREQ;
880
881 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
882 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
883 req->sv1 = newSVsv (fh_or_path);
884
885 if (SvPOK (req->sv1))
886 {
887 req->type = EIO_UTIME;
888 req->ptr1 = SvPVbyte_nolen (req->sv1);
889 }
890 else
891 {
892 req->type = EIO_FUTIME;
893 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
894 }
895
896 REQ_SEND;
897}
898
899void
900aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
901 PPCODE:
902{
903 dREQ;
904
905 req->sv1 = newSVsv (fh_or_path);
906 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
907
908 if (SvPOK (req->sv1))
909 {
910 req->type = EIO_TRUNCATE;
911 req->ptr1 = SvPVbyte_nolen (req->sv1);
912 }
913 else
914 {
915 req->type = EIO_FTRUNCATE;
916 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
917 }
918
919 REQ_SEND;
920}
921
922void
923aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
924 ALIAS:
925 aio_chmod = EIO_CHMOD
926 aio_mkdir = EIO_MKDIR
927 PPCODE:
928{
929 dREQ;
930
931 req->int2 = mode;
932 req->sv1 = newSVsv (fh_or_path);
933
934 if (SvPOK (req->sv1))
935 {
936 req->type = ix;
937 req->ptr1 = SvPVbyte_nolen (req->sv1);
938 }
939 else
940 {
941 req->type = EIO_FCHMOD;
942 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
943 }
944
945 REQ_SEND;
946}
947
948void
949aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef)
950 PPCODE:
951{
952 dREQ;
953
954 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
955 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
956 req->sv1 = newSVsv (fh_or_path);
957
958 if (SvPOK (req->sv1))
959 {
960 req->type = EIO_CHOWN;
961 req->ptr1 = SvPVbyte_nolen (req->sv1);
962 }
963 else
964 {
965 req->type = EIO_FCHOWN;
966 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
967 }
968
969 REQ_SEND;
970}
971
972void
973aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
974 PPCODE:
975{
976 dREQ;
977
978 req->type = EIO_READDIR;
979 req->sv1 = newSVsv (pathname);
980 req->ptr1 = SvPVbyte_nolen (req->sv1);
981 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
982
983 if (flags & EIO_READDIR_DENTS)
984 req->int1 |= EIO_READDIR_CUSTOM2;
985
986 REQ_SEND;
987}
988
989void
1195aio_unlink (pathname,callback=&PL_sv_undef) 990aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1196 SV * pathname
1197 SV * callback
1198 ALIAS: 991 ALIAS:
1199 aio_unlink = REQ_UNLINK 992 aio_unlink = EIO_UNLINK
1200 aio_rmdir = REQ_RMDIR 993 aio_rmdir = EIO_RMDIR
1201 aio_readdir = REQ_READDIR 994 aio_readdir = EIO_READDIR
1202 PPCODE: 995 PPCODE:
1203{ 996{
1204 dREQ; 997 dREQ;
1205 998
1206 req->type = ix; 999 req->type = ix;
1207 req->data = newSVsv (pathname); 1000 req->sv1 = newSVsv (pathname);
1208 req->dataptr = SvPVbyte_nolen (req->data); 1001 req->ptr1 = SvPVbyte_nolen (req->sv1);
1002
1003 REQ_SEND;
1004}
1005
1006void
1007aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef)
1008 ALIAS:
1009 aio_link = EIO_LINK
1010 aio_symlink = EIO_SYMLINK
1011 aio_rename = EIO_RENAME
1012 PPCODE:
1013{
1014 dREQ;
1015
1016 req->type = ix;
1017 req->sv1 = newSVsv (oldpath);
1018 req->ptr1 = SvPVbyte_nolen (req->sv1);
1019 req->sv2 = newSVsv (newpath);
1020 req->ptr2 = SvPVbyte_nolen (req->sv2);
1209 1021
1210 REQ_SEND; 1022 REQ_SEND;
1211} 1023}
1212 1024
1213void 1025void
1214aio_link (oldpath,newpath,callback=&PL_sv_undef) 1026aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef)
1215 SV * oldpath
1216 SV * newpath
1217 SV * callback
1218 ALIAS:
1219 aio_link = REQ_LINK
1220 aio_symlink = REQ_SYMLINK
1221 aio_rename = REQ_RENAME
1222 PPCODE: 1027 PPCODE:
1223{ 1028{
1224 dREQ; 1029 dREQ;
1225 1030
1226 req->type = ix; 1031 req->type = EIO_MKNOD;
1227 req->fh = newSVsv (oldpath); 1032 req->sv1 = newSVsv (pathname);
1228 req->data2ptr = SvPVbyte_nolen (req->fh); 1033 req->ptr1 = SvPVbyte_nolen (req->sv1);
1229 req->data = newSVsv (newpath); 1034 req->int2 = (mode_t)mode;
1230 req->dataptr = SvPVbyte_nolen (req->data); 1035 req->offs = dev;
1231 1036
1232 REQ_SEND; 1037 REQ_SEND;
1233} 1038}
1234 1039
1235void 1040void
1236aio_sleep (delay,callback=&PL_sv_undef) 1041aio_busy (double delay, SV *callback=&PL_sv_undef)
1237 double delay
1238 SV * callback
1239 PPCODE: 1042 PPCODE:
1240{ 1043{
1241 dREQ; 1044 dREQ;
1242 1045
1243 req->type = REQ_SLEEP; 1046 req->type = EIO_BUSY;
1244 req->fd = delay < 0. ? 0 : delay; 1047 req->nv1 = delay < 0. ? 0. : delay;
1245 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1246 1048
1247 REQ_SEND; 1049 REQ_SEND;
1248} 1050}
1249 1051
1250void 1052void
1251aio_group (callback=&PL_sv_undef) 1053aio_group (SV *callback=&PL_sv_undef)
1252 SV * callback
1253 PROTOTYPE: ;$ 1054 PROTOTYPE: ;$
1254 PPCODE: 1055 PPCODE:
1255{ 1056{
1256 dREQ; 1057 dREQ;
1257 1058
1258 req->type = REQ_GROUP; 1059 req->type = EIO_GROUP;
1060
1259 req_send (req); 1061 req_submit (req);
1260
1261 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1062 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1262} 1063}
1263 1064
1264void 1065void
1265aio_nop (callback=&PL_sv_undef) 1066aio_nop (SV *callback=&PL_sv_undef)
1266 SV * callback 1067 ALIAS:
1068 aio_nop = EIO_NOP
1069 aio_sync = EIO_SYNC
1267 PPCODE: 1070 PPCODE:
1268{ 1071{
1269 dREQ; 1072 dREQ;
1270 1073
1271 req->type = REQ_NOP; 1074 req->type = ix;
1272 1075
1273 REQ_SEND; 1076 REQ_SEND;
1274} 1077}
1275 1078
1276#if 0 1079int
1277 1080aioreq_pri (int pri = 0)
1278void 1081 PROTOTYPE: ;$
1279aio_pri (int pri = DEFAULT_PRI)
1280 CODE: 1082 CODE:
1083 RETVAL = next_pri;
1084 if (items > 0)
1085 {
1281 if (pri < PRI_MIN) pri = PRI_MIN; 1086 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
1282 if (pri > PRI_MAX) pri = PRI_MAX; 1087 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
1283 next_pri = pri + PRI_BIAS; 1088 next_pri = pri;
1089 }
1090 OUTPUT:
1091 RETVAL
1284 1092
1285#endif 1093void
1094aioreq_nice (int nice = 0)
1095 CODE:
1096 nice = next_pri - nice;
1097 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
1098 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1099 next_pri = nice;
1286 1100
1287void 1101void
1288flush () 1102flush ()
1289 PROTOTYPE: 1103 PROTOTYPE:
1290 CODE: 1104 CODE:
1291 while (nreqs) 1105 while (eio_nreqs ())
1292 { 1106 {
1293 poll_wait (); 1107 poll_wait ();
1294 poll_cb (); 1108 poll_cb ();
1295 } 1109 }
1296 1110
1297void 1111int
1298poll() 1112poll()
1299 PROTOTYPE: 1113 PROTOTYPE:
1300 CODE: 1114 CODE:
1301 if (nreqs)
1302 {
1303 poll_wait (); 1115 poll_wait ();
1304 poll_cb (); 1116 RETVAL = poll_cb ();
1305 } 1117 OUTPUT:
1118 RETVAL
1306 1119
1307int 1120int
1308poll_fileno() 1121poll_fileno()
1309 PROTOTYPE: 1122 PROTOTYPE:
1310 CODE: 1123 CODE:
1322 1135
1323void 1136void
1324poll_wait() 1137poll_wait()
1325 PROTOTYPE: 1138 PROTOTYPE:
1326 CODE: 1139 CODE:
1327 if (nreqs)
1328 poll_wait (); 1140 poll_wait ();
1329 1141
1330int 1142int
1331nreqs() 1143nreqs()
1332 PROTOTYPE: 1144 PROTOTYPE:
1333 CODE: 1145 CODE:
1334 RETVAL = nreqs; 1146 RETVAL = eio_nreqs ();
1335 OUTPUT: 1147 OUTPUT:
1336 RETVAL 1148 RETVAL
1337 1149
1150int
1151nready()
1152 PROTOTYPE:
1153 CODE:
1154 RETVAL = eio_nready ();
1155 OUTPUT:
1156 RETVAL
1157
1158int
1159npending()
1160 PROTOTYPE:
1161 CODE:
1162 RETVAL = eio_npending ();
1163 OUTPUT:
1164 RETVAL
1165
1166int
1167nthreads()
1168 PROTOTYPE:
1169 CODE:
1170 RETVAL = eio_nthreads ();
1171 OUTPUT:
1172 RETVAL
1173
1174int
1175fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1176 PROTOTYPE: $$$$
1177 CODE:
1178#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1179 RETVAL = posix_fadvise (fh, offset, length, advice);
1180#else
1181 RETVAL = errno = ENOSYS;
1182#endif
1183 OUTPUT:
1184 RETVAL
1185
1186ssize_t
1187sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1188 PROTOTYPE: $$$$
1189 CODE:
1190 eio_sendfile_sync (ofh, ifh, offset, count);
1191
1192void _on_next_submit (SV *cb)
1193 CODE:
1194 SvREFCNT_dec (on_next_submit);
1195 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1196
1338PROTOTYPES: DISABLE 1197PROTOTYPES: DISABLE
1339 1198
1340MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1199MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1341 1200
1342void 1201void
1343cancel (aio_req_ornot req) 1202cancel (aio_req_ornot req)
1344 PROTOTYPE:
1345 CODE: 1203 CODE:
1346 req_cancel (req); 1204 eio_cancel (req);
1347 1205
1348void 1206void
1349cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1207cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1350 CODE: 1208 PPCODE:
1209{
1210 if (GIMME_V != G_VOID)
1211 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1212
1213 if (items > 1)
1214 {
1215 SV *cb_cv =get_cb (callback);
1216
1351 SvREFCNT_dec (req->callback); 1217 SvREFCNT_dec (req->callback);
1352 req->callback = newSVsv (callback); 1218 req->callback = SvREFCNT_inc (cb_cv);
1219 }
1220}
1353 1221
1354MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1222MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1355 1223
1356void 1224void
1357add (aio_req grp, ...) 1225add (aio_req grp, ...)
1358 PPCODE: 1226 PPCODE:
1359{ 1227{
1360 int i; 1228 int i;
1361 aio_req req;
1362 1229
1363 if (grp->fd == 2) 1230 if (grp->int1 == 2)
1364 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1231 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1365 1232
1366 for (i = 1; i < items; ++i ) 1233 for (i = 1; i < items; ++i )
1367 { 1234 {
1235 aio_req req;
1236
1368 if (GIMME_V != G_VOID) 1237 if (GIMME_V != G_VOID)
1369 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1238 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1370 1239
1371 req = SvAIO_REQ (ST (i)); 1240 req = SvAIO_REQ (ST (i));
1372 1241
1373 if (req) 1242 if (req)
1374 { 1243 eio_grp_add (grp, req);
1375 ++grp->length;
1376 req->grp = grp;
1377
1378 req->grp_prev = 0;
1379 req->grp_next = grp->grp_first;
1380
1381 if (grp->grp_first)
1382 grp->grp_first->grp_prev = req;
1383
1384 grp->grp_first = req;
1385 } 1244 }
1386 }
1387} 1245}
1246
1247void
1248cancel_subs (aio_req_ornot req)
1249 CODE:
1250 req_cancel_subs (req);
1388 1251
1389void 1252void
1390result (aio_req grp, ...) 1253result (aio_req grp, ...)
1391 CODE: 1254 CODE:
1392{ 1255{
1393 int i; 1256 int i;
1257 AV *av;
1258
1259 grp->errorno = errno;
1260
1394 AV *av = newAV (); 1261 av = newAV ();
1262 av_extend (av, items - 1);
1395 1263
1396 for (i = 1; i < items; ++i ) 1264 for (i = 1; i < items; ++i )
1397 av_push (av, newSVsv (ST (i))); 1265 av_push (av, newSVsv (ST (i)));
1398 1266
1399 SvREFCNT_dec (grp->data); 1267 SvREFCNT_dec (grp->sv1);
1400 grp->data = (SV *)av; 1268 grp->sv1 = (SV *)av;
1401} 1269}
1402 1270
1403void 1271void
1272errno (aio_req grp, int errorno = errno)
1273 CODE:
1274 grp->errorno = errorno;
1275
1276void
1404feed_limit (aio_req grp, int limit) 1277limit (aio_req grp, int limit)
1405 CODE: 1278 CODE:
1406 grp->fd2 = limit; 1279 eio_grp_limit (grp, limit);
1407 aio_grp_feed (grp);
1408 1280
1409void 1281void
1410feed (aio_req grp, SV *callback=&PL_sv_undef) 1282feed (aio_req grp, SV *callback=&PL_sv_undef)
1411 CODE: 1283 CODE:
1412{ 1284{
1413 SvREFCNT_dec (grp->fh2); 1285 SvREFCNT_dec (grp->sv2);
1414 grp->fh2 = newSVsv (callback); 1286 grp->sv2 = newSVsv (callback);
1287 grp->feed = aio_grp_feed;
1415 1288
1416 if (grp->fd2 <= 0) 1289 if (grp->int2 <= 0)
1417 grp->fd2 = 2; 1290 grp->int2 = 2;
1418 1291
1419 aio_grp_feed (grp); 1292 eio_grp_limit (grp, grp->int2);
1420} 1293}
1421 1294

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines