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.76 by root, Thu Oct 26 12:38:04 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"
… …
44/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 49#ifndef NAME_MAX
46# define NAME_MAX 4096 50# define NAME_MAX 4096
47#endif 51#endif
48 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
49#if __ia64 58#if __ia64
50# define STACKSIZE 65536 59# define STACKSIZE 65536
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN 61# define STACKSIZE PTHREAD_STACK_MIN
53#else 62#else
… …
56 65
57/* buffer size for various temporary buffers */ 66/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536 67#define AIO_BUFSIZE 65536
59 68
60#define dBUF \ 69#define dBUF \
70 char *aio_buf; \
71 LOCK (wrklock); \
61 char *aio_buf = malloc (AIO_BUFSIZE); \ 72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \
62 if (!aio_buf) \ 74 if (!aio_buf) \
63 return -1; 75 return -1;
64
65#define fBUF free (aio_buf)
66 76
67enum { 77enum {
68 REQ_QUIT, 78 REQ_QUIT,
69 REQ_OPEN, REQ_CLOSE, 79 REQ_OPEN, REQ_CLOSE,
70 REQ_READ, REQ_WRITE, REQ_READAHEAD, 80 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
73 REQ_FSYNC, REQ_FDATASYNC, 83 REQ_FSYNC, REQ_FDATASYNC,
74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75 REQ_READDIR, 85 REQ_READDIR,
76 REQ_LINK, REQ_SYMLINK, 86 REQ_LINK, REQ_SYMLINK,
77 REQ_GROUP, REQ_NOP, 87 REQ_GROUP, REQ_NOP,
78 REQ_SLEEP, 88 REQ_BUSY,
79}; 89};
80 90
81#define AIO_REQ_KLASS "IO::AIO::REQ" 91#define AIO_REQ_KLASS "IO::AIO::REQ"
82#define AIO_GRP_KLASS "IO::AIO::GRP" 92#define AIO_GRP_KLASS "IO::AIO::GRP"
83 93
… …
117 PRI_MIN = -4, 127 PRI_MIN = -4,
118 PRI_MAX = 4, 128 PRI_MAX = 4,
119 129
120 DEFAULT_PRI = 0, 130 DEFAULT_PRI = 0,
121 PRI_BIAS = -PRI_MIN, 131 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
122}; 133};
123 134
124static int next_pri = DEFAULT_PRI + PRI_BIAS; 135static int next_pri = DEFAULT_PRI + PRI_BIAS;
125 136
126static int started, wanted; 137static int started, wanted;
127static volatile int nreqs; 138static volatile int nreqs;
128static int max_outstanding = 1<<30;
129static int respipe [2]; 139static int respipe [2];
130 140
131#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 141#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
132# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 142# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133#else 143#else
134# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 144# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135#endif 145#endif
136 146
147#define LOCK(mutex) pthread_mutex_lock (&(mutex))
148#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
149
150/* worker threads management */
151static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
152
153typedef struct worker {
154 /* locked by wrklock */
155 struct worker *prev, *next;
156
157 pthread_t tid;
158
159 /* locked by reslock, reqlock or wrklock */
160 aio_req req; /* currently processed request */
161 void *dbuf;
162 DIR *dirp;
163} worker;
164
165static worker wrk_first = { &wrk_first, &wrk_first, 0 };
166
167static void worker_clear (worker *wrk)
168{
169 if (wrk->dirp)
170 {
171 closedir (wrk->dirp);
172 wrk->dirp = 0;
173 }
174
175 if (wrk->dbuf)
176 {
177 free (wrk->dbuf);
178 wrk->dbuf = 0;
179 }
180}
181
182static void worker_free (worker *wrk)
183{
184 wrk->next->prev = wrk->prev;
185 wrk->prev->next = wrk->next;
186
187 free (wrk);
188}
189
137static pthread_mutex_t reslock = AIO_MUTEX_INIT; 190static pthread_mutex_t reslock = AIO_MUTEX_INIT;
138static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 191static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
139static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 192static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
140 193
141static volatile aio_req reqs, reqe; /* queue start, queue end */ 194/*
142static volatile aio_req ress, rese; /* queue start, queue end */ 195 * a somewhat faster data structure might be nice, but
196 * with 8 priorities this actually needs <20 insns
197 * per shift, the most expensive operation.
198 */
199typedef struct {
200 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
201 int size;
202} reqq;
143 203
204static reqq req_queue;
205static reqq res_queue;
206
207int reqq_push (reqq *q, aio_req req)
208{
209 int pri = req->pri;
210 req->next = 0;
211
212 if (q->qe[pri])
213 {
214 q->qe[pri]->next = req;
215 q->qe[pri] = req;
216 }
217 else
218 q->qe[pri] = q->qs[pri] = req;
219
220 return q->size++;
221}
222
223aio_req reqq_shift (reqq *q)
224{
225 int pri;
226
227 if (!q->size)
228 return 0;
229
230 --q->size;
231
232 for (pri = NUM_PRI; pri--; )
233 {
234 aio_req req = q->qs[pri];
235
236 if (req)
237 {
238 if (!(q->qs[pri] = req->next))
239 q->qe[pri] = 0;
240
241 return req;
242 }
243 }
244
245 abort ();
246}
247
248static int poll_cb (int max);
144static void req_invoke (aio_req req); 249static void req_invoke (aio_req req);
145static void req_free (aio_req req); 250static void req_free (aio_req req);
251static void req_cancel (aio_req req);
146 252
147/* must be called at most once */ 253/* must be called at most once */
148static SV *req_sv (aio_req req, const char *klass) 254static SV *req_sv (aio_req req, const char *klass)
149{ 255{
150 if (!req->self) 256 if (!req->self)
… …
181 ENTER; 287 ENTER;
182 SAVETMPS; 288 SAVETMPS;
183 PUSHMARK (SP); 289 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 290 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185 PUTBACK; 291 PUTBACK;
186 call_sv (grp->fh2, G_VOID | G_EVAL); 292 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 293 SPAGAIN;
188 FREETMPS; 294 FREETMPS;
189 LEAVE; 295 LEAVE;
190 } 296 }
191 297
… …
218{ 324{
219 fd_set rfd; 325 fd_set rfd;
220 326
221 while (nreqs) 327 while (nreqs)
222 { 328 {
223 aio_req req; 329 int size;
224#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 330#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
225 pthread_mutex_lock (&reslock); 331 LOCK (reslock);
226#endif 332#endif
227 req = ress; 333 size = res_queue.size;
228#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 334#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
229 pthread_mutex_unlock (&reslock); 335 UNLOCK (reslock);
230#endif 336#endif
231 337
232 if (req) 338 if (size)
233 return; 339 return;
234 340
235 FD_ZERO(&rfd); 341 FD_ZERO(&rfd);
236 FD_SET(respipe [0], &rfd); 342 FD_SET(respipe [0], &rfd);
237 343
… …
240} 346}
241 347
242static void req_invoke (aio_req req) 348static void req_invoke (aio_req req)
243{ 349{
244 dSP; 350 dSP;
245 int errorno = errno;
246 351
247 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 352 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
248 return; 353 {
249
250 errno = req->errorno; 354 errno = req->errorno;
251 355
252 ENTER; 356 ENTER;
253 SAVETMPS; 357 SAVETMPS;
254 PUSHMARK (SP); 358 PUSHMARK (SP);
255 EXTEND (SP, 1); 359 EXTEND (SP, 1);
256 360
257 switch (req->type) 361 switch (req->type)
258 {
259 case REQ_READDIR:
260 { 362 {
261 SV *rv = &PL_sv_undef; 363 case REQ_READDIR:
262
263 if (req->result >= 0)
264 { 364 {
265 char *buf = req->data2ptr; 365 SV *rv = &PL_sv_undef;
266 AV *av = newAV ();
267 366
268 while (req->result) 367 if (req->result >= 0)
269 { 368 {
369 int i;
370 char *buf = req->data2ptr;
371 AV *av = newAV ();
372
373 av_extend (av, req->result - 1);
374
375 for (i = 0; i < req->result; ++i)
376 {
270 SV *sv = newSVpv (buf, 0); 377 SV *sv = newSVpv (buf, 0);
271 378
272 av_push (av, sv); 379 av_store (av, i, sv);
273 buf += SvCUR (sv) + 1; 380 buf += SvCUR (sv) + 1;
274 req->result--; 381 }
382
383 rv = sv_2mortal (newRV_noinc ((SV *)av));
275 } 384 }
276 385
277 rv = sv_2mortal (newRV_noinc ((SV *)av)); 386 PUSHs (rv);
278 } 387 }
388 break;
279 389
280 PUSHs (rv); 390 case REQ_OPEN:
391 {
392 /* convert fd to fh */
393 SV *fh;
394
395 PUSHs (sv_2mortal (newSViv (req->result)));
396 PUTBACK;
397 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
398 SPAGAIN;
399
400 fh = SvREFCNT_inc (POPs);
401
402 PUSHMARK (SP);
403 XPUSHs (sv_2mortal (fh));
404 }
405 break;
406
407 case REQ_GROUP:
408 req->fd = 2; /* mark group as finished */
409
410 if (req->data)
411 {
412 int i;
413 AV *av = (AV *)req->data;
414
415 EXTEND (SP, AvFILL (av) + 1);
416 for (i = 0; i <= AvFILL (av); ++i)
417 PUSHs (*av_fetch (av, i, 0));
418 }
419 break;
420
421 case REQ_NOP:
422 case REQ_BUSY:
423 break;
424
425 default:
426 PUSHs (sv_2mortal (newSViv (req->result)));
427 break;
281 } 428 }
282 break;
283 429
284 case REQ_OPEN:
285 {
286 /* convert fd to fh */
287 SV *fh;
288 430
289 PUSHs (sv_2mortal (newSViv (req->result)));
290 PUTBACK; 431 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 }
323
324
325 PUTBACK;
326 call_sv (req->callback, G_VOID | G_EVAL); 432 call_sv (req->callback, G_VOID | G_EVAL);
327 SPAGAIN; 433 SPAGAIN;
328 434
329 FREETMPS; 435 FREETMPS;
330 LEAVE; 436 LEAVE;
331
332 errno = errorno;
333
334 if (SvTRUE (ERRSV))
335 { 437 }
336 req_free (req);
337 croak (0);
338 }
339}
340 438
341static void req_free (aio_req req)
342{
343 if (req->grp) 439 if (req->grp)
344 { 440 {
345 aio_req grp = req->grp; 441 aio_req grp = req->grp;
346 442
347 /* unlink request */ 443 /* unlink request */
… …
352 grp->grp_first = req->grp_next; 448 grp->grp_first = req->grp_next;
353 449
354 aio_grp_dec (grp); 450 aio_grp_dec (grp);
355 } 451 }
356 452
453 if (SvTRUE (ERRSV))
454 {
455 req_free (req);
456 croak (0);
457 }
458}
459
460static void req_free (aio_req req)
461{
357 if (req->self) 462 if (req->self)
358 { 463 {
359 sv_unmagic (req->self, PERL_MAGIC_ext); 464 sv_unmagic (req->self, PERL_MAGIC_ext);
360 SvREFCNT_dec (req->self); 465 SvREFCNT_dec (req->self);
361 } 466 }
… …
364 SvREFCNT_dec (req->fh); 469 SvREFCNT_dec (req->fh);
365 SvREFCNT_dec (req->fh2); 470 SvREFCNT_dec (req->fh2);
366 SvREFCNT_dec (req->callback); 471 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata); 472 Safefree (req->statdata);
368 473
369 if (req->type == REQ_READDIR && req->result >= 0) 474 if (req->type == REQ_READDIR)
370 free (req->data2ptr); 475 free (req->data2ptr);
371 476
372 Safefree (req); 477 Safefree (req);
373} 478}
374 479
480static void req_cancel_subs (aio_req grp)
481{
482 aio_req sub;
483
484 if (grp->type != REQ_GROUP)
485 return;
486
487 SvREFCNT_dec (grp->fh2);
488 grp->fh2 = 0;
489
490 for (sub = grp->grp_first; sub; sub = sub->grp_next)
491 req_cancel (sub);
492}
493
375static void req_cancel (aio_req req) 494static void req_cancel (aio_req req)
376{ 495{
377 req->flags |= FLAG_CANCELLED; 496 req->flags |= FLAG_CANCELLED;
378 497
379 if (req->type == REQ_GROUP) 498 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} 499}
387 500
388static int poll_cb () 501static int poll_cb (int max)
389{ 502{
390 dSP; 503 dSP;
391 int count = 0; 504 int count = 0;
392 int do_croak = 0; 505 int do_croak = 0;
393 aio_req req; 506 aio_req req;
394 507
395 for (;;) 508 while (max <= 0 || count < max)
396 { 509 {
397 pthread_mutex_lock (&reslock); 510 LOCK (reslock);
398 req = ress; 511 req = reqq_shift (&res_queue);
399 512
400 if (req) 513 if (req)
401 { 514 {
402 ress = req->next;
403
404 if (!ress) 515 if (!res_queue.size)
405 { 516 {
406 /* read any signals sent by the worker threads */ 517 /* read any signals sent by the worker threads */
407 char buf [32]; 518 char buf [32];
408 while (read (respipe [0], buf, 32) == 32) 519 while (read (respipe [0], buf, 32) == 32)
409 ; 520 ;
410
411 rese = 0;
412 } 521 }
413 } 522 }
414 523
415 pthread_mutex_unlock (&reslock); 524 UNLOCK (reslock);
416 525
417 if (!req) 526 if (!req)
418 break; 527 break;
419 528
420 --nreqs; 529 --nreqs;
… …
455static void *aio_proc(void *arg); 564static void *aio_proc(void *arg);
456 565
457static void start_thread (void) 566static void start_thread (void)
458{ 567{
459 sigset_t fullsigset, oldsigset; 568 sigset_t fullsigset, oldsigset;
460 pthread_t tid;
461 pthread_attr_t attr; 569 pthread_attr_t attr;
570
571 worker *wrk = calloc (1, sizeof (worker));
572
573 if (!wrk)
574 croak ("unable to allocate worker thread data");
462 575
463 pthread_attr_init (&attr); 576 pthread_attr_init (&attr);
464 pthread_attr_setstacksize (&attr, STACKSIZE); 577 pthread_attr_setstacksize (&attr, STACKSIZE);
465 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 578 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
466 579
467 sigfillset (&fullsigset); 580 sigfillset (&fullsigset);
581
582 LOCK (wrklock);
468 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 583 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469 584
470 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 585 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
586 {
587 wrk->prev = &wrk_first;
588 wrk->next = wrk_first.next;
589 wrk_first.next->prev = wrk;
590 wrk_first.next = wrk;
471 started++; 591 started++;
592 }
593 else
594 free (wrk);
472 595
473 sigprocmask (SIG_SETMASK, &oldsigset, 0); 596 sigprocmask (SIG_SETMASK, &oldsigset, 0);
597 UNLOCK (wrklock);
474} 598}
475 599
476static void req_send (aio_req req) 600static void req_send (aio_req req)
477{ 601{
478 while (started < wanted && nreqs >= started) 602 while (started < wanted && nreqs >= started)
479 start_thread (); 603 start_thread ();
480 604
481 ++nreqs; 605 ++nreqs;
482 606
483 pthread_mutex_lock (&reqlock); 607 LOCK (reqlock);
484 608 reqq_push (&req_queue, req);
485 req->next = 0;
486
487 if (reqe)
488 {
489 reqe->next = req;
490 reqe = req;
491 }
492 else
493 reqe = reqs = req;
494
495 pthread_cond_signal (&reqwait); 609 pthread_cond_signal (&reqwait);
496 pthread_mutex_unlock (&reqlock); 610 UNLOCK (reqlock);
497
498 if (nreqs > max_outstanding)
499 for (;;)
500 {
501 poll_cb ();
502
503 if (nreqs <= max_outstanding)
504 break;
505
506 poll_wait ();
507 }
508} 611}
509 612
510static void end_thread (void) 613static void end_thread (void)
511{ 614{
512 aio_req req; 615 aio_req req;
616
513 Newz (0, req, 1, aio_cb); 617 Newz (0, req, 1, aio_cb);
618
514 req->type = REQ_QUIT; 619 req->type = REQ_QUIT;
620 req->pri = PRI_MAX + PRI_BIAS;
515 621
516 req_send (req); 622 req_send (req);
517} 623}
518 624
519static void min_parallel (int nthreads) 625static void min_parallel (int nthreads)
… …
536 } 642 }
537 643
538 while (started > wanted) 644 while (started > wanted)
539 { 645 {
540 poll_wait (); 646 poll_wait ();
541 poll_cb (); 647 poll_cb (0);
542 } 648 }
543} 649}
544 650
545static void create_pipe () 651static void create_pipe ()
546{ 652{
… …
571static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 677static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
572{ 678{
573 ssize_t res; 679 ssize_t res;
574 off_t ooffset; 680 off_t ooffset;
575 681
576 pthread_mutex_lock (&preadwritelock); 682 LOCK (preadwritelock);
577 ooffset = lseek (fd, 0, SEEK_CUR); 683 ooffset = lseek (fd, 0, SEEK_CUR);
578 lseek (fd, offset, SEEK_SET); 684 lseek (fd, offset, SEEK_SET);
579 res = read (fd, buf, count); 685 res = read (fd, buf, count);
580 lseek (fd, ooffset, SEEK_SET); 686 lseek (fd, ooffset, SEEK_SET);
581 pthread_mutex_unlock (&preadwritelock); 687 UNLOCK (preadwritelock);
582 688
583 return res; 689 return res;
584} 690}
585 691
586static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 692static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
587{ 693{
588 ssize_t res; 694 ssize_t res;
589 off_t ooffset; 695 off_t ooffset;
590 696
591 pthread_mutex_lock (&preadwritelock); 697 LOCK (preadwritelock);
592 ooffset = lseek (fd, 0, SEEK_CUR); 698 ooffset = lseek (fd, 0, SEEK_CUR);
593 lseek (fd, offset, SEEK_SET); 699 lseek (fd, offset, SEEK_SET);
594 res = write (fd, buf, count); 700 res = write (fd, buf, count);
595 lseek (fd, offset, SEEK_SET); 701 lseek (fd, offset, SEEK_SET);
596 pthread_mutex_unlock (&preadwritelock); 702 UNLOCK (preadwritelock);
597 703
598 return res; 704 return res;
599} 705}
600#endif 706#endif
601 707
602#if !HAVE_FDATASYNC 708#if !HAVE_FDATASYNC
603# define fdatasync fsync 709# define fdatasync fsync
604#endif 710#endif
605 711
606#if !HAVE_READAHEAD 712#if !HAVE_READAHEAD
607# define readahead aio_readahead 713# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
608 714
609static ssize_t readahead (int fd, off_t offset, size_t count) 715static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
610{ 716{
611 dBUF; 717 dBUF;
612 718
613 while (count > 0) 719 while (count > 0)
614 { 720 {
… …
617 pread (fd, aio_buf, len, offset); 723 pread (fd, aio_buf, len, offset);
618 offset += len; 724 offset += len;
619 count -= len; 725 count -= len;
620 } 726 }
621 727
622 fBUF;
623
624 errno = 0; 728 errno = 0;
625} 729}
730
626#endif 731#endif
627 732
628#if !HAVE_READDIR_R 733#if !HAVE_READDIR_R
629# define readdir_r aio_readdir_r 734# define readdir_r aio_readdir_r
630 735
… …
633static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 738static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
634{ 739{
635 struct dirent *e; 740 struct dirent *e;
636 int errorno; 741 int errorno;
637 742
638 pthread_mutex_lock (&readdirlock); 743 LOCK (readdirlock);
639 744
640 e = readdir (dirp); 745 e = readdir (dirp);
641 errorno = errno; 746 errorno = errno;
642 747
643 if (e) 748 if (e)
… …
646 strcpy (ent->d_name, e->d_name); 751 strcpy (ent->d_name, e->d_name);
647 } 752 }
648 else 753 else
649 *res = 0; 754 *res = 0;
650 755
651 pthread_mutex_unlock (&readdirlock); 756 UNLOCK (readdirlock);
652 757
653 errno = errorno; 758 errno = errorno;
654 return e ? 0 : -1; 759 return e ? 0 : -1;
655} 760}
656#endif 761#endif
657 762
658/* sendfile always needs emulation */ 763/* sendfile always needs emulation */
659static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 764static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
660{ 765{
661 ssize_t res; 766 ssize_t res;
662 767
663 if (!count) 768 if (!count)
664 return 0; 769 return 0;
… …
741 846
742 offset += cnt; 847 offset += cnt;
743 res += cnt; 848 res += cnt;
744 count -= cnt; 849 count -= cnt;
745 } 850 }
746
747 fBUF;
748 } 851 }
749 852
750 return res; 853 return res;
751} 854}
752 855
753/* read a full directory */ 856/* read a full directory */
754static int scandir_ (const char *path, void **namesp) 857static void scandir_ (aio_req req, worker *self)
755{ 858{
756 DIR *dirp; 859 DIR *dirp;
757 union 860 union
758 { 861 {
759 struct dirent d; 862 struct dirent d;
… …
764 int memlen = 4096; 867 int memlen = 4096;
765 int memofs = 0; 868 int memofs = 0;
766 int res = 0; 869 int res = 0;
767 int errorno; 870 int errorno;
768 871
769 dirp = opendir (path); 872 LOCK (wrklock);
770 if (!dirp) 873 self->dirp = dirp = opendir (req->dataptr);
771 return -1;
772
773 u = malloc (sizeof (*u)); 874 self->dbuf = u = malloc (sizeof (*u));
774 names = malloc (memlen); 875 req->data2ptr = names = malloc (memlen);
876 UNLOCK (wrklock);
775 877
776 if (u && names) 878 if (dirp && u && names)
777 for (;;) 879 for (;;)
778 { 880 {
779 errno = 0; 881 errno = 0;
780 readdir_r (dirp, &u->d, &entp); 882 readdir_r (dirp, &u->d, &entp);
781 883
… …
791 res++; 893 res++;
792 894
793 while (memofs + len > memlen) 895 while (memofs + len > memlen)
794 { 896 {
795 memlen *= 2; 897 memlen *= 2;
898 LOCK (wrklock);
796 names = realloc (names, memlen); 899 req->data2ptr = names = realloc (names, memlen);
900 UNLOCK (wrklock);
901
797 if (!names) 902 if (!names)
798 break; 903 break;
799 } 904 }
800 905
801 memcpy (names + memofs, name, len); 906 memcpy (names + memofs, name, len);
802 memofs += len; 907 memofs += len;
803 } 908 }
804 } 909 }
805 910
806 errorno = errno;
807 free (u);
808 closedir (dirp);
809
810 if (errorno) 911 if (errno)
811 {
812 free (names);
813 errno = errorno;
814 res = -1; 912 res = -1;
815 } 913
816 914 req->result = res;
817 *namesp = (void *)names;
818 return res;
819} 915}
820 916
821/*****************************************************************************/ 917/*****************************************************************************/
822 918
823static void *aio_proc (void *thr_arg) 919static void *aio_proc (void *thr_arg)
824{ 920{
825 aio_req req; 921 aio_req req;
826 int type; 922 int type;
923 worker *self = (worker *)thr_arg;
827 924
828 do 925 do
829 { 926 {
830 pthread_mutex_lock (&reqlock); 927 LOCK (reqlock);
831 928
832 for (;;) 929 for (;;)
833 { 930 {
834 req = reqs; 931 self->req = req = reqq_shift (&req_queue);
835
836 if (reqs)
837 {
838 reqs = reqs->next;
839 if (!reqs) reqe = 0;
840 }
841 932
842 if (req) 933 if (req)
843 break; 934 break;
844 935
845 pthread_cond_wait (&reqwait, &reqlock); 936 pthread_cond_wait (&reqwait, &reqlock);
846 } 937 }
847 938
848 pthread_mutex_unlock (&reqlock); 939 UNLOCK (reqlock);
849 940
850 errno = 0; /* strictly unnecessary */ 941 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */ 942 type = req->type; /* remember type for QUIT check */
852 943
853 if (!(req->flags & FLAG_CANCELLED)) 944 if (!(req->flags & FLAG_CANCELLED))
… …
855 { 946 {
856 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
857 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 948 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
858 949
859 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
860 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 951 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
861 952
862 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
863 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
864 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
865 956
… …
871 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
872 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
873 964
874 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
875 case REQ_FSYNC: req->result = fsync (req->fd); break; 966 case REQ_FSYNC: req->result = fsync (req->fd); break;
876 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 967 case REQ_READDIR: scandir_ (req, self); break;
877 968
878 case REQ_SLEEP: 969 case REQ_BUSY:
879 { 970 {
880 struct timeval tv; 971 struct timeval tv;
881 972
882 tv.tv_sec = req->fd; 973 tv.tv_sec = req->fd;
883 tv.tv_usec = req->fd2; 974 tv.tv_usec = req->fd2;
… …
895 break; 986 break;
896 } 987 }
897 988
898 req->errorno = errno; 989 req->errorno = errno;
899 990
900 pthread_mutex_lock (&reslock); 991 LOCK (reslock);
901 992
902 req->next = 0; 993 if (!reqq_push (&res_queue, req))
903
904 if (rese)
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 */ 994 /* write a dummy byte to the pipe so fh becomes ready */
914 write (respipe [1], &respipe, 1); 995 write (respipe [1], &respipe, 1);
915 }
916 996
917 pthread_mutex_unlock (&reslock); 997 self->req = 0;
998 worker_clear (self);
999
1000 UNLOCK (reslock);
918 } 1001 }
919 while (type != REQ_QUIT); 1002 while (type != REQ_QUIT);
920 1003
1004 LOCK (wrklock);
1005 worker_free (self);
1006 UNLOCK (wrklock);
1007
921 return 0; 1008 return 0;
922} 1009}
923 1010
924/*****************************************************************************/ 1011/*****************************************************************************/
925 1012
926static void atfork_prepare (void) 1013static void atfork_prepare (void)
927{ 1014{
928 pthread_mutex_lock (&reqlock); 1015 LOCK (wrklock);
929 pthread_mutex_lock (&reslock); 1016 LOCK (reqlock);
1017 LOCK (reslock);
930#if !HAVE_PREADWRITE 1018#if !HAVE_PREADWRITE
931 pthread_mutex_lock (&preadwritelock); 1019 LOCK (preadwritelock);
932#endif 1020#endif
933#if !HAVE_READDIR_R 1021#if !HAVE_READDIR_R
934 pthread_mutex_lock (&readdirlock); 1022 LOCK (readdirlock);
935#endif 1023#endif
936} 1024}
937 1025
938static void atfork_parent (void) 1026static void atfork_parent (void)
939{ 1027{
940#if !HAVE_READDIR_R 1028#if !HAVE_READDIR_R
941 pthread_mutex_unlock (&readdirlock); 1029 UNLOCK (readdirlock);
942#endif 1030#endif
943#if !HAVE_PREADWRITE 1031#if !HAVE_PREADWRITE
944 pthread_mutex_unlock (&preadwritelock); 1032 UNLOCK (preadwritelock);
945#endif 1033#endif
946 pthread_mutex_unlock (&reslock); 1034 UNLOCK (reslock);
947 pthread_mutex_unlock (&reqlock); 1035 UNLOCK (reqlock);
1036 UNLOCK (wrklock);
948} 1037}
949 1038
950static void atfork_child (void) 1039static void atfork_child (void)
951{ 1040{
952 aio_req prv; 1041 aio_req prv;
953 1042
1043 while (prv = reqq_shift (&req_queue))
1044 req_free (prv);
1045
1046 while (prv = reqq_shift (&res_queue))
1047 req_free (prv);
1048
1049 while (wrk_first.next != &wrk_first)
1050 {
1051 worker *wrk = wrk_first.next;
1052
1053 if (wrk->req)
1054 req_free (wrk->req);
1055
1056 worker_clear (wrk);
1057 worker_free (wrk);
1058 }
1059
954 started = 0; 1060 started = 0;
955 1061 nreqs = 0;
956 while (reqs)
957 {
958 prv = reqs;
959 reqs = prv->next;
960 req_free (prv);
961 }
962
963 reqs = reqe = 0;
964
965 while (ress)
966 {
967 prv = ress;
968 ress = prv->next;
969 req_free (prv);
970 }
971
972 ress = rese = 0;
973 1062
974 close (respipe [0]); 1063 close (respipe [0]);
975 close (respipe [1]); 1064 close (respipe [1]);
976 create_pipe (); 1065 create_pipe ();
977 1066
… …
1022void 1111void
1023max_parallel (nthreads) 1112max_parallel (nthreads)
1024 int nthreads 1113 int nthreads
1025 PROTOTYPE: $ 1114 PROTOTYPE: $
1026 1115
1027int
1028max_outstanding (nreqs)
1029 int nreqs
1030 PROTOTYPE: $
1031 CODE:
1032 RETVAL = max_outstanding;
1033 max_outstanding = nreqs;
1034
1035void 1116void
1036aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1117aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1037 SV * pathname 1118 SV * pathname
1038 int flags 1119 int flags
1039 int mode 1120 int mode
… …
1253 1334
1254 REQ_SEND; 1335 REQ_SEND;
1255} 1336}
1256 1337
1257void 1338void
1258aio_sleep (delay,callback=&PL_sv_undef) 1339aio_busy (delay,callback=&PL_sv_undef)
1259 double delay 1340 double delay
1260 SV * callback 1341 SV * callback
1261 PPCODE: 1342 PPCODE:
1262{ 1343{
1263 dREQ; 1344 dREQ;
1264 1345
1265 req->type = REQ_SLEEP; 1346 req->type = REQ_BUSY;
1266 req->fd = delay < 0. ? 0 : delay; 1347 req->fd = delay < 0. ? 0 : delay;
1267 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1268 1349
1269 REQ_SEND; 1350 REQ_SEND;
1270} 1351}
… …
1293 req->type = REQ_NOP; 1374 req->type = REQ_NOP;
1294 1375
1295 REQ_SEND; 1376 REQ_SEND;
1296} 1377}
1297 1378
1298#if 0
1299
1300void 1379void
1301aio_pri (int pri = DEFAULT_PRI) 1380aioreq_pri (int pri = DEFAULT_PRI)
1302 CODE: 1381 CODE:
1303 if (pri < PRI_MIN) pri = PRI_MIN; 1382 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX; 1383 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS; 1384 next_pri = pri + PRI_BIAS;
1306 1385
1307#endif 1386void
1387aioreq_nice (int nice = 0)
1388 CODE:
1389 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS;
1308 1393
1309void 1394void
1310flush () 1395flush ()
1311 PROTOTYPE: 1396 PROTOTYPE:
1312 CODE: 1397 CODE:
1313 while (nreqs) 1398 while (nreqs)
1314 { 1399 {
1315 poll_wait (); 1400 poll_wait ();
1316 poll_cb (); 1401 poll_cb (0);
1317 } 1402 }
1318 1403
1319void 1404void
1320poll() 1405poll()
1321 PROTOTYPE: 1406 PROTOTYPE:
1322 CODE: 1407 CODE:
1323 if (nreqs) 1408 if (nreqs)
1324 { 1409 {
1325 poll_wait (); 1410 poll_wait ();
1326 poll_cb (); 1411 poll_cb (0);
1327 } 1412 }
1328 1413
1329int 1414int
1330poll_fileno() 1415poll_fileno()
1331 PROTOTYPE: 1416 PROTOTYPE:
… …
1336 1421
1337int 1422int
1338poll_cb(...) 1423poll_cb(...)
1339 PROTOTYPE: 1424 PROTOTYPE:
1340 CODE: 1425 CODE:
1341 RETVAL = poll_cb (); 1426 RETVAL = poll_cb (0);
1427 OUTPUT:
1428 RETVAL
1429
1430int
1431poll_some(int max = 0)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = poll_cb (max);
1342 OUTPUT: 1435 OUTPUT:
1343 RETVAL 1436 RETVAL
1344 1437
1345void 1438void
1346poll_wait() 1439poll_wait()
… …
1361 1454
1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1455MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363 1456
1364void 1457void
1365cancel (aio_req_ornot req) 1458cancel (aio_req_ornot req)
1366 PROTOTYPE:
1367 CODE: 1459 CODE:
1368 req_cancel (req); 1460 req_cancel (req);
1369 1461
1370void 1462void
1371cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1463cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1407 } 1499 }
1408 } 1500 }
1409} 1501}
1410 1502
1411void 1503void
1504cancel_subs (aio_req_ornot req)
1505 CODE:
1506 req_cancel_subs (req);
1507
1508void
1412result (aio_req grp, ...) 1509result (aio_req grp, ...)
1413 CODE: 1510 CODE:
1414{ 1511{
1415 int i; 1512 int i;
1416 AV *av = newAV (); 1513 AV *av = newAV ();
… …
1421 SvREFCNT_dec (grp->data); 1518 SvREFCNT_dec (grp->data);
1422 grp->data = (SV *)av; 1519 grp->data = (SV *)av;
1423} 1520}
1424 1521
1425void 1522void
1426feed_limit (aio_req grp, int limit) 1523limit (aio_req grp, int limit)
1427 CODE: 1524 CODE:
1428 grp->fd2 = limit; 1525 grp->fd2 = limit;
1429 aio_grp_feed (grp); 1526 aio_grp_feed (grp);
1430 1527
1431void 1528void

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines