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

Diff Legend

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