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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines