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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines