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.79 by root, Thu Oct 26 16:28:33 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
… …
44/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 49#ifndef NAME_MAX
46# define NAME_MAX 4096 50# define NAME_MAX 4096
47#endif 51#endif
48 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
49#if __ia64 58#if __ia64
50# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
51#else 62#else
52# define STACKSIZE 8192 63# define STACKSIZE 16384
53#endif 64#endif
65
66/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes.
69 */
70#ifndef WORDREAD_UNSAFE
71# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0
73# else
74# define WORDREAD_UNSAFE 1
75# endif
76#endif
77
78/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536
80
81#define dBUF \
82 char *aio_buf; \
83 LOCK (wrklock); \
84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \
86 if (!aio_buf) \
87 return -1;
54 88
55enum { 89enum {
56 REQ_QUIT, 90 REQ_QUIT,
57 REQ_OPEN, REQ_CLOSE, 91 REQ_OPEN, REQ_CLOSE,
58 REQ_READ, REQ_WRITE, REQ_READAHEAD, 92 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
61 REQ_FSYNC, REQ_FDATASYNC, 95 REQ_FSYNC, REQ_FDATASYNC,
62 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
63 REQ_READDIR, 97 REQ_READDIR,
64 REQ_LINK, REQ_SYMLINK, 98 REQ_LINK, REQ_SYMLINK,
65 REQ_GROUP, REQ_NOP, 99 REQ_GROUP, REQ_NOP,
66 REQ_SLEEP, 100 REQ_BUSY,
67}; 101};
68 102
69#define AIO_REQ_KLASS "IO::AIO::REQ" 103#define AIO_REQ_KLASS "IO::AIO::REQ"
70#define AIO_GRP_KLASS "IO::AIO::GRP" 104#define AIO_GRP_KLASS "IO::AIO::GRP"
71 105
… …
105 PRI_MIN = -4, 139 PRI_MIN = -4,
106 PRI_MAX = 4, 140 PRI_MAX = 4,
107 141
108 DEFAULT_PRI = 0, 142 DEFAULT_PRI = 0,
109 PRI_BIAS = -PRI_MIN, 143 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
110}; 145};
111 146
112static int next_pri = DEFAULT_PRI + PRI_BIAS; 147static int next_pri = DEFAULT_PRI + PRI_BIAS;
113 148
114static int started, wanted; 149static unsigned int started, wanted;
115static volatile int nreqs; 150static volatile unsigned int nreqs, nready, npending;
116static int max_outstanding = 1<<30; 151static volatile unsigned int max_outstanding = 0xffffffff;
117static int respipe [2]; 152static int respipe [2];
118 153
119#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
120# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121#else 156#else
122# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123#endif 158#endif
124 159
160#define LOCK(mutex) pthread_mutex_lock (&(mutex))
161#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
162
163/* worker threads management */
164static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
165
166typedef struct worker {
167 /* locked by wrklock */
168 struct worker *prev, *next;
169
170 pthread_t tid;
171
172 /* locked by reslock, reqlock or wrklock */
173 aio_req req; /* currently processed request */
174 void *dbuf;
175 DIR *dirp;
176} worker;
177
178static worker wrk_first = { &wrk_first, &wrk_first, 0 };
179
180static void worker_clear (worker *wrk)
181{
182 if (wrk->dirp)
183 {
184 closedir (wrk->dirp);
185 wrk->dirp = 0;
186 }
187
188 if (wrk->dbuf)
189 {
190 free (wrk->dbuf);
191 wrk->dbuf = 0;
192 }
193}
194
195static void worker_free (worker *wrk)
196{
197 wrk->next->prev = wrk->prev;
198 wrk->prev->next = wrk->next;
199
200 free (wrk);
201}
202
125static pthread_mutex_t reslock = AIO_MUTEX_INIT; 203static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 204static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128 206
129static volatile aio_req reqs, reqe; /* queue start, queue end */ 207/*
130static volatile aio_req ress, rese; /* queue start, queue end */ 208 * a somewhat faster data structure might be nice, but
209 * with 8 priorities this actually needs <20 insns
210 * per shift, the most expensive operation.
211 */
212typedef struct {
213 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
214 int size;
215} reqq;
131 216
217static reqq req_queue;
218static reqq res_queue;
219
220int reqq_push (reqq *q, aio_req req)
221{
222 int pri = req->pri;
223 req->next = 0;
224
225 if (q->qe[pri])
226 {
227 q->qe[pri]->next = req;
228 q->qe[pri] = req;
229 }
230 else
231 q->qe[pri] = q->qs[pri] = req;
232
233 return q->size++;
234}
235
236aio_req reqq_shift (reqq *q)
237{
238 int pri;
239
240 if (!q->size)
241 return 0;
242
243 --q->size;
244
245 for (pri = NUM_PRI; pri--; )
246 {
247 aio_req req = q->qs[pri];
248
249 if (req)
250 {
251 if (!(q->qs[pri] = req->next))
252 q->qe[pri] = 0;
253
254 return req;
255 }
256 }
257
258 abort ();
259}
260
261static int poll_cb (int max);
132static void req_invoke (aio_req req); 262static void req_invoke (aio_req req);
133static void req_free (aio_req req); 263static void req_free (aio_req req);
264static void req_cancel (aio_req req);
134 265
135/* must be called at most once */ 266/* must be called at most once */
136static SV *req_sv (aio_req req, const char *klass) 267static SV *req_sv (aio_req req, const char *klass)
137{ 268{
138 if (!req->self) 269 if (!req->self)
… …
169 ENTER; 300 ENTER;
170 SAVETMPS; 301 SAVETMPS;
171 PUSHMARK (SP); 302 PUSHMARK (SP);
172 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 303 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
173 PUTBACK; 304 PUTBACK;
174 call_sv (grp->fh2, G_VOID | G_EVAL); 305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
175 SPAGAIN; 306 SPAGAIN;
176 FREETMPS; 307 FREETMPS;
177 LEAVE; 308 LEAVE;
178 } 309 }
179 310
… …
206{ 337{
207 fd_set rfd; 338 fd_set rfd;
208 339
209 while (nreqs) 340 while (nreqs)
210 { 341 {
211 aio_req req; 342 int size;
212#if !(__x86 || __x86_64) /* safe without sempahore on this archs */ 343 if (WORDREAD_UNSAFE) LOCK (reslock);
213 pthread_mutex_lock (&reslock); 344 size = res_queue.size;
214#endif 345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
215 req = ress;
216#if !(__x86 || __x86_64) /* safe without sempahore on this archs */
217 pthread_mutex_unlock (&reslock);
218#endif
219 346
220 if (req) 347 if (size)
221 return; 348 return;
222 349
223 FD_ZERO(&rfd); 350 FD_ZERO(&rfd);
224 FD_SET(respipe [0], &rfd); 351 FD_SET(respipe [0], &rfd);
225 352
… …
228} 355}
229 356
230static void req_invoke (aio_req req) 357static void req_invoke (aio_req req)
231{ 358{
232 dSP; 359 dSP;
233 int errorno = errno;
234 360
235 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
236 return; 362 {
237
238 errno = req->errorno;
239
240 ENTER; 363 ENTER;
241 SAVETMPS; 364 SAVETMPS;
242 PUSHMARK (SP); 365 PUSHMARK (SP);
243 EXTEND (SP, 1); 366 EXTEND (SP, 1);
244 367
245 switch (req->type) 368 switch (req->type)
246 {
247 case REQ_READDIR:
248 { 369 {
249 SV *rv = &PL_sv_undef; 370 case REQ_READDIR:
250
251 if (req->result >= 0)
252 { 371 {
253 char *buf = req->data2ptr; 372 SV *rv = &PL_sv_undef;
254 AV *av = newAV ();
255 373
256 while (req->result) 374 if (req->result >= 0)
257 { 375 {
376 int i;
377 char *buf = req->data2ptr;
378 AV *av = newAV ();
379
380 av_extend (av, req->result - 1);
381
382 for (i = 0; i < req->result; ++i)
383 {
258 SV *sv = newSVpv (buf, 0); 384 SV *sv = newSVpv (buf, 0);
259 385
260 av_push (av, sv); 386 av_store (av, i, sv);
261 buf += SvCUR (sv) + 1; 387 buf += SvCUR (sv) + 1;
262 req->result--; 388 }
389
390 rv = sv_2mortal (newRV_noinc ((SV *)av));
263 } 391 }
264 392
265 rv = sv_2mortal (newRV_noinc ((SV *)av)); 393 PUSHs (rv);
266 } 394 }
395 break;
267 396
268 PUSHs (rv); 397 case REQ_OPEN:
398 {
399 /* convert fd to fh */
400 SV *fh;
401
402 PUSHs (sv_2mortal (newSViv (req->result)));
403 PUTBACK;
404 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
405 SPAGAIN;
406
407 fh = SvREFCNT_inc (POPs);
408
409 PUSHMARK (SP);
410 XPUSHs (sv_2mortal (fh));
411 }
412 break;
413
414 case REQ_GROUP:
415 req->fd = 2; /* mark group as finished */
416
417 if (req->data)
418 {
419 int i;
420 AV *av = (AV *)req->data;
421
422 EXTEND (SP, AvFILL (av) + 1);
423 for (i = 0; i <= AvFILL (av); ++i)
424 PUSHs (*av_fetch (av, i, 0));
425 }
426 break;
427
428 case REQ_NOP:
429 case REQ_BUSY:
430 break;
431
432 default:
433 PUSHs (sv_2mortal (newSViv (req->result)));
434 break;
269 } 435 }
270 break;
271 436
272 case REQ_OPEN: 437 errno = req->errorno;
273 {
274 /* convert fd to fh */
275 SV *fh;
276 438
277 PUSHs (sv_2mortal (newSViv (req->result)));
278 PUTBACK; 439 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); 440 call_sv (req->callback, G_VOID | G_EVAL);
315 SPAGAIN; 441 SPAGAIN;
316 442
317 FREETMPS; 443 FREETMPS;
318 LEAVE; 444 LEAVE;
319
320 errno = errorno;
321
322 if (SvTRUE (ERRSV))
323 { 445 }
324 req_free (req);
325 croak (0);
326 }
327}
328 446
329static void req_free (aio_req req)
330{
331 if (req->grp) 447 if (req->grp)
332 { 448 {
333 aio_req grp = req->grp; 449 aio_req grp = req->grp;
334 450
335 /* unlink request */ 451 /* unlink request */
… …
340 grp->grp_first = req->grp_next; 456 grp->grp_first = req->grp_next;
341 457
342 aio_grp_dec (grp); 458 aio_grp_dec (grp);
343 } 459 }
344 460
461 if (SvTRUE (ERRSV))
462 {
463 req_free (req);
464 croak (0);
465 }
466}
467
468static void req_free (aio_req req)
469{
345 if (req->self) 470 if (req->self)
346 { 471 {
347 sv_unmagic (req->self, PERL_MAGIC_ext); 472 sv_unmagic (req->self, PERL_MAGIC_ext);
348 SvREFCNT_dec (req->self); 473 SvREFCNT_dec (req->self);
349 } 474 }
… …
352 SvREFCNT_dec (req->fh); 477 SvREFCNT_dec (req->fh);
353 SvREFCNT_dec (req->fh2); 478 SvREFCNT_dec (req->fh2);
354 SvREFCNT_dec (req->callback); 479 SvREFCNT_dec (req->callback);
355 Safefree (req->statdata); 480 Safefree (req->statdata);
356 481
357 if (req->type == REQ_READDIR && req->result >= 0) 482 if (req->type == REQ_READDIR)
358 free (req->data2ptr); 483 free (req->data2ptr);
359 484
360 Safefree (req); 485 Safefree (req);
361} 486}
362 487
488static void req_cancel_subs (aio_req grp)
489{
490 aio_req sub;
491
492 if (grp->type != REQ_GROUP)
493 return;
494
495 SvREFCNT_dec (grp->fh2);
496 grp->fh2 = 0;
497
498 for (sub = grp->grp_first; sub; sub = sub->grp_next)
499 req_cancel (sub);
500}
501
363static void req_cancel (aio_req req) 502static void req_cancel (aio_req req)
364{ 503{
365 req->flags |= FLAG_CANCELLED; 504 req->flags |= FLAG_CANCELLED;
366 505
367 if (req->type == REQ_GROUP) 506 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} 507}
375 508
376static int poll_cb () 509static int poll_cb (int max)
377{ 510{
378 dSP; 511 dSP;
379 int count = 0; 512 int count = 0;
380 int do_croak = 0; 513 int do_croak = 0;
381 aio_req req; 514 aio_req req;
382 515
383 for (;;) 516 for (;;)
384 { 517 {
385 pthread_mutex_lock (&reslock); 518 while (max <= 0 || count < max)
386 req = ress;
387
388 if (req)
389 { 519 {
390 ress = req->next; 520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
391 522
392 if (!ress) 523 if (req)
393 { 524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
394 /* read any signals sent by the worker threads */ 529 /* read any signals sent by the worker threads */
395 char buf [32]; 530 char buf [32];
396 while (read (respipe [0], buf, 32) == 32) 531 while (read (respipe [0], buf, 32) == 32)
532 ;
397 ; 533 }
398
399 rese = 0;
400 } 534 }
535
536 UNLOCK (reslock);
537
538 if (!req)
539 break;
540
541 --nreqs;
542
543 if (req->type == REQ_QUIT)
544 --started;
545 else if (req->type == REQ_GROUP && req->length)
546 {
547 req->fd = 1; /* mark request as delayed */
548 continue;
549 }
550 else
551 {
552 if (req->type == REQ_READ)
553 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
554
555 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
556 SvREADONLY_off (req->data);
557
558 if (req->statdata)
559 {
560 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
561 PL_laststatval = req->result;
562 PL_statcache = *(req->statdata);
563 }
564
565 req_invoke (req);
566
567 count++;
568 }
569
570 req_free (req);
401 } 571 }
402 572
403 pthread_mutex_unlock (&reslock); 573 if (nreqs <= max_outstanding)
404
405 if (!req)
406 break; 574 break;
407 575
408 --nreqs; 576 poll_wait ();
409 577
410 if (req->type == REQ_QUIT) 578 max = 0;
411 started--;
412 else if (req->type == REQ_GROUP && req->length)
413 {
414 req->fd = 1; /* mark request as delayed */
415 continue;
416 }
417 else
418 {
419 if (req->type == REQ_READ)
420 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
421
422 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
423 SvREADONLY_off (req->data);
424
425 if (req->statdata)
426 {
427 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
428 PL_laststatval = req->result;
429 PL_statcache = *(req->statdata);
430 }
431
432 req_invoke (req);
433
434 count++;
435 }
436
437 req_free (req);
438 } 579 }
439 580
440 return count; 581 return count;
441} 582}
442 583
443static void *aio_proc(void *arg); 584static void *aio_proc(void *arg);
444 585
445static void start_thread (void) 586static void start_thread (void)
446{ 587{
447 sigset_t fullsigset, oldsigset; 588 sigset_t fullsigset, oldsigset;
448 pthread_t tid;
449 pthread_attr_t attr; 589 pthread_attr_t attr;
590
591 worker *wrk = calloc (1, sizeof (worker));
592
593 if (!wrk)
594 croak ("unable to allocate worker thread data");
450 595
451 pthread_attr_init (&attr); 596 pthread_attr_init (&attr);
452 pthread_attr_setstacksize (&attr, STACKSIZE); 597 pthread_attr_setstacksize (&attr, STACKSIZE);
453 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
454 599
455 sigfillset (&fullsigset); 600 sigfillset (&fullsigset);
601
602 LOCK (wrklock);
456 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
457 604
458 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 605 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
606 {
607 wrk->prev = &wrk_first;
608 wrk->next = wrk_first.next;
609 wrk_first.next->prev = wrk;
610 wrk_first.next = wrk;
459 started++; 611 ++started;
612 }
613 else
614 free (wrk);
460 615
461 sigprocmask (SIG_SETMASK, &oldsigset, 0); 616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock);
462} 618}
463 619
464static void req_send (aio_req req) 620static void req_send (aio_req req)
465{ 621{
466 while (started < wanted && nreqs >= started) 622 while (started < wanted && nreqs >= started)
467 start_thread (); 623 start_thread ();
468 624
469 ++nreqs; 625 ++nreqs;
470 626
471 pthread_mutex_lock (&reqlock); 627 LOCK (reqlock);
472 628 ++nready;
473 req->next = 0; 629 reqq_push (&req_queue, req);
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); 630 pthread_cond_signal (&reqwait);
484 pthread_mutex_unlock (&reqlock); 631 UNLOCK (reqlock);
485
486 if (nreqs > max_outstanding)
487 for (;;)
488 {
489 poll_cb ();
490
491 if (nreqs <= max_outstanding)
492 break;
493
494 poll_wait ();
495 }
496} 632}
497 633
498static void end_thread (void) 634static void end_thread (void)
499{ 635{
500 aio_req req; 636 aio_req req;
637
501 Newz (0, req, 1, aio_cb); 638 Newz (0, req, 1, aio_cb);
639
502 req->type = REQ_QUIT; 640 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS;
503 642
504 req_send (req); 643 req_send (req);
505} 644}
506 645
507static void min_parallel (int nthreads) 646static void min_parallel (int nthreads)
… …
524 } 663 }
525 664
526 while (started > wanted) 665 while (started > wanted)
527 { 666 {
528 poll_wait (); 667 poll_wait ();
529 poll_cb (); 668 poll_cb (0);
530 } 669 }
531} 670}
532 671
533static void create_pipe () 672static void create_pipe ()
534{ 673{
… …
559static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 698static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
560{ 699{
561 ssize_t res; 700 ssize_t res;
562 off_t ooffset; 701 off_t ooffset;
563 702
564 pthread_mutex_lock (&preadwritelock); 703 LOCK (preadwritelock);
565 ooffset = lseek (fd, 0, SEEK_CUR); 704 ooffset = lseek (fd, 0, SEEK_CUR);
566 lseek (fd, offset, SEEK_SET); 705 lseek (fd, offset, SEEK_SET);
567 res = read (fd, buf, count); 706 res = read (fd, buf, count);
568 lseek (fd, ooffset, SEEK_SET); 707 lseek (fd, ooffset, SEEK_SET);
569 pthread_mutex_unlock (&preadwritelock); 708 UNLOCK (preadwritelock);
570 709
571 return res; 710 return res;
572} 711}
573 712
574static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 713static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
575{ 714{
576 ssize_t res; 715 ssize_t res;
577 off_t ooffset; 716 off_t ooffset;
578 717
579 pthread_mutex_lock (&preadwritelock); 718 LOCK (preadwritelock);
580 ooffset = lseek (fd, 0, SEEK_CUR); 719 ooffset = lseek (fd, 0, SEEK_CUR);
581 lseek (fd, offset, SEEK_SET); 720 lseek (fd, offset, SEEK_SET);
582 res = write (fd, buf, count); 721 res = write (fd, buf, count);
583 lseek (fd, offset, SEEK_SET); 722 lseek (fd, offset, SEEK_SET);
584 pthread_mutex_unlock (&preadwritelock); 723 UNLOCK (preadwritelock);
585 724
586 return res; 725 return res;
587} 726}
588#endif 727#endif
589 728
590#if !HAVE_FDATASYNC 729#if !HAVE_FDATASYNC
591# define fdatasync fsync 730# define fdatasync fsync
592#endif 731#endif
593 732
594#if !HAVE_READAHEAD 733#if !HAVE_READAHEAD
595# define readahead aio_readahead 734# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
596 735
597static ssize_t readahead (int fd, off_t offset, size_t count) 736static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
598{ 737{
599 char readahead_buf[4096]; 738 dBUF;
600 739
601 while (count > 0) 740 while (count > 0)
602 { 741 {
603 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 742 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
604 743
605 pread (fd, readahead_buf, len, offset); 744 pread (fd, aio_buf, len, offset);
606 offset += len; 745 offset += len;
607 count -= len; 746 count -= len;
608 } 747 }
609 748
610 errno = 0; 749 errno = 0;
611} 750}
751
612#endif 752#endif
613 753
614#if !HAVE_READDIR_R 754#if !HAVE_READDIR_R
615# define readdir_r aio_readdir_r 755# define readdir_r aio_readdir_r
616 756
… …
619static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 759static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
620{ 760{
621 struct dirent *e; 761 struct dirent *e;
622 int errorno; 762 int errorno;
623 763
624 pthread_mutex_lock (&readdirlock); 764 LOCK (readdirlock);
625 765
626 e = readdir (dirp); 766 e = readdir (dirp);
627 errorno = errno; 767 errorno = errno;
628 768
629 if (e) 769 if (e)
… …
632 strcpy (ent->d_name, e->d_name); 772 strcpy (ent->d_name, e->d_name);
633 } 773 }
634 else 774 else
635 *res = 0; 775 *res = 0;
636 776
637 pthread_mutex_unlock (&readdirlock); 777 UNLOCK (readdirlock);
638 778
639 errno = errorno; 779 errno = errorno;
640 return e ? 0 : -1; 780 return e ? 0 : -1;
641} 781}
642#endif 782#endif
643 783
644/* sendfile always needs emulation */ 784/* sendfile always needs emulation */
645static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 785static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
646{ 786{
647 ssize_t res; 787 ssize_t res;
648 788
649 if (!count) 789 if (!count)
650 return 0; 790 return 0;
… …
661 { 801 {
662 off_t sbytes; 802 off_t sbytes;
663 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 803 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
664 804
665 if (res < 0 && sbytes) 805 if (res < 0 && sbytes)
666 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 806 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
667 res = sbytes; 807 res = sbytes;
668 } 808 }
669 809
670# elif __hpux 810# elif __hpux
671 res = sendfile (ofd, ifd, offset, count, 0, 0); 811 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
699#endif 839#endif
700 ) 840 )
701 ) 841 )
702 { 842 {
703 /* emulate sendfile. this is a major pain in the ass */ 843 /* emulate sendfile. this is a major pain in the ass */
704 char buf[4096]; 844 dBUF;
845
705 res = 0; 846 res = 0;
706 847
707 while (count) 848 while (count)
708 { 849 {
709 ssize_t cnt; 850 ssize_t cnt;
710 851
711 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 852 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
712 853
713 if (cnt <= 0) 854 if (cnt <= 0)
714 { 855 {
715 if (cnt && !res) res = -1; 856 if (cnt && !res) res = -1;
716 break; 857 break;
717 } 858 }
718 859
719 cnt = write (ofd, buf, cnt); 860 cnt = write (ofd, aio_buf, cnt);
720 861
721 if (cnt <= 0) 862 if (cnt <= 0)
722 { 863 {
723 if (cnt && !res) res = -1; 864 if (cnt && !res) res = -1;
724 break; 865 break;
… …
732 873
733 return res; 874 return res;
734} 875}
735 876
736/* read a full directory */ 877/* read a full directory */
737static int scandir_ (const char *path, void **namesp) 878static void scandir_ (aio_req req, worker *self)
738{ 879{
739 DIR *dirp = opendir (path); 880 DIR *dirp;
740 union 881 union
741 { 882 {
742 struct dirent d; 883 struct dirent d;
743 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 884 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
744 } u; 885 } *u;
745 struct dirent *entp; 886 struct dirent *entp;
746 char *name, *names; 887 char *name, *names;
747 int memlen = 4096; 888 int memlen = 4096;
748 int memofs = 0; 889 int memofs = 0;
749 int res = 0; 890 int res = 0;
750 int errorno; 891 int errorno;
751 892
752 if (!dirp) 893 LOCK (wrklock);
753 return -1; 894 self->dirp = dirp = opendir (req->dataptr);
754 895 self->dbuf = u = malloc (sizeof (*u));
755 names = malloc (memlen); 896 req->data2ptr = names = malloc (memlen);
897 UNLOCK (wrklock);
756 898
899 if (dirp && u && names)
757 for (;;) 900 for (;;)
758 { 901 {
902 errno = 0;
759 errno = 0, readdir_r (dirp, &u.d, &entp); 903 readdir_r (dirp, &u->d, &entp);
760 904
761 if (!entp) 905 if (!entp)
762 break; 906 break;
763 907
764 name = entp->d_name; 908 name = entp->d_name;
765 909
766 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 910 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
767 { 911 {
768 int len = strlen (name) + 1; 912 int len = strlen (name) + 1;
769 913
770 res++; 914 res++;
771 915
772 while (memofs + len > memlen) 916 while (memofs + len > memlen)
773 { 917 {
774 memlen *= 2; 918 memlen *= 2;
919 LOCK (wrklock);
775 names = realloc (names, memlen); 920 req->data2ptr = names = realloc (names, memlen);
921 UNLOCK (wrklock);
922
776 if (!names) 923 if (!names)
777 break; 924 break;
778 } 925 }
779 926
780 memcpy (names + memofs, name, len); 927 memcpy (names + memofs, name, len);
781 memofs += len; 928 memofs += len;
782 } 929 }
783 } 930 }
784 931
785 errorno = errno;
786 closedir (dirp);
787
788 if (errorno) 932 if (errno)
789 {
790 free (names);
791 errno = errorno;
792 res = -1; 933 res = -1;
793 } 934
794 935 req->result = res;
795 *namesp = (void *)names;
796 return res;
797} 936}
798 937
799/*****************************************************************************/ 938/*****************************************************************************/
800 939
801static void *aio_proc (void *thr_arg) 940static void *aio_proc (void *thr_arg)
802{ 941{
803 aio_req req; 942 aio_req req;
804 int type; 943 int type;
944 worker *self = (worker *)thr_arg;
805 945
806 do 946 do
807 { 947 {
808 pthread_mutex_lock (&reqlock); 948 LOCK (reqlock);
809 949
810 for (;;) 950 for (;;)
811 { 951 {
812 req = reqs; 952 self->req = req = reqq_shift (&req_queue);
813
814 if (reqs)
815 {
816 reqs = reqs->next;
817 if (!reqs) reqe = 0;
818 }
819 953
820 if (req) 954 if (req)
821 break; 955 break;
822 956
823 pthread_cond_wait (&reqwait, &reqlock); 957 pthread_cond_wait (&reqwait, &reqlock);
824 } 958 }
825 959
826 pthread_mutex_unlock (&reqlock); 960 --nready;
961
962 UNLOCK (reqlock);
827 963
828 errno = 0; /* strictly unnecessary */ 964 errno = 0; /* strictly unnecessary */
829 type = req->type; /* remember type for QUIT check */ 965 type = req->type; /* remember type for QUIT check */
830 966
831 if (!(req->flags & FLAG_CANCELLED)) 967 if (!(req->flags & FLAG_CANCELLED))
… …
833 { 969 {
834 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 970 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; 971 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
836 972
837 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 973 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; 974 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
839 975
840 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 976 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
841 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 977 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
842 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 978 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
843 979
… …
849 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
850 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
851 987
852 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
853 case REQ_FSYNC: req->result = fsync (req->fd); break; 989 case REQ_FSYNC: req->result = fsync (req->fd); break;
854 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 990 case REQ_READDIR: scandir_ (req, self); break;
855 991
856 case REQ_SLEEP: 992 case REQ_BUSY:
857 { 993 {
858 struct timeval tv; 994 struct timeval tv;
859 995
860 tv.tv_sec = req->fd; 996 tv.tv_sec = req->fd;
861 tv.tv_usec = req->fd2; 997 tv.tv_usec = req->fd2;
… …
873 break; 1009 break;
874 } 1010 }
875 1011
876 req->errorno = errno; 1012 req->errorno = errno;
877 1013
878 pthread_mutex_lock (&reslock); 1014 LOCK (reslock);
879 1015
880 req->next = 0; 1016 ++npending;
881 1017
882 if (rese) 1018 if (!reqq_push (&res_queue, req))
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 */ 1019 /* write a dummy byte to the pipe so fh becomes ready */
892 write (respipe [1], &respipe, 1); 1020 write (respipe [1], &respipe, 1);
893 }
894 1021
895 pthread_mutex_unlock (&reslock); 1022 self->req = 0;
1023 worker_clear (self);
1024
1025 UNLOCK (reslock);
896 } 1026 }
897 while (type != REQ_QUIT); 1027 while (type != REQ_QUIT);
898 1028
1029 LOCK (wrklock);
1030 worker_free (self);
1031 UNLOCK (wrklock);
1032
899 return 0; 1033 return 0;
900} 1034}
901 1035
902/*****************************************************************************/ 1036/*****************************************************************************/
903 1037
904static void atfork_prepare (void) 1038static void atfork_prepare (void)
905{ 1039{
906 pthread_mutex_lock (&reqlock); 1040 LOCK (wrklock);
907 pthread_mutex_lock (&reslock); 1041 LOCK (reqlock);
1042 LOCK (reslock);
908#if !HAVE_PREADWRITE 1043#if !HAVE_PREADWRITE
909 pthread_mutex_lock (&preadwritelock); 1044 LOCK (preadwritelock);
910#endif 1045#endif
911#if !HAVE_READDIR_R 1046#if !HAVE_READDIR_R
912 pthread_mutex_lock (&readdirlock); 1047 LOCK (readdirlock);
913#endif 1048#endif
914} 1049}
915 1050
916static void atfork_parent (void) 1051static void atfork_parent (void)
917{ 1052{
918#if !HAVE_READDIR_R 1053#if !HAVE_READDIR_R
919 pthread_mutex_unlock (&readdirlock); 1054 UNLOCK (readdirlock);
920#endif 1055#endif
921#if !HAVE_PREADWRITE 1056#if !HAVE_PREADWRITE
922 pthread_mutex_unlock (&preadwritelock); 1057 UNLOCK (preadwritelock);
923#endif 1058#endif
924 pthread_mutex_unlock (&reslock); 1059 UNLOCK (reslock);
925 pthread_mutex_unlock (&reqlock); 1060 UNLOCK (reqlock);
1061 UNLOCK (wrklock);
926} 1062}
927 1063
928static void atfork_child (void) 1064static void atfork_child (void)
929{ 1065{
930 aio_req prv; 1066 aio_req prv;
931 1067
1068 while (prv = reqq_shift (&req_queue))
1069 req_free (prv);
1070
1071 while (prv = reqq_shift (&res_queue))
1072 req_free (prv);
1073
1074 while (wrk_first.next != &wrk_first)
1075 {
1076 worker *wrk = wrk_first.next;
1077
1078 if (wrk->req)
1079 req_free (wrk->req);
1080
1081 worker_clear (wrk);
1082 worker_free (wrk);
1083 }
1084
932 started = 0; 1085 started = 0;
933 1086 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 1087
952 close (respipe [0]); 1088 close (respipe [0]);
953 close (respipe [1]); 1089 close (respipe [1]);
954 create_pipe (); 1090 create_pipe ();
955 1091
… …
991 create_pipe (); 1127 create_pipe ();
992 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
993} 1129}
994 1130
995void 1131void
996min_parallel (nthreads) 1132min_parallel (int nthreads)
997 int nthreads
998 PROTOTYPE: $ 1133 PROTOTYPE: $
999 1134
1000void 1135void
1001max_parallel (nthreads) 1136max_parallel (int nthreads)
1002 int nthreads
1003 PROTOTYPE: $ 1137 PROTOTYPE: $
1004 1138
1005int 1139int
1006max_outstanding (nreqs) 1140max_outstanding (int maxreqs)
1007 int nreqs 1141 PROTOTYPE: $
1008 PROTOTYPE: $
1009 CODE: 1142 CODE:
1010 RETVAL = max_outstanding; 1143 RETVAL = max_outstanding;
1011 max_outstanding = nreqs; 1144 max_outstanding = maxreqs;
1145 OUTPUT:
1146 RETVAL
1012 1147
1013void 1148void
1014aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1149aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1015 SV * pathname 1150 SV * pathname
1016 int flags 1151 int flags
… …
1231 1366
1232 REQ_SEND; 1367 REQ_SEND;
1233} 1368}
1234 1369
1235void 1370void
1236aio_sleep (delay,callback=&PL_sv_undef) 1371aio_busy (delay,callback=&PL_sv_undef)
1237 double delay 1372 double delay
1238 SV * callback 1373 SV * callback
1239 PPCODE: 1374 PPCODE:
1240{ 1375{
1241 dREQ; 1376 dREQ;
1242 1377
1243 req->type = REQ_SLEEP; 1378 req->type = REQ_BUSY;
1244 req->fd = delay < 0. ? 0 : delay; 1379 req->fd = delay < 0. ? 0 : delay;
1245 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1246 1381
1247 REQ_SEND; 1382 REQ_SEND;
1248} 1383}
… …
1271 req->type = REQ_NOP; 1406 req->type = REQ_NOP;
1272 1407
1273 REQ_SEND; 1408 REQ_SEND;
1274} 1409}
1275 1410
1276#if 0 1411int
1277 1412aioreq_pri (int pri = 0)
1278void 1413 PROTOTYPE: ;$
1279aio_pri (int pri = DEFAULT_PRI)
1280 CODE: 1414 CODE:
1415 RETVAL = next_pri - PRI_BIAS;
1416 if (items > 0)
1417 {
1281 if (pri < PRI_MIN) pri = PRI_MIN; 1418 if (pri < PRI_MIN) pri = PRI_MIN;
1282 if (pri > PRI_MAX) pri = PRI_MAX; 1419 if (pri > PRI_MAX) pri = PRI_MAX;
1283 next_pri = pri + PRI_BIAS; 1420 next_pri = pri + PRI_BIAS;
1421 }
1422 OUTPUT:
1423 RETVAL
1284 1424
1285#endif 1425void
1426aioreq_nice (int nice = 0)
1427 CODE:
1428 nice = next_pri - nice;
1429 if (nice < PRI_MIN) nice = PRI_MIN;
1430 if (nice > PRI_MAX) nice = PRI_MAX;
1431 next_pri = nice + PRI_BIAS;
1286 1432
1287void 1433void
1288flush () 1434flush ()
1289 PROTOTYPE: 1435 PROTOTYPE:
1290 CODE: 1436 CODE:
1291 while (nreqs) 1437 while (nreqs)
1292 { 1438 {
1293 poll_wait (); 1439 poll_wait ();
1294 poll_cb (); 1440 poll_cb (0);
1295 } 1441 }
1296 1442
1297void 1443void
1298poll() 1444poll()
1299 PROTOTYPE: 1445 PROTOTYPE:
1300 CODE: 1446 CODE:
1301 if (nreqs) 1447 if (nreqs)
1302 { 1448 {
1303 poll_wait (); 1449 poll_wait ();
1304 poll_cb (); 1450 poll_cb (0);
1305 } 1451 }
1306 1452
1307int 1453int
1308poll_fileno() 1454poll_fileno()
1309 PROTOTYPE: 1455 PROTOTYPE:
… …
1314 1460
1315int 1461int
1316poll_cb(...) 1462poll_cb(...)
1317 PROTOTYPE: 1463 PROTOTYPE:
1318 CODE: 1464 CODE:
1319 RETVAL = poll_cb (); 1465 RETVAL = poll_cb (0);
1466 OUTPUT:
1467 RETVAL
1468
1469int
1470poll_some(int max = 0)
1471 PROTOTYPE: $
1472 CODE:
1473 RETVAL = poll_cb (max);
1320 OUTPUT: 1474 OUTPUT:
1321 RETVAL 1475 RETVAL
1322 1476
1323void 1477void
1324poll_wait() 1478poll_wait()
… …
1333 CODE: 1487 CODE:
1334 RETVAL = nreqs; 1488 RETVAL = nreqs;
1335 OUTPUT: 1489 OUTPUT:
1336 RETVAL 1490 RETVAL
1337 1491
1492int
1493nready()
1494 PROTOTYPE:
1495 CODE:
1496 if (WORDREAD_UNSAFE) LOCK (reqlock);
1497 RETVAL = nready;
1498 if (WORDREAD_UNSAFE) UNLOCK (reqlock);
1499 OUTPUT:
1500 RETVAL
1501
1502int
1503npending()
1504 PROTOTYPE:
1505 CODE:
1506 if (WORDREAD_UNSAFE) LOCK (reslock);
1507 RETVAL = npending;
1508 if (WORDREAD_UNSAFE) UNLOCK (reslock);
1509 OUTPUT:
1510 RETVAL
1511
1338PROTOTYPES: DISABLE 1512PROTOTYPES: DISABLE
1339 1513
1340MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1514MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1341 1515
1342void 1516void
1343cancel (aio_req_ornot req) 1517cancel (aio_req_ornot req)
1344 PROTOTYPE:
1345 CODE: 1518 CODE:
1346 req_cancel (req); 1519 req_cancel (req);
1347 1520
1348void 1521void
1349cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1522cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1385 } 1558 }
1386 } 1559 }
1387} 1560}
1388 1561
1389void 1562void
1563cancel_subs (aio_req_ornot req)
1564 CODE:
1565 req_cancel_subs (req);
1566
1567void
1390result (aio_req grp, ...) 1568result (aio_req grp, ...)
1391 CODE: 1569 CODE:
1392{ 1570{
1393 int i; 1571 int i;
1572 AV *av;
1573
1574 grp->errorno = errno;
1575
1394 AV *av = newAV (); 1576 av = newAV ();
1395 1577
1396 for (i = 1; i < items; ++i ) 1578 for (i = 1; i < items; ++i )
1397 av_push (av, newSVsv (ST (i))); 1579 av_push (av, newSVsv (ST (i)));
1398 1580
1399 SvREFCNT_dec (grp->data); 1581 SvREFCNT_dec (grp->data);
1400 grp->data = (SV *)av; 1582 grp->data = (SV *)av;
1401} 1583}
1402 1584
1403void 1585void
1586errno (aio_req grp, int errorno = errno)
1587 CODE:
1588 grp->errorno = errorno;
1589
1590void
1404feed_limit (aio_req grp, int limit) 1591limit (aio_req grp, int limit)
1405 CODE: 1592 CODE:
1406 grp->fd2 = limit; 1593 grp->fd2 = limit;
1407 aio_grp_feed (grp); 1594 aio_grp_feed (grp);
1408 1595
1409void 1596void

Diff Legend

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