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.74 by root, Wed Oct 25 17:57:30 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
… …
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;
112static int respipe [2]; 133static int respipe [2];
113 134
135#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
136# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
137#else
138# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
139#endif
140
141#define LOCK(mutex) pthread_mutex_lock (&(mutex))
142#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
143
144/* worker threasd management */
145static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
146
147typedef struct worker {
148 /* locked by wrklock */
149 struct worker *prev, *next;
150
151 pthread_t tid;
152
153 /* locked by reslock, reqlock or wrklock */
154 aio_req req; /* currently processed request */
155 void *dbuf;
156 DIR *dirp;
157} worker;
158
159static worker wrk_first = { &wrk_first, &wrk_first, 0 };
160
161static void worker_clear (worker *wrk)
162{
163 if (wrk->dirp)
164 {
165 closedir (wrk->dirp);
166 wrk->dirp = 0;
167 }
168
169 if (wrk->dbuf)
170 {
171 free (wrk->dbuf);
172 wrk->dbuf = 0;
173 }
174}
175
176static void worker_free (worker *wrk)
177{
178 wrk->next->prev = wrk->prev;
179 wrk->prev->next = wrk->next;
180
181 free (wrk);
182}
183
114static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 184static pthread_mutex_t reslock = AIO_MUTEX_INIT;
115static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 185static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
116static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 186static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
117 187
118static volatile aio_req reqs, reqe; /* queue start, queue end */ 188/*
119static volatile aio_req ress, rese; /* queue start, queue end */ 189 * a somewhat faster data structure might be nice, but
190 * with 8 priorities this actually needs <20 insns
191 * per shift, the most expensive operation.
192 */
193typedef struct {
194 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
195 int size;
196} reqq;
120 197
198static reqq req_queue;
199static reqq res_queue;
200
201int reqq_push (reqq *q, aio_req req)
202{
203 int pri = req->pri;
204 req->next = 0;
205
206 if (q->qe[pri])
207 {
208 q->qe[pri]->next = req;
209 q->qe[pri] = req;
210 }
211 else
212 q->qe[pri] = q->qs[pri] = req;
213
214 return q->size++;
215}
216
217aio_req reqq_shift (reqq *q)
218{
219 int pri;
220
221 if (!q->size)
222 return 0;
223
224 --q->size;
225
226 for (pri = NUM_PRI; pri--; )
227 {
228 aio_req req = q->qs[pri];
229
230 if (req)
231 {
232 if (!(q->qs[pri] = req->next))
233 q->qe[pri] = 0;
234
235 return req;
236 }
237 }
238
239 abort ();
240}
241
242static int poll_cb ();
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);
245static void req_cancel (aio_req req);
123 246
124/* must be called at most once */ 247/* must be called at most once */
125static SV *req_sv (aio_req req, const char *klass) 248static SV *req_sv (aio_req req, const char *klass)
126{ 249{
127 if (!req->self) 250 if (!req->self)
… …
158 ENTER; 281 ENTER;
159 SAVETMPS; 282 SAVETMPS;
160 PUSHMARK (SP); 283 PUSHMARK (SP);
161 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 284 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
162 PUTBACK; 285 PUTBACK;
163 call_sv (grp->fh2, G_VOID | G_EVAL); 286 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
164 SPAGAIN; 287 SPAGAIN;
165 FREETMPS; 288 FREETMPS;
166 LEAVE; 289 LEAVE;
167 } 290 }
168 291
… …
195{ 318{
196 fd_set rfd; 319 fd_set rfd;
197 320
198 while (nreqs) 321 while (nreqs)
199 { 322 {
200 aio_req req; 323 int size;
201 pthread_mutex_lock (&reslock); 324#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
202 req = ress; 325 LOCK (reslock);
203 pthread_mutex_unlock (&reslock); 326#endif
327 size = res_queue.size;
328#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
329 UNLOCK (reslock);
330#endif
204 331
205 if (req) 332 if (size)
206 return; 333 return;
207 334
208 FD_ZERO(&rfd); 335 FD_ZERO(&rfd);
209 FD_SET(respipe [0], &rfd); 336 FD_SET(respipe [0], &rfd);
210 337
… …
213} 340}
214 341
215static void req_invoke (aio_req req) 342static void req_invoke (aio_req req)
216{ 343{
217 dSP; 344 dSP;
218 int errorno = errno;
219 345
220 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
221 return; 347 {
222
223 errno = req->errorno; 348 errno = req->errorno;
224 349
225 ENTER; 350 ENTER;
226 SAVETMPS; 351 SAVETMPS;
227 PUSHMARK (SP); 352 PUSHMARK (SP);
228 EXTEND (SP, 1); 353 EXTEND (SP, 1);
229 354
230 switch (req->type) 355 switch (req->type)
231 {
232 case REQ_READDIR:
233 { 356 {
234 SV *rv = &PL_sv_undef; 357 case REQ_READDIR:
235
236 if (req->result >= 0)
237 { 358 {
238 char *buf = req->data2ptr; 359 SV *rv = &PL_sv_undef;
239 AV *av = newAV ();
240 360
241 while (req->result) 361 if (req->result >= 0)
242 { 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 {
243 SV *sv = newSVpv (buf, 0); 371 SV *sv = newSVpv (buf, 0);
244 372
245 av_push (av, sv); 373 av_store (av, i, sv);
246 buf += SvCUR (sv) + 1; 374 buf += SvCUR (sv) + 1;
247 req->result--; 375 }
376
377 rv = sv_2mortal (newRV_noinc ((SV *)av));
248 } 378 }
249 379
250 rv = sv_2mortal (newRV_noinc ((SV *)av)); 380 PUSHs (rv);
251 } 381 }
382 break;
252 383
253 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;
254 } 422 }
255 break;
256 423
257 case REQ_OPEN:
258 {
259 /* convert fd to fh */
260 SV *fh;
261 424
262 PUSHs (sv_2mortal (newSViv (req->result)));
263 PUTBACK; 425 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); 426 call_sv (req->callback, G_VOID | G_EVAL);
300 SPAGAIN; 427 SPAGAIN;
301 428
302 FREETMPS; 429 FREETMPS;
303 LEAVE; 430 LEAVE;
304
305 errno = errorno;
306
307 if (SvTRUE (ERRSV))
308 { 431 }
309 req_free (req);
310 croak (0);
311 }
312}
313 432
314static void req_free (aio_req req)
315{
316 if (req->grp) 433 if (req->grp)
317 { 434 {
318 aio_req grp = req->grp; 435 aio_req grp = req->grp;
319 436
320 /* unlink request */ 437 /* unlink request */
… …
325 grp->grp_first = req->grp_next; 442 grp->grp_first = req->grp_next;
326 443
327 aio_grp_dec (grp); 444 aio_grp_dec (grp);
328 } 445 }
329 446
447 if (SvTRUE (ERRSV))
448 {
449 req_free (req);
450 croak (0);
451 }
452}
453
454static void req_free (aio_req req)
455{
330 if (req->self) 456 if (req->self)
331 { 457 {
332 sv_unmagic (req->self, PERL_MAGIC_ext); 458 sv_unmagic (req->self, PERL_MAGIC_ext);
333 SvREFCNT_dec (req->self); 459 SvREFCNT_dec (req->self);
334 } 460 }
… …
337 SvREFCNT_dec (req->fh); 463 SvREFCNT_dec (req->fh);
338 SvREFCNT_dec (req->fh2); 464 SvREFCNT_dec (req->fh2);
339 SvREFCNT_dec (req->callback); 465 SvREFCNT_dec (req->callback);
340 Safefree (req->statdata); 466 Safefree (req->statdata);
341 467
342 if (req->type == REQ_READDIR && req->result >= 0) 468 if (req->type == REQ_READDIR)
343 free (req->data2ptr); 469 free (req->data2ptr);
344 470
345 Safefree (req); 471 Safefree (req);
346} 472}
347 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
348static void req_cancel (aio_req req) 488static void req_cancel (aio_req req)
349{ 489{
350 req->flags |= FLAG_CANCELLED; 490 req->flags |= FLAG_CANCELLED;
351 491
352 if (req->type == REQ_GROUP) 492 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} 493}
360 494
361static int poll_cb () 495static int poll_cb ()
362{ 496{
363 dSP; 497 dSP;
… …
365 int do_croak = 0; 499 int do_croak = 0;
366 aio_req req; 500 aio_req req;
367 501
368 for (;;) 502 for (;;)
369 { 503 {
370 pthread_mutex_lock (&reslock); 504 LOCK (reslock);
371 req = ress; 505 req = reqq_shift (&res_queue);
372 506
373 if (req) 507 if (req)
374 { 508 {
375 ress = req->next;
376
377 if (!ress) 509 if (!res_queue.size)
378 { 510 {
379 /* read any signals sent by the worker threads */ 511 /* read any signals sent by the worker threads */
380 char buf [32]; 512 char buf [32];
381 while (read (respipe [0], buf, 32) == 32) 513 while (read (respipe [0], buf, 32) == 32)
382 ; 514 ;
383
384 rese = 0;
385 } 515 }
386 } 516 }
387 517
388 pthread_mutex_unlock (&reslock); 518 UNLOCK (reslock);
389 519
390 if (!req) 520 if (!req)
391 break; 521 break;
392 522
393 --nreqs; 523 --nreqs;
… …
428static void *aio_proc(void *arg); 558static void *aio_proc(void *arg);
429 559
430static void start_thread (void) 560static void start_thread (void)
431{ 561{
432 sigset_t fullsigset, oldsigset; 562 sigset_t fullsigset, oldsigset;
433 pthread_t tid;
434 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");
435 569
436 pthread_attr_init (&attr); 570 pthread_attr_init (&attr);
437 pthread_attr_setstacksize (&attr, STACKSIZE); 571 pthread_attr_setstacksize (&attr, STACKSIZE);
438 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
439 573
440 sigfillset (&fullsigset); 574 sigfillset (&fullsigset);
575
576 LOCK (wrklock);
441 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
442 578
443 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;
444 started++; 585 started++;
586 }
587 else
588 free (wrk);
445 589
446 sigprocmask (SIG_SETMASK, &oldsigset, 0); 590 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock);
447} 592}
448 593
449static void req_send (aio_req req) 594static void req_send (aio_req req)
450{ 595{
451 while (started < wanted && nreqs >= started) 596 while (started < wanted && nreqs >= started)
452 start_thread (); 597 start_thread ();
453 598
454 ++nreqs; 599 ++nreqs;
455 600
456 pthread_mutex_lock (&reqlock); 601 LOCK (reqlock);
457 602 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); 603 pthread_cond_signal (&reqwait);
469 pthread_mutex_unlock (&reqlock); 604 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} 605}
482 606
483static void end_thread (void) 607static void end_thread (void)
484{ 608{
485 aio_req req; 609 aio_req req;
610
486 Newz (0, req, 1, aio_cb); 611 Newz (0, req, 1, aio_cb);
612
487 req->type = REQ_QUIT; 613 req->type = REQ_QUIT;
614 req->pri = PRI_MAX + PRI_BIAS;
488 615
489 req_send (req); 616 req_send (req);
490} 617}
491 618
492static void min_parallel (int nthreads) 619static void min_parallel (int nthreads)
… …
544static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 671static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
545{ 672{
546 ssize_t res; 673 ssize_t res;
547 off_t ooffset; 674 off_t ooffset;
548 675
549 pthread_mutex_lock (&preadwritelock); 676 LOCK (preadwritelock);
550 ooffset = lseek (fd, 0, SEEK_CUR); 677 ooffset = lseek (fd, 0, SEEK_CUR);
551 lseek (fd, offset, SEEK_SET); 678 lseek (fd, offset, SEEK_SET);
552 res = read (fd, buf, count); 679 res = read (fd, buf, count);
553 lseek (fd, ooffset, SEEK_SET); 680 lseek (fd, ooffset, SEEK_SET);
554 pthread_mutex_unlock (&preadwritelock); 681 UNLOCK (preadwritelock);
555 682
556 return res; 683 return res;
557} 684}
558 685
559static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 686static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
560{ 687{
561 ssize_t res; 688 ssize_t res;
562 off_t ooffset; 689 off_t ooffset;
563 690
564 pthread_mutex_lock (&preadwritelock); 691 LOCK (preadwritelock);
565 ooffset = lseek (fd, 0, SEEK_CUR); 692 ooffset = lseek (fd, 0, SEEK_CUR);
566 lseek (fd, offset, SEEK_SET); 693 lseek (fd, offset, SEEK_SET);
567 res = write (fd, buf, count); 694 res = write (fd, buf, count);
568 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
569 pthread_mutex_unlock (&preadwritelock); 696 UNLOCK (preadwritelock);
570 697
571 return res; 698 return res;
572} 699}
573#endif 700#endif
574 701
… …
579#if !HAVE_READAHEAD 706#if !HAVE_READAHEAD
580# define readahead aio_readahead 707# define readahead aio_readahead
581 708
582static ssize_t readahead (int fd, off_t offset, size_t count) 709static ssize_t readahead (int fd, off_t offset, size_t count)
583{ 710{
584 char readahead_buf[4096]; 711 dBUF;
585 712
586 while (count > 0) 713 while (count > 0)
587 { 714 {
588 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 715 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
589 716
590 pread (fd, readahead_buf, len, offset); 717 pread (fd, aio_buf, len, offset);
591 offset += len; 718 offset += len;
592 count -= len; 719 count -= len;
593 } 720 }
594 721
595 errno = 0; 722 errno = 0;
… …
604static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 731static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
605{ 732{
606 struct dirent *e; 733 struct dirent *e;
607 int errorno; 734 int errorno;
608 735
609 pthread_mutex_lock (&readdirlock); 736 LOCK (readdirlock);
610 737
611 e = readdir (dirp); 738 e = readdir (dirp);
612 errorno = errno; 739 errorno = errno;
613 740
614 if (e) 741 if (e)
… …
617 strcpy (ent->d_name, e->d_name); 744 strcpy (ent->d_name, e->d_name);
618 } 745 }
619 else 746 else
620 *res = 0; 747 *res = 0;
621 748
622 pthread_mutex_unlock (&readdirlock); 749 UNLOCK (readdirlock);
623 750
624 errno = errorno; 751 errno = errorno;
625 return e ? 0 : -1; 752 return e ? 0 : -1;
626} 753}
627#endif 754#endif
628 755
629/* sendfile always needs emulation */ 756/* sendfile always needs emulation */
630static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 757static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
631{ 758{
632 ssize_t res; 759 ssize_t res;
633 760
634 if (!count) 761 if (!count)
635 return 0; 762 return 0;
… …
684#endif 811#endif
685 ) 812 )
686 ) 813 )
687 { 814 {
688 /* emulate sendfile. this is a major pain in the ass */ 815 /* emulate sendfile. this is a major pain in the ass */
689 char buf[4096]; 816 dBUF;
817
690 res = 0; 818 res = 0;
691 819
692 while (count) 820 while (count)
693 { 821 {
694 ssize_t cnt; 822 ssize_t cnt;
695 823
696 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 824 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
697 825
698 if (cnt <= 0) 826 if (cnt <= 0)
699 { 827 {
700 if (cnt && !res) res = -1; 828 if (cnt && !res) res = -1;
701 break; 829 break;
702 } 830 }
703 831
704 cnt = write (ofd, buf, cnt); 832 cnt = write (ofd, aio_buf, cnt);
705 833
706 if (cnt <= 0) 834 if (cnt <= 0)
707 { 835 {
708 if (cnt && !res) res = -1; 836 if (cnt && !res) res = -1;
709 break; 837 break;
… …
717 845
718 return res; 846 return res;
719} 847}
720 848
721/* read a full directory */ 849/* read a full directory */
722static int scandir_ (const char *path, void **namesp) 850static void scandir_ (aio_req req, worker *self)
723{ 851{
724 DIR *dirp = opendir (path); 852 DIR *dirp;
725 union 853 union
726 { 854 {
727 struct dirent d; 855 struct dirent d;
728 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 856 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
729 } u; 857 } *u;
730 struct dirent *entp; 858 struct dirent *entp;
731 char *name, *names; 859 char *name, *names;
732 int memlen = 4096; 860 int memlen = 4096;
733 int memofs = 0; 861 int memofs = 0;
734 int res = 0; 862 int res = 0;
735 int errorno; 863 int errorno;
736 864
737 if (!dirp) 865 LOCK (wrklock);
738 return -1; 866 self->dirp = dirp = opendir (req->dataptr);
867 self->dbuf = u = malloc (sizeof (*u));
868 UNLOCK (wrklock);
739 869
740 names = malloc (memlen); 870 req->data2ptr = names = malloc (memlen);
741 871
872 if (dirp && u && names)
742 for (;;) 873 for (;;)
743 { 874 {
875 errno = 0;
744 errno = 0, readdir_r (dirp, &u.d, &entp); 876 readdir_r (dirp, &u->d, &entp);
745 877
746 if (!entp) 878 if (!entp)
747 break; 879 break;
748 880
749 name = entp->d_name; 881 name = entp->d_name;
750 882
751 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 883 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
752 { 884 {
753 int len = strlen (name) + 1; 885 int len = strlen (name) + 1;
754 886
755 res++; 887 res++;
756 888
757 while (memofs + len > memlen) 889 while (memofs + len > memlen)
758 { 890 {
759 memlen *= 2; 891 memlen *= 2;
892 LOCK (wrklock);
760 names = realloc (names, memlen); 893 req->data2ptr = names = realloc (names, memlen);
894 UNLOCK (wrklock);
895
761 if (!names) 896 if (!names)
762 break; 897 break;
763 } 898 }
764 899
765 memcpy (names + memofs, name, len); 900 memcpy (names + memofs, name, len);
766 memofs += len; 901 memofs += len;
767 } 902 }
768 } 903 }
769 904
770 errorno = errno;
771 closedir (dirp);
772
773 if (errorno) 905 if (errno)
774 {
775 free (names);
776 errno = errorno;
777 res = -1; 906 res = -1;
778 } 907
779 908 req->result = res;
780 *namesp = (void *)names;
781 return res;
782} 909}
783 910
784/*****************************************************************************/ 911/*****************************************************************************/
785 912
786static void *aio_proc (void *thr_arg) 913static void *aio_proc (void *thr_arg)
787{ 914{
788 aio_req req; 915 aio_req req;
789 int type; 916 int type;
917 worker *self = (worker *)thr_arg;
790 918
791 do 919 do
792 { 920 {
793 pthread_mutex_lock (&reqlock); 921 LOCK (reqlock);
794 922
795 for (;;) 923 for (;;)
796 { 924 {
797 req = reqs; 925 self->req = req = reqq_shift (&req_queue);
798
799 if (reqs)
800 {
801 reqs = reqs->next;
802 if (!reqs) reqe = 0;
803 }
804 926
805 if (req) 927 if (req)
806 break; 928 break;
807 929
808 pthread_cond_wait (&reqwait, &reqlock); 930 pthread_cond_wait (&reqwait, &reqlock);
809 } 931 }
810 932
811 pthread_mutex_unlock (&reqlock); 933 UNLOCK (reqlock);
812 934
813 errno = 0; /* strictly unnecessary */ 935 errno = 0; /* strictly unnecessary */
814 type = req->type; /* remember type for QUIT check */ 936 type = req->type; /* remember type for QUIT check */
815 937
816 if (!(req->flags & FLAG_CANCELLED)) 938 if (!(req->flags & FLAG_CANCELLED))
… …
818 { 940 {
819 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 941 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; 942 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
821 943
822 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 944 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; 945 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
824 946
825 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 947 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
826 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 948 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
827 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 949 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
828 950
… …
834 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 956 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
835 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 957 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
836 958
837 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 959 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
838 case REQ_FSYNC: req->result = fsync (req->fd); break; 960 case REQ_FSYNC: req->result = fsync (req->fd); break;
839 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 961 case REQ_READDIR: scandir_ (req, self); break;
840 962
841 case REQ_SLEEP: 963 case REQ_BUSY:
842 { 964 {
843 struct timeval tv; 965 struct timeval tv;
844 966
845 tv.tv_sec = req->fd; 967 tv.tv_sec = req->fd;
846 tv.tv_usec = req->fd2; 968 tv.tv_usec = req->fd2;
… …
858 break; 980 break;
859 } 981 }
860 982
861 req->errorno = errno; 983 req->errorno = errno;
862 984
863 pthread_mutex_lock (&reslock); 985 LOCK (reslock);
864 986
865 req->next = 0; 987 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 */ 988 /* write a dummy byte to the pipe so fh becomes ready */
877 write (respipe [1], &respipe, 1); 989 write (respipe [1], &respipe, 1);
878 }
879 990
880 pthread_mutex_unlock (&reslock); 991 self->req = 0;
992 worker_clear (self);
993
994 UNLOCK (reslock);
881 } 995 }
882 while (type != REQ_QUIT); 996 while (type != REQ_QUIT);
883 997
998 LOCK (wrklock);
999 worker_free (self);
1000 UNLOCK (wrklock);
1001
884 return 0; 1002 return 0;
885} 1003}
886 1004
887/*****************************************************************************/ 1005/*****************************************************************************/
888 1006
889static void atfork_prepare (void) 1007static void atfork_prepare (void)
890{ 1008{
891 pthread_mutex_lock (&reqlock); 1009 LOCK (wrklock);
892 pthread_mutex_lock (&reslock); 1010 LOCK (reqlock);
1011 LOCK (reslock);
893#if !HAVE_PREADWRITE 1012#if !HAVE_PREADWRITE
894 pthread_mutex_lock (&preadwritelock); 1013 LOCK (preadwritelock);
895#endif 1014#endif
896#if !HAVE_READDIR_R 1015#if !HAVE_READDIR_R
897 pthread_mutex_lock (&readdirlock); 1016 LOCK (readdirlock);
898#endif 1017#endif
899} 1018}
900 1019
901static void atfork_parent (void) 1020static void atfork_parent (void)
902{ 1021{
903#if !HAVE_READDIR_R 1022#if !HAVE_READDIR_R
904 pthread_mutex_unlock (&readdirlock); 1023 UNLOCK (readdirlock);
905#endif 1024#endif
906#if !HAVE_PREADWRITE 1025#if !HAVE_PREADWRITE
907 pthread_mutex_unlock (&preadwritelock); 1026 UNLOCK (preadwritelock);
908#endif 1027#endif
909 pthread_mutex_unlock (&reslock); 1028 UNLOCK (reslock);
910 pthread_mutex_unlock (&reqlock); 1029 UNLOCK (reqlock);
1030 UNLOCK (wrklock);
911} 1031}
912 1032
913static void atfork_child (void) 1033static void atfork_child (void)
914{ 1034{
915 aio_req prv; 1035 aio_req prv;
916 1036
1037 while (prv = reqq_shift (&req_queue))
1038 req_free (prv);
1039
1040 while (prv = reqq_shift (&res_queue))
1041 req_free (prv);
1042
1043 while (wrk_first.next != &wrk_first)
1044 {
1045 worker *wrk = wrk_first.next;
1046
1047 if (wrk->req)
1048 req_free (wrk->req);
1049
1050 worker_clear (wrk);
1051 worker_free (wrk);
1052 }
1053
917 started = 0; 1054 started = 0;
918 1055 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 1056
937 close (respipe [0]); 1057 close (respipe [0]);
938 close (respipe [1]); 1058 close (respipe [1]);
939 create_pipe (); 1059 create_pipe ();
940 1060
… …
985void 1105void
986max_parallel (nthreads) 1106max_parallel (nthreads)
987 int nthreads 1107 int nthreads
988 PROTOTYPE: $ 1108 PROTOTYPE: $
989 1109
990int
991max_outstanding (nreqs)
992 int nreqs
993 PROTOTYPE: $
994 CODE:
995 RETVAL = max_outstanding;
996 max_outstanding = nreqs;
997
998void 1110void
999aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1111aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1000 SV * pathname 1112 SV * pathname
1001 int flags 1113 int flags
1002 int mode 1114 int mode
… …
1216 1328
1217 REQ_SEND; 1329 REQ_SEND;
1218} 1330}
1219 1331
1220void 1332void
1221aio_sleep (delay,callback=&PL_sv_undef) 1333aio_busy (delay,callback=&PL_sv_undef)
1222 double delay 1334 double delay
1223 SV * callback 1335 SV * callback
1224 PPCODE: 1336 PPCODE:
1225{ 1337{
1226 dREQ; 1338 dREQ;
1227 1339
1228 req->type = REQ_SLEEP; 1340 req->type = REQ_BUSY;
1229 req->fd = delay < 0. ? 0 : delay; 1341 req->fd = delay < 0. ? 0 : delay;
1230 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1342 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1231 1343
1232 REQ_SEND; 1344 REQ_SEND;
1233} 1345}
… …
1256 req->type = REQ_NOP; 1368 req->type = REQ_NOP;
1257 1369
1258 REQ_SEND; 1370 REQ_SEND;
1259} 1371}
1260 1372
1261#if 0
1262
1263void 1373void
1264aio_pri (int pri = DEFAULT_PRI) 1374aioreq_pri (int pri = DEFAULT_PRI)
1265 CODE: 1375 CODE:
1266 if (pri < PRI_MIN) pri = PRI_MIN; 1376 if (pri < PRI_MIN) pri = PRI_MIN;
1267 if (pri > PRI_MAX) pri = PRI_MAX; 1377 if (pri > PRI_MAX) pri = PRI_MAX;
1268 next_pri = pri + PRI_BIAS; 1378 next_pri = pri + PRI_BIAS;
1269 1379
1270#endif 1380void
1381aioreq_nice (int nice = 0)
1382 CODE:
1383 nice = next_pri - nice;
1384 if (nice < PRI_MIN) nice = PRI_MIN;
1385 if (nice > PRI_MAX) nice = PRI_MAX;
1386 next_pri = nice + PRI_BIAS;
1271 1387
1272void 1388void
1273flush () 1389flush ()
1274 PROTOTYPE: 1390 PROTOTYPE:
1275 CODE: 1391 CODE:
… …
1324 1440
1325MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1441MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1326 1442
1327void 1443void
1328cancel (aio_req_ornot req) 1444cancel (aio_req_ornot req)
1329 PROTOTYPE:
1330 CODE: 1445 CODE:
1331 req_cancel (req); 1446 req_cancel (req);
1332 1447
1333void 1448void
1334cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1449cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1370 } 1485 }
1371 } 1486 }
1372} 1487}
1373 1488
1374void 1489void
1490cancel_subs (aio_req_ornot req)
1491 CODE:
1492 req_cancel_subs (req);
1493
1494void
1375result (aio_req grp, ...) 1495result (aio_req grp, ...)
1376 CODE: 1496 CODE:
1377{ 1497{
1378 int i; 1498 int i;
1379 AV *av = newAV (); 1499 AV *av = newAV ();
… …
1384 SvREFCNT_dec (grp->data); 1504 SvREFCNT_dec (grp->data);
1385 grp->data = (SV *)av; 1505 grp->data = (SV *)av;
1386} 1506}
1387 1507
1388void 1508void
1389feed_limit (aio_req grp, int limit) 1509limit (aio_req grp, int limit)
1390 CODE: 1510 CODE:
1391 grp->fd2 = limit; 1511 grp->fd2 = limit;
1392 aio_grp_feed (grp); 1512 aio_grp_feed (grp);
1393 1513
1394void 1514void

Diff Legend

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