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.65 by root, Tue Oct 24 00:26:32 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
39# else 43# else
40# error sendfile support requested but not available 44# error sendfile support requested but not available
41# endif 45# endif
42#endif 46#endif
43 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
44/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 52#ifndef NAME_MAX
46# define NAME_MAX 4096 53# define NAME_MAX 4096
54#endif
55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
47#endif 59#endif
48 60
49#if __ia64 61#if __ia64
50# define STACKSIZE 65536 62# define STACKSIZE 65536
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
53#else 65#else
54# define STACKSIZE 16384 66# define STACKSIZE 16384
55#endif 67#endif
56 68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
57/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
59 83
60#define dBUF \ 84#define dBUF \
85 char *aio_buf; \
86 LOCK (wrklock); \
61 char *aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \
62 if (!aio_buf) \ 89 if (!aio_buf) \
63 return -1; 90 return -1;
64 91
65#define fBUF free (aio_buf) 92typedef SV SV8; /* byte-sv, used for argument-checking */
66 93
67enum { 94enum {
68 REQ_QUIT, 95 REQ_QUIT,
69 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
70 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
71 REQ_SENDFILE, 98 REQ_SENDFILE,
72 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
73 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75 REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
76 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
77 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
78 REQ_SLEEP, 105 REQ_BUSY,
79}; 106};
80 107
81#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
82#define AIO_GRP_KLASS "IO::AIO::GRP" 109#define AIO_GRP_KLASS "IO::AIO::GRP"
83 110
84typedef struct aio_cb 111typedef struct aio_cb
85{ 112{
86 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
87 114
88 SV *data, *callback; 115 SV *callback, *fh;
89 SV *fh, *fh2; 116 SV *sv1, *sv2;
90 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
91 Stat_t *statdata;
92 off_t offset; 118 off_t offs;
93 size_t length; 119 size_t size;
94 ssize_t result; 120 ssize_t result;
95 121
96 STRLEN dataoffset; 122 STRLEN stroffset;
97 int type; 123 int type;
98 int fd, fd2; 124 int int1, int2;
99 int errorno; 125 int errorno;
100 mode_t mode; /* open */ 126 mode_t mode; /* open */
101 127
102 unsigned char flags; 128 unsigned char flags;
103 unsigned char pri; 129 unsigned char pri;
105 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
106 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
107} aio_cb; 133} aio_cb;
108 134
109enum { 135enum {
110 FLAG_CANCELLED = 0x01, 136 FLAG_CANCELLED = 0x01, /* request was cancelled */
137 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
138 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
111}; 139};
112 140
113typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
114typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
115 143
117 PRI_MIN = -4, 145 PRI_MIN = -4,
118 PRI_MAX = 4, 146 PRI_MAX = 4,
119 147
120 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
121 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
122}; 151};
123 152
153#define AIO_TICKS ((1000000 + 1023) >> 10)
154
155static unsigned int max_poll_time = 0;
156static unsigned int max_poll_reqs = 0;
157
158/* calculcate time difference in ~1/AIO_TICKS of a second */
159static int tvdiff (struct timeval *tv1, struct timeval *tv2)
160{
161 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
162 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
163}
164
124static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
125 166
126static int started, wanted; 167static unsigned int started, idle, wanted;
127static volatile int nreqs;
128static int max_outstanding = 1<<30;
129static int respipe [2];
130 168
131#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
132# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133#else 171#else
134# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135#endif 173#endif
136 174
175#define LOCK(mutex) pthread_mutex_lock (&(mutex))
176#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
177
178/* worker threads management */
179static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
180
181typedef struct worker {
182 /* locked by wrklock */
183 struct worker *prev, *next;
184
185 pthread_t tid;
186
187 /* locked by reslock, reqlock or wrklock */
188 aio_req req; /* currently processed request */
189 void *dbuf;
190 DIR *dirp;
191} worker;
192
193static worker wrk_first = { &wrk_first, &wrk_first, 0 };
194
195static void worker_clear (worker *wrk)
196{
197 if (wrk->dirp)
198 {
199 closedir (wrk->dirp);
200 wrk->dirp = 0;
201 }
202
203 if (wrk->dbuf)
204 {
205 free (wrk->dbuf);
206 wrk->dbuf = 0;
207 }
208}
209
210static void worker_free (worker *wrk)
211{
212 wrk->next->prev = wrk->prev;
213 wrk->prev->next = wrk->next;
214
215 free (wrk);
216}
217
218static volatile unsigned int nreqs, nready, npending;
219static volatile unsigned int max_idle = 4;
220static volatile unsigned int max_outstanding = 0xffffffff;
221static int respipe [2];
222
137static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
138static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
139static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 225static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
140 226
141static volatile aio_req reqs, reqe; /* queue start, queue end */ 227#if WORDACCESS_UNSAFE
142static volatile aio_req ress, rese; /* queue start, queue end */
143 228
229static unsigned int get_nready ()
230{
231 unsigned int retval;
232
233 LOCK (reqlock);
234 retval = nready;
235 UNLOCK (reqlock);
236
237 return retval;
238}
239
240static unsigned int get_npending ()
241{
242 unsigned int retval;
243
244 LOCK (reslock);
245 retval = npending;
246 UNLOCK (reslock);
247
248 return retval;
249}
250
251static unsigned int get_nthreads ()
252{
253 unsigned int retval;
254
255 LOCK (wrklock);
256 retval = started;
257 UNLOCK (wrklock);
258
259 return retval;
260}
261
262#else
263
264# define get_nready() nready
265# define get_npending() npending
266# define get_nthreads() started
267
268#endif
269
270/*
271 * a somewhat faster data structure might be nice, but
272 * with 8 priorities this actually needs <20 insns
273 * per shift, the most expensive operation.
274 */
275typedef struct {
276 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
277 int size;
278} reqq;
279
280static reqq req_queue;
281static reqq res_queue;
282
283int reqq_push (reqq *q, aio_req req)
284{
285 int pri = req->pri;
286 req->next = 0;
287
288 if (q->qe[pri])
289 {
290 q->qe[pri]->next = req;
291 q->qe[pri] = req;
292 }
293 else
294 q->qe[pri] = q->qs[pri] = req;
295
296 return q->size++;
297}
298
299aio_req reqq_shift (reqq *q)
300{
301 int pri;
302
303 if (!q->size)
304 return 0;
305
306 --q->size;
307
308 for (pri = NUM_PRI; pri--; )
309 {
310 aio_req req = q->qs[pri];
311
312 if (req)
313 {
314 if (!(q->qs[pri] = req->next))
315 q->qe[pri] = 0;
316
317 return req;
318 }
319 }
320
321 abort ();
322}
323
324static int poll_cb ();
144static void req_invoke (aio_req req); 325static void req_invoke (aio_req req);
145static void req_free (aio_req req); 326static void req_free (aio_req req);
327static void req_cancel (aio_req req);
146 328
147/* must be called at most once */ 329/* must be called at most once */
148static SV *req_sv (aio_req req, const char *klass) 330static SV *req_sv (aio_req req, const char *klass)
149{ 331{
150 if (!req->self) 332 if (!req->self)
168 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
169} 351}
170 352
171static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
172{ 354{
173 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
174 { 356 {
175 int old_len = grp->length; 357 int old_len = grp->size;
176 358
177 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
178 { 360 {
179 dSP; 361 dSP;
180 362
181 ENTER; 363 ENTER;
182 SAVETMPS; 364 SAVETMPS;
183 PUSHMARK (SP); 365 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185 PUTBACK; 367 PUTBACK;
186 call_sv (grp->fh2, G_VOID | G_EVAL); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 369 SPAGAIN;
188 FREETMPS; 370 FREETMPS;
189 LEAVE; 371 LEAVE;
190 } 372 }
191 373
192 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
193 if (old_len == grp->length) 375 if (old_len == grp->size)
194 { 376 {
195 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
196 grp->fh2 = 0; 378 grp->sv2 = 0;
197 break; 379 break;
198 } 380 }
199 } 381 }
200} 382}
201 383
202static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
203{ 385{
204 --grp->length; 386 --grp->size;
205 387
206 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
207 aio_grp_feed (grp); 389 aio_grp_feed (grp);
208 390
209 /* finish, if done */ 391 /* finish, if done */
210 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
211 { 393 {
212 req_invoke (grp); 394 req_invoke (grp);
213 req_free (grp); 395 req_free (grp);
214 } 396 }
215} 397}
216 398
217static void poll_wait () 399static void req_invoke (aio_req req)
218{ 400{
219 fd_set rfd; 401 dSP;
220 402
221 while (nreqs) 403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
405
406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
222 { 407 {
223 aio_req req; 408 ENTER;
224#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 409 SAVETMPS;
225 pthread_mutex_lock (&reslock); 410 PUSHMARK (SP);
226#endif 411 EXTEND (SP, 1);
227 req = ress;
228#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
229 pthread_mutex_unlock (&reslock);
230#endif
231 412
232 if (req) 413 switch (req->type)
233 return; 414 {
415 case REQ_READDIR:
416 {
417 SV *rv = &PL_sv_undef;
234 418
235 FD_ZERO(&rfd); 419 if (req->result >= 0)
236 FD_SET(respipe [0], &rfd); 420 {
421 int i;
422 char *buf = req->ptr2;
423 AV *av = newAV ();
237 424
238 select (respipe [0] + 1, &rfd, 0, 0, 0); 425 av_extend (av, req->result - 1);
426
427 for (i = 0; i < req->result; ++i)
428 {
429 SV *sv = newSVpv (buf, 0);
430
431 av_store (av, i, sv);
432 buf += SvCUR (sv) + 1;
433 }
434
435 rv = sv_2mortal (newRV_noinc ((SV *)av));
436 }
437
438 PUSHs (rv);
439 }
440 break;
441
442 case REQ_OPEN:
443 {
444 /* convert fd to fh */
445 SV *fh;
446
447 PUSHs (sv_2mortal (newSViv (req->result)));
448 PUTBACK;
449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
450 SPAGAIN;
451
452 fh = POPs;
453 PUSHMARK (SP);
454 XPUSHs (fh);
455 }
456 break;
457
458 case REQ_GROUP:
459 req->int1 = 2; /* mark group as finished */
460
461 if (req->sv1)
462 {
463 int i;
464 AV *av = (AV *)req->sv1;
465
466 EXTEND (SP, AvFILL (av) + 1);
467 for (i = 0; i <= AvFILL (av); ++i)
468 PUSHs (*av_fetch (av, i, 0));
469 }
470 break;
471
472 case REQ_NOP:
473 case REQ_BUSY:
474 break;
475
476 case REQ_READLINK:
477 if (req->result > 0)
478 {
479 SvCUR_set (req->sv1, req->result);
480 *SvEND (req->sv1) = 0;
481 PUSHs (req->sv1);
482 }
483 break;
484
485 case REQ_STAT:
486 case REQ_LSTAT:
487 case REQ_FSTAT:
488 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
489 PL_laststatval = req->result;
490 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result)));
492 break;
493
494 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result)));
498 break;
499
500 default:
501 PUSHs (sv_2mortal (newSViv (req->result)));
502 break;
503 }
504
505 errno = req->errorno;
506
507 PUTBACK;
508 call_sv (req->callback, G_VOID | G_EVAL);
509 SPAGAIN;
510
511 FREETMPS;
512 LEAVE;
239 } 513 }
240}
241 514
242static void req_invoke (aio_req req) 515 if (req->grp)
243{
244 dSP;
245 int errorno = errno;
246
247 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
248 return;
249
250 errno = req->errorno;
251
252 ENTER;
253 SAVETMPS;
254 PUSHMARK (SP);
255 EXTEND (SP, 1);
256
257 switch (req->type)
258 { 516 {
259 case REQ_READDIR: 517 aio_req grp = req->grp;
260 {
261 SV *rv = &PL_sv_undef;
262 518
263 if (req->result >= 0) 519 /* unlink request */
264 { 520 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
265 char *buf = req->data2ptr; 521 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
266 AV *av = newAV ();
267 522
268 while (req->result) 523 if (grp->grp_first == req)
269 { 524 grp->grp_first = req->grp_next;
270 SV *sv = newSVpv (buf, 0);
271 525
272 av_push (av, sv); 526 aio_grp_dec (grp);
273 buf += SvCUR (sv) + 1;
274 req->result--;
275 }
276
277 rv = sv_2mortal (newRV_noinc ((SV *)av));
278 }
279
280 PUSHs (rv);
281 }
282 break;
283
284 case REQ_OPEN:
285 {
286 /* convert fd to fh */
287 SV *fh;
288
289 PUSHs (sv_2mortal (newSViv (req->result)));
290 PUTBACK;
291 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
292 SPAGAIN;
293
294 fh = SvREFCNT_inc (POPs);
295
296 PUSHMARK (SP);
297 XPUSHs (sv_2mortal (fh));
298 }
299 break;
300
301 case REQ_GROUP:
302 req->fd = 2; /* mark group as finished */
303
304 if (req->data)
305 {
306 int i;
307 AV *av = (AV *)req->data;
308
309 EXTEND (SP, AvFILL (av) + 1);
310 for (i = 0; i <= AvFILL (av); ++i)
311 PUSHs (*av_fetch (av, i, 0));
312 }
313 break;
314
315 case REQ_NOP:
316 case REQ_SLEEP:
317 break;
318
319 default:
320 PUSHs (sv_2mortal (newSViv (req->result)));
321 break;
322 } 527 }
323
324
325 PUTBACK;
326 call_sv (req->callback, G_VOID | G_EVAL);
327 SPAGAIN;
328
329 FREETMPS;
330 LEAVE;
331
332 errno = errorno;
333 528
334 if (SvTRUE (ERRSV)) 529 if (SvTRUE (ERRSV))
335 { 530 {
336 req_free (req); 531 req_free (req);
337 croak (0); 532 croak (0);
338 } 533 }
339} 534}
340 535
341static void req_free (aio_req req) 536static void req_free (aio_req req)
342{ 537{
343 if (req->grp)
344 {
345 aio_req grp = req->grp;
346
347 /* unlink request */
348 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
349 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
350
351 if (grp->grp_first == req)
352 grp->grp_first = req->grp_next;
353
354 aio_grp_dec (grp);
355 }
356
357 if (req->self) 538 if (req->self)
358 { 539 {
359 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
360 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
361 } 542 }
362 543
363 SvREFCNT_dec (req->data);
364 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
365 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
366 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata);
368 548
369 if (req->type == REQ_READDIR && req->result >= 0) 549 if (req->flags & FLAG_PTR2_FREE)
370 free (req->data2ptr); 550 free (req->ptr2);
371 551
372 Safefree (req); 552 Safefree (req);
373} 553}
374 554
555static void req_cancel_subs (aio_req grp)
556{
557 aio_req sub;
558
559 if (grp->type != REQ_GROUP)
560 return;
561
562 SvREFCNT_dec (grp->sv2);
563 grp->sv2 = 0;
564
565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
566 req_cancel (sub);
567}
568
375static void req_cancel (aio_req req) 569static void req_cancel (aio_req req)
376{ 570{
377 req->flags |= FLAG_CANCELLED; 571 req->flags |= FLAG_CANCELLED;
378 572
379 if (req->type == REQ_GROUP) 573 req_cancel_subs (req);
380 {
381 aio_req sub;
382
383 for (sub = req->grp_first; sub; sub = sub->grp_next)
384 req_cancel (sub);
385 }
386}
387
388static int poll_cb ()
389{
390 dSP;
391 int count = 0;
392 int do_croak = 0;
393 aio_req req;
394
395 for (;;)
396 {
397 pthread_mutex_lock (&reslock);
398 req = ress;
399
400 if (req)
401 {
402 ress = req->next;
403
404 if (!ress)
405 {
406 /* read any signals sent by the worker threads */
407 char buf [32];
408 while (read (respipe [0], buf, 32) == 32)
409 ;
410
411 rese = 0;
412 }
413 }
414
415 pthread_mutex_unlock (&reslock);
416
417 if (!req)
418 break;
419
420 --nreqs;
421
422 if (req->type == REQ_QUIT)
423 started--;
424 else if (req->type == REQ_GROUP && req->length)
425 {
426 req->fd = 1; /* mark request as delayed */
427 continue;
428 }
429 else
430 {
431 if (req->type == REQ_READ)
432 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
433
434 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
435 SvREADONLY_off (req->data);
436
437 if (req->statdata)
438 {
439 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
440 PL_laststatval = req->result;
441 PL_statcache = *(req->statdata);
442 }
443
444 req_invoke (req);
445
446 count++;
447 }
448
449 req_free (req);
450 }
451
452 return count;
453} 574}
454 575
455static void *aio_proc(void *arg); 576static void *aio_proc(void *arg);
456 577
457static void start_thread (void) 578static void start_thread (void)
458{ 579{
459 sigset_t fullsigset, oldsigset; 580 sigset_t fullsigset, oldsigset;
460 pthread_t tid;
461 pthread_attr_t attr; 581 pthread_attr_t attr;
582
583 worker *wrk = calloc (1, sizeof (worker));
584
585 if (!wrk)
586 croak ("unable to allocate worker thread data");
462 587
463 pthread_attr_init (&attr); 588 pthread_attr_init (&attr);
464 pthread_attr_setstacksize (&attr, STACKSIZE); 589 pthread_attr_setstacksize (&attr, STACKSIZE);
465 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 590 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
591#ifdef PTHREAD_SCOPE_PROCESS
592 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
593#endif
466 594
467 sigfillset (&fullsigset); 595 sigfillset (&fullsigset);
596
597 LOCK (wrklock);
468 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 598 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469 599
470 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 600 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
471 started++;
472
473 sigprocmask (SIG_SETMASK, &oldsigset, 0);
474}
475
476static void req_send (aio_req req)
477{
478 while (started < wanted && nreqs >= started)
479 start_thread ();
480
481 ++nreqs;
482
483 pthread_mutex_lock (&reqlock);
484
485 req->next = 0;
486
487 if (reqe)
488 { 601 {
489 reqe->next = req; 602 wrk->prev = &wrk_first;
490 reqe = req; 603 wrk->next = wrk_first.next;
604 wrk_first.next->prev = wrk;
605 wrk_first.next = wrk;
606 ++started;
491 } 607 }
492 else 608 else
493 reqe = reqs = req; 609 free (wrk);
494 610
611 sigprocmask (SIG_SETMASK, &oldsigset, 0);
612 UNLOCK (wrklock);
613}
614
615static void maybe_start_thread ()
616{
617 if (get_nthreads () >= wanted)
618 return;
619
620 /* todo: maybe use idle here, but might be less exact */
621 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
622 return;
623
624 start_thread ();
625}
626
627static void req_send (aio_req req)
628{
629 ++nreqs;
630
631 LOCK (reqlock);
632 ++nready;
633 reqq_push (&req_queue, req);
495 pthread_cond_signal (&reqwait); 634 pthread_cond_signal (&reqwait);
496 pthread_mutex_unlock (&reqlock); 635 UNLOCK (reqlock);
497 636
498 if (nreqs > max_outstanding) 637 maybe_start_thread ();
499 for (;;)
500 {
501 poll_cb ();
502
503 if (nreqs <= max_outstanding)
504 break;
505
506 poll_wait ();
507 }
508} 638}
509 639
510static void end_thread (void) 640static void end_thread (void)
511{ 641{
512 aio_req req; 642 aio_req req;
643
513 Newz (0, req, 1, aio_cb); 644 Newz (0, req, 1, aio_cb);
645
514 req->type = REQ_QUIT; 646 req->type = REQ_QUIT;
647 req->pri = PRI_MAX + PRI_BIAS;
515 648
516 req_send (req); 649 LOCK (reqlock);
650 reqq_push (&req_queue, req);
651 pthread_cond_signal (&reqwait);
652 UNLOCK (reqlock);
653
654 LOCK (wrklock);
655 --started;
656 UNLOCK (wrklock);
657}
658
659static void set_max_idle (int nthreads)
660{
661 if (WORDACCESS_UNSAFE) LOCK (reqlock);
662 max_idle = nthreads <= 0 ? 1 : nthreads;
663 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
517} 664}
518 665
519static void min_parallel (int nthreads) 666static void min_parallel (int nthreads)
520{ 667{
521 if (wanted < nthreads) 668 if (wanted < nthreads)
522 wanted = nthreads; 669 wanted = nthreads;
523} 670}
524 671
525static void max_parallel (int nthreads) 672static void max_parallel (int nthreads)
526{ 673{
527 int cur = started;
528
529 if (wanted > nthreads) 674 if (wanted > nthreads)
530 wanted = nthreads; 675 wanted = nthreads;
531 676
532 while (cur > wanted) 677 while (started > wanted)
678 end_thread ();
679}
680
681static void poll_wait ()
682{
683 fd_set rfd;
684
685 while (nreqs)
533 { 686 {
687 int size;
688 if (WORDACCESS_UNSAFE) LOCK (reslock);
689 size = res_queue.size;
690 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
691
692 if (size)
693 return;
694
534 end_thread (); 695 maybe_start_thread ();
535 cur--; 696
697 FD_ZERO(&rfd);
698 FD_SET(respipe [0], &rfd);
699
700 select (respipe [0] + 1, &rfd, 0, 0, 0);
536 } 701 }
702}
537 703
538 while (started > wanted) 704static int poll_cb ()
705{
706 dSP;
707 int count = 0;
708 int maxreqs = max_poll_reqs;
709 int do_croak = 0;
710 struct timeval tv_start, tv_now;
711 aio_req req;
712
713 if (max_poll_time)
714 gettimeofday (&tv_start, 0);
715
716 for (;;)
539 { 717 {
718 for (;;)
719 {
720 maybe_start_thread ();
721
722 LOCK (reslock);
723 req = reqq_shift (&res_queue);
724
725 if (req)
726 {
727 --npending;
728
729 if (!res_queue.size)
730 {
731 /* read any signals sent by the worker threads */
732 char buf [32];
733 while (read (respipe [0], buf, 32) == 32)
734 ;
735 }
736 }
737
738 UNLOCK (reslock);
739
740 if (!req)
741 break;
742
743 --nreqs;
744
745 if (req->type == REQ_GROUP && req->size)
746 {
747 req->int1 = 1; /* mark request as delayed */
748 continue;
749 }
750 else
751 {
752 req_invoke (req);
753
754 count++;
755 }
756
757 req_free (req);
758
759 if (maxreqs && !--maxreqs)
760 break;
761
762 if (max_poll_time)
763 {
764 gettimeofday (&tv_now, 0);
765
766 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
767 break;
768 }
769 }
770
771 if (nreqs <= max_outstanding)
772 break;
773
540 poll_wait (); 774 poll_wait ();
541 poll_cb (); 775
776 ++maxreqs;
542 } 777 }
778
779 return count;
543} 780}
544 781
545static void create_pipe () 782static void create_pipe ()
546{ 783{
547 if (pipe (respipe)) 784 if (pipe (respipe))
571static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 808static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
572{ 809{
573 ssize_t res; 810 ssize_t res;
574 off_t ooffset; 811 off_t ooffset;
575 812
576 pthread_mutex_lock (&preadwritelock); 813 LOCK (preadwritelock);
577 ooffset = lseek (fd, 0, SEEK_CUR); 814 ooffset = lseek (fd, 0, SEEK_CUR);
578 lseek (fd, offset, SEEK_SET); 815 lseek (fd, offset, SEEK_SET);
579 res = read (fd, buf, count); 816 res = read (fd, buf, count);
580 lseek (fd, ooffset, SEEK_SET); 817 lseek (fd, ooffset, SEEK_SET);
581 pthread_mutex_unlock (&preadwritelock); 818 UNLOCK (preadwritelock);
582 819
583 return res; 820 return res;
584} 821}
585 822
586static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 823static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
587{ 824{
588 ssize_t res; 825 ssize_t res;
589 off_t ooffset; 826 off_t ooffset;
590 827
591 pthread_mutex_lock (&preadwritelock); 828 LOCK (preadwritelock);
592 ooffset = lseek (fd, 0, SEEK_CUR); 829 ooffset = lseek (fd, 0, SEEK_CUR);
593 lseek (fd, offset, SEEK_SET); 830 lseek (fd, offset, SEEK_SET);
594 res = write (fd, buf, count); 831 res = write (fd, buf, count);
595 lseek (fd, offset, SEEK_SET); 832 lseek (fd, offset, SEEK_SET);
596 pthread_mutex_unlock (&preadwritelock); 833 UNLOCK (preadwritelock);
597 834
598 return res; 835 return res;
599} 836}
600#endif 837#endif
601 838
602#if !HAVE_FDATASYNC 839#if !HAVE_FDATASYNC
603# define fdatasync fsync 840# define fdatasync fsync
604#endif 841#endif
605 842
606#if !HAVE_READAHEAD 843#if !HAVE_READAHEAD
607# define readahead aio_readahead 844# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
608 845
609static ssize_t readahead (int fd, off_t offset, size_t count) 846static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
610{ 847{
611 dBUF; 848 dBUF;
612 849
613 while (count > 0) 850 while (count > 0)
614 { 851 {
617 pread (fd, aio_buf, len, offset); 854 pread (fd, aio_buf, len, offset);
618 offset += len; 855 offset += len;
619 count -= len; 856 count -= len;
620 } 857 }
621 858
622 fBUF;
623
624 errno = 0; 859 errno = 0;
625} 860}
861
626#endif 862#endif
627 863
628#if !HAVE_READDIR_R 864#if !HAVE_READDIR_R
629# define readdir_r aio_readdir_r 865# define readdir_r aio_readdir_r
630 866
633static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 869static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
634{ 870{
635 struct dirent *e; 871 struct dirent *e;
636 int errorno; 872 int errorno;
637 873
638 pthread_mutex_lock (&readdirlock); 874 LOCK (readdirlock);
639 875
640 e = readdir (dirp); 876 e = readdir (dirp);
641 errorno = errno; 877 errorno = errno;
642 878
643 if (e) 879 if (e)
646 strcpy (ent->d_name, e->d_name); 882 strcpy (ent->d_name, e->d_name);
647 } 883 }
648 else 884 else
649 *res = 0; 885 *res = 0;
650 886
651 pthread_mutex_unlock (&readdirlock); 887 UNLOCK (readdirlock);
652 888
653 errno = errorno; 889 errno = errorno;
654 return e ? 0 : -1; 890 return e ? 0 : -1;
655} 891}
656#endif 892#endif
657 893
658/* sendfile always needs emulation */ 894/* sendfile always needs emulation */
659static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 895static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
660{ 896{
661 ssize_t res; 897 ssize_t res;
662 898
663 if (!count) 899 if (!count)
664 return 0; 900 return 0;
675 { 911 {
676 off_t sbytes; 912 off_t sbytes;
677 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 913 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
678 914
679 if (res < 0 && sbytes) 915 if (res < 0 && sbytes)
680 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 916 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
681 res = sbytes; 917 res = sbytes;
682 } 918 }
683 919
684# elif __hpux 920# elif __hpux
685 res = sendfile (ofd, ifd, offset, count, 0, 0); 921 res = sendfile (ofd, ifd, offset, count, 0, 0);
741 977
742 offset += cnt; 978 offset += cnt;
743 res += cnt; 979 res += cnt;
744 count -= cnt; 980 count -= cnt;
745 } 981 }
746
747 fBUF;
748 } 982 }
749 983
750 return res; 984 return res;
751} 985}
752 986
753/* read a full directory */ 987/* read a full directory */
754static int scandir_ (const char *path, void **namesp) 988static void scandir_ (aio_req req, worker *self)
755{ 989{
756 DIR *dirp; 990 DIR *dirp;
757 union 991 union
758 { 992 {
759 struct dirent d; 993 struct dirent d;
764 int memlen = 4096; 998 int memlen = 4096;
765 int memofs = 0; 999 int memofs = 0;
766 int res = 0; 1000 int res = 0;
767 int errorno; 1001 int errorno;
768 1002
769 dirp = opendir (path); 1003 LOCK (wrklock);
770 if (!dirp) 1004 self->dirp = dirp = opendir (req->ptr1);
771 return -1;
772
773 u = malloc (sizeof (*u)); 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
774 names = malloc (memlen); 1007 req->ptr2 = names = malloc (memlen);
1008 UNLOCK (wrklock);
775 1009
776 if (u && names) 1010 if (dirp && u && names)
777 for (;;) 1011 for (;;)
778 { 1012 {
779 errno = 0; 1013 errno = 0;
780 readdir_r (dirp, &u->d, &entp); 1014 readdir_r (dirp, &u->d, &entp);
781 1015
791 res++; 1025 res++;
792 1026
793 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
794 { 1028 {
795 memlen *= 2; 1029 memlen *= 2;
1030 LOCK (wrklock);
796 names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
1032 UNLOCK (wrklock);
1033
797 if (!names) 1034 if (!names)
798 break; 1035 break;
799 } 1036 }
800 1037
801 memcpy (names + memofs, name, len); 1038 memcpy (names + memofs, name, len);
802 memofs += len; 1039 memofs += len;
803 } 1040 }
804 } 1041 }
805 1042
806 errorno = errno;
807 free (u);
808 closedir (dirp);
809
810 if (errorno) 1043 if (errno)
1044 res = -1;
1045
1046 req->result = res;
1047}
1048
1049/*****************************************************************************/
1050
1051static void *aio_proc (void *thr_arg)
1052{
1053 aio_req req;
1054 struct timespec ts;
1055 worker *self = (worker *)thr_arg;
1056
1057 /* try to distribute timeouts somewhat evenly */
1058 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1059 * (1000000000UL / 1024UL);
1060
1061 for (;;)
811 { 1062 {
812 free (names); 1063 ts.tv_sec = time (0) + IDLE_TIMEOUT;
813 errno = errorno;
814 res = -1;
815 }
816 1064
817 *namesp = (void *)names; 1065 LOCK (reqlock);
818 return res;
819}
820
821/*****************************************************************************/
822
823static void *aio_proc (void *thr_arg)
824{
825 aio_req req;
826 int type;
827
828 do
829 {
830 pthread_mutex_lock (&reqlock);
831 1066
832 for (;;) 1067 for (;;)
833 { 1068 {
834 req = reqs; 1069 self->req = req = reqq_shift (&req_queue);
835
836 if (reqs)
837 {
838 reqs = reqs->next;
839 if (!reqs) reqe = 0;
840 }
841 1070
842 if (req) 1071 if (req)
843 break; 1072 break;
844 1073
1074 ++idle;
1075
1076 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1077 == ETIMEDOUT)
1078 {
1079 if (idle > max_idle)
1080 {
1081 --idle;
1082 UNLOCK (reqlock);
1083 LOCK (wrklock);
1084 --started;
1085 UNLOCK (wrklock);
1086 goto quit;
1087 }
1088
1089 /* we are allowed to idle, so do so without any timeout */
845 pthread_cond_wait (&reqwait, &reqlock); 1090 pthread_cond_wait (&reqwait, &reqlock);
1091 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1092 }
1093
1094 --idle;
846 } 1095 }
847 1096
848 pthread_mutex_unlock (&reqlock); 1097 --nready;
1098
1099 UNLOCK (reqlock);
849 1100
850 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */
852 1102
853 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
854 switch (type) 1104 switch (req->type)
855 { 1105 {
856 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
857 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
858 1108
859 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1109 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
860 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
861 1111
862 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1112 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
863 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1113 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
864 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
865 1115
866 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
867 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
868 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
869 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
870 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
871 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
872 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
873 1125
874 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
875 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
876 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
877 1129
878 case REQ_SLEEP: 1130 case REQ_BUSY:
879 { 1131 {
880 struct timeval tv; 1132 struct timeval tv;
881 1133
882 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
883 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
884 1136
885 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
886 } 1138 }
887 1139
888 case REQ_GROUP: 1140 case REQ_GROUP:
889 case REQ_NOP: 1141 case REQ_NOP:
1142 break;
1143
890 case REQ_QUIT: 1144 case REQ_QUIT:
891 break; 1145 goto quit;
892 1146
893 default: 1147 default:
894 req->result = ENOSYS; 1148 req->result = ENOSYS;
895 break; 1149 break;
896 } 1150 }
897 1151
898 req->errorno = errno; 1152 req->errorno = errno;
899 1153
900 pthread_mutex_lock (&reslock); 1154 LOCK (reslock);
901 1155
902 req->next = 0; 1156 ++npending;
903 1157
904 if (rese) 1158 if (!reqq_push (&res_queue, req))
905 {
906 rese->next = req;
907 rese = req;
908 }
909 else
910 {
911 rese = ress = req;
912
913 /* write a dummy byte to the pipe so fh becomes ready */ 1159 /* write a dummy byte to the pipe so fh becomes ready */
914 write (respipe [1], &respipe, 1); 1160 write (respipe [1], &respipe, 1);
915 }
916 1161
917 pthread_mutex_unlock (&reslock); 1162 self->req = 0;
1163 worker_clear (self);
1164
1165 UNLOCK (reslock);
918 } 1166 }
919 while (type != REQ_QUIT); 1167
1168quit:
1169 LOCK (wrklock);
1170 worker_free (self);
1171 UNLOCK (wrklock);
920 1172
921 return 0; 1173 return 0;
922} 1174}
923 1175
924/*****************************************************************************/ 1176/*****************************************************************************/
925 1177
926static void atfork_prepare (void) 1178static void atfork_prepare (void)
927{ 1179{
928 pthread_mutex_lock (&reqlock); 1180 LOCK (wrklock);
929 pthread_mutex_lock (&reslock); 1181 LOCK (reqlock);
1182 LOCK (reslock);
930#if !HAVE_PREADWRITE 1183#if !HAVE_PREADWRITE
931 pthread_mutex_lock (&preadwritelock); 1184 LOCK (preadwritelock);
932#endif 1185#endif
933#if !HAVE_READDIR_R 1186#if !HAVE_READDIR_R
934 pthread_mutex_lock (&readdirlock); 1187 LOCK (readdirlock);
935#endif 1188#endif
936} 1189}
937 1190
938static void atfork_parent (void) 1191static void atfork_parent (void)
939{ 1192{
940#if !HAVE_READDIR_R 1193#if !HAVE_READDIR_R
941 pthread_mutex_unlock (&readdirlock); 1194 UNLOCK (readdirlock);
942#endif 1195#endif
943#if !HAVE_PREADWRITE 1196#if !HAVE_PREADWRITE
944 pthread_mutex_unlock (&preadwritelock); 1197 UNLOCK (preadwritelock);
945#endif 1198#endif
946 pthread_mutex_unlock (&reslock); 1199 UNLOCK (reslock);
947 pthread_mutex_unlock (&reqlock); 1200 UNLOCK (reqlock);
1201 UNLOCK (wrklock);
948} 1202}
949 1203
950static void atfork_child (void) 1204static void atfork_child (void)
951{ 1205{
952 aio_req prv; 1206 aio_req prv;
953 1207
954 started = 0; 1208 while (prv = reqq_shift (&req_queue))
1209 req_free (prv);
955 1210
956 while (reqs) 1211 while (prv = reqq_shift (&res_queue))
1212 req_free (prv);
1213
1214 while (wrk_first.next != &wrk_first)
957 { 1215 {
958 prv = reqs; 1216 worker *wrk = wrk_first.next;
959 reqs = prv->next; 1217
1218 if (wrk->req)
1219 req_free (wrk->req);
1220
1221 worker_clear (wrk);
960 req_free (prv); 1222 worker_free (wrk);
961 } 1223 }
962 1224
963 reqs = reqe = 0; 1225 started = 0;
964 1226 idle = 0;
965 while (ress) 1227 nreqs = 0;
966 { 1228 nready = 0;
967 prv = ress; 1229 npending = 0;
968 ress = prv->next;
969 req_free (prv);
970 }
971
972 ress = rese = 0;
973 1230
974 close (respipe [0]); 1231 close (respipe [0]);
975 close (respipe [1]); 1232 close (respipe [1]);
976 create_pipe (); 1233 create_pipe ();
977 1234
1004PROTOTYPES: ENABLE 1261PROTOTYPES: ENABLE
1005 1262
1006BOOT: 1263BOOT:
1007{ 1264{
1008 HV *stash = gv_stashpv ("IO::AIO", 1); 1265 HV *stash = gv_stashpv ("IO::AIO", 1);
1266
1009 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1267 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1010 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1268 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1011 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1269 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1270 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1271 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1272 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1012 1273
1013 create_pipe (); 1274 create_pipe ();
1014 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1275 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1015} 1276}
1016 1277
1017void 1278void
1018min_parallel (nthreads) 1279max_poll_reqs (int nreqs)
1019 int nthreads
1020 PROTOTYPE: $ 1280 PROTOTYPE: $
1281 CODE:
1282 max_poll_reqs = nreqs;
1021 1283
1022void 1284void
1023max_parallel (nthreads) 1285max_poll_time (double nseconds)
1024 int nthreads
1025 PROTOTYPE: $ 1286 PROTOTYPE: $
1287 CODE:
1288 max_poll_time = nseconds * AIO_TICKS;
1289
1290void
1291min_parallel (int nthreads)
1292 PROTOTYPE: $
1293
1294void
1295max_parallel (int nthreads)
1296 PROTOTYPE: $
1297
1298void
1299max_idle (int nthreads)
1300 PROTOTYPE: $
1301 CODE:
1302 set_max_idle (nthreads);
1026 1303
1027int 1304int
1028max_outstanding (nreqs) 1305max_outstanding (int maxreqs)
1029 int nreqs 1306 PROTOTYPE: $
1030 PROTOTYPE: $
1031 CODE: 1307 CODE:
1032 RETVAL = max_outstanding; 1308 RETVAL = max_outstanding;
1033 max_outstanding = nreqs; 1309 max_outstanding = maxreqs;
1310 OUTPUT:
1311 RETVAL
1034 1312
1035void 1313void
1036aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1037 SV * pathname 1315 SV8 * pathname
1038 int flags 1316 int flags
1039 int mode 1317 int mode
1040 SV * callback 1318 SV * callback
1041 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1042 PPCODE: 1320 PPCODE:
1043{ 1321{
1044 dREQ; 1322 dREQ;
1045 1323
1046 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1047 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1048 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1049 req->fd = flags; 1327 req->int1 = flags;
1050 req->mode = mode; 1328 req->mode = mode;
1051 1329
1052 REQ_SEND; 1330 REQ_SEND;
1053} 1331}
1054 1332
1064 PPCODE: 1342 PPCODE:
1065{ 1343{
1066 dREQ; 1344 dREQ;
1067 1345
1068 req->type = ix; 1346 req->type = ix;
1069 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1070 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1071 1349
1072 REQ_SEND (req); 1350 REQ_SEND (req);
1073} 1351}
1074 1352
1075void 1353void
1076aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1077 SV * fh 1355 SV * fh
1078 UV offset 1356 UV offset
1079 UV length 1357 UV length
1080 SV * data 1358 SV8 * data
1081 UV dataoffset 1359 UV dataoffset
1082 SV * callback 1360 SV * callback
1083 ALIAS: 1361 ALIAS:
1084 aio_read = REQ_READ 1362 aio_read = REQ_READ
1085 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1086 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1087 PPCODE: 1365 PPCODE:
1088{ 1366{
1089 aio_req req;
1090 STRLEN svlen; 1367 STRLEN svlen;
1091 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1092 1369
1093 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1094 SvPOK_on (data); 1371 SvPOK_on (data);
1116 1393
1117 { 1394 {
1118 dREQ; 1395 dREQ;
1119 1396
1120 req->type = ix; 1397 req->type = ix;
1121 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1122 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1123 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1124 req->offset = offset; 1401 req->offs = offset;
1125 req->length = length; 1402 req->size = length;
1126 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1127 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1128 1406
1129 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1130 { 1408 {
1131 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1132 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1133 } 1411 }
1134 1412
1135 REQ_SEND; 1413 REQ_SEND;
1136 } 1414 }
1415}
1416
1417void
1418aio_readlink (path,callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$
1422 PPCODE:
1423{
1424 SV *data;
1425 dREQ;
1426
1427 data = newSV (NAME_MAX);
1428 SvPOK_on (data);
1429
1430 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh);
1433 req->sv1 = data;
1434 req->ptr1 = SvPVbyte_nolen (data);
1435
1436 REQ_SEND;
1137} 1437}
1138 1438
1139void 1439void
1140aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1141 SV * out_fh 1441 SV * out_fh
1147 PPCODE: 1447 PPCODE:
1148{ 1448{
1149 dREQ; 1449 dREQ;
1150 1450
1151 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1152 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1153 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1154 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1155 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1156 req->offset = in_offset; 1456 req->offs = in_offset;
1157 req->length = length; 1457 req->size = length;
1158 1458
1159 REQ_SEND; 1459 REQ_SEND;
1160} 1460}
1161 1461
1162void 1462void
1169 PPCODE: 1469 PPCODE:
1170{ 1470{
1171 dREQ; 1471 dREQ;
1172 1472
1173 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1174 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1175 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1176 req->offset = offset; 1476 req->offs = offset;
1177 req->length = length; 1477 req->size = length;
1178 1478
1179 REQ_SEND; 1479 REQ_SEND;
1180} 1480}
1181 1481
1182void 1482void
1183aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1184 SV * fh_or_path 1484 SV8 * fh_or_path
1185 SV * callback 1485 SV * callback
1186 ALIAS: 1486 ALIAS:
1187 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1188 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1189 PPCODE: 1489 PPCODE:
1190{ 1490{
1191 dREQ; 1491 dREQ;
1192 1492
1193 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1194 if (!req->statdata) 1494 if (!req->ptr2)
1195 { 1495 {
1196 req_free (req); 1496 req_free (req);
1197 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1198 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1199 1501
1200 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1201 { 1503 {
1202 req->type = ix; 1504 req->type = ix;
1203 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1204 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1205 } 1507 }
1206 else 1508 else
1207 { 1509 {
1208 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1209 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1210 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1211 } 1513 }
1212 1514
1213 REQ_SEND; 1515 REQ_SEND;
1214} 1516}
1215 1517
1216void 1518void
1217aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1218 SV * pathname 1520 SV8 * pathname
1219 SV * callback 1521 SV * callback
1220 ALIAS: 1522 ALIAS:
1221 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1222 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1223 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1224 PPCODE: 1526 PPCODE:
1225{ 1527{
1226 dREQ; 1528 dREQ;
1227 1529
1228 req->type = ix; 1530 req->type = ix;
1229 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1230 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1231 1533
1232 REQ_SEND; 1534 REQ_SEND;
1233} 1535}
1234 1536
1235void 1537void
1236aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1237 SV * oldpath 1539 SV8 * oldpath
1238 SV * newpath 1540 SV8 * newpath
1239 SV * callback 1541 SV * callback
1240 ALIAS: 1542 ALIAS:
1241 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1242 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1243 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1244 PPCODE: 1546 PPCODE:
1245{ 1547{
1246 dREQ; 1548 dREQ;
1247 1549
1248 req->type = ix; 1550 req->type = ix;
1249 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1250 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1251 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1252 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1253 1555
1254 REQ_SEND; 1556 REQ_SEND;
1255} 1557}
1256 1558
1257void 1559void
1258aio_sleep (delay,callback=&PL_sv_undef) 1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1259 double delay 1561 SV8 * pathname
1260 SV * callback 1562 SV * callback
1563 UV mode
1564 UV dev
1261 PPCODE: 1565 PPCODE:
1262{ 1566{
1263 dREQ; 1567 dREQ;
1568
1569 req->type = REQ_MKNOD;
1570 req->sv1 = newSVsv (pathname);
1571 req->ptr1 = SvPVbyte_nolen (req->sv1);
1572 req->mode = (mode_t)mode;
1573 req->offs = dev;
1574
1575 REQ_SEND;
1576}
1264 1577
1578void
1579aio_busy (delay,callback=&PL_sv_undef)
1580 double delay
1581 SV * callback
1582 PPCODE:
1583{
1584 dREQ;
1585
1265 req->type = REQ_SLEEP; 1586 req->type = REQ_BUSY;
1266 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1267 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1268 1589
1269 REQ_SEND; 1590 REQ_SEND;
1270} 1591}
1271 1592
1272void 1593void
1276 PPCODE: 1597 PPCODE:
1277{ 1598{
1278 dREQ; 1599 dREQ;
1279 1600
1280 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1281 req_send (req); 1603 req_send (req);
1282
1283 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1284} 1605}
1285 1606
1286void 1607void
1287aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1288 SV * callback 1609 SV * callback
1289 PPCODE: 1610 PPCODE:
1290{ 1611{
1291 dREQ; 1612 dREQ;
1292 1613
1293 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
1294 1615
1295 REQ_SEND; 1616 REQ_SEND;
1296} 1617}
1297 1618
1298#if 0 1619int
1299 1620aioreq_pri (int pri = 0)
1300void 1621 PROTOTYPE: ;$
1301aio_pri (int pri = DEFAULT_PRI)
1302 CODE: 1622 CODE:
1623 RETVAL = next_pri - PRI_BIAS;
1624 if (items > 0)
1625 {
1303 if (pri < PRI_MIN) pri = PRI_MIN; 1626 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX; 1627 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS; 1628 next_pri = pri + PRI_BIAS;
1629 }
1630 OUTPUT:
1631 RETVAL
1306 1632
1307#endif 1633void
1634aioreq_nice (int nice = 0)
1635 CODE:
1636 nice = next_pri - nice;
1637 if (nice < PRI_MIN) nice = PRI_MIN;
1638 if (nice > PRI_MAX) nice = PRI_MAX;
1639 next_pri = nice + PRI_BIAS;
1308 1640
1309void 1641void
1310flush () 1642flush ()
1311 PROTOTYPE: 1643 PROTOTYPE:
1312 CODE: 1644 CODE:
1314 { 1646 {
1315 poll_wait (); 1647 poll_wait ();
1316 poll_cb (); 1648 poll_cb ();
1317 } 1649 }
1318 1650
1319void 1651int
1320poll() 1652poll()
1321 PROTOTYPE: 1653 PROTOTYPE:
1322 CODE: 1654 CODE:
1323 if (nreqs)
1324 {
1325 poll_wait (); 1655 poll_wait ();
1326 poll_cb (); 1656 RETVAL = poll_cb ();
1327 } 1657 OUTPUT:
1658 RETVAL
1328 1659
1329int 1660int
1330poll_fileno() 1661poll_fileno()
1331 PROTOTYPE: 1662 PROTOTYPE:
1332 CODE: 1663 CODE:
1344 1675
1345void 1676void
1346poll_wait() 1677poll_wait()
1347 PROTOTYPE: 1678 PROTOTYPE:
1348 CODE: 1679 CODE:
1349 if (nreqs)
1350 poll_wait (); 1680 poll_wait ();
1351 1681
1352int 1682int
1353nreqs() 1683nreqs()
1354 PROTOTYPE: 1684 PROTOTYPE:
1355 CODE: 1685 CODE:
1356 RETVAL = nreqs; 1686 RETVAL = nreqs;
1357 OUTPUT: 1687 OUTPUT:
1358 RETVAL 1688 RETVAL
1359 1689
1690int
1691nready()
1692 PROTOTYPE:
1693 CODE:
1694 RETVAL = get_nready ();
1695 OUTPUT:
1696 RETVAL
1697
1698int
1699npending()
1700 PROTOTYPE:
1701 CODE:
1702 RETVAL = get_npending ();
1703 OUTPUT:
1704 RETVAL
1705
1706int
1707nthreads()
1708 PROTOTYPE:
1709 CODE:
1710 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1711 RETVAL = started;
1712 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1713 OUTPUT:
1714 RETVAL
1715
1360PROTOTYPES: DISABLE 1716PROTOTYPES: DISABLE
1361 1717
1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1718MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363 1719
1364void 1720void
1365cancel (aio_req_ornot req) 1721cancel (aio_req_ornot req)
1366 PROTOTYPE:
1367 CODE: 1722 CODE:
1368 req_cancel (req); 1723 req_cancel (req);
1369 1724
1370void 1725void
1371cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1726cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1380 PPCODE: 1735 PPCODE:
1381{ 1736{
1382 int i; 1737 int i;
1383 aio_req req; 1738 aio_req req;
1384 1739
1385 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1386 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1741 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1387 1742
1388 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1389 { 1744 {
1390 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
1392 1747
1393 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1394 1749
1395 if (req) 1750 if (req)
1396 { 1751 {
1397 ++grp->length; 1752 ++grp->size;
1398 req->grp = grp; 1753 req->grp = grp;
1399 1754
1400 req->grp_prev = 0; 1755 req->grp_prev = 0;
1401 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1402 1757
1407 } 1762 }
1408 } 1763 }
1409} 1764}
1410 1765
1411void 1766void
1767cancel_subs (aio_req_ornot req)
1768 CODE:
1769 req_cancel_subs (req);
1770
1771void
1412result (aio_req grp, ...) 1772result (aio_req grp, ...)
1413 CODE: 1773 CODE:
1414{ 1774{
1415 int i; 1775 int i;
1776 AV *av;
1777
1778 grp->errorno = errno;
1779
1416 AV *av = newAV (); 1780 av = newAV ();
1417 1781
1418 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1419 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1420 1784
1421 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1422 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1423} 1787}
1424 1788
1425void 1789void
1790errno (aio_req grp, int errorno = errno)
1791 CODE:
1792 grp->errorno = errorno;
1793
1794void
1426feed_limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1427 CODE: 1796 CODE:
1428 grp->fd2 = limit; 1797 grp->int2 = limit;
1429 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1430 1799
1431void 1800void
1432feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1433 CODE: 1802 CODE:
1434{ 1803{
1435 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1436 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1437 1806
1438 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1439 grp->fd2 = 2; 1808 grp->int2 = 2;
1440 1809
1441 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1442} 1811}
1443 1812

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines