ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.62 by root, Mon Oct 23 22:45:18 2006 UTC vs.
Revision 1.77 by root, Thu Oct 26 13:25:40 2006 UTC

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
1#define _REENTRANT 1 9#define _REENTRANT 1
10
2#include <errno.h> 11#include <errno.h>
3 12
4#include "EXTERN.h" 13#include "EXTERN.h"
5#include "perl.h" 14#include "perl.h"
6#include "XSUB.h" 15#include "XSUB.h"
… …
39/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 49#ifndef NAME_MAX
41# define NAME_MAX 4096 50# define NAME_MAX 4096
42#endif 51#endif
43 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
44#if __ia64 58#if __ia64
45# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
46#else 62#else
47# define STACKSIZE 8192 63# define STACKSIZE 16384
48#endif 64#endif
65
66/* buffer size for various temporary buffers */
67#define AIO_BUFSIZE 65536
68
69#define dBUF \
70 char *aio_buf; \
71 LOCK (wrklock); \
72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \
74 if (!aio_buf) \
75 return -1;
49 76
50enum { 77enum {
51 REQ_QUIT, 78 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 79 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 80 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
56 REQ_FSYNC, REQ_FDATASYNC, 83 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 85 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 86 REQ_LINK, REQ_SYMLINK,
60 REQ_GROUP, REQ_NOP, 87 REQ_GROUP, REQ_NOP,
61 REQ_SLEEP, 88 REQ_BUSY,
62}; 89};
63 90
64#define AIO_REQ_KLASS "IO::AIO::REQ" 91#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 92#define AIO_GRP_KLASS "IO::AIO::GRP"
66 93
… …
100 PRI_MIN = -4, 127 PRI_MIN = -4,
101 PRI_MAX = 4, 128 PRI_MAX = 4,
102 129
103 DEFAULT_PRI = 0, 130 DEFAULT_PRI = 0,
104 PRI_BIAS = -PRI_MIN, 131 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
105}; 133};
106 134
107static int next_pri = DEFAULT_PRI + PRI_BIAS; 135static int next_pri = DEFAULT_PRI + PRI_BIAS;
108 136
109static int started, wanted; 137static int started, wanted;
110static volatile int nreqs; 138static volatile int nreqs;
111static int max_outstanding = 1<<30;
112static int respipe [2]; 139static int respipe [2];
113 140
141#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
142# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
143#else
144# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
145#endif
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
114static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 190static pthread_mutex_t reslock = AIO_MUTEX_INIT;
115static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 191static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
116static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 192static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
117 193
118static volatile aio_req reqs, reqe; /* queue start, queue end */ 194/*
119static 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;
120 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);
121static void req_invoke (aio_req req); 249static void req_invoke (aio_req req);
122static void req_free (aio_req req); 250static void req_free (aio_req req);
251static void req_cancel (aio_req req);
123 252
124/* must be called at most once */ 253/* must be called at most once */
125static SV *req_sv (aio_req req, const char *klass) 254static SV *req_sv (aio_req req, const char *klass)
126{ 255{
127 if (!req->self) 256 if (!req->self)
… …
158 ENTER; 287 ENTER;
159 SAVETMPS; 288 SAVETMPS;
160 PUSHMARK (SP); 289 PUSHMARK (SP);
161 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 290 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
162 PUTBACK; 291 PUTBACK;
163 call_sv (grp->fh2, G_VOID | G_EVAL); 292 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
164 SPAGAIN; 293 SPAGAIN;
165 FREETMPS; 294 FREETMPS;
166 LEAVE; 295 LEAVE;
167 } 296 }
168 297
… …
195{ 324{
196 fd_set rfd; 325 fd_set rfd;
197 326
198 while (nreqs) 327 while (nreqs)
199 { 328 {
200 aio_req req; 329 int size;
201 pthread_mutex_lock (&reslock); 330#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
202 req = ress; 331 LOCK (reslock);
203 pthread_mutex_unlock (&reslock); 332#endif
333 size = res_queue.size;
334#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
335 UNLOCK (reslock);
336#endif
204 337
205 if (req) 338 if (size)
206 return; 339 return;
207 340
208 FD_ZERO(&rfd); 341 FD_ZERO(&rfd);
209 FD_SET(respipe [0], &rfd); 342 FD_SET(respipe [0], &rfd);
210 343
… …
213} 346}
214 347
215static void req_invoke (aio_req req) 348static void req_invoke (aio_req req)
216{ 349{
217 dSP; 350 dSP;
218 int errorno = errno;
219 351
220 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 352 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
221 return; 353 {
222
223 errno = req->errorno; 354 errno = req->errorno;
224 355
225 ENTER; 356 ENTER;
226 SAVETMPS; 357 SAVETMPS;
227 PUSHMARK (SP); 358 PUSHMARK (SP);
228 EXTEND (SP, 1); 359 EXTEND (SP, 1);
229 360
230 switch (req->type) 361 switch (req->type)
231 {
232 case REQ_READDIR:
233 { 362 {
234 SV *rv = &PL_sv_undef; 363 case REQ_READDIR:
235
236 if (req->result >= 0)
237 { 364 {
238 char *buf = req->data2ptr; 365 SV *rv = &PL_sv_undef;
239 AV *av = newAV ();
240 366
241 while (req->result) 367 if (req->result >= 0)
242 { 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 {
243 SV *sv = newSVpv (buf, 0); 377 SV *sv = newSVpv (buf, 0);
244 378
245 av_push (av, sv); 379 av_store (av, i, sv);
246 buf += SvCUR (sv) + 1; 380 buf += SvCUR (sv) + 1;
247 req->result--; 381 }
382
383 rv = sv_2mortal (newRV_noinc ((SV *)av));
248 } 384 }
249 385
250 rv = sv_2mortal (newRV_noinc ((SV *)av)); 386 PUSHs (rv);
251 } 387 }
388 break;
252 389
253 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;
254 } 428 }
255 break;
256 429
257 case REQ_OPEN:
258 {
259 /* convert fd to fh */
260 SV *fh;
261 430
262 PUSHs (sv_2mortal (newSViv (req->result)));
263 PUTBACK; 431 PUTBACK;
264 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
265 SPAGAIN;
266
267 fh = SvREFCNT_inc (POPs);
268
269 PUSHMARK (SP);
270 XPUSHs (sv_2mortal (fh));
271 }
272 break;
273
274 case REQ_GROUP:
275 req->fd = 2; /* mark group as finished */
276
277 if (req->data)
278 {
279 int i;
280 AV *av = (AV *)req->data;
281
282 EXTEND (SP, AvFILL (av) + 1);
283 for (i = 0; i <= AvFILL (av); ++i)
284 PUSHs (*av_fetch (av, i, 0));
285 }
286 break;
287
288 case REQ_NOP:
289 case REQ_SLEEP:
290 break;
291
292 default:
293 PUSHs (sv_2mortal (newSViv (req->result)));
294 break;
295 }
296
297
298 PUTBACK;
299 call_sv (req->callback, G_VOID | G_EVAL); 432 call_sv (req->callback, G_VOID | G_EVAL);
300 SPAGAIN; 433 SPAGAIN;
301 434
302 FREETMPS; 435 FREETMPS;
303 LEAVE; 436 LEAVE;
304
305 errno = errorno;
306
307 if (SvTRUE (ERRSV))
308 { 437 }
309 req_free (req);
310 croak (0);
311 }
312}
313 438
314static void req_free (aio_req req)
315{
316 if (req->grp) 439 if (req->grp)
317 { 440 {
318 aio_req grp = req->grp; 441 aio_req grp = req->grp;
319 442
320 /* unlink request */ 443 /* unlink request */
… …
325 grp->grp_first = req->grp_next; 448 grp->grp_first = req->grp_next;
326 449
327 aio_grp_dec (grp); 450 aio_grp_dec (grp);
328 } 451 }
329 452
453 if (SvTRUE (ERRSV))
454 {
455 req_free (req);
456 croak (0);
457 }
458}
459
460static void req_free (aio_req req)
461{
330 if (req->self) 462 if (req->self)
331 { 463 {
332 sv_unmagic (req->self, PERL_MAGIC_ext); 464 sv_unmagic (req->self, PERL_MAGIC_ext);
333 SvREFCNT_dec (req->self); 465 SvREFCNT_dec (req->self);
334 } 466 }
… …
337 SvREFCNT_dec (req->fh); 469 SvREFCNT_dec (req->fh);
338 SvREFCNT_dec (req->fh2); 470 SvREFCNT_dec (req->fh2);
339 SvREFCNT_dec (req->callback); 471 SvREFCNT_dec (req->callback);
340 Safefree (req->statdata); 472 Safefree (req->statdata);
341 473
342 if (req->type == REQ_READDIR && req->result >= 0) 474 if (req->type == REQ_READDIR)
343 free (req->data2ptr); 475 free (req->data2ptr);
344 476
345 Safefree (req); 477 Safefree (req);
346} 478}
347 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
348static void req_cancel (aio_req req) 494static void req_cancel (aio_req req)
349{ 495{
350 req->flags |= FLAG_CANCELLED; 496 req->flags |= FLAG_CANCELLED;
351 497
352 if (req->type == REQ_GROUP) 498 req_cancel_subs (req);
353 {
354 aio_req sub;
355
356 for (sub = req->grp_first; sub; sub = sub->grp_next)
357 req_cancel (sub);
358 }
359} 499}
360 500
361static int poll_cb () 501static int poll_cb (int max)
362{ 502{
363 dSP; 503 dSP;
364 int count = 0; 504 int count = 0;
365 int do_croak = 0; 505 int do_croak = 0;
366 aio_req req; 506 aio_req req;
367 507
368 for (;;) 508 while (max <= 0 || count < max)
369 { 509 {
370 pthread_mutex_lock (&reslock); 510 LOCK (reslock);
371 req = ress; 511 req = reqq_shift (&res_queue);
372 512
373 if (req) 513 if (req)
374 { 514 {
375 ress = req->next;
376
377 if (!ress) 515 if (!res_queue.size)
378 { 516 {
379 /* read any signals sent by the worker threads */ 517 /* read any signals sent by the worker threads */
380 char buf [32]; 518 char buf [32];
381 while (read (respipe [0], buf, 32) == 32) 519 while (read (respipe [0], buf, 32) == 32)
382 ; 520 ;
383
384 rese = 0;
385 } 521 }
386 } 522 }
387 523
388 pthread_mutex_unlock (&reslock); 524 UNLOCK (reslock);
389 525
390 if (!req) 526 if (!req)
391 break; 527 break;
392 528
393 --nreqs; 529 --nreqs;
… …
428static void *aio_proc(void *arg); 564static void *aio_proc(void *arg);
429 565
430static void start_thread (void) 566static void start_thread (void)
431{ 567{
432 sigset_t fullsigset, oldsigset; 568 sigset_t fullsigset, oldsigset;
433 pthread_t tid;
434 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");
435 575
436 pthread_attr_init (&attr); 576 pthread_attr_init (&attr);
437 pthread_attr_setstacksize (&attr, STACKSIZE); 577 pthread_attr_setstacksize (&attr, STACKSIZE);
438 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 578 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
439 579
440 sigfillset (&fullsigset); 580 sigfillset (&fullsigset);
581
582 LOCK (wrklock);
441 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 583 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
442 584
443 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;
444 started++; 591 started++;
592 }
593 else
594 free (wrk);
445 595
446 sigprocmask (SIG_SETMASK, &oldsigset, 0); 596 sigprocmask (SIG_SETMASK, &oldsigset, 0);
597 UNLOCK (wrklock);
447} 598}
448 599
449static void req_send (aio_req req) 600static void req_send (aio_req req)
450{ 601{
451 while (started < wanted && nreqs >= started) 602 while (started < wanted && nreqs >= started)
452 start_thread (); 603 start_thread ();
453 604
454 ++nreqs; 605 ++nreqs;
455 606
456 pthread_mutex_lock (&reqlock); 607 LOCK (reqlock);
457 608 reqq_push (&req_queue, req);
458 req->next = 0;
459
460 if (reqe)
461 {
462 reqe->next = req;
463 reqe = req;
464 }
465 else
466 reqe = reqs = req;
467
468 pthread_cond_signal (&reqwait); 609 pthread_cond_signal (&reqwait);
469 pthread_mutex_unlock (&reqlock); 610 UNLOCK (reqlock);
470
471 if (nreqs > max_outstanding)
472 for (;;)
473 {
474 poll_cb ();
475
476 if (nreqs <= max_outstanding)
477 break;
478
479 poll_wait ();
480 }
481} 611}
482 612
483static void end_thread (void) 613static void end_thread (void)
484{ 614{
485 aio_req req; 615 aio_req req;
616
486 Newz (0, req, 1, aio_cb); 617 Newz (0, req, 1, aio_cb);
618
487 req->type = REQ_QUIT; 619 req->type = REQ_QUIT;
620 req->pri = PRI_MAX + PRI_BIAS;
488 621
489 req_send (req); 622 req_send (req);
490} 623}
491 624
492static void min_parallel (int nthreads) 625static void min_parallel (int nthreads)
… …
509 } 642 }
510 643
511 while (started > wanted) 644 while (started > wanted)
512 { 645 {
513 poll_wait (); 646 poll_wait ();
514 poll_cb (); 647 poll_cb (0);
515 } 648 }
516} 649}
517 650
518static void create_pipe () 651static void create_pipe ()
519{ 652{
… …
544static 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)
545{ 678{
546 ssize_t res; 679 ssize_t res;
547 off_t ooffset; 680 off_t ooffset;
548 681
549 pthread_mutex_lock (&preadwritelock); 682 LOCK (preadwritelock);
550 ooffset = lseek (fd, 0, SEEK_CUR); 683 ooffset = lseek (fd, 0, SEEK_CUR);
551 lseek (fd, offset, SEEK_SET); 684 lseek (fd, offset, SEEK_SET);
552 res = read (fd, buf, count); 685 res = read (fd, buf, count);
553 lseek (fd, ooffset, SEEK_SET); 686 lseek (fd, ooffset, SEEK_SET);
554 pthread_mutex_unlock (&preadwritelock); 687 UNLOCK (preadwritelock);
555 688
556 return res; 689 return res;
557} 690}
558 691
559static 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)
560{ 693{
561 ssize_t res; 694 ssize_t res;
562 off_t ooffset; 695 off_t ooffset;
563 696
564 pthread_mutex_lock (&preadwritelock); 697 LOCK (preadwritelock);
565 ooffset = lseek (fd, 0, SEEK_CUR); 698 ooffset = lseek (fd, 0, SEEK_CUR);
566 lseek (fd, offset, SEEK_SET); 699 lseek (fd, offset, SEEK_SET);
567 res = write (fd, buf, count); 700 res = write (fd, buf, count);
568 lseek (fd, offset, SEEK_SET); 701 lseek (fd, offset, SEEK_SET);
569 pthread_mutex_unlock (&preadwritelock); 702 UNLOCK (preadwritelock);
570 703
571 return res; 704 return res;
572} 705}
573#endif 706#endif
574 707
575#if !HAVE_FDATASYNC 708#if !HAVE_FDATASYNC
576# define fdatasync fsync 709# define fdatasync fsync
577#endif 710#endif
578 711
579#if !HAVE_READAHEAD 712#if !HAVE_READAHEAD
580# define readahead aio_readahead 713# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
581 714
582static 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)
583{ 716{
584 char readahead_buf[4096]; 717 dBUF;
585 718
586 while (count > 0) 719 while (count > 0)
587 { 720 {
588 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 721 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
589 722
590 pread (fd, readahead_buf, len, offset); 723 pread (fd, aio_buf, len, offset);
591 offset += len; 724 offset += len;
592 count -= len; 725 count -= len;
593 } 726 }
594 727
595 errno = 0; 728 errno = 0;
596} 729}
730
597#endif 731#endif
598 732
599#if !HAVE_READDIR_R 733#if !HAVE_READDIR_R
600# define readdir_r aio_readdir_r 734# define readdir_r aio_readdir_r
601 735
… …
604static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 738static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
605{ 739{
606 struct dirent *e; 740 struct dirent *e;
607 int errorno; 741 int errorno;
608 742
609 pthread_mutex_lock (&readdirlock); 743 LOCK (readdirlock);
610 744
611 e = readdir (dirp); 745 e = readdir (dirp);
612 errorno = errno; 746 errorno = errno;
613 747
614 if (e) 748 if (e)
… …
617 strcpy (ent->d_name, e->d_name); 751 strcpy (ent->d_name, e->d_name);
618 } 752 }
619 else 753 else
620 *res = 0; 754 *res = 0;
621 755
622 pthread_mutex_unlock (&readdirlock); 756 UNLOCK (readdirlock);
623 757
624 errno = errorno; 758 errno = errorno;
625 return e ? 0 : -1; 759 return e ? 0 : -1;
626} 760}
627#endif 761#endif
628 762
629/* sendfile always needs emulation */ 763/* sendfile always needs emulation */
630static 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)
631{ 765{
632 ssize_t res; 766 ssize_t res;
633 767
634 if (!count) 768 if (!count)
635 return 0; 769 return 0;
… …
646 { 780 {
647 off_t sbytes; 781 off_t sbytes;
648 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 782 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
649 783
650 if (res < 0 && sbytes) 784 if (res < 0 && sbytes)
651 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 785 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
652 res = sbytes; 786 res = sbytes;
653 } 787 }
654 788
655# elif __hpux 789# elif __hpux
656 res = sendfile (ofd, ifd, offset, count, 0, 0); 790 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
684#endif 818#endif
685 ) 819 )
686 ) 820 )
687 { 821 {
688 /* emulate sendfile. this is a major pain in the ass */ 822 /* emulate sendfile. this is a major pain in the ass */
689 char buf[4096]; 823 dBUF;
824
690 res = 0; 825 res = 0;
691 826
692 while (count) 827 while (count)
693 { 828 {
694 ssize_t cnt; 829 ssize_t cnt;
695 830
696 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 831 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
697 832
698 if (cnt <= 0) 833 if (cnt <= 0)
699 { 834 {
700 if (cnt && !res) res = -1; 835 if (cnt && !res) res = -1;
701 break; 836 break;
702 } 837 }
703 838
704 cnt = write (ofd, buf, cnt); 839 cnt = write (ofd, aio_buf, cnt);
705 840
706 if (cnt <= 0) 841 if (cnt <= 0)
707 { 842 {
708 if (cnt && !res) res = -1; 843 if (cnt && !res) res = -1;
709 break; 844 break;
… …
717 852
718 return res; 853 return res;
719} 854}
720 855
721/* read a full directory */ 856/* read a full directory */
722static int scandir_ (const char *path, void **namesp) 857static void scandir_ (aio_req req, worker *self)
723{ 858{
724 DIR *dirp = opendir (path); 859 DIR *dirp;
725 union 860 union
726 { 861 {
727 struct dirent d; 862 struct dirent d;
728 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 863 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
729 } u; 864 } *u;
730 struct dirent *entp; 865 struct dirent *entp;
731 char *name, *names; 866 char *name, *names;
732 int memlen = 4096; 867 int memlen = 4096;
733 int memofs = 0; 868 int memofs = 0;
734 int res = 0; 869 int res = 0;
735 int errorno; 870 int errorno;
736 871
737 if (!dirp) 872 LOCK (wrklock);
738 return -1; 873 self->dirp = dirp = opendir (req->dataptr);
739 874 self->dbuf = u = malloc (sizeof (*u));
740 names = malloc (memlen); 875 req->data2ptr = names = malloc (memlen);
876 UNLOCK (wrklock);
741 877
878 if (dirp && u && names)
742 for (;;) 879 for (;;)
743 { 880 {
881 errno = 0;
744 errno = 0, readdir_r (dirp, &u.d, &entp); 882 readdir_r (dirp, &u->d, &entp);
745 883
746 if (!entp) 884 if (!entp)
747 break; 885 break;
748 886
749 name = entp->d_name; 887 name = entp->d_name;
750 888
751 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 889 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
752 { 890 {
753 int len = strlen (name) + 1; 891 int len = strlen (name) + 1;
754 892
755 res++; 893 res++;
756 894
757 while (memofs + len > memlen) 895 while (memofs + len > memlen)
758 { 896 {
759 memlen *= 2; 897 memlen *= 2;
898 LOCK (wrklock);
760 names = realloc (names, memlen); 899 req->data2ptr = names = realloc (names, memlen);
900 UNLOCK (wrklock);
901
761 if (!names) 902 if (!names)
762 break; 903 break;
763 } 904 }
764 905
765 memcpy (names + memofs, name, len); 906 memcpy (names + memofs, name, len);
766 memofs += len; 907 memofs += len;
767 } 908 }
768 } 909 }
769 910
770 errorno = errno;
771 closedir (dirp);
772
773 if (errorno) 911 if (errno)
774 {
775 free (names);
776 errno = errorno;
777 res = -1; 912 res = -1;
778 } 913
779 914 req->result = res;
780 *namesp = (void *)names;
781 return res;
782} 915}
783 916
784/*****************************************************************************/ 917/*****************************************************************************/
785 918
786static void *aio_proc (void *thr_arg) 919static void *aio_proc (void *thr_arg)
787{ 920{
788 aio_req req; 921 aio_req req;
789 int type; 922 int type;
923 worker *self = (worker *)thr_arg;
790 924
791 do 925 do
792 { 926 {
793 pthread_mutex_lock (&reqlock); 927 LOCK (reqlock);
794 928
795 for (;;) 929 for (;;)
796 { 930 {
797 req = reqs; 931 self->req = req = reqq_shift (&req_queue);
798
799 if (reqs)
800 {
801 reqs = reqs->next;
802 if (!reqs) reqe = 0;
803 }
804 932
805 if (req) 933 if (req)
806 break; 934 break;
807 935
808 pthread_cond_wait (&reqwait, &reqlock); 936 pthread_cond_wait (&reqwait, &reqlock);
809 } 937 }
810 938
811 pthread_mutex_unlock (&reqlock); 939 UNLOCK (reqlock);
812 940
813 errno = 0; /* strictly unnecessary */ 941 errno = 0; /* strictly unnecessary */
814 type = req->type; /* remember type for QUIT check */ 942 type = req->type; /* remember type for QUIT check */
815 943
816 if (!(req->flags & FLAG_CANCELLED)) 944 if (!(req->flags & FLAG_CANCELLED))
… …
818 { 946 {
819 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;
820 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;
821 949
822 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;
823 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;
824 952
825 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
826 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
827 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
828 956
… …
834 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
835 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
836 964
837 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
838 case REQ_FSYNC: req->result = fsync (req->fd); break; 966 case REQ_FSYNC: req->result = fsync (req->fd); break;
839 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 967 case REQ_READDIR: scandir_ (req, self); break;
840 968
841 case REQ_SLEEP: 969 case REQ_BUSY:
842 { 970 {
843 struct timeval tv; 971 struct timeval tv;
844 972
845 tv.tv_sec = req->fd; 973 tv.tv_sec = req->fd;
846 tv.tv_usec = req->fd2; 974 tv.tv_usec = req->fd2;
… …
858 break; 986 break;
859 } 987 }
860 988
861 req->errorno = errno; 989 req->errorno = errno;
862 990
863 pthread_mutex_lock (&reslock); 991 LOCK (reslock);
864 992
865 req->next = 0; 993 if (!reqq_push (&res_queue, req))
866
867 if (rese)
868 {
869 rese->next = req;
870 rese = req;
871 }
872 else
873 {
874 rese = ress = req;
875
876 /* write a dummy byte to the pipe so fh becomes ready */ 994 /* write a dummy byte to the pipe so fh becomes ready */
877 write (respipe [1], &respipe, 1); 995 write (respipe [1], &respipe, 1);
878 }
879 996
880 pthread_mutex_unlock (&reslock); 997 self->req = 0;
998 worker_clear (self);
999
1000 UNLOCK (reslock);
881 } 1001 }
882 while (type != REQ_QUIT); 1002 while (type != REQ_QUIT);
883 1003
1004 LOCK (wrklock);
1005 worker_free (self);
1006 UNLOCK (wrklock);
1007
884 return 0; 1008 return 0;
885} 1009}
886 1010
887/*****************************************************************************/ 1011/*****************************************************************************/
888 1012
889static void atfork_prepare (void) 1013static void atfork_prepare (void)
890{ 1014{
891 pthread_mutex_lock (&reqlock); 1015 LOCK (wrklock);
892 pthread_mutex_lock (&reslock); 1016 LOCK (reqlock);
1017 LOCK (reslock);
893#if !HAVE_PREADWRITE 1018#if !HAVE_PREADWRITE
894 pthread_mutex_lock (&preadwritelock); 1019 LOCK (preadwritelock);
895#endif 1020#endif
896#if !HAVE_READDIR_R 1021#if !HAVE_READDIR_R
897 pthread_mutex_lock (&readdirlock); 1022 LOCK (readdirlock);
898#endif 1023#endif
899} 1024}
900 1025
901static void atfork_parent (void) 1026static void atfork_parent (void)
902{ 1027{
903#if !HAVE_READDIR_R 1028#if !HAVE_READDIR_R
904 pthread_mutex_unlock (&readdirlock); 1029 UNLOCK (readdirlock);
905#endif 1030#endif
906#if !HAVE_PREADWRITE 1031#if !HAVE_PREADWRITE
907 pthread_mutex_unlock (&preadwritelock); 1032 UNLOCK (preadwritelock);
908#endif 1033#endif
909 pthread_mutex_unlock (&reslock); 1034 UNLOCK (reslock);
910 pthread_mutex_unlock (&reqlock); 1035 UNLOCK (reqlock);
1036 UNLOCK (wrklock);
911} 1037}
912 1038
913static void atfork_child (void) 1039static void atfork_child (void)
914{ 1040{
915 aio_req prv; 1041 aio_req prv;
916 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
917 started = 0; 1060 started = 0;
918 1061 nreqs = 0;
919 while (reqs)
920 {
921 prv = reqs;
922 reqs = prv->next;
923 req_free (prv);
924 }
925
926 reqs = reqe = 0;
927
928 while (ress)
929 {
930 prv = ress;
931 ress = prv->next;
932 req_free (prv);
933 }
934
935 ress = rese = 0;
936 1062
937 close (respipe [0]); 1063 close (respipe [0]);
938 close (respipe [1]); 1064 close (respipe [1]);
939 create_pipe (); 1065 create_pipe ();
940 1066
… …
985void 1111void
986max_parallel (nthreads) 1112max_parallel (nthreads)
987 int nthreads 1113 int nthreads
988 PROTOTYPE: $ 1114 PROTOTYPE: $
989 1115
990int
991max_outstanding (nreqs)
992 int nreqs
993 PROTOTYPE: $
994 CODE:
995 RETVAL = max_outstanding;
996 max_outstanding = nreqs;
997
998void 1116void
999aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1117aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1000 SV * pathname 1118 SV * pathname
1001 int flags 1119 int flags
1002 int mode 1120 int mode
… …
1216 1334
1217 REQ_SEND; 1335 REQ_SEND;
1218} 1336}
1219 1337
1220void 1338void
1221aio_sleep (delay,callback=&PL_sv_undef) 1339aio_busy (delay,callback=&PL_sv_undef)
1222 double delay 1340 double delay
1223 SV * callback 1341 SV * callback
1224 PPCODE: 1342 PPCODE:
1225{ 1343{
1226 dREQ; 1344 dREQ;
1227 1345
1228 req->type = REQ_SLEEP; 1346 req->type = REQ_BUSY;
1229 req->fd = delay < 0. ? 0 : delay; 1347 req->fd = delay < 0. ? 0 : delay;
1230 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1231 1349
1232 REQ_SEND; 1350 REQ_SEND;
1233} 1351}
… …
1256 req->type = REQ_NOP; 1374 req->type = REQ_NOP;
1257 1375
1258 REQ_SEND; 1376 REQ_SEND;
1259} 1377}
1260 1378
1261#if 0
1262
1263void 1379void
1264aio_pri (int pri = DEFAULT_PRI) 1380aioreq_pri (int pri = DEFAULT_PRI)
1265 CODE: 1381 CODE:
1266 if (pri < PRI_MIN) pri = PRI_MIN; 1382 if (pri < PRI_MIN) pri = PRI_MIN;
1267 if (pri > PRI_MAX) pri = PRI_MAX; 1383 if (pri > PRI_MAX) pri = PRI_MAX;
1268 next_pri = pri + PRI_BIAS; 1384 next_pri = pri + PRI_BIAS;
1269 1385
1270#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;
1271 1393
1272void 1394void
1273flush () 1395flush ()
1274 PROTOTYPE: 1396 PROTOTYPE:
1275 CODE: 1397 CODE:
1276 while (nreqs) 1398 while (nreqs)
1277 { 1399 {
1278 poll_wait (); 1400 poll_wait ();
1279 poll_cb (); 1401 poll_cb (0);
1280 } 1402 }
1281 1403
1282void 1404void
1283poll() 1405poll()
1284 PROTOTYPE: 1406 PROTOTYPE:
1285 CODE: 1407 CODE:
1286 if (nreqs) 1408 if (nreqs)
1287 { 1409 {
1288 poll_wait (); 1410 poll_wait ();
1289 poll_cb (); 1411 poll_cb (0);
1290 } 1412 }
1291 1413
1292int 1414int
1293poll_fileno() 1415poll_fileno()
1294 PROTOTYPE: 1416 PROTOTYPE:
… …
1299 1421
1300int 1422int
1301poll_cb(...) 1423poll_cb(...)
1302 PROTOTYPE: 1424 PROTOTYPE:
1303 CODE: 1425 CODE:
1304 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);
1305 OUTPUT: 1435 OUTPUT:
1306 RETVAL 1436 RETVAL
1307 1437
1308void 1438void
1309poll_wait() 1439poll_wait()
… …
1324 1454
1325MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1455MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1326 1456
1327void 1457void
1328cancel (aio_req_ornot req) 1458cancel (aio_req_ornot req)
1329 PROTOTYPE:
1330 CODE: 1459 CODE:
1331 req_cancel (req); 1460 req_cancel (req);
1332 1461
1333void 1462void
1334cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1463cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1370 } 1499 }
1371 } 1500 }
1372} 1501}
1373 1502
1374void 1503void
1504cancel_subs (aio_req_ornot req)
1505 CODE:
1506 req_cancel_subs (req);
1507
1508void
1375result (aio_req grp, ...) 1509result (aio_req grp, ...)
1376 CODE: 1510 CODE:
1377{ 1511{
1378 int i; 1512 int i;
1379 AV *av = newAV (); 1513 AV *av = newAV ();
… …
1384 SvREFCNT_dec (grp->data); 1518 SvREFCNT_dec (grp->data);
1385 grp->data = (SV *)av; 1519 grp->data = (SV *)av;
1386} 1520}
1387 1521
1388void 1522void
1389feed_limit (aio_req grp, int limit) 1523limit (aio_req grp, int limit)
1390 CODE: 1524 CODE:
1391 grp->fd2 = limit; 1525 grp->fd2 = limit;
1392 aio_grp_feed (grp); 1526 aio_grp_feed (grp);
1393 1527
1394void 1528void

Diff Legend

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