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.65 by root, Tue Oct 24 00:26:32 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
51#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ 60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
52# define STACKSIZE PTHREAD_STACK_MIN 61# define STACKSIZE PTHREAD_STACK_MIN
53#else 62#else
54# define STACKSIZE 16384 63# define STACKSIZE 16384
55#endif 64#endif
56 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
57/* buffer size for various temporary buffers */ 78/* buffer size for various temporary buffers */
58#define AIO_BUFSIZE 65536 79#define AIO_BUFSIZE 65536
59 80
60#define dBUF \ 81#define dBUF \
82 char *aio_buf; \
83 LOCK (wrklock); \
61 char *aio_buf = malloc (AIO_BUFSIZE); \ 84 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
85 UNLOCK (wrklock); \
62 if (!aio_buf) \ 86 if (!aio_buf) \
63 return -1; 87 return -1;
64
65#define fBUF free (aio_buf)
66 88
67enum { 89enum {
68 REQ_QUIT, 90 REQ_QUIT,
69 REQ_OPEN, REQ_CLOSE, 91 REQ_OPEN, REQ_CLOSE,
70 REQ_READ, REQ_WRITE, REQ_READAHEAD, 92 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
73 REQ_FSYNC, REQ_FDATASYNC, 95 REQ_FSYNC, REQ_FDATASYNC,
74 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
75 REQ_READDIR, 97 REQ_READDIR,
76 REQ_LINK, REQ_SYMLINK, 98 REQ_LINK, REQ_SYMLINK,
77 REQ_GROUP, REQ_NOP, 99 REQ_GROUP, REQ_NOP,
78 REQ_SLEEP, 100 REQ_BUSY,
79}; 101};
80 102
81#define AIO_REQ_KLASS "IO::AIO::REQ" 103#define AIO_REQ_KLASS "IO::AIO::REQ"
82#define AIO_GRP_KLASS "IO::AIO::GRP" 104#define AIO_GRP_KLASS "IO::AIO::GRP"
83 105
… …
117 PRI_MIN = -4, 139 PRI_MIN = -4,
118 PRI_MAX = 4, 140 PRI_MAX = 4,
119 141
120 DEFAULT_PRI = 0, 142 DEFAULT_PRI = 0,
121 PRI_BIAS = -PRI_MIN, 143 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
122}; 145};
123 146
124static int next_pri = DEFAULT_PRI + PRI_BIAS; 147static int next_pri = DEFAULT_PRI + PRI_BIAS;
125 148
126static int started, wanted; 149static unsigned int started, wanted;
127static volatile int nreqs; 150static volatile unsigned int nreqs, nready, npending;
128static int max_outstanding = 1<<30; 151static volatile unsigned int max_outstanding = 0xffffffff;
129static int respipe [2]; 152static int respipe [2];
130 153
131#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
132# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
133#else 156#else
134# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
135#endif 158#endif
136 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
137static pthread_mutex_t reslock = AIO_MUTEX_INIT; 203static pthread_mutex_t reslock = AIO_MUTEX_INIT;
138static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 204static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
139static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
140 206
141static volatile aio_req reqs, reqe; /* queue start, queue end */ 207/*
142static 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;
143 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);
144static void req_invoke (aio_req req); 262static void req_invoke (aio_req req);
145static void req_free (aio_req req); 263static void req_free (aio_req req);
264static void req_cancel (aio_req req);
146 265
147/* must be called at most once */ 266/* must be called at most once */
148static SV *req_sv (aio_req req, const char *klass) 267static SV *req_sv (aio_req req, const char *klass)
149{ 268{
150 if (!req->self) 269 if (!req->self)
… …
181 ENTER; 300 ENTER;
182 SAVETMPS; 301 SAVETMPS;
183 PUSHMARK (SP); 302 PUSHMARK (SP);
184 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 303 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
185 PUTBACK; 304 PUTBACK;
186 call_sv (grp->fh2, G_VOID | G_EVAL); 305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
187 SPAGAIN; 306 SPAGAIN;
188 FREETMPS; 307 FREETMPS;
189 LEAVE; 308 LEAVE;
190 } 309 }
191 310
… …
218{ 337{
219 fd_set rfd; 338 fd_set rfd;
220 339
221 while (nreqs) 340 while (nreqs)
222 { 341 {
223 aio_req req; 342 int size;
224#if !(__i386 || __x86_64) /* safe without sempahore on this archs */ 343 if (WORDREAD_UNSAFE) LOCK (reslock);
225 pthread_mutex_lock (&reslock); 344 size = res_queue.size;
226#endif 345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
227 req = ress;
228#if !(__i386 || __x86_64) /* safe without sempahore on this archs */
229 pthread_mutex_unlock (&reslock);
230#endif
231 346
232 if (req) 347 if (size)
233 return; 348 return;
234 349
235 FD_ZERO(&rfd); 350 FD_ZERO(&rfd);
236 FD_SET(respipe [0], &rfd); 351 FD_SET(respipe [0], &rfd);
237 352
… …
240} 355}
241 356
242static void req_invoke (aio_req req) 357static void req_invoke (aio_req req)
243{ 358{
244 dSP; 359 dSP;
245 int errorno = errno;
246 360
247 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
248 return; 362 {
249
250 errno = req->errorno;
251
252 ENTER; 363 ENTER;
253 SAVETMPS; 364 SAVETMPS;
254 PUSHMARK (SP); 365 PUSHMARK (SP);
255 EXTEND (SP, 1); 366 EXTEND (SP, 1);
256 367
257 switch (req->type) 368 switch (req->type)
258 {
259 case REQ_READDIR:
260 { 369 {
261 SV *rv = &PL_sv_undef; 370 case REQ_READDIR:
262
263 if (req->result >= 0)
264 { 371 {
265 char *buf = req->data2ptr; 372 SV *rv = &PL_sv_undef;
266 AV *av = newAV ();
267 373
268 while (req->result) 374 if (req->result >= 0)
269 { 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 {
270 SV *sv = newSVpv (buf, 0); 384 SV *sv = newSVpv (buf, 0);
271 385
272 av_push (av, sv); 386 av_store (av, i, sv);
273 buf += SvCUR (sv) + 1; 387 buf += SvCUR (sv) + 1;
274 req->result--; 388 }
389
390 rv = sv_2mortal (newRV_noinc ((SV *)av));
275 } 391 }
276 392
277 rv = sv_2mortal (newRV_noinc ((SV *)av)); 393 PUSHs (rv);
278 } 394 }
395 break;
279 396
280 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;
281 } 435 }
282 break;
283 436
284 case REQ_OPEN: 437 errno = req->errorno;
285 {
286 /* convert fd to fh */
287 SV *fh;
288 438
289 PUSHs (sv_2mortal (newSViv (req->result)));
290 PUTBACK; 439 PUTBACK;
291 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
292 SPAGAIN;
293
294 fh = SvREFCNT_inc (POPs);
295
296 PUSHMARK (SP);
297 XPUSHs (sv_2mortal (fh));
298 }
299 break;
300
301 case REQ_GROUP:
302 req->fd = 2; /* mark group as finished */
303
304 if (req->data)
305 {
306 int i;
307 AV *av = (AV *)req->data;
308
309 EXTEND (SP, AvFILL (av) + 1);
310 for (i = 0; i <= AvFILL (av); ++i)
311 PUSHs (*av_fetch (av, i, 0));
312 }
313 break;
314
315 case REQ_NOP:
316 case REQ_SLEEP:
317 break;
318
319 default:
320 PUSHs (sv_2mortal (newSViv (req->result)));
321 break;
322 }
323
324
325 PUTBACK;
326 call_sv (req->callback, G_VOID | G_EVAL); 440 call_sv (req->callback, G_VOID | G_EVAL);
327 SPAGAIN; 441 SPAGAIN;
328 442
329 FREETMPS; 443 FREETMPS;
330 LEAVE; 444 LEAVE;
331
332 errno = errorno;
333
334 if (SvTRUE (ERRSV))
335 { 445 }
336 req_free (req);
337 croak (0);
338 }
339}
340 446
341static void req_free (aio_req req)
342{
343 if (req->grp) 447 if (req->grp)
344 { 448 {
345 aio_req grp = req->grp; 449 aio_req grp = req->grp;
346 450
347 /* unlink request */ 451 /* unlink request */
… …
352 grp->grp_first = req->grp_next; 456 grp->grp_first = req->grp_next;
353 457
354 aio_grp_dec (grp); 458 aio_grp_dec (grp);
355 } 459 }
356 460
461 if (SvTRUE (ERRSV))
462 {
463 req_free (req);
464 croak (0);
465 }
466}
467
468static void req_free (aio_req req)
469{
357 if (req->self) 470 if (req->self)
358 { 471 {
359 sv_unmagic (req->self, PERL_MAGIC_ext); 472 sv_unmagic (req->self, PERL_MAGIC_ext);
360 SvREFCNT_dec (req->self); 473 SvREFCNT_dec (req->self);
361 } 474 }
… …
364 SvREFCNT_dec (req->fh); 477 SvREFCNT_dec (req->fh);
365 SvREFCNT_dec (req->fh2); 478 SvREFCNT_dec (req->fh2);
366 SvREFCNT_dec (req->callback); 479 SvREFCNT_dec (req->callback);
367 Safefree (req->statdata); 480 Safefree (req->statdata);
368 481
369 if (req->type == REQ_READDIR && req->result >= 0) 482 if (req->type == REQ_READDIR)
370 free (req->data2ptr); 483 free (req->data2ptr);
371 484
372 Safefree (req); 485 Safefree (req);
373} 486}
374 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
375static void req_cancel (aio_req req) 502static void req_cancel (aio_req req)
376{ 503{
377 req->flags |= FLAG_CANCELLED; 504 req->flags |= FLAG_CANCELLED;
378 505
379 if (req->type == REQ_GROUP) 506 req_cancel_subs (req);
380 {
381 aio_req sub;
382
383 for (sub = req->grp_first; sub; sub = sub->grp_next)
384 req_cancel (sub);
385 }
386} 507}
387 508
388static int poll_cb () 509static int poll_cb (int max)
389{ 510{
390 dSP; 511 dSP;
391 int count = 0; 512 int count = 0;
392 int do_croak = 0; 513 int do_croak = 0;
393 aio_req req; 514 aio_req req;
394 515
395 for (;;) 516 for (;;)
396 { 517 {
397 pthread_mutex_lock (&reslock); 518 while (max <= 0 || count < max)
398 req = ress;
399
400 if (req)
401 { 519 {
402 ress = req->next; 520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
403 522
404 if (!ress) 523 if (req)
405 { 524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
406 /* read any signals sent by the worker threads */ 529 /* read any signals sent by the worker threads */
407 char buf [32]; 530 char buf [32];
408 while (read (respipe [0], buf, 32) == 32) 531 while (read (respipe [0], buf, 32) == 32)
532 ;
409 ; 533 }
410
411 rese = 0;
412 } 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);
413 } 571 }
414 572
415 pthread_mutex_unlock (&reslock); 573 if (nreqs <= max_outstanding)
416
417 if (!req)
418 break; 574 break;
419 575
420 --nreqs; 576 poll_wait ();
421 577
422 if (req->type == REQ_QUIT) 578 max = 0;
423 started--;
424 else if (req->type == REQ_GROUP && req->length)
425 {
426 req->fd = 1; /* mark request as delayed */
427 continue;
428 }
429 else
430 {
431 if (req->type == REQ_READ)
432 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
433
434 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
435 SvREADONLY_off (req->data);
436
437 if (req->statdata)
438 {
439 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
440 PL_laststatval = req->result;
441 PL_statcache = *(req->statdata);
442 }
443
444 req_invoke (req);
445
446 count++;
447 }
448
449 req_free (req);
450 } 579 }
451 580
452 return count; 581 return count;
453} 582}
454 583
455static void *aio_proc(void *arg); 584static void *aio_proc(void *arg);
456 585
457static void start_thread (void) 586static void start_thread (void)
458{ 587{
459 sigset_t fullsigset, oldsigset; 588 sigset_t fullsigset, oldsigset;
460 pthread_t tid;
461 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");
462 595
463 pthread_attr_init (&attr); 596 pthread_attr_init (&attr);
464 pthread_attr_setstacksize (&attr, STACKSIZE); 597 pthread_attr_setstacksize (&attr, STACKSIZE);
465 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
466 599
467 sigfillset (&fullsigset); 600 sigfillset (&fullsigset);
601
602 LOCK (wrklock);
468 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
469 604
470 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;
471 started++; 611 ++started;
612 }
613 else
614 free (wrk);
472 615
473 sigprocmask (SIG_SETMASK, &oldsigset, 0); 616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock);
474} 618}
475 619
476static void req_send (aio_req req) 620static void req_send (aio_req req)
477{ 621{
478 while (started < wanted && nreqs >= started) 622 while (started < wanted && nreqs >= started)
479 start_thread (); 623 start_thread ();
480 624
481 ++nreqs; 625 ++nreqs;
482 626
483 pthread_mutex_lock (&reqlock); 627 LOCK (reqlock);
484 628 ++nready;
485 req->next = 0; 629 reqq_push (&req_queue, req);
486
487 if (reqe)
488 {
489 reqe->next = req;
490 reqe = req;
491 }
492 else
493 reqe = reqs = req;
494
495 pthread_cond_signal (&reqwait); 630 pthread_cond_signal (&reqwait);
496 pthread_mutex_unlock (&reqlock); 631 UNLOCK (reqlock);
497
498 if (nreqs > max_outstanding)
499 for (;;)
500 {
501 poll_cb ();
502
503 if (nreqs <= max_outstanding)
504 break;
505
506 poll_wait ();
507 }
508} 632}
509 633
510static void end_thread (void) 634static void end_thread (void)
511{ 635{
512 aio_req req; 636 aio_req req;
637
513 Newz (0, req, 1, aio_cb); 638 Newz (0, req, 1, aio_cb);
639
514 req->type = REQ_QUIT; 640 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS;
515 642
516 req_send (req); 643 req_send (req);
517} 644}
518 645
519static void min_parallel (int nthreads) 646static void min_parallel (int nthreads)
… …
536 } 663 }
537 664
538 while (started > wanted) 665 while (started > wanted)
539 { 666 {
540 poll_wait (); 667 poll_wait ();
541 poll_cb (); 668 poll_cb (0);
542 } 669 }
543} 670}
544 671
545static void create_pipe () 672static void create_pipe ()
546{ 673{
… …
571static 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)
572{ 699{
573 ssize_t res; 700 ssize_t res;
574 off_t ooffset; 701 off_t ooffset;
575 702
576 pthread_mutex_lock (&preadwritelock); 703 LOCK (preadwritelock);
577 ooffset = lseek (fd, 0, SEEK_CUR); 704 ooffset = lseek (fd, 0, SEEK_CUR);
578 lseek (fd, offset, SEEK_SET); 705 lseek (fd, offset, SEEK_SET);
579 res = read (fd, buf, count); 706 res = read (fd, buf, count);
580 lseek (fd, ooffset, SEEK_SET); 707 lseek (fd, ooffset, SEEK_SET);
581 pthread_mutex_unlock (&preadwritelock); 708 UNLOCK (preadwritelock);
582 709
583 return res; 710 return res;
584} 711}
585 712
586static 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)
587{ 714{
588 ssize_t res; 715 ssize_t res;
589 off_t ooffset; 716 off_t ooffset;
590 717
591 pthread_mutex_lock (&preadwritelock); 718 LOCK (preadwritelock);
592 ooffset = lseek (fd, 0, SEEK_CUR); 719 ooffset = lseek (fd, 0, SEEK_CUR);
593 lseek (fd, offset, SEEK_SET); 720 lseek (fd, offset, SEEK_SET);
594 res = write (fd, buf, count); 721 res = write (fd, buf, count);
595 lseek (fd, offset, SEEK_SET); 722 lseek (fd, offset, SEEK_SET);
596 pthread_mutex_unlock (&preadwritelock); 723 UNLOCK (preadwritelock);
597 724
598 return res; 725 return res;
599} 726}
600#endif 727#endif
601 728
602#if !HAVE_FDATASYNC 729#if !HAVE_FDATASYNC
603# define fdatasync fsync 730# define fdatasync fsync
604#endif 731#endif
605 732
606#if !HAVE_READAHEAD 733#if !HAVE_READAHEAD
607# define readahead aio_readahead 734# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
608 735
609static 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)
610{ 737{
611 dBUF; 738 dBUF;
612 739
613 while (count > 0) 740 while (count > 0)
614 { 741 {
… …
617 pread (fd, aio_buf, len, offset); 744 pread (fd, aio_buf, len, offset);
618 offset += len; 745 offset += len;
619 count -= len; 746 count -= len;
620 } 747 }
621 748
622 fBUF;
623
624 errno = 0; 749 errno = 0;
625} 750}
751
626#endif 752#endif
627 753
628#if !HAVE_READDIR_R 754#if !HAVE_READDIR_R
629# define readdir_r aio_readdir_r 755# define readdir_r aio_readdir_r
630 756
… …
633static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 759static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
634{ 760{
635 struct dirent *e; 761 struct dirent *e;
636 int errorno; 762 int errorno;
637 763
638 pthread_mutex_lock (&readdirlock); 764 LOCK (readdirlock);
639 765
640 e = readdir (dirp); 766 e = readdir (dirp);
641 errorno = errno; 767 errorno = errno;
642 768
643 if (e) 769 if (e)
… …
646 strcpy (ent->d_name, e->d_name); 772 strcpy (ent->d_name, e->d_name);
647 } 773 }
648 else 774 else
649 *res = 0; 775 *res = 0;
650 776
651 pthread_mutex_unlock (&readdirlock); 777 UNLOCK (readdirlock);
652 778
653 errno = errorno; 779 errno = errorno;
654 return e ? 0 : -1; 780 return e ? 0 : -1;
655} 781}
656#endif 782#endif
657 783
658/* sendfile always needs emulation */ 784/* sendfile always needs emulation */
659static 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)
660{ 786{
661 ssize_t res; 787 ssize_t res;
662 788
663 if (!count) 789 if (!count)
664 return 0; 790 return 0;
… …
675 { 801 {
676 off_t sbytes; 802 off_t sbytes;
677 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 803 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
678 804
679 if (res < 0 && sbytes) 805 if (res < 0 && sbytes)
680 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 806 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
681 res = sbytes; 807 res = sbytes;
682 } 808 }
683 809
684# elif __hpux 810# elif __hpux
685 res = sendfile (ofd, ifd, offset, count, 0, 0); 811 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
741 867
742 offset += cnt; 868 offset += cnt;
743 res += cnt; 869 res += cnt;
744 count -= cnt; 870 count -= cnt;
745 } 871 }
746
747 fBUF;
748 } 872 }
749 873
750 return res; 874 return res;
751} 875}
752 876
753/* read a full directory */ 877/* read a full directory */
754static int scandir_ (const char *path, void **namesp) 878static void scandir_ (aio_req req, worker *self)
755{ 879{
756 DIR *dirp; 880 DIR *dirp;
757 union 881 union
758 { 882 {
759 struct dirent d; 883 struct dirent d;
… …
764 int memlen = 4096; 888 int memlen = 4096;
765 int memofs = 0; 889 int memofs = 0;
766 int res = 0; 890 int res = 0;
767 int errorno; 891 int errorno;
768 892
769 dirp = opendir (path); 893 LOCK (wrklock);
770 if (!dirp) 894 self->dirp = dirp = opendir (req->dataptr);
771 return -1;
772
773 u = malloc (sizeof (*u)); 895 self->dbuf = u = malloc (sizeof (*u));
774 names = malloc (memlen); 896 req->data2ptr = names = malloc (memlen);
897 UNLOCK (wrklock);
775 898
776 if (u && names) 899 if (dirp && u && names)
777 for (;;) 900 for (;;)
778 { 901 {
779 errno = 0; 902 errno = 0;
780 readdir_r (dirp, &u->d, &entp); 903 readdir_r (dirp, &u->d, &entp);
781 904
… …
791 res++; 914 res++;
792 915
793 while (memofs + len > memlen) 916 while (memofs + len > memlen)
794 { 917 {
795 memlen *= 2; 918 memlen *= 2;
919 LOCK (wrklock);
796 names = realloc (names, memlen); 920 req->data2ptr = names = realloc (names, memlen);
921 UNLOCK (wrklock);
922
797 if (!names) 923 if (!names)
798 break; 924 break;
799 } 925 }
800 926
801 memcpy (names + memofs, name, len); 927 memcpy (names + memofs, name, len);
802 memofs += len; 928 memofs += len;
803 } 929 }
804 } 930 }
805 931
806 errorno = errno;
807 free (u);
808 closedir (dirp);
809
810 if (errorno) 932 if (errno)
811 {
812 free (names);
813 errno = errorno;
814 res = -1; 933 res = -1;
815 } 934
816 935 req->result = res;
817 *namesp = (void *)names;
818 return res;
819} 936}
820 937
821/*****************************************************************************/ 938/*****************************************************************************/
822 939
823static void *aio_proc (void *thr_arg) 940static void *aio_proc (void *thr_arg)
824{ 941{
825 aio_req req; 942 aio_req req;
826 int type; 943 int type;
944 worker *self = (worker *)thr_arg;
827 945
828 do 946 do
829 { 947 {
830 pthread_mutex_lock (&reqlock); 948 LOCK (reqlock);
831 949
832 for (;;) 950 for (;;)
833 { 951 {
834 req = reqs; 952 self->req = req = reqq_shift (&req_queue);
835
836 if (reqs)
837 {
838 reqs = reqs->next;
839 if (!reqs) reqe = 0;
840 }
841 953
842 if (req) 954 if (req)
843 break; 955 break;
844 956
845 pthread_cond_wait (&reqwait, &reqlock); 957 pthread_cond_wait (&reqwait, &reqlock);
846 } 958 }
847 959
848 pthread_mutex_unlock (&reqlock); 960 --nready;
961
962 UNLOCK (reqlock);
849 963
850 errno = 0; /* strictly unnecessary */ 964 errno = 0; /* strictly unnecessary */
851 type = req->type; /* remember type for QUIT check */ 965 type = req->type; /* remember type for QUIT check */
852 966
853 if (!(req->flags & FLAG_CANCELLED)) 967 if (!(req->flags & FLAG_CANCELLED))
… …
855 { 969 {
856 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;
857 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;
858 972
859 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;
860 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;
861 975
862 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 976 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
863 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 977 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
864 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 978 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
865 979
… …
871 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
872 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
873 987
874 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
875 case REQ_FSYNC: req->result = fsync (req->fd); break; 989 case REQ_FSYNC: req->result = fsync (req->fd); break;
876 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 990 case REQ_READDIR: scandir_ (req, self); break;
877 991
878 case REQ_SLEEP: 992 case REQ_BUSY:
879 { 993 {
880 struct timeval tv; 994 struct timeval tv;
881 995
882 tv.tv_sec = req->fd; 996 tv.tv_sec = req->fd;
883 tv.tv_usec = req->fd2; 997 tv.tv_usec = req->fd2;
… …
895 break; 1009 break;
896 } 1010 }
897 1011
898 req->errorno = errno; 1012 req->errorno = errno;
899 1013
900 pthread_mutex_lock (&reslock); 1014 LOCK (reslock);
901 1015
902 req->next = 0; 1016 ++npending;
903 1017
904 if (rese) 1018 if (!reqq_push (&res_queue, req))
905 {
906 rese->next = req;
907 rese = req;
908 }
909 else
910 {
911 rese = ress = req;
912
913 /* write a dummy byte to the pipe so fh becomes ready */ 1019 /* write a dummy byte to the pipe so fh becomes ready */
914 write (respipe [1], &respipe, 1); 1020 write (respipe [1], &respipe, 1);
915 }
916 1021
917 pthread_mutex_unlock (&reslock); 1022 self->req = 0;
1023 worker_clear (self);
1024
1025 UNLOCK (reslock);
918 } 1026 }
919 while (type != REQ_QUIT); 1027 while (type != REQ_QUIT);
920 1028
1029 LOCK (wrklock);
1030 worker_free (self);
1031 UNLOCK (wrklock);
1032
921 return 0; 1033 return 0;
922} 1034}
923 1035
924/*****************************************************************************/ 1036/*****************************************************************************/
925 1037
926static void atfork_prepare (void) 1038static void atfork_prepare (void)
927{ 1039{
928 pthread_mutex_lock (&reqlock); 1040 LOCK (wrklock);
929 pthread_mutex_lock (&reslock); 1041 LOCK (reqlock);
1042 LOCK (reslock);
930#if !HAVE_PREADWRITE 1043#if !HAVE_PREADWRITE
931 pthread_mutex_lock (&preadwritelock); 1044 LOCK (preadwritelock);
932#endif 1045#endif
933#if !HAVE_READDIR_R 1046#if !HAVE_READDIR_R
934 pthread_mutex_lock (&readdirlock); 1047 LOCK (readdirlock);
935#endif 1048#endif
936} 1049}
937 1050
938static void atfork_parent (void) 1051static void atfork_parent (void)
939{ 1052{
940#if !HAVE_READDIR_R 1053#if !HAVE_READDIR_R
941 pthread_mutex_unlock (&readdirlock); 1054 UNLOCK (readdirlock);
942#endif 1055#endif
943#if !HAVE_PREADWRITE 1056#if !HAVE_PREADWRITE
944 pthread_mutex_unlock (&preadwritelock); 1057 UNLOCK (preadwritelock);
945#endif 1058#endif
946 pthread_mutex_unlock (&reslock); 1059 UNLOCK (reslock);
947 pthread_mutex_unlock (&reqlock); 1060 UNLOCK (reqlock);
1061 UNLOCK (wrklock);
948} 1062}
949 1063
950static void atfork_child (void) 1064static void atfork_child (void)
951{ 1065{
952 aio_req prv; 1066 aio_req prv;
953 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
954 started = 0; 1085 started = 0;
955 1086 nreqs = 0;
956 while (reqs)
957 {
958 prv = reqs;
959 reqs = prv->next;
960 req_free (prv);
961 }
962
963 reqs = reqe = 0;
964
965 while (ress)
966 {
967 prv = ress;
968 ress = prv->next;
969 req_free (prv);
970 }
971
972 ress = rese = 0;
973 1087
974 close (respipe [0]); 1088 close (respipe [0]);
975 close (respipe [1]); 1089 close (respipe [1]);
976 create_pipe (); 1090 create_pipe ();
977 1091
… …
1013 create_pipe (); 1127 create_pipe ();
1014 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1015} 1129}
1016 1130
1017void 1131void
1018min_parallel (nthreads) 1132min_parallel (int nthreads)
1019 int nthreads
1020 PROTOTYPE: $ 1133 PROTOTYPE: $
1021 1134
1022void 1135void
1023max_parallel (nthreads) 1136max_parallel (int nthreads)
1024 int nthreads
1025 PROTOTYPE: $ 1137 PROTOTYPE: $
1026 1138
1027int 1139int
1028max_outstanding (nreqs) 1140max_outstanding (int maxreqs)
1029 int nreqs 1141 PROTOTYPE: $
1030 PROTOTYPE: $
1031 CODE: 1142 CODE:
1032 RETVAL = max_outstanding; 1143 RETVAL = max_outstanding;
1033 max_outstanding = nreqs; 1144 max_outstanding = maxreqs;
1145 OUTPUT:
1146 RETVAL
1034 1147
1035void 1148void
1036aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1149aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1037 SV * pathname 1150 SV * pathname
1038 int flags 1151 int flags
… …
1253 1366
1254 REQ_SEND; 1367 REQ_SEND;
1255} 1368}
1256 1369
1257void 1370void
1258aio_sleep (delay,callback=&PL_sv_undef) 1371aio_busy (delay,callback=&PL_sv_undef)
1259 double delay 1372 double delay
1260 SV * callback 1373 SV * callback
1261 PPCODE: 1374 PPCODE:
1262{ 1375{
1263 dREQ; 1376 dREQ;
1264 1377
1265 req->type = REQ_SLEEP; 1378 req->type = REQ_BUSY;
1266 req->fd = delay < 0. ? 0 : delay; 1379 req->fd = delay < 0. ? 0 : delay;
1267 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1268 1381
1269 REQ_SEND; 1382 REQ_SEND;
1270} 1383}
… …
1293 req->type = REQ_NOP; 1406 req->type = REQ_NOP;
1294 1407
1295 REQ_SEND; 1408 REQ_SEND;
1296} 1409}
1297 1410
1298#if 0 1411int
1299 1412aioreq_pri (int pri = 0)
1300void 1413 PROTOTYPE: ;$
1301aio_pri (int pri = DEFAULT_PRI)
1302 CODE: 1414 CODE:
1415 RETVAL = next_pri - PRI_BIAS;
1416 if (items > 0)
1417 {
1303 if (pri < PRI_MIN) pri = PRI_MIN; 1418 if (pri < PRI_MIN) pri = PRI_MIN;
1304 if (pri > PRI_MAX) pri = PRI_MAX; 1419 if (pri > PRI_MAX) pri = PRI_MAX;
1305 next_pri = pri + PRI_BIAS; 1420 next_pri = pri + PRI_BIAS;
1421 }
1422 OUTPUT:
1423 RETVAL
1306 1424
1307#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;
1308 1432
1309void 1433void
1310flush () 1434flush ()
1311 PROTOTYPE: 1435 PROTOTYPE:
1312 CODE: 1436 CODE:
1313 while (nreqs) 1437 while (nreqs)
1314 { 1438 {
1315 poll_wait (); 1439 poll_wait ();
1316 poll_cb (); 1440 poll_cb (0);
1317 } 1441 }
1318 1442
1319void 1443void
1320poll() 1444poll()
1321 PROTOTYPE: 1445 PROTOTYPE:
1322 CODE: 1446 CODE:
1323 if (nreqs) 1447 if (nreqs)
1324 { 1448 {
1325 poll_wait (); 1449 poll_wait ();
1326 poll_cb (); 1450 poll_cb (0);
1327 } 1451 }
1328 1452
1329int 1453int
1330poll_fileno() 1454poll_fileno()
1331 PROTOTYPE: 1455 PROTOTYPE:
… …
1336 1460
1337int 1461int
1338poll_cb(...) 1462poll_cb(...)
1339 PROTOTYPE: 1463 PROTOTYPE:
1340 CODE: 1464 CODE:
1341 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);
1342 OUTPUT: 1474 OUTPUT:
1343 RETVAL 1475 RETVAL
1344 1476
1345void 1477void
1346poll_wait() 1478poll_wait()
… …
1355 CODE: 1487 CODE:
1356 RETVAL = nreqs; 1488 RETVAL = nreqs;
1357 OUTPUT: 1489 OUTPUT:
1358 RETVAL 1490 RETVAL
1359 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
1360PROTOTYPES: DISABLE 1512PROTOTYPES: DISABLE
1361 1513
1362MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1514MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1363 1515
1364void 1516void
1365cancel (aio_req_ornot req) 1517cancel (aio_req_ornot req)
1366 PROTOTYPE:
1367 CODE: 1518 CODE:
1368 req_cancel (req); 1519 req_cancel (req);
1369 1520
1370void 1521void
1371cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1522cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1407 } 1558 }
1408 } 1559 }
1409} 1560}
1410 1561
1411void 1562void
1563cancel_subs (aio_req_ornot req)
1564 CODE:
1565 req_cancel_subs (req);
1566
1567void
1412result (aio_req grp, ...) 1568result (aio_req grp, ...)
1413 CODE: 1569 CODE:
1414{ 1570{
1415 int i; 1571 int i;
1572 AV *av;
1573
1574 grp->errorno = errno;
1575
1416 AV *av = newAV (); 1576 av = newAV ();
1417 1577
1418 for (i = 1; i < items; ++i ) 1578 for (i = 1; i < items; ++i )
1419 av_push (av, newSVsv (ST (i))); 1579 av_push (av, newSVsv (ST (i)));
1420 1580
1421 SvREFCNT_dec (grp->data); 1581 SvREFCNT_dec (grp->data);
1422 grp->data = (SV *)av; 1582 grp->data = (SV *)av;
1423} 1583}
1424 1584
1425void 1585void
1586errno (aio_req grp, int errorno = errno)
1587 CODE:
1588 grp->errorno = errorno;
1589
1590void
1426feed_limit (aio_req grp, int limit) 1591limit (aio_req grp, int limit)
1427 CODE: 1592 CODE:
1428 grp->fd2 = limit; 1593 grp->fd2 = limit;
1429 aio_grp_feed (grp); 1594 aio_grp_feed (grp);
1430 1595
1431void 1596void

Diff Legend

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