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.92 by root, Wed Nov 8 01:59:59 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 = SvREFCNT_inc (POPs);
453
454 PUSHMARK (SP);
455 XPUSHs (sv_2mortal (fh));
456 }
457 break;
458
459 case REQ_GROUP:
460 req->int1 = 2; /* mark group as finished */
461
462 if (req->sv1)
463 {
464 int i;
465 AV *av = (AV *)req->sv1;
466
467 EXTEND (SP, AvFILL (av) + 1);
468 for (i = 0; i <= AvFILL (av); ++i)
469 PUSHs (*av_fetch (av, i, 0));
470 }
471 break;
472
473 case REQ_NOP:
474 case REQ_BUSY:
475 break;
476
477 case REQ_READLINK:
478 if (req->result > 0)
479 {
480 SvCUR_set (req->sv1, req->result);
481 *SvEND (req->sv1) = 0;
482 PUSHs (req->sv1);
483 }
484 break;
485
486 case REQ_STAT:
487 case REQ_LSTAT:
488 case REQ_FSTAT:
489 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
490 PL_laststatval = req->result;
491 PL_statcache = *(Stat_t *)(req->ptr2);
492 PUSHs (sv_2mortal (newSViv (req->result)));
493 break;
494
495 case REQ_READ:
496 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
497 *SvEND (req->sv1) = 0;
498 PUSHs (sv_2mortal (newSViv (req->result)));
499 break;
500
501 default:
502 PUSHs (sv_2mortal (newSViv (req->result)));
503 break;
504 }
505
506 errno = req->errorno;
507
508 PUTBACK;
509 call_sv (req->callback, G_VOID | G_EVAL);
510 SPAGAIN;
511
512 FREETMPS;
513 LEAVE;
239 } 514 }
240}
241 515
242static void req_invoke (aio_req req) 516 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 { 517 {
259 case REQ_READDIR: 518 aio_req grp = req->grp;
260 {
261 SV *rv = &PL_sv_undef;
262 519
263 if (req->result >= 0) 520 /* unlink request */
264 { 521 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
265 char *buf = req->data2ptr; 522 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
266 AV *av = newAV ();
267 523
268 while (req->result) 524 if (grp->grp_first == req)
269 { 525 grp->grp_first = req->grp_next;
270 SV *sv = newSVpv (buf, 0);
271 526
272 av_push (av, sv); 527 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 } 528 }
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 529
334 if (SvTRUE (ERRSV)) 530 if (SvTRUE (ERRSV))
335 { 531 {
336 req_free (req); 532 req_free (req);
337 croak (0); 533 croak (0);
338 } 534 }
339} 535}
340 536
341static void req_free (aio_req req) 537static void req_free (aio_req req)
342{ 538{
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) 539 if (req->self)
358 { 540 {
359 sv_unmagic (req->self, PERL_MAGIC_ext); 541 sv_unmagic (req->self, PERL_MAGIC_ext);
360 SvREFCNT_dec (req->self); 542 SvREFCNT_dec (req->self);
361 } 543 }
362 544
363 SvREFCNT_dec (req->data);
364 SvREFCNT_dec (req->fh); 545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1);
365 SvREFCNT_dec (req->fh2); 547 SvREFCNT_dec (req->sv2);
366 SvREFCNT_dec (req->callback); 548 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata);
368 549
369 if (req->type == REQ_READDIR && req->result >= 0) 550 if (req->flags & FLAG_PTR2_FREE)
370 free (req->data2ptr); 551 free (req->ptr2);
371 552
372 Safefree (req); 553 Safefree (req);
373} 554}
374 555
556static void req_cancel_subs (aio_req grp)
557{
558 aio_req sub;
559
560 if (grp->type != REQ_GROUP)
561 return;
562
563 SvREFCNT_dec (grp->sv2);
564 grp->sv2 = 0;
565
566 for (sub = grp->grp_first; sub; sub = sub->grp_next)
567 req_cancel (sub);
568}
569
375static void req_cancel (aio_req req) 570static void req_cancel (aio_req req)
376{ 571{
377 req->flags |= FLAG_CANCELLED; 572 req->flags |= FLAG_CANCELLED;
378 573
379 if (req->type == REQ_GROUP) 574 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} 575}
454 576
455static void *aio_proc(void *arg); 577static void *aio_proc(void *arg);
456 578
457static void start_thread (void) 579static void start_thread (void)
458{ 580{
459 sigset_t fullsigset, oldsigset; 581 sigset_t fullsigset, oldsigset;
460 pthread_t tid;
461 pthread_attr_t attr; 582 pthread_attr_t attr;
583
584 worker *wrk = calloc (1, sizeof (worker));
585
586 if (!wrk)
587 croak ("unable to allocate worker thread data");
462 588
463 pthread_attr_init (&attr); 589 pthread_attr_init (&attr);
464 pthread_attr_setstacksize (&attr, STACKSIZE); 590 pthread_attr_setstacksize (&attr, STACKSIZE);
465 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 591 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
592#ifdef PTHREAD_SCOPE_PROCESS
593 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
594#endif
466 595
467 sigfillset (&fullsigset); 596 sigfillset (&fullsigset);
597
598 LOCK (wrklock);
468 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 599 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469 600
470 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 601 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 { 602 {
489 reqe->next = req; 603 wrk->prev = &wrk_first;
490 reqe = req; 604 wrk->next = wrk_first.next;
605 wrk_first.next->prev = wrk;
606 wrk_first.next = wrk;
607 ++started;
491 } 608 }
492 else 609 else
493 reqe = reqs = req; 610 free (wrk);
494 611
612 sigprocmask (SIG_SETMASK, &oldsigset, 0);
613 UNLOCK (wrklock);
614}
615
616static void maybe_start_thread ()
617{
618 if (get_nthreads () >= wanted)
619 return;
620
621 /* todo: maybe use idle here, but might be less exact */
622 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
623 return;
624
625 start_thread ();
626}
627
628static void req_send (aio_req req)
629{
630 ++nreqs;
631
632 LOCK (reqlock);
633 ++nready;
634 reqq_push (&req_queue, req);
495 pthread_cond_signal (&reqwait); 635 pthread_cond_signal (&reqwait);
496 pthread_mutex_unlock (&reqlock); 636 UNLOCK (reqlock);
497 637
498 if (nreqs > max_outstanding) 638 maybe_start_thread ();
499 for (;;)
500 {
501 poll_cb ();
502
503 if (nreqs <= max_outstanding)
504 break;
505
506 poll_wait ();
507 }
508} 639}
509 640
510static void end_thread (void) 641static void end_thread (void)
511{ 642{
512 aio_req req; 643 aio_req req;
644
513 Newz (0, req, 1, aio_cb); 645 Newz (0, req, 1, aio_cb);
646
514 req->type = REQ_QUIT; 647 req->type = REQ_QUIT;
648 req->pri = PRI_MAX + PRI_BIAS;
515 649
516 req_send (req); 650 LOCK (reqlock);
651 reqq_push (&req_queue, req);
652 pthread_cond_signal (&reqwait);
653 UNLOCK (reqlock);
654
655 LOCK (wrklock);
656 --started;
657 UNLOCK (wrklock);
658}
659
660static void set_max_idle (int nthreads)
661{
662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
663 max_idle = nthreads <= 0 ? 1 : nthreads;
664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
517} 665}
518 666
519static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
520{ 668{
521 if (wanted < nthreads) 669 if (wanted < nthreads)
522 wanted = nthreads; 670 wanted = nthreads;
523} 671}
524 672
525static void max_parallel (int nthreads) 673static void max_parallel (int nthreads)
526{ 674{
527 int cur = started;
528
529 if (wanted > nthreads) 675 if (wanted > nthreads)
530 wanted = nthreads; 676 wanted = nthreads;
531 677
532 while (cur > wanted) 678 while (started > wanted)
679 end_thread ();
680}
681
682static void poll_wait ()
683{
684 fd_set rfd;
685
686 while (nreqs)
533 { 687 {
688 int size;
689 if (WORDACCESS_UNSAFE) LOCK (reslock);
690 size = res_queue.size;
691 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
692
693 if (size)
694 return;
695
534 end_thread (); 696 maybe_start_thread ();
535 cur--; 697
698 FD_ZERO(&rfd);
699 FD_SET(respipe [0], &rfd);
700
701 select (respipe [0] + 1, &rfd, 0, 0, 0);
536 } 702 }
703}
537 704
538 while (started > wanted) 705static int poll_cb ()
706{
707 dSP;
708 int count = 0;
709 int maxreqs = max_poll_reqs;
710 int do_croak = 0;
711 struct timeval tv_start, tv_now;
712 aio_req req;
713
714 if (max_poll_time)
715 gettimeofday (&tv_start, 0);
716
717 for (;;)
539 { 718 {
719 for (;;)
720 {
721 maybe_start_thread ();
722
723 LOCK (reslock);
724 req = reqq_shift (&res_queue);
725
726 if (req)
727 {
728 --npending;
729
730 if (!res_queue.size)
731 {
732 /* read any signals sent by the worker threads */
733 char buf [32];
734 while (read (respipe [0], buf, 32) == 32)
735 ;
736 }
737 }
738
739 UNLOCK (reslock);
740
741 if (!req)
742 break;
743
744 --nreqs;
745
746 if (req->type == REQ_GROUP && req->size)
747 {
748 req->int1 = 1; /* mark request as delayed */
749 continue;
750 }
751 else
752 {
753 req_invoke (req);
754
755 count++;
756 }
757
758 req_free (req);
759
760 if (maxreqs && !--maxreqs)
761 break;
762
763 if (max_poll_time)
764 {
765 gettimeofday (&tv_now, 0);
766
767 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
768 break;
769 }
770 }
771
772 if (nreqs <= max_outstanding)
773 break;
774
540 poll_wait (); 775 poll_wait ();
541 poll_cb (); 776
777 ++maxreqs;
542 } 778 }
779
780 return count;
543} 781}
544 782
545static void create_pipe () 783static void create_pipe ()
546{ 784{
547 if (pipe (respipe)) 785 if (pipe (respipe))
571static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 809static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
572{ 810{
573 ssize_t res; 811 ssize_t res;
574 off_t ooffset; 812 off_t ooffset;
575 813
576 pthread_mutex_lock (&preadwritelock); 814 LOCK (preadwritelock);
577 ooffset = lseek (fd, 0, SEEK_CUR); 815 ooffset = lseek (fd, 0, SEEK_CUR);
578 lseek (fd, offset, SEEK_SET); 816 lseek (fd, offset, SEEK_SET);
579 res = read (fd, buf, count); 817 res = read (fd, buf, count);
580 lseek (fd, ooffset, SEEK_SET); 818 lseek (fd, ooffset, SEEK_SET);
581 pthread_mutex_unlock (&preadwritelock); 819 UNLOCK (preadwritelock);
582 820
583 return res; 821 return res;
584} 822}
585 823
586static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 824static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
587{ 825{
588 ssize_t res; 826 ssize_t res;
589 off_t ooffset; 827 off_t ooffset;
590 828
591 pthread_mutex_lock (&preadwritelock); 829 LOCK (preadwritelock);
592 ooffset = lseek (fd, 0, SEEK_CUR); 830 ooffset = lseek (fd, 0, SEEK_CUR);
593 lseek (fd, offset, SEEK_SET); 831 lseek (fd, offset, SEEK_SET);
594 res = write (fd, buf, count); 832 res = write (fd, buf, count);
595 lseek (fd, offset, SEEK_SET); 833 lseek (fd, offset, SEEK_SET);
596 pthread_mutex_unlock (&preadwritelock); 834 UNLOCK (preadwritelock);
597 835
598 return res; 836 return res;
599} 837}
600#endif 838#endif
601 839
602#if !HAVE_FDATASYNC 840#if !HAVE_FDATASYNC
603# define fdatasync fsync 841# define fdatasync fsync
604#endif 842#endif
605 843
606#if !HAVE_READAHEAD 844#if !HAVE_READAHEAD
607# define readahead aio_readahead 845# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
608 846
609static ssize_t readahead (int fd, off_t offset, size_t count) 847static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
610{ 848{
611 dBUF; 849 dBUF;
612 850
613 while (count > 0) 851 while (count > 0)
614 { 852 {
617 pread (fd, aio_buf, len, offset); 855 pread (fd, aio_buf, len, offset);
618 offset += len; 856 offset += len;
619 count -= len; 857 count -= len;
620 } 858 }
621 859
622 fBUF;
623
624 errno = 0; 860 errno = 0;
625} 861}
862
626#endif 863#endif
627 864
628#if !HAVE_READDIR_R 865#if !HAVE_READDIR_R
629# define readdir_r aio_readdir_r 866# define readdir_r aio_readdir_r
630 867
633static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 870static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
634{ 871{
635 struct dirent *e; 872 struct dirent *e;
636 int errorno; 873 int errorno;
637 874
638 pthread_mutex_lock (&readdirlock); 875 LOCK (readdirlock);
639 876
640 e = readdir (dirp); 877 e = readdir (dirp);
641 errorno = errno; 878 errorno = errno;
642 879
643 if (e) 880 if (e)
646 strcpy (ent->d_name, e->d_name); 883 strcpy (ent->d_name, e->d_name);
647 } 884 }
648 else 885 else
649 *res = 0; 886 *res = 0;
650 887
651 pthread_mutex_unlock (&readdirlock); 888 UNLOCK (readdirlock);
652 889
653 errno = errorno; 890 errno = errorno;
654 return e ? 0 : -1; 891 return e ? 0 : -1;
655} 892}
656#endif 893#endif
657 894
658/* sendfile always needs emulation */ 895/* sendfile always needs emulation */
659static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 896static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
660{ 897{
661 ssize_t res; 898 ssize_t res;
662 899
663 if (!count) 900 if (!count)
664 return 0; 901 return 0;
675 { 912 {
676 off_t sbytes; 913 off_t sbytes;
677 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 914 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
678 915
679 if (res < 0 && sbytes) 916 if (res < 0 && sbytes)
680 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 917 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
681 res = sbytes; 918 res = sbytes;
682 } 919 }
683 920
684# elif __hpux 921# elif __hpux
685 res = sendfile (ofd, ifd, offset, count, 0, 0); 922 res = sendfile (ofd, ifd, offset, count, 0, 0);
741 978
742 offset += cnt; 979 offset += cnt;
743 res += cnt; 980 res += cnt;
744 count -= cnt; 981 count -= cnt;
745 } 982 }
746
747 fBUF;
748 } 983 }
749 984
750 return res; 985 return res;
751} 986}
752 987
753/* read a full directory */ 988/* read a full directory */
754static int scandir_ (const char *path, void **namesp) 989static void scandir_ (aio_req req, worker *self)
755{ 990{
756 DIR *dirp; 991 DIR *dirp;
757 union 992 union
758 { 993 {
759 struct dirent d; 994 struct dirent d;
764 int memlen = 4096; 999 int memlen = 4096;
765 int memofs = 0; 1000 int memofs = 0;
766 int res = 0; 1001 int res = 0;
767 int errorno; 1002 int errorno;
768 1003
769 dirp = opendir (path); 1004 LOCK (wrklock);
770 if (!dirp) 1005 self->dirp = dirp = opendir (req->ptr1);
771 return -1;
772
773 u = malloc (sizeof (*u)); 1006 self->dbuf = u = malloc (sizeof (*u));
1007 req->flags |= FLAG_PTR2_FREE;
774 names = malloc (memlen); 1008 req->ptr2 = names = malloc (memlen);
1009 UNLOCK (wrklock);
775 1010
776 if (u && names) 1011 if (dirp && u && names)
777 for (;;) 1012 for (;;)
778 { 1013 {
779 errno = 0; 1014 errno = 0;
780 readdir_r (dirp, &u->d, &entp); 1015 readdir_r (dirp, &u->d, &entp);
781 1016
791 res++; 1026 res++;
792 1027
793 while (memofs + len > memlen) 1028 while (memofs + len > memlen)
794 { 1029 {
795 memlen *= 2; 1030 memlen *= 2;
1031 LOCK (wrklock);
796 names = realloc (names, memlen); 1032 req->ptr2 = names = realloc (names, memlen);
1033 UNLOCK (wrklock);
1034
797 if (!names) 1035 if (!names)
798 break; 1036 break;
799 } 1037 }
800 1038
801 memcpy (names + memofs, name, len); 1039 memcpy (names + memofs, name, len);
802 memofs += len; 1040 memofs += len;
803 } 1041 }
804 } 1042 }
805 1043
806 errorno = errno;
807 free (u);
808 closedir (dirp);
809
810 if (errorno) 1044 if (errno)
1045 res = -1;
1046
1047 req->result = res;
1048}
1049
1050/*****************************************************************************/
1051
1052static void *aio_proc (void *thr_arg)
1053{
1054 aio_req req;
1055 struct timespec ts;
1056 worker *self = (worker *)thr_arg;
1057
1058 /* try to distribute timeouts somewhat evenly */
1059 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1060 * (1000000000UL / 1024UL);
1061
1062 for (;;)
811 { 1063 {
812 free (names); 1064 ts.tv_sec = time (0) + IDLE_TIMEOUT;
813 errno = errorno;
814 res = -1;
815 }
816 1065
817 *namesp = (void *)names; 1066 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 1067
832 for (;;) 1068 for (;;)
833 { 1069 {
834 req = reqs; 1070 self->req = req = reqq_shift (&req_queue);
835
836 if (reqs)
837 {
838 reqs = reqs->next;
839 if (!reqs) reqe = 0;
840 }
841 1071
842 if (req) 1072 if (req)
843 break; 1073 break;
844 1074
1075 ++idle;
1076
1077 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1078 == ETIMEDOUT)
1079 {
1080 if (idle > max_idle)
1081 {
1082 --idle;
1083 UNLOCK (reqlock);
1084 LOCK (wrklock);
1085 --started;
1086 UNLOCK (wrklock);
1087 goto quit;
1088 }
1089
1090 /* we are allowed to idle, so do so without any timeout */
845 pthread_cond_wait (&reqwait, &reqlock); 1091 pthread_cond_wait (&reqwait, &reqlock);
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 }
1094
1095 --idle;
846 } 1096 }
847 1097
848 pthread_mutex_unlock (&reqlock); 1098 --nready;
1099
1100 UNLOCK (reqlock);
849 1101
850 errno = 0; /* strictly unnecessary */ 1102 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */
852 1103
853 if (!(req->flags & FLAG_CANCELLED)) 1104 if (!(req->flags & FLAG_CANCELLED))
854 switch (type) 1105 switch (req->type)
855 { 1106 {
856 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1107 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; 1108 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
858 1109
859 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1110 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; 1111 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
861 1112
862 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1113 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; 1114 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; 1115 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
865 1116
866 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1117 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
867 case REQ_CLOSE: req->result = close (req->fd); break; 1118 case REQ_CLOSE: req->result = close (req->int1); break;
868 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
869 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
870 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
871 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
872 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1123 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1124 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1125 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
873 1126
874 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
875 case REQ_FSYNC: req->result = fsync (req->fd); break; 1128 case REQ_FSYNC: req->result = fsync (req->int1); break;
876 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1129 case REQ_READDIR: scandir_ (req, self); break;
877 1130
878 case REQ_SLEEP: 1131 case REQ_BUSY:
879 { 1132 {
880 struct timeval tv; 1133 struct timeval tv;
881 1134
882 tv.tv_sec = req->fd; 1135 tv.tv_sec = req->int1;
883 tv.tv_usec = req->fd2; 1136 tv.tv_usec = req->int2;
884 1137
885 req->result = select (0, 0, 0, 0, &tv); 1138 req->result = select (0, 0, 0, 0, &tv);
886 } 1139 }
887 1140
888 case REQ_GROUP: 1141 case REQ_GROUP:
889 case REQ_NOP: 1142 case REQ_NOP:
1143 break;
1144
890 case REQ_QUIT: 1145 case REQ_QUIT:
891 break; 1146 goto quit;
892 1147
893 default: 1148 default:
894 req->result = ENOSYS; 1149 req->result = ENOSYS;
895 break; 1150 break;
896 } 1151 }
897 1152
898 req->errorno = errno; 1153 req->errorno = errno;
899 1154
900 pthread_mutex_lock (&reslock); 1155 LOCK (reslock);
901 1156
902 req->next = 0; 1157 ++npending;
903 1158
904 if (rese) 1159 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 */ 1160 /* write a dummy byte to the pipe so fh becomes ready */
914 write (respipe [1], &respipe, 1); 1161 write (respipe [1], &respipe, 1);
915 }
916 1162
917 pthread_mutex_unlock (&reslock); 1163 self->req = 0;
1164 worker_clear (self);
1165
1166 UNLOCK (reslock);
918 } 1167 }
919 while (type != REQ_QUIT); 1168
1169quit:
1170 LOCK (wrklock);
1171 worker_free (self);
1172 UNLOCK (wrklock);
920 1173
921 return 0; 1174 return 0;
922} 1175}
923 1176
924/*****************************************************************************/ 1177/*****************************************************************************/
925 1178
926static void atfork_prepare (void) 1179static void atfork_prepare (void)
927{ 1180{
928 pthread_mutex_lock (&reqlock); 1181 LOCK (wrklock);
929 pthread_mutex_lock (&reslock); 1182 LOCK (reqlock);
1183 LOCK (reslock);
930#if !HAVE_PREADWRITE 1184#if !HAVE_PREADWRITE
931 pthread_mutex_lock (&preadwritelock); 1185 LOCK (preadwritelock);
932#endif 1186#endif
933#if !HAVE_READDIR_R 1187#if !HAVE_READDIR_R
934 pthread_mutex_lock (&readdirlock); 1188 LOCK (readdirlock);
935#endif 1189#endif
936} 1190}
937 1191
938static void atfork_parent (void) 1192static void atfork_parent (void)
939{ 1193{
940#if !HAVE_READDIR_R 1194#if !HAVE_READDIR_R
941 pthread_mutex_unlock (&readdirlock); 1195 UNLOCK (readdirlock);
942#endif 1196#endif
943#if !HAVE_PREADWRITE 1197#if !HAVE_PREADWRITE
944 pthread_mutex_unlock (&preadwritelock); 1198 UNLOCK (preadwritelock);
945#endif 1199#endif
946 pthread_mutex_unlock (&reslock); 1200 UNLOCK (reslock);
947 pthread_mutex_unlock (&reqlock); 1201 UNLOCK (reqlock);
1202 UNLOCK (wrklock);
948} 1203}
949 1204
950static void atfork_child (void) 1205static void atfork_child (void)
951{ 1206{
952 aio_req prv; 1207 aio_req prv;
953 1208
954 started = 0; 1209 while (prv = reqq_shift (&req_queue))
1210 req_free (prv);
955 1211
956 while (reqs) 1212 while (prv = reqq_shift (&res_queue))
1213 req_free (prv);
1214
1215 while (wrk_first.next != &wrk_first)
957 { 1216 {
958 prv = reqs; 1217 worker *wrk = wrk_first.next;
959 reqs = prv->next; 1218
1219 if (wrk->req)
1220 req_free (wrk->req);
1221
1222 worker_clear (wrk);
960 req_free (prv); 1223 worker_free (wrk);
961 } 1224 }
962 1225
963 reqs = reqe = 0; 1226 started = 0;
964 1227 idle = 0;
965 while (ress) 1228 nreqs = 0;
966 { 1229 nready = 0;
967 prv = ress; 1230 npending = 0;
968 ress = prv->next;
969 req_free (prv);
970 }
971
972 ress = rese = 0;
973 1231
974 close (respipe [0]); 1232 close (respipe [0]);
975 close (respipe [1]); 1233 close (respipe [1]);
976 create_pipe (); 1234 create_pipe ();
977 1235
1004PROTOTYPES: ENABLE 1262PROTOTYPES: ENABLE
1005 1263
1006BOOT: 1264BOOT:
1007{ 1265{
1008 HV *stash = gv_stashpv ("IO::AIO", 1); 1266 HV *stash = gv_stashpv ("IO::AIO", 1);
1267
1009 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1268 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1010 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1269 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1011 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1270 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1271 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1272 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1273 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1012 1274
1013 create_pipe (); 1275 create_pipe ();
1014 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1015} 1277}
1016 1278
1017void 1279void
1018min_parallel (nthreads) 1280max_poll_reqs (int nreqs)
1019 int nthreads
1020 PROTOTYPE: $ 1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_reqs = nreqs;
1021 1284
1022void 1285void
1023max_parallel (nthreads) 1286max_poll_time (double nseconds)
1024 int nthreads
1025 PROTOTYPE: $ 1287 PROTOTYPE: $
1288 CODE:
1289 max_poll_time = nseconds * AIO_TICKS;
1290
1291void
1292min_parallel (int nthreads)
1293 PROTOTYPE: $
1294
1295void
1296max_parallel (int nthreads)
1297 PROTOTYPE: $
1298
1299void
1300max_idle (int nthreads)
1301 PROTOTYPE: $
1302 CODE:
1303 set_max_idle (nthreads);
1026 1304
1027int 1305int
1028max_outstanding (nreqs) 1306max_outstanding (int maxreqs)
1029 int nreqs 1307 PROTOTYPE: $
1030 PROTOTYPE: $
1031 CODE: 1308 CODE:
1032 RETVAL = max_outstanding; 1309 RETVAL = max_outstanding;
1033 max_outstanding = nreqs; 1310 max_outstanding = maxreqs;
1311 OUTPUT:
1312 RETVAL
1034 1313
1035void 1314void
1036aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1315aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1037 SV * pathname 1316 SV8 * pathname
1038 int flags 1317 int flags
1039 int mode 1318 int mode
1040 SV * callback 1319 SV * callback
1041 PROTOTYPE: $$$;$ 1320 PROTOTYPE: $$$;$
1042 PPCODE: 1321 PPCODE:
1043{ 1322{
1044 dREQ; 1323 dREQ;
1045 1324
1046 req->type = REQ_OPEN; 1325 req->type = REQ_OPEN;
1047 req->data = newSVsv (pathname); 1326 req->sv1 = newSVsv (pathname);
1048 req->dataptr = SvPVbyte_nolen (req->data); 1327 req->ptr1 = SvPVbyte_nolen (req->sv1);
1049 req->fd = flags; 1328 req->int1 = flags;
1050 req->mode = mode; 1329 req->mode = mode;
1051 1330
1052 REQ_SEND; 1331 REQ_SEND;
1053} 1332}
1054 1333
1064 PPCODE: 1343 PPCODE:
1065{ 1344{
1066 dREQ; 1345 dREQ;
1067 1346
1068 req->type = ix; 1347 req->type = ix;
1069 req->fh = newSVsv (fh); 1348 req->fh = newSVsv (fh);
1070 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1071 1350
1072 REQ_SEND (req); 1351 REQ_SEND (req);
1073} 1352}
1074 1353
1075void 1354void
1076aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1077 SV * fh 1356 SV * fh
1078 UV offset 1357 UV offset
1079 UV length 1358 UV length
1080 SV * data 1359 SV8 * data
1081 UV dataoffset 1360 UV dataoffset
1082 SV * callback 1361 SV * callback
1083 ALIAS: 1362 ALIAS:
1084 aio_read = REQ_READ 1363 aio_read = REQ_READ
1085 aio_write = REQ_WRITE 1364 aio_write = REQ_WRITE
1086 PROTOTYPE: $$$$$;$ 1365 PROTOTYPE: $$$$$;$
1087 PPCODE: 1366 PPCODE:
1088{ 1367{
1089 aio_req req;
1090 STRLEN svlen; 1368 STRLEN svlen;
1091 char *svptr = SvPVbyte (data, svlen); 1369 char *svptr = SvPVbyte (data, svlen);
1092 1370
1093 SvUPGRADE (data, SVt_PV); 1371 SvUPGRADE (data, SVt_PV);
1094 SvPOK_on (data); 1372 SvPOK_on (data);
1116 1394
1117 { 1395 {
1118 dREQ; 1396 dREQ;
1119 1397
1120 req->type = ix; 1398 req->type = ix;
1121 req->fh = newSVsv (fh); 1399 req->fh = newSVsv (fh);
1122 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1123 : IoOFP (sv_2io (fh))); 1401 : IoOFP (sv_2io (fh)));
1124 req->offset = offset; 1402 req->offs = offset;
1125 req->length = length; 1403 req->size = length;
1126 req->data = SvREFCNT_inc (data); 1404 req->sv1 = SvREFCNT_inc (data);
1127 req->dataptr = (char *)svptr + dataoffset; 1405 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset;
1128 1407
1129 if (!SvREADONLY (data)) 1408 if (!SvREADONLY (data))
1130 { 1409 {
1131 SvREADONLY_on (data); 1410 SvREADONLY_on (data);
1132 req->data2ptr = (void *)data; 1411 req->flags |= FLAG_SV1_RO_OFF;
1133 } 1412 }
1134 1413
1135 REQ_SEND; 1414 REQ_SEND;
1136 } 1415 }
1416}
1417
1418void
1419aio_readlink (path,callback=&PL_sv_undef)
1420 SV8 * path
1421 SV * callback
1422 PROTOTYPE: $$;$
1423 PPCODE:
1424{
1425 SV *data;
1426 dREQ;
1427
1428 data = newSV (NAME_MAX);
1429 SvPOK_on (data);
1430
1431 req->type = REQ_READLINK;
1432 req->fh = newSVsv (path);
1433 req->ptr2 = SvPVbyte_nolen (req->fh);
1434 req->sv1 = data;
1435 req->ptr1 = SvPVbyte_nolen (data);
1436
1437 REQ_SEND;
1137} 1438}
1138 1439
1139void 1440void
1140aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1441aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1141 SV * out_fh 1442 SV * out_fh
1147 PPCODE: 1448 PPCODE:
1148{ 1449{
1149 dREQ; 1450 dREQ;
1150 1451
1151 req->type = REQ_SENDFILE; 1452 req->type = REQ_SENDFILE;
1152 req->fh = newSVsv (out_fh); 1453 req->fh = newSVsv (out_fh);
1153 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1154 req->fh2 = newSVsv (in_fh); 1455 req->sv2 = newSVsv (in_fh);
1155 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1156 req->offset = in_offset; 1457 req->offs = in_offset;
1157 req->length = length; 1458 req->size = length;
1158 1459
1159 REQ_SEND; 1460 REQ_SEND;
1160} 1461}
1161 1462
1162void 1463void
1169 PPCODE: 1470 PPCODE:
1170{ 1471{
1171 dREQ; 1472 dREQ;
1172 1473
1173 req->type = REQ_READAHEAD; 1474 req->type = REQ_READAHEAD;
1174 req->fh = newSVsv (fh); 1475 req->fh = newSVsv (fh);
1175 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1176 req->offset = offset; 1477 req->offs = offset;
1177 req->length = length; 1478 req->size = length;
1178 1479
1179 REQ_SEND; 1480 REQ_SEND;
1180} 1481}
1181 1482
1182void 1483void
1183aio_stat (fh_or_path,callback=&PL_sv_undef) 1484aio_stat (fh_or_path,callback=&PL_sv_undef)
1184 SV * fh_or_path 1485 SV8 * fh_or_path
1185 SV * callback 1486 SV * callback
1186 ALIAS: 1487 ALIAS:
1187 aio_stat = REQ_STAT 1488 aio_stat = REQ_STAT
1188 aio_lstat = REQ_LSTAT 1489 aio_lstat = REQ_LSTAT
1189 PPCODE: 1490 PPCODE:
1190{ 1491{
1191 dREQ; 1492 dREQ;
1192 1493
1193 New (0, req->statdata, 1, Stat_t); 1494 req->ptr2 = malloc (sizeof (Stat_t));
1194 if (!req->statdata) 1495 if (!req->ptr2)
1195 { 1496 {
1196 req_free (req); 1497 req_free (req);
1197 croak ("out of memory during aio_req->statdata allocation"); 1498 croak ("out of memory during aio_stat statdata allocation");
1198 } 1499 }
1500
1501 req->flags |= FLAG_PTR2_FREE;
1199 1502
1200 if (SvPOK (fh_or_path)) 1503 if (SvPOK (fh_or_path))
1201 { 1504 {
1202 req->type = ix; 1505 req->type = ix;
1203 req->data = newSVsv (fh_or_path); 1506 req->sv1 = newSVsv (fh_or_path);
1204 req->dataptr = SvPVbyte_nolen (req->data); 1507 req->ptr1 = SvPVbyte_nolen (req->sv1);
1205 } 1508 }
1206 else 1509 else
1207 { 1510 {
1208 req->type = REQ_FSTAT; 1511 req->type = REQ_FSTAT;
1209 req->fh = newSVsv (fh_or_path); 1512 req->fh = newSVsv (fh_or_path);
1210 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1211 } 1514 }
1212 1515
1213 REQ_SEND; 1516 REQ_SEND;
1214} 1517}
1215 1518
1216void 1519void
1217aio_unlink (pathname,callback=&PL_sv_undef) 1520aio_unlink (pathname,callback=&PL_sv_undef)
1218 SV * pathname 1521 SV8 * pathname
1219 SV * callback 1522 SV * callback
1220 ALIAS: 1523 ALIAS:
1221 aio_unlink = REQ_UNLINK 1524 aio_unlink = REQ_UNLINK
1222 aio_rmdir = REQ_RMDIR 1525 aio_rmdir = REQ_RMDIR
1223 aio_readdir = REQ_READDIR 1526 aio_readdir = REQ_READDIR
1224 PPCODE: 1527 PPCODE:
1225{ 1528{
1226 dREQ; 1529 dREQ;
1227 1530
1228 req->type = ix; 1531 req->type = ix;
1229 req->data = newSVsv (pathname); 1532 req->sv1 = newSVsv (pathname);
1230 req->dataptr = SvPVbyte_nolen (req->data); 1533 req->ptr1 = SvPVbyte_nolen (req->sv1);
1231 1534
1232 REQ_SEND; 1535 REQ_SEND;
1233} 1536}
1234 1537
1235void 1538void
1236aio_link (oldpath,newpath,callback=&PL_sv_undef) 1539aio_link (oldpath,newpath,callback=&PL_sv_undef)
1237 SV * oldpath 1540 SV8 * oldpath
1238 SV * newpath 1541 SV8 * newpath
1239 SV * callback 1542 SV * callback
1240 ALIAS: 1543 ALIAS:
1241 aio_link = REQ_LINK 1544 aio_link = REQ_LINK
1242 aio_symlink = REQ_SYMLINK 1545 aio_symlink = REQ_SYMLINK
1243 aio_rename = REQ_RENAME 1546 aio_rename = REQ_RENAME
1244 PPCODE: 1547 PPCODE:
1245{ 1548{
1246 dREQ; 1549 dREQ;
1247 1550
1248 req->type = ix; 1551 req->type = ix;
1249 req->fh = newSVsv (oldpath); 1552 req->fh = newSVsv (oldpath);
1250 req->data2ptr = SvPVbyte_nolen (req->fh); 1553 req->ptr2 = SvPVbyte_nolen (req->fh);
1251 req->data = newSVsv (newpath); 1554 req->sv1 = newSVsv (newpath);
1252 req->dataptr = SvPVbyte_nolen (req->data); 1555 req->ptr1 = SvPVbyte_nolen (req->sv1);
1253 1556
1254 REQ_SEND; 1557 REQ_SEND;
1255} 1558}
1256 1559
1257void 1560void
1258aio_sleep (delay,callback=&PL_sv_undef) 1561aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1259 double delay 1562 SV8 * pathname
1260 SV * callback 1563 SV * callback
1564 UV mode
1565 UV dev
1261 PPCODE: 1566 PPCODE:
1262{ 1567{
1263 dREQ; 1568 dREQ;
1569
1570 req->type = REQ_MKNOD;
1571 req->sv1 = newSVsv (pathname);
1572 req->ptr1 = SvPVbyte_nolen (req->sv1);
1573 req->mode = (mode_t)mode;
1574 req->offs = dev;
1575
1576 REQ_SEND;
1577}
1264 1578
1579void
1580aio_busy (delay,callback=&PL_sv_undef)
1581 double delay
1582 SV * callback
1583 PPCODE:
1584{
1585 dREQ;
1586
1265 req->type = REQ_SLEEP; 1587 req->type = REQ_BUSY;
1266 req->fd = delay < 0. ? 0 : delay; 1588 req->int1 = delay < 0. ? 0 : delay;
1267 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1268 1590
1269 REQ_SEND; 1591 REQ_SEND;
1270} 1592}
1271 1593
1272void 1594void
1276 PPCODE: 1598 PPCODE:
1277{ 1599{
1278 dREQ; 1600 dREQ;
1279 1601
1280 req->type = REQ_GROUP; 1602 req->type = REQ_GROUP;
1603
1281 req_send (req); 1604 req_send (req);
1282
1283 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1605 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1284} 1606}
1285 1607
1286void 1608void
1287aio_nop (callback=&PL_sv_undef) 1609aio_nop (callback=&PL_sv_undef)
1288 SV * callback 1610 SV * callback
1289 PPCODE: 1611 PPCODE:
1290{ 1612{
1291 dREQ; 1613 dREQ;
1292 1614
1293 req->type = REQ_NOP; 1615 req->type = REQ_NOP;
1294 1616
1295 REQ_SEND; 1617 REQ_SEND;
1296} 1618}
1297 1619
1298#if 0 1620int
1299 1621aioreq_pri (int pri = 0)
1300void 1622 PROTOTYPE: ;$
1301aio_pri (int pri = DEFAULT_PRI)
1302 CODE: 1623 CODE:
1624 RETVAL = next_pri - PRI_BIAS;
1625 if (items > 0)
1626 {
1303 if (pri < PRI_MIN) pri = PRI_MIN; 1627 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX; 1628 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS; 1629 next_pri = pri + PRI_BIAS;
1630 }
1631 OUTPUT:
1632 RETVAL
1306 1633
1307#endif 1634void
1635aioreq_nice (int nice = 0)
1636 CODE:
1637 nice = next_pri - nice;
1638 if (nice < PRI_MIN) nice = PRI_MIN;
1639 if (nice > PRI_MAX) nice = PRI_MAX;
1640 next_pri = nice + PRI_BIAS;
1308 1641
1309void 1642void
1310flush () 1643flush ()
1311 PROTOTYPE: 1644 PROTOTYPE:
1312 CODE: 1645 CODE:
1314 { 1647 {
1315 poll_wait (); 1648 poll_wait ();
1316 poll_cb (); 1649 poll_cb ();
1317 } 1650 }
1318 1651
1319void 1652int
1320poll() 1653poll()
1321 PROTOTYPE: 1654 PROTOTYPE:
1322 CODE: 1655 CODE:
1323 if (nreqs)
1324 {
1325 poll_wait (); 1656 poll_wait ();
1326 poll_cb (); 1657 RETVAL = poll_cb ();
1327 } 1658 OUTPUT:
1659 RETVAL
1328 1660
1329int 1661int
1330poll_fileno() 1662poll_fileno()
1331 PROTOTYPE: 1663 PROTOTYPE:
1332 CODE: 1664 CODE:
1344 1676
1345void 1677void
1346poll_wait() 1678poll_wait()
1347 PROTOTYPE: 1679 PROTOTYPE:
1348 CODE: 1680 CODE:
1349 if (nreqs)
1350 poll_wait (); 1681 poll_wait ();
1351 1682
1352int 1683int
1353nreqs() 1684nreqs()
1354 PROTOTYPE: 1685 PROTOTYPE:
1355 CODE: 1686 CODE:
1356 RETVAL = nreqs; 1687 RETVAL = nreqs;
1357 OUTPUT: 1688 OUTPUT:
1358 RETVAL 1689 RETVAL
1359 1690
1691int
1692nready()
1693 PROTOTYPE:
1694 CODE:
1695 RETVAL = get_nready ();
1696 OUTPUT:
1697 RETVAL
1698
1699int
1700npending()
1701 PROTOTYPE:
1702 CODE:
1703 RETVAL = get_npending ();
1704 OUTPUT:
1705 RETVAL
1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1360PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1361 1718
1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363 1720
1364void 1721void
1365cancel (aio_req_ornot req) 1722cancel (aio_req_ornot req)
1366 PROTOTYPE:
1367 CODE: 1723 CODE:
1368 req_cancel (req); 1724 req_cancel (req);
1369 1725
1370void 1726void
1371cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1727cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1380 PPCODE: 1736 PPCODE:
1381{ 1737{
1382 int i; 1738 int i;
1383 aio_req req; 1739 aio_req req;
1384 1740
1385 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1386 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1387 1743
1388 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1389 { 1745 {
1390 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
1392 1748
1393 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1394 1750
1395 if (req) 1751 if (req)
1396 { 1752 {
1397 ++grp->length; 1753 ++grp->size;
1398 req->grp = grp; 1754 req->grp = grp;
1399 1755
1400 req->grp_prev = 0; 1756 req->grp_prev = 0;
1401 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1402 1758
1407 } 1763 }
1408 } 1764 }
1409} 1765}
1410 1766
1411void 1767void
1768cancel_subs (aio_req_ornot req)
1769 CODE:
1770 req_cancel_subs (req);
1771
1772void
1412result (aio_req grp, ...) 1773result (aio_req grp, ...)
1413 CODE: 1774 CODE:
1414{ 1775{
1415 int i; 1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1416 AV *av = newAV (); 1781 av = newAV ();
1417 1782
1418 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1419 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1420 1785
1421 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1422 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1423} 1788}
1424 1789
1425void 1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1794
1795void
1426feed_limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1427 CODE: 1797 CODE:
1428 grp->fd2 = limit; 1798 grp->int2 = limit;
1429 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1430 1800
1431void 1801void
1432feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1433 CODE: 1803 CODE:
1434{ 1804{
1435 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1436 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1437 1807
1438 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1439 grp->fd2 = 2; 1809 grp->int2 = 2;
1440 1810
1441 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1442} 1812}
1443 1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines