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.60 by root, Mon Oct 23 20:05:27 2006 UTC vs.
Revision 1.71 by root, Tue Oct 24 16:35:04 2006 UTC

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux
5# define _GNU_SOURCE
6#endif
7
1#define _REENTRANT 1 8#define _REENTRANT 1
9
2#include <errno.h> 10#include <errno.h>
3 11
4#include "EXTERN.h" 12#include "EXTERN.h"
5#include "perl.h" 13#include "perl.h"
6#include "XSUB.h" 14#include "XSUB.h"
41# define NAME_MAX 4096 49# define NAME_MAX 4096
42#endif 50#endif
43 51
44#if __ia64 52#if __ia64
45# define STACKSIZE 65536 53# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN
46#else 56#else
47# define STACKSIZE 8192 57# define STACKSIZE 16384
48#endif 58#endif
59
60/* buffer size for various temporary buffers */
61#define AIO_BUFSIZE 65536
62
63#define dBUF \
64 char *aio_buf; \
65 LOCK (wrklock); \
66 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
67 UNLOCK (wrklock); \
68 if (!aio_buf) \
69 return -1;
49 70
50enum { 71enum {
51 REQ_QUIT, 72 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 73 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 74 REQ_READ, REQ_WRITE, REQ_READAHEAD,
56 REQ_FSYNC, REQ_FDATASYNC, 77 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 79 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 80 REQ_LINK, REQ_SYMLINK,
60 REQ_GROUP, REQ_NOP, 81 REQ_GROUP, REQ_NOP,
61 REQ_SLEEP, 82 REQ_BUSY,
62}; 83};
63 84
64#define AIO_REQ_KLASS "IO::AIO::REQ" 85#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 86#define AIO_GRP_KLASS "IO::AIO::GRP"
66 87
95 116
96typedef aio_cb *aio_req; 117typedef aio_cb *aio_req;
97typedef aio_cb *aio_req_ornot; 118typedef aio_cb *aio_req_ornot;
98 119
99enum { 120enum {
100 PRI_MIN = 4, 121 PRI_MIN = -4,
101 PRI_MAX = -4, 122 PRI_MAX = 4,
102 123
103 DEFAULT_PRI = 0, 124 DEFAULT_PRI = 0,
104 PRI_BIAS = PRI_MIN, 125 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
105}; 127};
106 128
107static int next_pri = DEFAULT_PRI + PRI_BIAS; 129static int next_pri = DEFAULT_PRI + PRI_BIAS;
108 130
109static int started, wanted; 131static int started, wanted;
110static volatile int nreqs; 132static volatile int nreqs;
111static int max_outstanding = 1<<30; 133static int max_outstanding = 1<<30;
112static int respipe [2]; 134static int respipe [2];
113 135
136#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
137# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
138#else
139# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
140#endif
141
142#define LOCK(mutex) pthread_mutex_lock (&(mutex))
143#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
144
145/* worker threasd management */
146static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
147
148typedef struct worker {
149 /* locked by wrklock */
150 struct worker *prev, *next;
151
152 pthread_t tid;
153
154 /* locked by reslock, reqlock or wrklock */
155 aio_req req; /* currently processed request */
156 void *dbuf;
157 DIR *dirp;
158} worker;
159
160static worker wrk_first = { &wrk_first, &wrk_first, 0 };
161
162static void worker_clear (worker *wrk)
163{
164 if (wrk->dirp)
165 {
166 closedir (wrk->dirp);
167 wrk->dirp = 0;
168 }
169
170 if (wrk->dbuf)
171 {
172 free (wrk->dbuf);
173 wrk->dbuf = 0;
174 }
175}
176
177static void worker_free (worker *wrk)
178{
179 wrk->next->prev = wrk->prev;
180 wrk->prev->next = wrk->next;
181
182 free (wrk);
183}
184
114static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 185static pthread_mutex_t reslock = AIO_MUTEX_INIT;
115static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 186static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
116static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 187static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
117 188
118static volatile aio_req reqs, reqe; /* queue start, queue end */ 189/*
119static volatile aio_req ress, rese; /* queue start, queue end */ 190 * a somewhat faster data structure might be nice, but
191 * with 8 priorities this actually needs <20 insns
192 * per shift, the most expensive operation.
193 */
194typedef struct {
195 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
196 int size;
197} reqq;
198
199static reqq req_queue;
200static reqq res_queue;
201
202int reqq_push (reqq *q, aio_req req)
203{
204 int pri = req->pri;
205 req->next = 0;
206
207 if (q->qe[pri])
208 {
209 q->qe[pri]->next = req;
210 q->qe[pri] = req;
211 }
212 else
213 q->qe[pri] = q->qs[pri] = req;
214
215 return q->size++;
216}
217
218aio_req reqq_shift (reqq *q)
219{
220 int pri;
221
222 if (!q->size)
223 return 0;
224
225 --q->size;
226
227 for (pri = NUM_PRI; pri--; )
228 {
229 aio_req req = q->qs[pri];
230
231 if (req)
232 {
233 if (!(q->qs[pri] = req->next))
234 q->qe[pri] = 0;
235
236 return req;
237 }
238 }
239
240 abort ();
241}
120 242
121static void req_invoke (aio_req req); 243static void req_invoke (aio_req req);
122static void req_free (aio_req req); 244static void req_free (aio_req req);
123 245
124/* must be called at most once */ 246/* must be called at most once */
158 ENTER; 280 ENTER;
159 SAVETMPS; 281 SAVETMPS;
160 PUSHMARK (SP); 282 PUSHMARK (SP);
161 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 283 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
162 PUTBACK; 284 PUTBACK;
163 call_sv (grp->fh2, G_VOID | G_EVAL); 285 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
164 SPAGAIN; 286 SPAGAIN;
165 FREETMPS; 287 FREETMPS;
166 LEAVE; 288 LEAVE;
167 } 289 }
168 290
191 } 313 }
192} 314}
193 315
194static void poll_wait () 316static void poll_wait ()
195{ 317{
318 fd_set rfd;
319
196 while (nreqs) 320 while (nreqs)
197 { 321 {
198 aio_req req; 322 int size;
199 pthread_mutex_lock (&reslock); 323#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
200 req = ress; 324 LOCK (reslock);
201 pthread_mutex_unlock (&reslock); 325#endif
326 size = res_queue.size;
327#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
328 UNLOCK (reslock);
329#endif
202 330
203 if (req) 331 if (size)
204 return; 332 return;
205 333
206 fd_set rfd;
207 FD_ZERO(&rfd); 334 FD_ZERO(&rfd);
208 FD_SET(respipe [0], &rfd); 335 FD_SET(respipe [0], &rfd);
209 336
210 select (respipe [0] + 1, &rfd, 0, 0, 0); 337 select (respipe [0] + 1, &rfd, 0, 0, 0);
211 } 338 }
212} 339}
213 340
214static void req_invoke (aio_req req) 341static void req_invoke (aio_req req)
215{ 342{
216 dSP; 343 dSP;
217 int errorno = errno;
218 344
219 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 345 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
220 return; 346 {
221
222 errno = req->errorno; 347 errno = req->errorno;
223 348
224 ENTER; 349 ENTER;
225 SAVETMPS; 350 SAVETMPS;
226 PUSHMARK (SP); 351 PUSHMARK (SP);
227 EXTEND (SP, 1); 352 EXTEND (SP, 1);
228 353
229 switch (req->type) 354 switch (req->type)
230 {
231 case REQ_READDIR:
232 { 355 {
233 SV *rv = &PL_sv_undef; 356 case REQ_READDIR:
234
235 if (req->result >= 0)
236 { 357 {
237 char *buf = req->data2ptr; 358 SV *rv = &PL_sv_undef;
238 AV *av = newAV ();
239 359
240 while (req->result) 360 if (req->result >= 0)
241 { 361 {
362 int i;
363 char *buf = req->data2ptr;
364 AV *av = newAV ();
365
366 av_extend (av, req->result - 1);
367
368 for (i = 0; i < req->result; ++i)
369 {
242 SV *sv = newSVpv (buf, 0); 370 SV *sv = newSVpv (buf, 0);
243 371
244 av_push (av, sv); 372 av_store (av, i, sv);
245 buf += SvCUR (sv) + 1; 373 buf += SvCUR (sv) + 1;
246 req->result--; 374 }
375
376 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 377 }
248 378
249 rv = sv_2mortal (newRV_noinc ((SV *)av)); 379 PUSHs (rv);
250 } 380 }
381 break;
251 382
252 PUSHs (rv); 383 case REQ_OPEN:
384 {
385 /* convert fd to fh */
386 SV *fh;
387
388 PUSHs (sv_2mortal (newSViv (req->result)));
389 PUTBACK;
390 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
391 SPAGAIN;
392
393 fh = SvREFCNT_inc (POPs);
394
395 PUSHMARK (SP);
396 XPUSHs (sv_2mortal (fh));
397 }
398 break;
399
400 case REQ_GROUP:
401 req->fd = 2; /* mark group as finished */
402
403 if (req->data)
404 {
405 int i;
406 AV *av = (AV *)req->data;
407
408 EXTEND (SP, AvFILL (av) + 1);
409 for (i = 0; i <= AvFILL (av); ++i)
410 PUSHs (*av_fetch (av, i, 0));
411 }
412 break;
413
414 case REQ_NOP:
415 case REQ_BUSY:
416 break;
417
418 default:
419 PUSHs (sv_2mortal (newSViv (req->result)));
420 break;
253 } 421 }
254 break;
255 422
256 case REQ_OPEN:
257 {
258 /* convert fd to fh */
259 SV *fh;
260 423
261 PUSHs (sv_2mortal (newSViv (req->result)));
262 PUTBACK; 424 PUTBACK;
263 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
264 SPAGAIN;
265
266 fh = SvREFCNT_inc (POPs);
267
268 PUSHMARK (SP);
269 XPUSHs (sv_2mortal (fh));
270 }
271 break;
272
273 case REQ_GROUP:
274 req->fd = 2; /* mark group as finished */
275
276 if (req->data)
277 {
278 int i;
279 AV *av = (AV *)req->data;
280
281 EXTEND (SP, AvFILL (av) + 1);
282 for (i = 0; i <= AvFILL (av); ++i)
283 PUSHs (*av_fetch (av, i, 0));
284 }
285 break;
286
287 case REQ_NOP:
288 case REQ_SLEEP:
289 break;
290
291 default:
292 PUSHs (sv_2mortal (newSViv (req->result)));
293 break;
294 }
295
296
297 PUTBACK;
298 call_sv (req->callback, G_VOID | G_EVAL); 425 call_sv (req->callback, G_VOID | G_EVAL);
299 SPAGAIN; 426 SPAGAIN;
300 427
301 FREETMPS; 428 FREETMPS;
302 LEAVE; 429 LEAVE;
303
304 errno = errorno;
305
306 if (SvTRUE (ERRSV))
307 { 430 }
308 req_free (req);
309 croak (0);
310 }
311}
312 431
313static void req_free (aio_req req)
314{
315 if (req->grp) 432 if (req->grp)
316 { 433 {
317 aio_req grp = req->grp; 434 aio_req grp = req->grp;
318 435
319 /* unlink request */ 436 /* unlink request */
324 grp->grp_first = req->grp_next; 441 grp->grp_first = req->grp_next;
325 442
326 aio_grp_dec (grp); 443 aio_grp_dec (grp);
327 } 444 }
328 445
446 if (SvTRUE (ERRSV))
447 {
448 req_free (req);
449 croak (0);
450 }
451}
452
453static void req_free (aio_req req)
454{
329 if (req->self) 455 if (req->self)
330 { 456 {
331 sv_unmagic (req->self, PERL_MAGIC_ext); 457 sv_unmagic (req->self, PERL_MAGIC_ext);
332 SvREFCNT_dec (req->self); 458 SvREFCNT_dec (req->self);
333 } 459 }
336 SvREFCNT_dec (req->fh); 462 SvREFCNT_dec (req->fh);
337 SvREFCNT_dec (req->fh2); 463 SvREFCNT_dec (req->fh2);
338 SvREFCNT_dec (req->callback); 464 SvREFCNT_dec (req->callback);
339 Safefree (req->statdata); 465 Safefree (req->statdata);
340 466
341 if (req->type == REQ_READDIR && req->result >= 0) 467 if (req->type == REQ_READDIR)
342 free (req->data2ptr); 468 free (req->data2ptr);
343 469
344 Safefree (req); 470 Safefree (req);
345} 471}
346 472
364 int do_croak = 0; 490 int do_croak = 0;
365 aio_req req; 491 aio_req req;
366 492
367 for (;;) 493 for (;;)
368 { 494 {
369 pthread_mutex_lock (&reslock); 495 LOCK (reslock);
370 req = ress; 496 req = reqq_shift (&res_queue);
371 497
372 if (req) 498 if (req)
373 { 499 {
374 ress = req->next;
375
376 if (!ress) 500 if (!res_queue.size)
377 { 501 {
378 /* read any signals sent by the worker threads */ 502 /* read any signals sent by the worker threads */
379 char buf [32]; 503 char buf [32];
380 while (read (respipe [0], buf, 32) == 32) 504 while (read (respipe [0], buf, 32) == 32)
381 ; 505 ;
382
383 rese = 0;
384 } 506 }
385 } 507 }
386 508
387 pthread_mutex_unlock (&reslock); 509 UNLOCK (reslock);
388 510
389 if (!req) 511 if (!req)
390 break; 512 break;
391 513
392 --nreqs; 514 --nreqs;
426 548
427static void *aio_proc(void *arg); 549static void *aio_proc(void *arg);
428 550
429static void start_thread (void) 551static void start_thread (void)
430{ 552{
553 worker *wrk = calloc (1, sizeof (worker));
554
555 if (!wrk)
556 croak ("unable to allocate worker thread data");
557
431 sigset_t fullsigset, oldsigset; 558 sigset_t fullsigset, oldsigset;
432 pthread_t tid;
433 pthread_attr_t attr; 559 pthread_attr_t attr;
434 560
435 pthread_attr_init (&attr); 561 pthread_attr_init (&attr);
436 pthread_attr_setstacksize (&attr, STACKSIZE); 562 pthread_attr_setstacksize (&attr, STACKSIZE);
437 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 563 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
438 564
439 sigfillset (&fullsigset); 565 sigfillset (&fullsigset);
566
567 LOCK (wrklock);
440 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 568 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
441 569
442 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 570 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
571 {
572 wrk->prev = &wrk_first;
573 wrk->next = wrk_first.next;
574 wrk_first.next->prev = wrk;
575 wrk_first.next = wrk;
443 started++; 576 started++;
577 }
578 else
579 free (wrk);
444 580
445 sigprocmask (SIG_SETMASK, &oldsigset, 0); 581 sigprocmask (SIG_SETMASK, &oldsigset, 0);
582 UNLOCK (wrklock);
446} 583}
447 584
448static void req_send (aio_req req) 585static void req_send (aio_req req)
449{ 586{
450 while (started < wanted && nreqs >= started) 587 while (started < wanted && nreqs >= started)
451 start_thread (); 588 start_thread ();
452 589
453 ++nreqs; 590 ++nreqs;
454 591
455 pthread_mutex_lock (&reqlock); 592 LOCK (reqlock);
456 593 reqq_push (&req_queue, req);
457 req->next = 0;
458
459 if (reqe)
460 {
461 reqe->next = req;
462 reqe = req;
463 }
464 else
465 reqe = reqs = req;
466
467 pthread_cond_signal (&reqwait); 594 pthread_cond_signal (&reqwait);
468 pthread_mutex_unlock (&reqlock); 595 UNLOCK (reqlock);
469 596
470 if (nreqs > max_outstanding) 597 if (nreqs > max_outstanding)
471 for (;;) 598 for (;;)
472 { 599 {
473 poll_cb (); 600 poll_cb ();
480} 607}
481 608
482static void end_thread (void) 609static void end_thread (void)
483{ 610{
484 aio_req req; 611 aio_req req;
612
485 Newz (0, req, 1, aio_cb); 613 Newz (0, req, 1, aio_cb);
614
486 req->type = REQ_QUIT; 615 req->type = REQ_QUIT;
616 req->pri = PRI_MAX + PRI_BIAS;
487 617
488 req_send (req); 618 req_send (req);
489} 619}
490 620
491static void min_parallel (int nthreads) 621static void min_parallel (int nthreads)
543static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 673static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
544{ 674{
545 ssize_t res; 675 ssize_t res;
546 off_t ooffset; 676 off_t ooffset;
547 677
548 pthread_mutex_lock (&preadwritelock); 678 LOCK (preadwritelock);
549 ooffset = lseek (fd, 0, SEEK_CUR); 679 ooffset = lseek (fd, 0, SEEK_CUR);
550 lseek (fd, offset, SEEK_SET); 680 lseek (fd, offset, SEEK_SET);
551 res = read (fd, buf, count); 681 res = read (fd, buf, count);
552 lseek (fd, ooffset, SEEK_SET); 682 lseek (fd, ooffset, SEEK_SET);
553 pthread_mutex_unlock (&preadwritelock); 683 UNLOCK (preadwritelock);
554 684
555 return res; 685 return res;
556} 686}
557 687
558static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 688static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
559{ 689{
560 ssize_t res; 690 ssize_t res;
561 off_t ooffset; 691 off_t ooffset;
562 692
563 pthread_mutex_lock (&preadwritelock); 693 LOCK (preadwritelock);
564 ooffset = lseek (fd, 0, SEEK_CUR); 694 ooffset = lseek (fd, 0, SEEK_CUR);
565 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
566 res = write (fd, buf, count); 696 res = write (fd, buf, count);
567 lseek (fd, offset, SEEK_SET); 697 lseek (fd, offset, SEEK_SET);
568 pthread_mutex_unlock (&preadwritelock); 698 UNLOCK (preadwritelock);
569 699
570 return res; 700 return res;
571} 701}
572#endif 702#endif
573 703
578#if !HAVE_READAHEAD 708#if !HAVE_READAHEAD
579# define readahead aio_readahead 709# define readahead aio_readahead
580 710
581static ssize_t readahead (int fd, off_t offset, size_t count) 711static ssize_t readahead (int fd, off_t offset, size_t count)
582{ 712{
583 char readahead_buf[4096]; 713 dBUF;
584 714
585 while (count > 0) 715 while (count > 0)
586 { 716 {
587 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 717 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
588 718
589 pread (fd, readahead_buf, len, offset); 719 pread (fd, aio_buf, len, offset);
590 offset += len; 720 offset += len;
591 count -= len; 721 count -= len;
592 } 722 }
593 723
594 errno = 0; 724 errno = 0;
603static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 733static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
604{ 734{
605 struct dirent *e; 735 struct dirent *e;
606 int errorno; 736 int errorno;
607 737
608 pthread_mutex_lock (&readdirlock); 738 LOCK (readdirlock);
609 739
610 e = readdir (dirp); 740 e = readdir (dirp);
611 errorno = errno; 741 errorno = errno;
612 742
613 if (e) 743 if (e)
616 strcpy (ent->d_name, e->d_name); 746 strcpy (ent->d_name, e->d_name);
617 } 747 }
618 else 748 else
619 *res = 0; 749 *res = 0;
620 750
621 pthread_mutex_unlock (&readdirlock); 751 UNLOCK (readdirlock);
622 752
623 errno = errorno; 753 errno = errorno;
624 return e ? 0 : -1; 754 return e ? 0 : -1;
625} 755}
626#endif 756#endif
627 757
628/* sendfile always needs emulation */ 758/* sendfile always needs emulation */
629static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 759static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
630{ 760{
631 ssize_t res; 761 ssize_t res;
632 762
633 if (!count) 763 if (!count)
634 return 0; 764 return 0;
683#endif 813#endif
684 ) 814 )
685 ) 815 )
686 { 816 {
687 /* emulate sendfile. this is a major pain in the ass */ 817 /* emulate sendfile. this is a major pain in the ass */
688 char buf[4096]; 818 dBUF;
819
689 res = 0; 820 res = 0;
690 821
691 while (count) 822 while (count)
692 { 823 {
693 ssize_t cnt; 824 ssize_t cnt;
694 825
695 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 826 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
696 827
697 if (cnt <= 0) 828 if (cnt <= 0)
698 { 829 {
699 if (cnt && !res) res = -1; 830 if (cnt && !res) res = -1;
700 break; 831 break;
701 } 832 }
702 833
703 cnt = write (ofd, buf, cnt); 834 cnt = write (ofd, aio_buf, cnt);
704 835
705 if (cnt <= 0) 836 if (cnt <= 0)
706 { 837 {
707 if (cnt && !res) res = -1; 838 if (cnt && !res) res = -1;
708 break; 839 break;
716 847
717 return res; 848 return res;
718} 849}
719 850
720/* read a full directory */ 851/* read a full directory */
721static int scandir_ (const char *path, void **namesp) 852static void scandir_ (aio_req req, worker *self)
722{ 853{
723 DIR *dirp = opendir (path); 854 DIR *dirp;
724 union 855 union
725 { 856 {
726 struct dirent d; 857 struct dirent d;
727 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 858 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
728 } u; 859 } *u;
729 struct dirent *entp; 860 struct dirent *entp;
730 char *name, *names; 861 char *name, *names;
731 int memlen = 4096; 862 int memlen = 4096;
732 int memofs = 0; 863 int memofs = 0;
733 int res = 0; 864 int res = 0;
734 int errorno; 865 int errorno;
735 866
736 if (!dirp) 867 LOCK (wrklock);
737 return -1; 868 self->dirp = dirp = opendir (req->dataptr);
869 self->dbuf = u = malloc (sizeof (*u));
870 UNLOCK (wrklock);
738 871
739 names = malloc (memlen); 872 req->data2ptr = names = malloc (memlen);
740 873
874 if (dirp && u && names)
741 for (;;) 875 for (;;)
742 { 876 {
877 errno = 0;
743 errno = 0, readdir_r (dirp, &u.d, &entp); 878 readdir_r (dirp, &u->d, &entp);
744 879
745 if (!entp) 880 if (!entp)
746 break; 881 break;
747 882
748 name = entp->d_name; 883 name = entp->d_name;
749 884
750 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 885 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
751 { 886 {
752 int len = strlen (name) + 1; 887 int len = strlen (name) + 1;
753 888
754 res++; 889 res++;
755 890
756 while (memofs + len > memlen) 891 while (memofs + len > memlen)
757 { 892 {
758 memlen *= 2; 893 memlen *= 2;
894 LOCK (wrklock);
759 names = realloc (names, memlen); 895 req->data2ptr = names = realloc (names, memlen);
896 UNLOCK (wrklock);
897
760 if (!names) 898 if (!names)
761 break; 899 break;
762 } 900 }
763 901
764 memcpy (names + memofs, name, len); 902 memcpy (names + memofs, name, len);
765 memofs += len; 903 memofs += len;
766 } 904 }
767 } 905 }
768 906
769 errorno = errno;
770 closedir (dirp);
771
772 if (errorno) 907 if (errno)
773 {
774 free (names);
775 errno = errorno;
776 res = -1; 908 res = -1;
777 } 909
778 910 req->result = res;
779 *namesp = (void *)names;
780 return res;
781} 911}
782 912
783/*****************************************************************************/ 913/*****************************************************************************/
784 914
785static void *aio_proc (void *thr_arg) 915static void *aio_proc (void *thr_arg)
786{ 916{
787 aio_req req; 917 aio_req req;
788 int type; 918 int type;
919 worker *self = (worker *)thr_arg;
789 920
790 do 921 do
791 { 922 {
792 pthread_mutex_lock (&reqlock); 923 LOCK (reqlock);
793 924
794 for (;;) 925 for (;;)
795 { 926 {
796 req = reqs; 927 self->req = req = reqq_shift (&req_queue);
797
798 if (reqs)
799 {
800 reqs = reqs->next;
801 if (!reqs) reqe = 0;
802 }
803 928
804 if (req) 929 if (req)
805 break; 930 break;
806 931
807 pthread_cond_wait (&reqwait, &reqlock); 932 pthread_cond_wait (&reqwait, &reqlock);
808 } 933 }
809 934
810 pthread_mutex_unlock (&reqlock); 935 UNLOCK (reqlock);
811 936
812 errno = 0; /* strictly unnecessary */ 937 errno = 0; /* strictly unnecessary */
813 type = req->type; /* remember type for QUIT check */ 938 type = req->type; /* remember type for QUIT check */
814 939
815 if (!(req->flags & FLAG_CANCELLED)) 940 if (!(req->flags & FLAG_CANCELLED))
817 { 942 {
818 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 943 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
819 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 944 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
820 945
821 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 946 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
822 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 947 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
823 948
824 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 949 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
825 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 950 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
826 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 951 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
827 952
833 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 958 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
834 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 959 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
835 960
836 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 961 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
837 case REQ_FSYNC: req->result = fsync (req->fd); break; 962 case REQ_FSYNC: req->result = fsync (req->fd); break;
838 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 963 case REQ_READDIR: scandir_ (req, self); break;
839 964
840 case REQ_SLEEP: 965 case REQ_BUSY:
841 { 966 {
842 struct timeval tv; 967 struct timeval tv;
843 968
844 tv.tv_sec = req->fd; 969 tv.tv_sec = req->fd;
845 tv.tv_usec = req->fd2; 970 tv.tv_usec = req->fd2;
857 break; 982 break;
858 } 983 }
859 984
860 req->errorno = errno; 985 req->errorno = errno;
861 986
862 pthread_mutex_lock (&reslock); 987 LOCK (reslock);
863 988
864 req->next = 0; 989 if (!reqq_push (&res_queue, req))
865
866 if (rese)
867 {
868 rese->next = req;
869 rese = req;
870 }
871 else
872 {
873 rese = ress = req;
874
875 /* write a dummy byte to the pipe so fh becomes ready */ 990 /* write a dummy byte to the pipe so fh becomes ready */
876 write (respipe [1], &respipe, 1); 991 write (respipe [1], &respipe, 1);
877 }
878 992
879 pthread_mutex_unlock (&reslock); 993 self->req = 0;
994 worker_clear (self);
995
996 UNLOCK (reslock);
880 } 997 }
881 while (type != REQ_QUIT); 998 while (type != REQ_QUIT);
882 999
1000 LOCK (wrklock);
1001 worker_free (self);
1002 UNLOCK (wrklock);
1003
883 return 0; 1004 return 0;
884} 1005}
885 1006
886/*****************************************************************************/ 1007/*****************************************************************************/
887 1008
888static void atfork_prepare (void) 1009static void atfork_prepare (void)
889{ 1010{
890 pthread_mutex_lock (&reqlock); 1011 LOCK (wrklock);
891 pthread_mutex_lock (&reslock); 1012 LOCK (reqlock);
1013 LOCK (reslock);
892#if !HAVE_PREADWRITE 1014#if !HAVE_PREADWRITE
893 pthread_mutex_lock (&preadwritelock); 1015 LOCK (preadwritelock);
894#endif 1016#endif
895#if !HAVE_READDIR_R 1017#if !HAVE_READDIR_R
896 pthread_mutex_lock (&readdirlock); 1018 LOCK (readdirlock);
897#endif 1019#endif
898} 1020}
899 1021
900static void atfork_parent (void) 1022static void atfork_parent (void)
901{ 1023{
902#if !HAVE_READDIR_R 1024#if !HAVE_READDIR_R
903 pthread_mutex_unlock (&readdirlock); 1025 UNLOCK (readdirlock);
904#endif 1026#endif
905#if !HAVE_PREADWRITE 1027#if !HAVE_PREADWRITE
906 pthread_mutex_unlock (&preadwritelock); 1028 UNLOCK (preadwritelock);
907#endif 1029#endif
908 pthread_mutex_unlock (&reslock); 1030 UNLOCK (reslock);
909 pthread_mutex_unlock (&reqlock); 1031 UNLOCK (reqlock);
1032 UNLOCK (wrklock);
910} 1033}
911 1034
912static void atfork_child (void) 1035static void atfork_child (void)
913{ 1036{
914 aio_req prv; 1037 aio_req prv;
915 1038
1039 while (prv = reqq_shift (&req_queue))
1040 req_free (prv);
1041
1042 while (prv = reqq_shift (&res_queue))
1043 req_free (prv);
1044
1045 while (wrk_first.next != &wrk_first)
1046 {
1047 worker *wrk = wrk_first.next;
1048
1049 if (wrk->req)
1050 req_free (wrk->req);
1051
1052 worker_clear (wrk);
1053 worker_free (wrk);
1054 }
1055
916 started = 0; 1056 started = 0;
917 1057 nreqs = 0;
918 while (reqs)
919 {
920 prv = reqs;
921 reqs = prv->next;
922 req_free (prv);
923 }
924
925 reqs = reqe = 0;
926
927 while (ress)
928 {
929 prv = ress;
930 ress = prv->next;
931 req_free (prv);
932 }
933
934 ress = rese = 0;
935 1058
936 close (respipe [0]); 1059 close (respipe [0]);
937 close (respipe [1]); 1060 close (respipe [1]);
938 create_pipe (); 1061 create_pipe ();
939 1062
1215 1338
1216 REQ_SEND; 1339 REQ_SEND;
1217} 1340}
1218 1341
1219void 1342void
1220aio_sleep (delay,callback=&PL_sv_undef) 1343aio_busy (delay,callback=&PL_sv_undef)
1221 double delay 1344 double delay
1222 SV * callback 1345 SV * callback
1223 PPCODE: 1346 PPCODE:
1224{ 1347{
1225 dREQ; 1348 dREQ;
1226 1349
1227 req->type = REQ_SLEEP; 1350 req->type = REQ_BUSY;
1228 req->fd = delay < 0. ? 0 : delay; 1351 req->fd = delay < 0. ? 0 : delay;
1229 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1352 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1230 1353
1231 REQ_SEND; 1354 REQ_SEND;
1232} 1355}
1255 req->type = REQ_NOP; 1378 req->type = REQ_NOP;
1256 1379
1257 REQ_SEND; 1380 REQ_SEND;
1258} 1381}
1259 1382
1260#if 0
1261
1262void 1383void
1263aio_pri (int pri = DEFAULT_PRI) 1384aioreq_pri (int pri = DEFAULT_PRI)
1264 CODE: 1385 CODE:
1265 if (pri > PRI_MIN) pri = PRI_MIN; 1386 if (pri < PRI_MIN) pri = PRI_MIN;
1266 if (pri < PRI_MAX) pri = PRI_MAX; 1387 if (pri > PRI_MAX) pri = PRI_MAX;
1267 next_pri = pri + PRI_BIAS; 1388 next_pri = pri + PRI_BIAS;
1268 1389
1269#endif 1390void
1391aioreq_nice (int nice = 0)
1392 CODE:
1393 nice = next_pri - nice;
1394 if (nice < PRI_MIN) nice = PRI_MIN;
1395 if (nice > PRI_MAX) nice = PRI_MAX;
1396 next_pri = nice + PRI_BIAS;
1270 1397
1271void 1398void
1272flush () 1399flush ()
1273 PROTOTYPE: 1400 PROTOTYPE:
1274 CODE: 1401 CODE:
1323 1450
1324MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1451MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1325 1452
1326void 1453void
1327cancel (aio_req_ornot req) 1454cancel (aio_req_ornot req)
1328 PROTOTYPE:
1329 CODE: 1455 CODE:
1330 req_cancel (req); 1456 req_cancel (req);
1331 1457
1332void 1458void
1333cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1459cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1383 SvREFCNT_dec (grp->data); 1509 SvREFCNT_dec (grp->data);
1384 grp->data = (SV *)av; 1510 grp->data = (SV *)av;
1385} 1511}
1386 1512
1387void 1513void
1388feed_limit (aio_req grp, int limit) 1514limit (aio_req grp, int limit)
1389 CODE: 1515 CODE:
1390 grp->fd2 = limit; 1516 grp->fd2 = limit;
1391 aio_grp_feed (grp); 1517 aio_grp_feed (grp);
1392 1518
1393void 1519void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines