ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.61 by root, Mon Oct 23 22:44:21 2006 UTC vs.
Revision 1.74 by root, Wed Oct 25 17:57:30 2006 UTC

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

Diff Legend

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