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

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
1#define _REENTRANT 1 9#define _REENTRANT 1
10
2#include <errno.h> 11#include <errno.h>
3 12
4#include "EXTERN.h" 13#include "EXTERN.h"
5#include "perl.h" 14#include "perl.h"
6#include "XSUB.h" 15#include "XSUB.h"
… …
39/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 49#ifndef NAME_MAX
41# define NAME_MAX 4096 50# define NAME_MAX 4096
42#endif 51#endif
43 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
44#if __ia64 58#if __ia64
45# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
46#else 62#else
47# define STACKSIZE 8192 63# define STACKSIZE 16384
48#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;
49 88
50enum { 89enum {
51 REQ_QUIT, 90 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 91 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 92 REQ_READ, REQ_WRITE, REQ_READAHEAD,
… …
56 REQ_FSYNC, REQ_FDATASYNC, 95 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 97 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 98 REQ_LINK, REQ_SYMLINK,
60 REQ_GROUP, REQ_NOP, 99 REQ_GROUP, REQ_NOP,
61 REQ_SLEEP, 100 REQ_BUSY,
62}; 101};
63 102
64#define AIO_REQ_KLASS "IO::AIO::REQ" 103#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 104#define AIO_GRP_KLASS "IO::AIO::GRP"
66 105
… …
100 PRI_MIN = -4, 139 PRI_MIN = -4,
101 PRI_MAX = 4, 140 PRI_MAX = 4,
102 141
103 DEFAULT_PRI = 0, 142 DEFAULT_PRI = 0,
104 PRI_BIAS = -PRI_MIN, 143 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
105}; 145};
106 146
107static int next_pri = DEFAULT_PRI + PRI_BIAS; 147static int next_pri = DEFAULT_PRI + PRI_BIAS;
108 148
109static int started, wanted; 149static unsigned int started, wanted;
110static volatile int nreqs; 150static volatile unsigned int nreqs, nready, npending;
111static int max_outstanding = 1<<30; 151static volatile unsigned int max_outstanding = 0xffffffff;
112static int respipe [2]; 152static int respipe [2];
113 153
154#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
155# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
156#else
157# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
158#endif
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
114static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 203static pthread_mutex_t reslock = AIO_MUTEX_INIT;
115static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 204static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
116static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 205static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
117 206
118static volatile aio_req reqs, reqe; /* queue start, queue end */ 207/*
119static 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;
120 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);
121static void req_invoke (aio_req req); 262static void req_invoke (aio_req req);
122static void req_free (aio_req req); 263static void req_free (aio_req req);
264static void req_cancel (aio_req req);
123 265
124/* must be called at most once */ 266/* must be called at most once */
125static SV *req_sv (aio_req req, const char *klass) 267static SV *req_sv (aio_req req, const char *klass)
126{ 268{
127 if (!req->self) 269 if (!req->self)
… …
158 ENTER; 300 ENTER;
159 SAVETMPS; 301 SAVETMPS;
160 PUSHMARK (SP); 302 PUSHMARK (SP);
161 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 303 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
162 PUTBACK; 304 PUTBACK;
163 call_sv (grp->fh2, G_VOID | G_EVAL); 305 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
164 SPAGAIN; 306 SPAGAIN;
165 FREETMPS; 307 FREETMPS;
166 LEAVE; 308 LEAVE;
167 } 309 }
168 310
… …
195{ 337{
196 fd_set rfd; 338 fd_set rfd;
197 339
198 while (nreqs) 340 while (nreqs)
199 { 341 {
200 aio_req req; 342 int size;
201 pthread_mutex_lock (&reslock); 343 if (WORDREAD_UNSAFE) LOCK (reslock);
202 req = ress; 344 size = res_queue.size;
203 pthread_mutex_unlock (&reslock); 345 if (WORDREAD_UNSAFE) UNLOCK (reslock);
204 346
205 if (req) 347 if (size)
206 return; 348 return;
207 349
208 FD_ZERO(&rfd); 350 FD_ZERO(&rfd);
209 FD_SET(respipe [0], &rfd); 351 FD_SET(respipe [0], &rfd);
210 352
… …
213} 355}
214 356
215static void req_invoke (aio_req req) 357static void req_invoke (aio_req req)
216{ 358{
217 dSP; 359 dSP;
218 int errorno = errno;
219 360
220 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 361 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
221 return; 362 {
222
223 errno = req->errorno;
224
225 ENTER; 363 ENTER;
226 SAVETMPS; 364 SAVETMPS;
227 PUSHMARK (SP); 365 PUSHMARK (SP);
228 EXTEND (SP, 1); 366 EXTEND (SP, 1);
229 367
230 switch (req->type) 368 switch (req->type)
231 {
232 case REQ_READDIR:
233 { 369 {
234 SV *rv = &PL_sv_undef; 370 case REQ_READDIR:
235
236 if (req->result >= 0)
237 { 371 {
238 char *buf = req->data2ptr; 372 SV *rv = &PL_sv_undef;
239 AV *av = newAV ();
240 373
241 while (req->result) 374 if (req->result >= 0)
242 { 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 {
243 SV *sv = newSVpv (buf, 0); 384 SV *sv = newSVpv (buf, 0);
244 385
245 av_push (av, sv); 386 av_store (av, i, sv);
246 buf += SvCUR (sv) + 1; 387 buf += SvCUR (sv) + 1;
247 req->result--; 388 }
389
390 rv = sv_2mortal (newRV_noinc ((SV *)av));
248 } 391 }
249 392
250 rv = sv_2mortal (newRV_noinc ((SV *)av)); 393 PUSHs (rv);
251 } 394 }
395 break;
252 396
253 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;
254 } 435 }
255 break;
256 436
257 case REQ_OPEN: 437 errno = req->errorno;
258 {
259 /* convert fd to fh */
260 SV *fh;
261 438
262 PUSHs (sv_2mortal (newSViv (req->result)));
263 PUTBACK; 439 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); 440 call_sv (req->callback, G_VOID | G_EVAL);
300 SPAGAIN; 441 SPAGAIN;
301 442
302 FREETMPS; 443 FREETMPS;
303 LEAVE; 444 LEAVE;
304
305 errno = errorno;
306
307 if (SvTRUE (ERRSV))
308 { 445 }
309 req_free (req);
310 croak (0);
311 }
312}
313 446
314static void req_free (aio_req req)
315{
316 if (req->grp) 447 if (req->grp)
317 { 448 {
318 aio_req grp = req->grp; 449 aio_req grp = req->grp;
319 450
320 /* unlink request */ 451 /* unlink request */
… …
325 grp->grp_first = req->grp_next; 456 grp->grp_first = req->grp_next;
326 457
327 aio_grp_dec (grp); 458 aio_grp_dec (grp);
328 } 459 }
329 460
461 if (SvTRUE (ERRSV))
462 {
463 req_free (req);
464 croak (0);
465 }
466}
467
468static void req_free (aio_req req)
469{
330 if (req->self) 470 if (req->self)
331 { 471 {
332 sv_unmagic (req->self, PERL_MAGIC_ext); 472 sv_unmagic (req->self, PERL_MAGIC_ext);
333 SvREFCNT_dec (req->self); 473 SvREFCNT_dec (req->self);
334 } 474 }
… …
337 SvREFCNT_dec (req->fh); 477 SvREFCNT_dec (req->fh);
338 SvREFCNT_dec (req->fh2); 478 SvREFCNT_dec (req->fh2);
339 SvREFCNT_dec (req->callback); 479 SvREFCNT_dec (req->callback);
340 Safefree (req->statdata); 480 Safefree (req->statdata);
341 481
342 if (req->type == REQ_READDIR && req->result >= 0) 482 if (req->type == REQ_READDIR)
343 free (req->data2ptr); 483 free (req->data2ptr);
344 484
345 Safefree (req); 485 Safefree (req);
346} 486}
347 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
348static void req_cancel (aio_req req) 502static void req_cancel (aio_req req)
349{ 503{
350 req->flags |= FLAG_CANCELLED; 504 req->flags |= FLAG_CANCELLED;
351 505
352 if (req->type == REQ_GROUP) 506 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} 507}
360 508
361static int poll_cb () 509static int poll_cb (int max)
362{ 510{
363 dSP; 511 dSP;
364 int count = 0; 512 int count = 0;
365 int do_croak = 0; 513 int do_croak = 0;
366 aio_req req; 514 aio_req req;
367 515
368 for (;;) 516 for (;;)
369 { 517 {
370 pthread_mutex_lock (&reslock); 518 while (max <= 0 || count < max)
371 req = ress;
372
373 if (req)
374 { 519 {
375 ress = req->next; 520 LOCK (reslock);
521 req = reqq_shift (&res_queue);
376 522
377 if (!ress) 523 if (req)
378 { 524 {
525 --npending;
526
527 if (!res_queue.size)
528 {
379 /* read any signals sent by the worker threads */ 529 /* read any signals sent by the worker threads */
380 char buf [32]; 530 char buf [32];
381 while (read (respipe [0], buf, 32) == 32) 531 while (read (respipe [0], buf, 32) == 32)
532 ;
382 ; 533 }
383
384 rese = 0;
385 } 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);
386 } 571 }
387 572
388 pthread_mutex_unlock (&reslock); 573 if (nreqs <= max_outstanding)
389
390 if (!req)
391 break; 574 break;
392 575
393 --nreqs; 576 poll_wait ();
394 577
395 if (req->type == REQ_QUIT) 578 max = 0;
396 started--;
397 else if (req->type == REQ_GROUP && req->length)
398 {
399 req->fd = 1; /* mark request as delayed */
400 continue;
401 }
402 else
403 {
404 if (req->type == REQ_READ)
405 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
406
407 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
408 SvREADONLY_off (req->data);
409
410 if (req->statdata)
411 {
412 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
413 PL_laststatval = req->result;
414 PL_statcache = *(req->statdata);
415 }
416
417 req_invoke (req);
418
419 count++;
420 }
421
422 req_free (req);
423 } 579 }
424 580
425 return count; 581 return count;
426} 582}
427 583
428static void *aio_proc(void *arg); 584static void *aio_proc(void *arg);
429 585
430static void start_thread (void) 586static void start_thread (void)
431{ 587{
432 sigset_t fullsigset, oldsigset; 588 sigset_t fullsigset, oldsigset;
433 pthread_t tid;
434 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");
435 595
436 pthread_attr_init (&attr); 596 pthread_attr_init (&attr);
437 pthread_attr_setstacksize (&attr, STACKSIZE); 597 pthread_attr_setstacksize (&attr, STACKSIZE);
438 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 598 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
439 599
440 sigfillset (&fullsigset); 600 sigfillset (&fullsigset);
601
602 LOCK (wrklock);
441 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 603 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
442 604
443 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;
444 started++; 611 ++started;
612 }
613 else
614 free (wrk);
445 615
446 sigprocmask (SIG_SETMASK, &oldsigset, 0); 616 sigprocmask (SIG_SETMASK, &oldsigset, 0);
617 UNLOCK (wrklock);
447} 618}
448 619
449static void req_send (aio_req req) 620static void req_send (aio_req req)
450{ 621{
451 while (started < wanted && nreqs >= started) 622 while (started < wanted && nreqs >= started)
452 start_thread (); 623 start_thread ();
453 624
454 ++nreqs; 625 ++nreqs;
455 626
456 pthread_mutex_lock (&reqlock); 627 LOCK (reqlock);
457 628 ++nready;
458 req->next = 0; 629 reqq_push (&req_queue, req);
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); 630 pthread_cond_signal (&reqwait);
469 pthread_mutex_unlock (&reqlock); 631 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} 632}
482 633
483static void end_thread (void) 634static void end_thread (void)
484{ 635{
485 aio_req req; 636 aio_req req;
637
486 Newz (0, req, 1, aio_cb); 638 Newz (0, req, 1, aio_cb);
639
487 req->type = REQ_QUIT; 640 req->type = REQ_QUIT;
641 req->pri = PRI_MAX + PRI_BIAS;
488 642
489 req_send (req); 643 req_send (req);
490} 644}
491 645
492static void min_parallel (int nthreads) 646static void min_parallel (int nthreads)
… …
509 } 663 }
510 664
511 while (started > wanted) 665 while (started > wanted)
512 { 666 {
513 poll_wait (); 667 poll_wait ();
514 poll_cb (); 668 poll_cb (0);
515 } 669 }
516} 670}
517 671
518static void create_pipe () 672static void create_pipe ()
519{ 673{
… …
544static 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)
545{ 699{
546 ssize_t res; 700 ssize_t res;
547 off_t ooffset; 701 off_t ooffset;
548 702
549 pthread_mutex_lock (&preadwritelock); 703 LOCK (preadwritelock);
550 ooffset = lseek (fd, 0, SEEK_CUR); 704 ooffset = lseek (fd, 0, SEEK_CUR);
551 lseek (fd, offset, SEEK_SET); 705 lseek (fd, offset, SEEK_SET);
552 res = read (fd, buf, count); 706 res = read (fd, buf, count);
553 lseek (fd, ooffset, SEEK_SET); 707 lseek (fd, ooffset, SEEK_SET);
554 pthread_mutex_unlock (&preadwritelock); 708 UNLOCK (preadwritelock);
555 709
556 return res; 710 return res;
557} 711}
558 712
559static 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)
560{ 714{
561 ssize_t res; 715 ssize_t res;
562 off_t ooffset; 716 off_t ooffset;
563 717
564 pthread_mutex_lock (&preadwritelock); 718 LOCK (preadwritelock);
565 ooffset = lseek (fd, 0, SEEK_CUR); 719 ooffset = lseek (fd, 0, SEEK_CUR);
566 lseek (fd, offset, SEEK_SET); 720 lseek (fd, offset, SEEK_SET);
567 res = write (fd, buf, count); 721 res = write (fd, buf, count);
568 lseek (fd, offset, SEEK_SET); 722 lseek (fd, offset, SEEK_SET);
569 pthread_mutex_unlock (&preadwritelock); 723 UNLOCK (preadwritelock);
570 724
571 return res; 725 return res;
572} 726}
573#endif 727#endif
574 728
575#if !HAVE_FDATASYNC 729#if !HAVE_FDATASYNC
576# define fdatasync fsync 730# define fdatasync fsync
577#endif 731#endif
578 732
579#if !HAVE_READAHEAD 733#if !HAVE_READAHEAD
580# define readahead aio_readahead 734# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
581 735
582static 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)
583{ 737{
584 char readahead_buf[4096]; 738 dBUF;
585 739
586 while (count > 0) 740 while (count > 0)
587 { 741 {
588 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 742 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
589 743
590 pread (fd, readahead_buf, len, offset); 744 pread (fd, aio_buf, len, offset);
591 offset += len; 745 offset += len;
592 count -= len; 746 count -= len;
593 } 747 }
594 748
595 errno = 0; 749 errno = 0;
596} 750}
751
597#endif 752#endif
598 753
599#if !HAVE_READDIR_R 754#if !HAVE_READDIR_R
600# define readdir_r aio_readdir_r 755# define readdir_r aio_readdir_r
601 756
… …
604static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 759static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
605{ 760{
606 struct dirent *e; 761 struct dirent *e;
607 int errorno; 762 int errorno;
608 763
609 pthread_mutex_lock (&readdirlock); 764 LOCK (readdirlock);
610 765
611 e = readdir (dirp); 766 e = readdir (dirp);
612 errorno = errno; 767 errorno = errno;
613 768
614 if (e) 769 if (e)
… …
617 strcpy (ent->d_name, e->d_name); 772 strcpy (ent->d_name, e->d_name);
618 } 773 }
619 else 774 else
620 *res = 0; 775 *res = 0;
621 776
622 pthread_mutex_unlock (&readdirlock); 777 UNLOCK (readdirlock);
623 778
624 errno = errorno; 779 errno = errorno;
625 return e ? 0 : -1; 780 return e ? 0 : -1;
626} 781}
627#endif 782#endif
628 783
629/* sendfile always needs emulation */ 784/* sendfile always needs emulation */
630static 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)
631{ 786{
632 ssize_t res; 787 ssize_t res;
633 788
634 if (!count) 789 if (!count)
635 return 0; 790 return 0;
… …
646 { 801 {
647 off_t sbytes; 802 off_t sbytes;
648 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 803 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
649 804
650 if (res < 0 && sbytes) 805 if (res < 0 && sbytes)
651 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 806 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
652 res = sbytes; 807 res = sbytes;
653 } 808 }
654 809
655# elif __hpux 810# elif __hpux
656 res = sendfile (ofd, ifd, offset, count, 0, 0); 811 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
684#endif 839#endif
685 ) 840 )
686 ) 841 )
687 { 842 {
688 /* emulate sendfile. this is a major pain in the ass */ 843 /* emulate sendfile. this is a major pain in the ass */
689 char buf[4096]; 844 dBUF;
845
690 res = 0; 846 res = 0;
691 847
692 while (count) 848 while (count)
693 { 849 {
694 ssize_t cnt; 850 ssize_t cnt;
695 851
696 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 852 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
697 853
698 if (cnt <= 0) 854 if (cnt <= 0)
699 { 855 {
700 if (cnt && !res) res = -1; 856 if (cnt && !res) res = -1;
701 break; 857 break;
702 } 858 }
703 859
704 cnt = write (ofd, buf, cnt); 860 cnt = write (ofd, aio_buf, cnt);
705 861
706 if (cnt <= 0) 862 if (cnt <= 0)
707 { 863 {
708 if (cnt && !res) res = -1; 864 if (cnt && !res) res = -1;
709 break; 865 break;
… …
717 873
718 return res; 874 return res;
719} 875}
720 876
721/* read a full directory */ 877/* read a full directory */
722static int scandir_ (const char *path, void **namesp) 878static void scandir_ (aio_req req, worker *self)
723{ 879{
724 DIR *dirp = opendir (path); 880 DIR *dirp;
725 union 881 union
726 { 882 {
727 struct dirent d; 883 struct dirent d;
728 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 884 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
729 } u; 885 } *u;
730 struct dirent *entp; 886 struct dirent *entp;
731 char *name, *names; 887 char *name, *names;
732 int memlen = 4096; 888 int memlen = 4096;
733 int memofs = 0; 889 int memofs = 0;
734 int res = 0; 890 int res = 0;
735 int errorno; 891 int errorno;
736 892
737 if (!dirp) 893 LOCK (wrklock);
738 return -1; 894 self->dirp = dirp = opendir (req->dataptr);
739 895 self->dbuf = u = malloc (sizeof (*u));
740 names = malloc (memlen); 896 req->data2ptr = names = malloc (memlen);
897 UNLOCK (wrklock);
741 898
899 if (dirp && u && names)
742 for (;;) 900 for (;;)
743 { 901 {
902 errno = 0;
744 errno = 0, readdir_r (dirp, &u.d, &entp); 903 readdir_r (dirp, &u->d, &entp);
745 904
746 if (!entp) 905 if (!entp)
747 break; 906 break;
748 907
749 name = entp->d_name; 908 name = entp->d_name;
750 909
751 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 910 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
752 { 911 {
753 int len = strlen (name) + 1; 912 int len = strlen (name) + 1;
754 913
755 res++; 914 res++;
756 915
757 while (memofs + len > memlen) 916 while (memofs + len > memlen)
758 { 917 {
759 memlen *= 2; 918 memlen *= 2;
919 LOCK (wrklock);
760 names = realloc (names, memlen); 920 req->data2ptr = names = realloc (names, memlen);
921 UNLOCK (wrklock);
922
761 if (!names) 923 if (!names)
762 break; 924 break;
763 } 925 }
764 926
765 memcpy (names + memofs, name, len); 927 memcpy (names + memofs, name, len);
766 memofs += len; 928 memofs += len;
767 } 929 }
768 } 930 }
769 931
770 errorno = errno;
771 closedir (dirp);
772
773 if (errorno) 932 if (errno)
774 {
775 free (names);
776 errno = errorno;
777 res = -1; 933 res = -1;
778 } 934
779 935 req->result = res;
780 *namesp = (void *)names;
781 return res;
782} 936}
783 937
784/*****************************************************************************/ 938/*****************************************************************************/
785 939
786static void *aio_proc (void *thr_arg) 940static void *aio_proc (void *thr_arg)
787{ 941{
788 aio_req req; 942 aio_req req;
789 int type; 943 int type;
944 worker *self = (worker *)thr_arg;
790 945
791 do 946 do
792 { 947 {
793 pthread_mutex_lock (&reqlock); 948 LOCK (reqlock);
794 949
795 for (;;) 950 for (;;)
796 { 951 {
797 req = reqs; 952 self->req = req = reqq_shift (&req_queue);
798
799 if (reqs)
800 {
801 reqs = reqs->next;
802 if (!reqs) reqe = 0;
803 }
804 953
805 if (req) 954 if (req)
806 break; 955 break;
807 956
808 pthread_cond_wait (&reqwait, &reqlock); 957 pthread_cond_wait (&reqwait, &reqlock);
809 } 958 }
810 959
811 pthread_mutex_unlock (&reqlock); 960 --nready;
961
962 UNLOCK (reqlock);
812 963
813 errno = 0; /* strictly unnecessary */ 964 errno = 0; /* strictly unnecessary */
814 type = req->type; /* remember type for QUIT check */ 965 type = req->type; /* remember type for QUIT check */
815 966
816 if (!(req->flags & FLAG_CANCELLED)) 967 if (!(req->flags & FLAG_CANCELLED))
… …
818 { 969 {
819 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;
820 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;
821 972
822 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;
823 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;
824 975
825 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 976 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
826 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 977 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
827 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 978 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
828 979
… …
834 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 985 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
835 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 986 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
836 987
837 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 988 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
838 case REQ_FSYNC: req->result = fsync (req->fd); break; 989 case REQ_FSYNC: req->result = fsync (req->fd); break;
839 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 990 case REQ_READDIR: scandir_ (req, self); break;
840 991
841 case REQ_SLEEP: 992 case REQ_BUSY:
842 { 993 {
843 struct timeval tv; 994 struct timeval tv;
844 995
845 tv.tv_sec = req->fd; 996 tv.tv_sec = req->fd;
846 tv.tv_usec = req->fd2; 997 tv.tv_usec = req->fd2;
… …
858 break; 1009 break;
859 } 1010 }
860 1011
861 req->errorno = errno; 1012 req->errorno = errno;
862 1013
863 pthread_mutex_lock (&reslock); 1014 LOCK (reslock);
864 1015
865 req->next = 0; 1016 ++npending;
866 1017
867 if (rese) 1018 if (!reqq_push (&res_queue, req))
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 */ 1019 /* write a dummy byte to the pipe so fh becomes ready */
877 write (respipe [1], &respipe, 1); 1020 write (respipe [1], &respipe, 1);
878 }
879 1021
880 pthread_mutex_unlock (&reslock); 1022 self->req = 0;
1023 worker_clear (self);
1024
1025 UNLOCK (reslock);
881 } 1026 }
882 while (type != REQ_QUIT); 1027 while (type != REQ_QUIT);
883 1028
1029 LOCK (wrklock);
1030 worker_free (self);
1031 UNLOCK (wrklock);
1032
884 return 0; 1033 return 0;
885} 1034}
886 1035
887/*****************************************************************************/ 1036/*****************************************************************************/
888 1037
889static void atfork_prepare (void) 1038static void atfork_prepare (void)
890{ 1039{
891 pthread_mutex_lock (&reqlock); 1040 LOCK (wrklock);
892 pthread_mutex_lock (&reslock); 1041 LOCK (reqlock);
1042 LOCK (reslock);
893#if !HAVE_PREADWRITE 1043#if !HAVE_PREADWRITE
894 pthread_mutex_lock (&preadwritelock); 1044 LOCK (preadwritelock);
895#endif 1045#endif
896#if !HAVE_READDIR_R 1046#if !HAVE_READDIR_R
897 pthread_mutex_lock (&readdirlock); 1047 LOCK (readdirlock);
898#endif 1048#endif
899} 1049}
900 1050
901static void atfork_parent (void) 1051static void atfork_parent (void)
902{ 1052{
903#if !HAVE_READDIR_R 1053#if !HAVE_READDIR_R
904 pthread_mutex_unlock (&readdirlock); 1054 UNLOCK (readdirlock);
905#endif 1055#endif
906#if !HAVE_PREADWRITE 1056#if !HAVE_PREADWRITE
907 pthread_mutex_unlock (&preadwritelock); 1057 UNLOCK (preadwritelock);
908#endif 1058#endif
909 pthread_mutex_unlock (&reslock); 1059 UNLOCK (reslock);
910 pthread_mutex_unlock (&reqlock); 1060 UNLOCK (reqlock);
1061 UNLOCK (wrklock);
911} 1062}
912 1063
913static void atfork_child (void) 1064static void atfork_child (void)
914{ 1065{
915 aio_req prv; 1066 aio_req prv;
916 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
917 started = 0; 1085 started = 0;
918 1086 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 1087
937 close (respipe [0]); 1088 close (respipe [0]);
938 close (respipe [1]); 1089 close (respipe [1]);
939 create_pipe (); 1090 create_pipe ();
940 1091
… …
976 create_pipe (); 1127 create_pipe ();
977 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1128 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
978} 1129}
979 1130
980void 1131void
981min_parallel (nthreads) 1132min_parallel (int nthreads)
982 int nthreads
983 PROTOTYPE: $ 1133 PROTOTYPE: $
984 1134
985void 1135void
986max_parallel (nthreads) 1136max_parallel (int nthreads)
987 int nthreads
988 PROTOTYPE: $ 1137 PROTOTYPE: $
989 1138
990int 1139int
991max_outstanding (nreqs) 1140max_outstanding (int maxreqs)
992 int nreqs 1141 PROTOTYPE: $
993 PROTOTYPE: $
994 CODE: 1142 CODE:
995 RETVAL = max_outstanding; 1143 RETVAL = max_outstanding;
996 max_outstanding = nreqs; 1144 max_outstanding = maxreqs;
1145 OUTPUT:
1146 RETVAL
997 1147
998void 1148void
999aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1149aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1000 SV * pathname 1150 SV * pathname
1001 int flags 1151 int flags
… …
1216 1366
1217 REQ_SEND; 1367 REQ_SEND;
1218} 1368}
1219 1369
1220void 1370void
1221aio_sleep (delay,callback=&PL_sv_undef) 1371aio_busy (delay,callback=&PL_sv_undef)
1222 double delay 1372 double delay
1223 SV * callback 1373 SV * callback
1224 PPCODE: 1374 PPCODE:
1225{ 1375{
1226 dREQ; 1376 dREQ;
1227 1377
1228 req->type = REQ_SLEEP; 1378 req->type = REQ_BUSY;
1229 req->fd = delay < 0. ? 0 : delay; 1379 req->fd = delay < 0. ? 0 : delay;
1230 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1380 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1231 1381
1232 REQ_SEND; 1382 REQ_SEND;
1233} 1383}
… …
1256 req->type = REQ_NOP; 1406 req->type = REQ_NOP;
1257 1407
1258 REQ_SEND; 1408 REQ_SEND;
1259} 1409}
1260 1410
1261#if 0 1411int
1262 1412aioreq_pri (int pri = 0)
1263void 1413 PROTOTYPE: ;$
1264aio_pri (int pri = DEFAULT_PRI)
1265 CODE: 1414 CODE:
1415 RETVAL = next_pri - PRI_BIAS;
1416 if (items > 0)
1417 {
1266 if (pri < PRI_MIN) pri = PRI_MIN; 1418 if (pri < PRI_MIN) pri = PRI_MIN;
1267 if (pri > PRI_MAX) pri = PRI_MAX; 1419 if (pri > PRI_MAX) pri = PRI_MAX;
1268 next_pri = pri + PRI_BIAS; 1420 next_pri = pri + PRI_BIAS;
1421 }
1422 OUTPUT:
1423 RETVAL
1269 1424
1270#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;
1271 1432
1272void 1433void
1273flush () 1434flush ()
1274 PROTOTYPE: 1435 PROTOTYPE:
1275 CODE: 1436 CODE:
1276 while (nreqs) 1437 while (nreqs)
1277 { 1438 {
1278 poll_wait (); 1439 poll_wait ();
1279 poll_cb (); 1440 poll_cb (0);
1280 } 1441 }
1281 1442
1282void 1443void
1283poll() 1444poll()
1284 PROTOTYPE: 1445 PROTOTYPE:
1285 CODE: 1446 CODE:
1286 if (nreqs) 1447 if (nreqs)
1287 { 1448 {
1288 poll_wait (); 1449 poll_wait ();
1289 poll_cb (); 1450 poll_cb (0);
1290 } 1451 }
1291 1452
1292int 1453int
1293poll_fileno() 1454poll_fileno()
1294 PROTOTYPE: 1455 PROTOTYPE:
… …
1299 1460
1300int 1461int
1301poll_cb(...) 1462poll_cb(...)
1302 PROTOTYPE: 1463 PROTOTYPE:
1303 CODE: 1464 CODE:
1304 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);
1305 OUTPUT: 1474 OUTPUT:
1306 RETVAL 1475 RETVAL
1307 1476
1308void 1477void
1309poll_wait() 1478poll_wait()
… …
1318 CODE: 1487 CODE:
1319 RETVAL = nreqs; 1488 RETVAL = nreqs;
1320 OUTPUT: 1489 OUTPUT:
1321 RETVAL 1490 RETVAL
1322 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
1323PROTOTYPES: DISABLE 1512PROTOTYPES: DISABLE
1324 1513
1325MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1514MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1326 1515
1327void 1516void
1328cancel (aio_req_ornot req) 1517cancel (aio_req_ornot req)
1329 PROTOTYPE:
1330 CODE: 1518 CODE:
1331 req_cancel (req); 1519 req_cancel (req);
1332 1520
1333void 1521void
1334cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1522cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1370 } 1558 }
1371 } 1559 }
1372} 1560}
1373 1561
1374void 1562void
1563cancel_subs (aio_req_ornot req)
1564 CODE:
1565 req_cancel_subs (req);
1566
1567void
1375result (aio_req grp, ...) 1568result (aio_req grp, ...)
1376 CODE: 1569 CODE:
1377{ 1570{
1378 int i; 1571 int i;
1572 AV *av;
1573
1574 grp->errorno = errno;
1575
1379 AV *av = newAV (); 1576 av = newAV ();
1380 1577
1381 for (i = 1; i < items; ++i ) 1578 for (i = 1; i < items; ++i )
1382 av_push (av, newSVsv (ST (i))); 1579 av_push (av, newSVsv (ST (i)));
1383 1580
1384 SvREFCNT_dec (grp->data); 1581 SvREFCNT_dec (grp->data);
1385 grp->data = (SV *)av; 1582 grp->data = (SV *)av;
1386} 1583}
1387 1584
1388void 1585void
1586errno (aio_req grp, int errorno = errno)
1587 CODE:
1588 grp->errorno = errorno;
1589
1590void
1389feed_limit (aio_req grp, int limit) 1591limit (aio_req grp, int limit)
1390 CODE: 1592 CODE:
1391 grp->fd2 = limit; 1593 grp->fd2 = limit;
1392 aio_grp_feed (grp); 1594 aio_grp_feed (grp);
1393 1595
1394void 1596void

Diff Legend

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