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.62 by root, Mon Oct 23 22:45:18 2006 UTC vs.
Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines