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.64 by root, Mon Oct 23 23:54:41 2006 UTC vs.
Revision 1.73 by root, Tue Oct 24 21:26:30 2006 UTC

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
1#if __linux 4#if __linux
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
5#define _REENTRANT 1 8#define _REENTRANT 1
… …
46# define NAME_MAX 4096 49# define NAME_MAX 4096
47#endif 50#endif
48 51
49#if __ia64 52#if __ia64
50# define STACKSIZE 65536 53# define STACKSIZE 65536
54#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
55# define STACKSIZE PTHREAD_STACK_MIN
51#else 56#else
52# define STACKSIZE 8192 57# define STACKSIZE 16384
53#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;
54 70
55enum { 71enum {
56 REQ_QUIT, 72 REQ_QUIT,
57 REQ_OPEN, REQ_CLOSE, 73 REQ_OPEN, REQ_CLOSE,
58 REQ_READ, REQ_WRITE, REQ_READAHEAD, 74 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
61 REQ_FSYNC, REQ_FDATASYNC, 77 REQ_FSYNC, REQ_FDATASYNC,
62 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 78 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
63 REQ_READDIR, 79 REQ_READDIR,
64 REQ_LINK, REQ_SYMLINK, 80 REQ_LINK, REQ_SYMLINK,
65 REQ_GROUP, REQ_NOP, 81 REQ_GROUP, REQ_NOP,
66 REQ_SLEEP, 82 REQ_BUSY,
67}; 83};
68 84
69#define AIO_REQ_KLASS "IO::AIO::REQ" 85#define AIO_REQ_KLASS "IO::AIO::REQ"
70#define AIO_GRP_KLASS "IO::AIO::GRP" 86#define AIO_GRP_KLASS "IO::AIO::GRP"
71 87
… …
105 PRI_MIN = -4, 121 PRI_MIN = -4,
106 PRI_MAX = 4, 122 PRI_MAX = 4,
107 123
108 DEFAULT_PRI = 0, 124 DEFAULT_PRI = 0,
109 PRI_BIAS = -PRI_MIN, 125 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
110}; 127};
111 128
112static int next_pri = DEFAULT_PRI + PRI_BIAS; 129static int next_pri = DEFAULT_PRI + PRI_BIAS;
113 130
114static int started, wanted; 131static int started, wanted;
… …
120# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 137# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121#else 138#else
122# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 139# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123#endif 140#endif
124 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
125static pthread_mutex_t reslock = AIO_MUTEX_INIT; 185static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 186static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 187static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128 188
129static volatile aio_req reqs, reqe; /* queue start, queue end */ 189/*
130static 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}
131 242
132static void req_invoke (aio_req req); 243static void req_invoke (aio_req req);
133static void req_free (aio_req req); 244static void req_free (aio_req req);
245static void req_cancel (aio_req req);
134 246
135/* must be called at most once */ 247/* must be called at most once */
136static SV *req_sv (aio_req req, const char *klass) 248static SV *req_sv (aio_req req, const char *klass)
137{ 249{
138 if (!req->self) 250 if (!req->self)
… …
169 ENTER; 281 ENTER;
170 SAVETMPS; 282 SAVETMPS;
171 PUSHMARK (SP); 283 PUSHMARK (SP);
172 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 284 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
173 PUTBACK; 285 PUTBACK;
174 call_sv (grp->fh2, G_VOID | G_EVAL); 286 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
175 SPAGAIN; 287 SPAGAIN;
176 FREETMPS; 288 FREETMPS;
177 LEAVE; 289 LEAVE;
178 } 290 }
179 291
… …
206{ 318{
207 fd_set rfd; 319 fd_set rfd;
208 320
209 while (nreqs) 321 while (nreqs)
210 { 322 {
211 aio_req req; 323 int size;
212#if !(__x86 || __x86_64) /* safe without sempahore on this archs */ 324#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
213 pthread_mutex_lock (&reslock); 325 LOCK (reslock);
214#endif 326#endif
215 req = ress; 327 size = res_queue.size;
216#if !(__x86 || __x86_64) /* safe without sempahore on this archs */ 328#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
217 pthread_mutex_unlock (&reslock); 329 UNLOCK (reslock);
218#endif 330#endif
219 331
220 if (req) 332 if (size)
221 return; 333 return;
222 334
223 FD_ZERO(&rfd); 335 FD_ZERO(&rfd);
224 FD_SET(respipe [0], &rfd); 336 FD_SET(respipe [0], &rfd);
225 337
… …
228} 340}
229 341
230static void req_invoke (aio_req req) 342static void req_invoke (aio_req req)
231{ 343{
232 dSP; 344 dSP;
233 int errorno = errno;
234 345
235 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
236 return; 347 {
237
238 errno = req->errorno; 348 errno = req->errorno;
239 349
240 ENTER; 350 ENTER;
241 SAVETMPS; 351 SAVETMPS;
242 PUSHMARK (SP); 352 PUSHMARK (SP);
243 EXTEND (SP, 1); 353 EXTEND (SP, 1);
244 354
245 switch (req->type) 355 switch (req->type)
246 {
247 case REQ_READDIR:
248 { 356 {
249 SV *rv = &PL_sv_undef; 357 case REQ_READDIR:
250
251 if (req->result >= 0)
252 { 358 {
253 char *buf = req->data2ptr; 359 SV *rv = &PL_sv_undef;
254 AV *av = newAV ();
255 360
256 while (req->result) 361 if (req->result >= 0)
257 { 362 {
363 int i;
364 char *buf = req->data2ptr;
365 AV *av = newAV ();
366
367 av_extend (av, req->result - 1);
368
369 for (i = 0; i < req->result; ++i)
370 {
258 SV *sv = newSVpv (buf, 0); 371 SV *sv = newSVpv (buf, 0);
259 372
260 av_push (av, sv); 373 av_store (av, i, sv);
261 buf += SvCUR (sv) + 1; 374 buf += SvCUR (sv) + 1;
262 req->result--; 375 }
376
377 rv = sv_2mortal (newRV_noinc ((SV *)av));
263 } 378 }
264 379
265 rv = sv_2mortal (newRV_noinc ((SV *)av)); 380 PUSHs (rv);
266 } 381 }
382 break;
267 383
268 PUSHs (rv); 384 case REQ_OPEN:
385 {
386 /* convert fd to fh */
387 SV *fh;
388
389 PUSHs (sv_2mortal (newSViv (req->result)));
390 PUTBACK;
391 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
392 SPAGAIN;
393
394 fh = SvREFCNT_inc (POPs);
395
396 PUSHMARK (SP);
397 XPUSHs (sv_2mortal (fh));
398 }
399 break;
400
401 case REQ_GROUP:
402 req->fd = 2; /* mark group as finished */
403
404 if (req->data)
405 {
406 int i;
407 AV *av = (AV *)req->data;
408
409 EXTEND (SP, AvFILL (av) + 1);
410 for (i = 0; i <= AvFILL (av); ++i)
411 PUSHs (*av_fetch (av, i, 0));
412 }
413 break;
414
415 case REQ_NOP:
416 case REQ_BUSY:
417 break;
418
419 default:
420 PUSHs (sv_2mortal (newSViv (req->result)));
421 break;
269 } 422 }
270 break;
271 423
272 case REQ_OPEN:
273 {
274 /* convert fd to fh */
275 SV *fh;
276 424
277 PUSHs (sv_2mortal (newSViv (req->result)));
278 PUTBACK; 425 PUTBACK;
279 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
280 SPAGAIN;
281
282 fh = SvREFCNT_inc (POPs);
283
284 PUSHMARK (SP);
285 XPUSHs (sv_2mortal (fh));
286 }
287 break;
288
289 case REQ_GROUP:
290 req->fd = 2; /* mark group as finished */
291
292 if (req->data)
293 {
294 int i;
295 AV *av = (AV *)req->data;
296
297 EXTEND (SP, AvFILL (av) + 1);
298 for (i = 0; i <= AvFILL (av); ++i)
299 PUSHs (*av_fetch (av, i, 0));
300 }
301 break;
302
303 case REQ_NOP:
304 case REQ_SLEEP:
305 break;
306
307 default:
308 PUSHs (sv_2mortal (newSViv (req->result)));
309 break;
310 }
311
312
313 PUTBACK;
314 call_sv (req->callback, G_VOID | G_EVAL); 426 call_sv (req->callback, G_VOID | G_EVAL);
315 SPAGAIN; 427 SPAGAIN;
316 428
317 FREETMPS; 429 FREETMPS;
318 LEAVE; 430 LEAVE;
319
320 errno = errorno;
321
322 if (SvTRUE (ERRSV))
323 { 431 }
324 req_free (req);
325 croak (0);
326 }
327}
328 432
329static void req_free (aio_req req)
330{
331 if (req->grp) 433 if (req->grp)
332 { 434 {
333 aio_req grp = req->grp; 435 aio_req grp = req->grp;
334 436
335 /* unlink request */ 437 /* unlink request */
… …
340 grp->grp_first = req->grp_next; 442 grp->grp_first = req->grp_next;
341 443
342 aio_grp_dec (grp); 444 aio_grp_dec (grp);
343 } 445 }
344 446
447 if (SvTRUE (ERRSV))
448 {
449 req_free (req);
450 croak (0);
451 }
452}
453
454static void req_free (aio_req req)
455{
345 if (req->self) 456 if (req->self)
346 { 457 {
347 sv_unmagic (req->self, PERL_MAGIC_ext); 458 sv_unmagic (req->self, PERL_MAGIC_ext);
348 SvREFCNT_dec (req->self); 459 SvREFCNT_dec (req->self);
349 } 460 }
… …
352 SvREFCNT_dec (req->fh); 463 SvREFCNT_dec (req->fh);
353 SvREFCNT_dec (req->fh2); 464 SvREFCNT_dec (req->fh2);
354 SvREFCNT_dec (req->callback); 465 SvREFCNT_dec (req->callback);
355 Safefree (req->statdata); 466 Safefree (req->statdata);
356 467
357 if (req->type == REQ_READDIR && req->result >= 0) 468 if (req->type == REQ_READDIR)
358 free (req->data2ptr); 469 free (req->data2ptr);
359 470
360 Safefree (req); 471 Safefree (req);
361} 472}
362 473
474static void req_cancel_subs (aio_req grp)
475{
476 aio_req sub;
477
478 if (grp->type != REQ_GROUP)
479 return;
480
481 SvREFCNT_dec (grp->fh2);
482 grp->fh2 = 0;
483
484 for (sub = grp->grp_first; sub; sub = sub->grp_next)
485 req_cancel (sub);
486}
487
363static void req_cancel (aio_req req) 488static void req_cancel (aio_req req)
364{ 489{
365 req->flags |= FLAG_CANCELLED; 490 req->flags |= FLAG_CANCELLED;
366 491
367 if (req->type == REQ_GROUP) 492 req_cancel_subs (req);
368 {
369 aio_req sub;
370
371 for (sub = req->grp_first; sub; sub = sub->grp_next)
372 req_cancel (sub);
373 }
374} 493}
375 494
376static int poll_cb () 495static int poll_cb ()
377{ 496{
378 dSP; 497 dSP;
… …
380 int do_croak = 0; 499 int do_croak = 0;
381 aio_req req; 500 aio_req req;
382 501
383 for (;;) 502 for (;;)
384 { 503 {
385 pthread_mutex_lock (&reslock); 504 LOCK (reslock);
386 req = ress; 505 req = reqq_shift (&res_queue);
387 506
388 if (req) 507 if (req)
389 { 508 {
390 ress = req->next;
391
392 if (!ress) 509 if (!res_queue.size)
393 { 510 {
394 /* read any signals sent by the worker threads */ 511 /* read any signals sent by the worker threads */
395 char buf [32]; 512 char buf [32];
396 while (read (respipe [0], buf, 32) == 32) 513 while (read (respipe [0], buf, 32) == 32)
397 ; 514 ;
398
399 rese = 0;
400 } 515 }
401 } 516 }
402 517
403 pthread_mutex_unlock (&reslock); 518 UNLOCK (reslock);
404 519
405 if (!req) 520 if (!req)
406 break; 521 break;
407 522
408 --nreqs; 523 --nreqs;
… …
443static void *aio_proc(void *arg); 558static void *aio_proc(void *arg);
444 559
445static void start_thread (void) 560static void start_thread (void)
446{ 561{
447 sigset_t fullsigset, oldsigset; 562 sigset_t fullsigset, oldsigset;
448 pthread_t tid;
449 pthread_attr_t attr; 563 pthread_attr_t attr;
564
565 worker *wrk = calloc (1, sizeof (worker));
566
567 if (!wrk)
568 croak ("unable to allocate worker thread data");
450 569
451 pthread_attr_init (&attr); 570 pthread_attr_init (&attr);
452 pthread_attr_setstacksize (&attr, STACKSIZE); 571 pthread_attr_setstacksize (&attr, STACKSIZE);
453 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
454 573
455 sigfillset (&fullsigset); 574 sigfillset (&fullsigset);
575
576 LOCK (wrklock);
456 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
457 578
458 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 579 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
580 {
581 wrk->prev = &wrk_first;
582 wrk->next = wrk_first.next;
583 wrk_first.next->prev = wrk;
584 wrk_first.next = wrk;
459 started++; 585 started++;
586 }
587 else
588 free (wrk);
460 589
461 sigprocmask (SIG_SETMASK, &oldsigset, 0); 590 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock);
462} 592}
463 593
464static void req_send (aio_req req) 594static void req_send (aio_req req)
465{ 595{
466 while (started < wanted && nreqs >= started) 596 while (started < wanted && nreqs >= started)
467 start_thread (); 597 start_thread ();
468 598
469 ++nreqs; 599 ++nreqs;
470 600
471 pthread_mutex_lock (&reqlock); 601 LOCK (reqlock);
472 602 reqq_push (&req_queue, req);
473 req->next = 0;
474
475 if (reqe)
476 {
477 reqe->next = req;
478 reqe = req;
479 }
480 else
481 reqe = reqs = req;
482
483 pthread_cond_signal (&reqwait); 603 pthread_cond_signal (&reqwait);
484 pthread_mutex_unlock (&reqlock); 604 UNLOCK (reqlock);
485 605
486 if (nreqs > max_outstanding) 606 if (nreqs > max_outstanding)
487 for (;;) 607 for (;;)
488 { 608 {
489 poll_cb (); 609 poll_cb ();
… …
496} 616}
497 617
498static void end_thread (void) 618static void end_thread (void)
499{ 619{
500 aio_req req; 620 aio_req req;
621
501 Newz (0, req, 1, aio_cb); 622 Newz (0, req, 1, aio_cb);
623
502 req->type = REQ_QUIT; 624 req->type = REQ_QUIT;
625 req->pri = PRI_MAX + PRI_BIAS;
503 626
504 req_send (req); 627 req_send (req);
505} 628}
506 629
507static void min_parallel (int nthreads) 630static void min_parallel (int nthreads)
… …
559static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 682static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
560{ 683{
561 ssize_t res; 684 ssize_t res;
562 off_t ooffset; 685 off_t ooffset;
563 686
564 pthread_mutex_lock (&preadwritelock); 687 LOCK (preadwritelock);
565 ooffset = lseek (fd, 0, SEEK_CUR); 688 ooffset = lseek (fd, 0, SEEK_CUR);
566 lseek (fd, offset, SEEK_SET); 689 lseek (fd, offset, SEEK_SET);
567 res = read (fd, buf, count); 690 res = read (fd, buf, count);
568 lseek (fd, ooffset, SEEK_SET); 691 lseek (fd, ooffset, SEEK_SET);
569 pthread_mutex_unlock (&preadwritelock); 692 UNLOCK (preadwritelock);
570 693
571 return res; 694 return res;
572} 695}
573 696
574static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 697static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
575{ 698{
576 ssize_t res; 699 ssize_t res;
577 off_t ooffset; 700 off_t ooffset;
578 701
579 pthread_mutex_lock (&preadwritelock); 702 LOCK (preadwritelock);
580 ooffset = lseek (fd, 0, SEEK_CUR); 703 ooffset = lseek (fd, 0, SEEK_CUR);
581 lseek (fd, offset, SEEK_SET); 704 lseek (fd, offset, SEEK_SET);
582 res = write (fd, buf, count); 705 res = write (fd, buf, count);
583 lseek (fd, offset, SEEK_SET); 706 lseek (fd, offset, SEEK_SET);
584 pthread_mutex_unlock (&preadwritelock); 707 UNLOCK (preadwritelock);
585 708
586 return res; 709 return res;
587} 710}
588#endif 711#endif
589 712
… …
594#if !HAVE_READAHEAD 717#if !HAVE_READAHEAD
595# define readahead aio_readahead 718# define readahead aio_readahead
596 719
597static ssize_t readahead (int fd, off_t offset, size_t count) 720static ssize_t readahead (int fd, off_t offset, size_t count)
598{ 721{
599 char readahead_buf[4096]; 722 dBUF;
600 723
601 while (count > 0) 724 while (count > 0)
602 { 725 {
603 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 726 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
604 727
605 pread (fd, readahead_buf, len, offset); 728 pread (fd, aio_buf, len, offset);
606 offset += len; 729 offset += len;
607 count -= len; 730 count -= len;
608 } 731 }
609 732
610 errno = 0; 733 errno = 0;
… …
619static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 742static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
620{ 743{
621 struct dirent *e; 744 struct dirent *e;
622 int errorno; 745 int errorno;
623 746
624 pthread_mutex_lock (&readdirlock); 747 LOCK (readdirlock);
625 748
626 e = readdir (dirp); 749 e = readdir (dirp);
627 errorno = errno; 750 errorno = errno;
628 751
629 if (e) 752 if (e)
… …
632 strcpy (ent->d_name, e->d_name); 755 strcpy (ent->d_name, e->d_name);
633 } 756 }
634 else 757 else
635 *res = 0; 758 *res = 0;
636 759
637 pthread_mutex_unlock (&readdirlock); 760 UNLOCK (readdirlock);
638 761
639 errno = errorno; 762 errno = errorno;
640 return e ? 0 : -1; 763 return e ? 0 : -1;
641} 764}
642#endif 765#endif
643 766
644/* sendfile always needs emulation */ 767/* sendfile always needs emulation */
645static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 768static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
646{ 769{
647 ssize_t res; 770 ssize_t res;
648 771
649 if (!count) 772 if (!count)
650 return 0; 773 return 0;
… …
699#endif 822#endif
700 ) 823 )
701 ) 824 )
702 { 825 {
703 /* emulate sendfile. this is a major pain in the ass */ 826 /* emulate sendfile. this is a major pain in the ass */
704 char buf[4096]; 827 dBUF;
828
705 res = 0; 829 res = 0;
706 830
707 while (count) 831 while (count)
708 { 832 {
709 ssize_t cnt; 833 ssize_t cnt;
710 834
711 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 835 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
712 836
713 if (cnt <= 0) 837 if (cnt <= 0)
714 { 838 {
715 if (cnt && !res) res = -1; 839 if (cnt && !res) res = -1;
716 break; 840 break;
717 } 841 }
718 842
719 cnt = write (ofd, buf, cnt); 843 cnt = write (ofd, aio_buf, cnt);
720 844
721 if (cnt <= 0) 845 if (cnt <= 0)
722 { 846 {
723 if (cnt && !res) res = -1; 847 if (cnt && !res) res = -1;
724 break; 848 break;
… …
732 856
733 return res; 857 return res;
734} 858}
735 859
736/* read a full directory */ 860/* read a full directory */
737static int scandir_ (const char *path, void **namesp) 861static void scandir_ (aio_req req, worker *self)
738{ 862{
739 DIR *dirp = opendir (path); 863 DIR *dirp;
740 union 864 union
741 { 865 {
742 struct dirent d; 866 struct dirent d;
743 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 867 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
744 } u; 868 } *u;
745 struct dirent *entp; 869 struct dirent *entp;
746 char *name, *names; 870 char *name, *names;
747 int memlen = 4096; 871 int memlen = 4096;
748 int memofs = 0; 872 int memofs = 0;
749 int res = 0; 873 int res = 0;
750 int errorno; 874 int errorno;
751 875
752 if (!dirp) 876 LOCK (wrklock);
753 return -1; 877 self->dirp = dirp = opendir (req->dataptr);
878 self->dbuf = u = malloc (sizeof (*u));
879 UNLOCK (wrklock);
754 880
755 names = malloc (memlen); 881 req->data2ptr = names = malloc (memlen);
756 882
883 if (dirp && u && names)
757 for (;;) 884 for (;;)
758 { 885 {
886 errno = 0;
759 errno = 0, readdir_r (dirp, &u.d, &entp); 887 readdir_r (dirp, &u->d, &entp);
760 888
761 if (!entp) 889 if (!entp)
762 break; 890 break;
763 891
764 name = entp->d_name; 892 name = entp->d_name;
765 893
766 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 894 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
767 { 895 {
768 int len = strlen (name) + 1; 896 int len = strlen (name) + 1;
769 897
770 res++; 898 res++;
771 899
772 while (memofs + len > memlen) 900 while (memofs + len > memlen)
773 { 901 {
774 memlen *= 2; 902 memlen *= 2;
903 LOCK (wrklock);
775 names = realloc (names, memlen); 904 req->data2ptr = names = realloc (names, memlen);
905 UNLOCK (wrklock);
906
776 if (!names) 907 if (!names)
777 break; 908 break;
778 } 909 }
779 910
780 memcpy (names + memofs, name, len); 911 memcpy (names + memofs, name, len);
781 memofs += len; 912 memofs += len;
782 } 913 }
783 } 914 }
784 915
785 errorno = errno;
786 closedir (dirp);
787
788 if (errorno) 916 if (errno)
789 {
790 free (names);
791 errno = errorno;
792 res = -1; 917 res = -1;
793 } 918
794 919 req->result = res;
795 *namesp = (void *)names;
796 return res;
797} 920}
798 921
799/*****************************************************************************/ 922/*****************************************************************************/
800 923
801static void *aio_proc (void *thr_arg) 924static void *aio_proc (void *thr_arg)
802{ 925{
803 aio_req req; 926 aio_req req;
804 int type; 927 int type;
928 worker *self = (worker *)thr_arg;
805 929
806 do 930 do
807 { 931 {
808 pthread_mutex_lock (&reqlock); 932 LOCK (reqlock);
809 933
810 for (;;) 934 for (;;)
811 { 935 {
812 req = reqs; 936 self->req = req = reqq_shift (&req_queue);
813
814 if (reqs)
815 {
816 reqs = reqs->next;
817 if (!reqs) reqe = 0;
818 }
819 937
820 if (req) 938 if (req)
821 break; 939 break;
822 940
823 pthread_cond_wait (&reqwait, &reqlock); 941 pthread_cond_wait (&reqwait, &reqlock);
824 } 942 }
825 943
826 pthread_mutex_unlock (&reqlock); 944 UNLOCK (reqlock);
827 945
828 errno = 0; /* strictly unnecessary */ 946 errno = 0; /* strictly unnecessary */
829 type = req->type; /* remember type for QUIT check */ 947 type = req->type; /* remember type for QUIT check */
830 948
831 if (!(req->flags & FLAG_CANCELLED)) 949 if (!(req->flags & FLAG_CANCELLED))
… …
833 { 951 {
834 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 952 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
835 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 953 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
836 954
837 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 955 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
838 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 956 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
839 957
840 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 958 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
841 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 959 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
842 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 960 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
843 961
… …
849 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 967 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
850 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 968 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
851 969
852 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 970 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
853 case REQ_FSYNC: req->result = fsync (req->fd); break; 971 case REQ_FSYNC: req->result = fsync (req->fd); break;
854 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 972 case REQ_READDIR: scandir_ (req, self); break;
855 973
856 case REQ_SLEEP: 974 case REQ_BUSY:
857 { 975 {
858 struct timeval tv; 976 struct timeval tv;
859 977
860 tv.tv_sec = req->fd; 978 tv.tv_sec = req->fd;
861 tv.tv_usec = req->fd2; 979 tv.tv_usec = req->fd2;
… …
873 break; 991 break;
874 } 992 }
875 993
876 req->errorno = errno; 994 req->errorno = errno;
877 995
878 pthread_mutex_lock (&reslock); 996 LOCK (reslock);
879 997
880 req->next = 0; 998 if (!reqq_push (&res_queue, req))
881
882 if (rese)
883 {
884 rese->next = req;
885 rese = req;
886 }
887 else
888 {
889 rese = ress = req;
890
891 /* write a dummy byte to the pipe so fh becomes ready */ 999 /* write a dummy byte to the pipe so fh becomes ready */
892 write (respipe [1], &respipe, 1); 1000 write (respipe [1], &respipe, 1);
893 }
894 1001
895 pthread_mutex_unlock (&reslock); 1002 self->req = 0;
1003 worker_clear (self);
1004
1005 UNLOCK (reslock);
896 } 1006 }
897 while (type != REQ_QUIT); 1007 while (type != REQ_QUIT);
898 1008
1009 LOCK (wrklock);
1010 worker_free (self);
1011 UNLOCK (wrklock);
1012
899 return 0; 1013 return 0;
900} 1014}
901 1015
902/*****************************************************************************/ 1016/*****************************************************************************/
903 1017
904static void atfork_prepare (void) 1018static void atfork_prepare (void)
905{ 1019{
906 pthread_mutex_lock (&reqlock); 1020 LOCK (wrklock);
907 pthread_mutex_lock (&reslock); 1021 LOCK (reqlock);
1022 LOCK (reslock);
908#if !HAVE_PREADWRITE 1023#if !HAVE_PREADWRITE
909 pthread_mutex_lock (&preadwritelock); 1024 LOCK (preadwritelock);
910#endif 1025#endif
911#if !HAVE_READDIR_R 1026#if !HAVE_READDIR_R
912 pthread_mutex_lock (&readdirlock); 1027 LOCK (readdirlock);
913#endif 1028#endif
914} 1029}
915 1030
916static void atfork_parent (void) 1031static void atfork_parent (void)
917{ 1032{
918#if !HAVE_READDIR_R 1033#if !HAVE_READDIR_R
919 pthread_mutex_unlock (&readdirlock); 1034 UNLOCK (readdirlock);
920#endif 1035#endif
921#if !HAVE_PREADWRITE 1036#if !HAVE_PREADWRITE
922 pthread_mutex_unlock (&preadwritelock); 1037 UNLOCK (preadwritelock);
923#endif 1038#endif
924 pthread_mutex_unlock (&reslock); 1039 UNLOCK (reslock);
925 pthread_mutex_unlock (&reqlock); 1040 UNLOCK (reqlock);
1041 UNLOCK (wrklock);
926} 1042}
927 1043
928static void atfork_child (void) 1044static void atfork_child (void)
929{ 1045{
930 aio_req prv; 1046 aio_req prv;
931 1047
1048 while (prv = reqq_shift (&req_queue))
1049 req_free (prv);
1050
1051 while (prv = reqq_shift (&res_queue))
1052 req_free (prv);
1053
1054 while (wrk_first.next != &wrk_first)
1055 {
1056 worker *wrk = wrk_first.next;
1057
1058 if (wrk->req)
1059 req_free (wrk->req);
1060
1061 worker_clear (wrk);
1062 worker_free (wrk);
1063 }
1064
932 started = 0; 1065 started = 0;
933 1066 nreqs = 0;
934 while (reqs)
935 {
936 prv = reqs;
937 reqs = prv->next;
938 req_free (prv);
939 }
940
941 reqs = reqe = 0;
942
943 while (ress)
944 {
945 prv = ress;
946 ress = prv->next;
947 req_free (prv);
948 }
949
950 ress = rese = 0;
951 1067
952 close (respipe [0]); 1068 close (respipe [0]);
953 close (respipe [1]); 1069 close (respipe [1]);
954 create_pipe (); 1070 create_pipe ();
955 1071
… …
1231 1347
1232 REQ_SEND; 1348 REQ_SEND;
1233} 1349}
1234 1350
1235void 1351void
1236aio_sleep (delay,callback=&PL_sv_undef) 1352aio_busy (delay,callback=&PL_sv_undef)
1237 double delay 1353 double delay
1238 SV * callback 1354 SV * callback
1239 PPCODE: 1355 PPCODE:
1240{ 1356{
1241 dREQ; 1357 dREQ;
1242 1358
1243 req->type = REQ_SLEEP; 1359 req->type = REQ_BUSY;
1244 req->fd = delay < 0. ? 0 : delay; 1360 req->fd = delay < 0. ? 0 : delay;
1245 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1361 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1246 1362
1247 REQ_SEND; 1363 REQ_SEND;
1248} 1364}
… …
1271 req->type = REQ_NOP; 1387 req->type = REQ_NOP;
1272 1388
1273 REQ_SEND; 1389 REQ_SEND;
1274} 1390}
1275 1391
1276#if 0
1277
1278void 1392void
1279aio_pri (int pri = DEFAULT_PRI) 1393aioreq_pri (int pri = DEFAULT_PRI)
1280 CODE: 1394 CODE:
1281 if (pri < PRI_MIN) pri = PRI_MIN; 1395 if (pri < PRI_MIN) pri = PRI_MIN;
1282 if (pri > PRI_MAX) pri = PRI_MAX; 1396 if (pri > PRI_MAX) pri = PRI_MAX;
1283 next_pri = pri + PRI_BIAS; 1397 next_pri = pri + PRI_BIAS;
1284 1398
1285#endif 1399void
1400aioreq_nice (int nice = 0)
1401 CODE:
1402 nice = next_pri - nice;
1403 if (nice < PRI_MIN) nice = PRI_MIN;
1404 if (nice > PRI_MAX) nice = PRI_MAX;
1405 next_pri = nice + PRI_BIAS;
1286 1406
1287void 1407void
1288flush () 1408flush ()
1289 PROTOTYPE: 1409 PROTOTYPE:
1290 CODE: 1410 CODE:
… …
1339 1459
1340MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1460MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1341 1461
1342void 1462void
1343cancel (aio_req_ornot req) 1463cancel (aio_req_ornot req)
1344 PROTOTYPE:
1345 CODE: 1464 CODE:
1346 req_cancel (req); 1465 req_cancel (req);
1347 1466
1348void 1467void
1349cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1468cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1385 } 1504 }
1386 } 1505 }
1387} 1506}
1388 1507
1389void 1508void
1509cancel_subs (aio_req_ornot req)
1510 CODE:
1511 req_cancel_subs (req);
1512
1513void
1390result (aio_req grp, ...) 1514result (aio_req grp, ...)
1391 CODE: 1515 CODE:
1392{ 1516{
1393 int i; 1517 int i;
1394 AV *av = newAV (); 1518 AV *av = newAV ();
… …
1399 SvREFCNT_dec (grp->data); 1523 SvREFCNT_dec (grp->data);
1400 grp->data = (SV *)av; 1524 grp->data = (SV *)av;
1401} 1525}
1402 1526
1403void 1527void
1404feed_limit (aio_req grp, int limit) 1528limit (aio_req grp, int limit)
1405 CODE: 1529 CODE:
1406 grp->fd2 = limit; 1530 grp->fd2 = limit;
1407 aio_grp_feed (grp); 1531 aio_grp_feed (grp);
1408 1532
1409void 1533void

Diff Legend

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