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.59 by root, Mon Oct 23 18:56:27 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
67typedef struct aio_cb 88typedef struct aio_cb
68{ 89{
69 struct aio_cb *volatile next; 90 struct aio_cb *volatile next;
70
71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 91
75 SV *data, *callback; 92 SV *data, *callback;
76 SV *fh, *fh2; 93 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 94 void *dataptr, *data2ptr;
78 Stat_t *statdata; 95 Stat_t *statdata;
79 off_t offset; 96 off_t offset;
80 size_t length; 97 size_t length;
81 ssize_t result; 98 ssize_t result;
82 99
100 STRLEN dataoffset;
83 int type; 101 int type;
84 int fd, fd2; 102 int fd, fd2;
85 int errorno; 103 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 104 mode_t mode; /* open */
105
106 unsigned char flags;
88 unsigned char pri; 107 unsigned char pri;
89 unsigned char flags; 108
109 SV *self; /* the perl counterpart of this request, if any */
110 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
90} aio_cb; 111} aio_cb;
91 112
92enum { 113enum {
93 FLAG_CANCELLED = 0x01, 114 FLAG_CANCELLED = 0x01,
94}; 115};
95 116
96typedef aio_cb *aio_req; 117typedef aio_cb *aio_req;
97typedef aio_cb *aio_req_ornot; 118typedef aio_cb *aio_req_ornot;
98 119
120enum {
121 PRI_MIN = -4,
122 PRI_MAX = 4,
123
124 DEFAULT_PRI = 0,
125 PRI_BIAS = -PRI_MIN,
126 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
127};
128
129static int next_pri = DEFAULT_PRI + PRI_BIAS;
130
99static int started, wanted; 131static int started, wanted;
100static volatile int nreqs; 132static volatile int nreqs;
101static int max_outstanding = 1<<30;
102static int respipe [2]; 133static int respipe [2];
103 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
104static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 184static pthread_mutex_t reslock = AIO_MUTEX_INIT;
105static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 185static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
106static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 186static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
107 187
108static volatile aio_req reqs, reqe; /* queue start, queue end */ 188/*
109static 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;
110 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 ();
111static void req_invoke (aio_req req); 243static void req_invoke (aio_req req);
112static void req_free (aio_req req); 244static void req_free (aio_req req);
245static void req_cancel (aio_req req);
113 246
114/* must be called at most once */ 247/* must be called at most once */
115static SV *req_sv (aio_req req, const char *klass) 248static SV *req_sv (aio_req req, const char *klass)
116{ 249{
117 if (!req->self) 250 if (!req->self)
… …
148 ENTER; 281 ENTER;
149 SAVETMPS; 282 SAVETMPS;
150 PUSHMARK (SP); 283 PUSHMARK (SP);
151 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 284 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
152 PUTBACK; 285 PUTBACK;
153 call_sv (grp->fh2, G_VOID | G_EVAL); 286 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
154 SPAGAIN; 287 SPAGAIN;
155 FREETMPS; 288 FREETMPS;
156 LEAVE; 289 LEAVE;
157 } 290 }
158 291
… …
181 } 314 }
182} 315}
183 316
184static void poll_wait () 317static void poll_wait ()
185{ 318{
186 if (nreqs && !ress)
187 {
188 fd_set rfd; 319 fd_set rfd;
320
321 while (nreqs)
322 {
323 int size;
324#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
325 LOCK (reslock);
326#endif
327 size = res_queue.size;
328#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
329 UNLOCK (reslock);
330#endif
331
332 if (size)
333 return;
334
189 FD_ZERO(&rfd); 335 FD_ZERO(&rfd);
190 FD_SET(respipe [0], &rfd); 336 FD_SET(respipe [0], &rfd);
191 337
192 select (respipe [0] + 1, &rfd, 0, 0, 0); 338 select (respipe [0] + 1, &rfd, 0, 0, 0);
193 } 339 }
194} 340}
195 341
196static void req_invoke (aio_req req) 342static void req_invoke (aio_req req)
197{ 343{
198 dSP; 344 dSP;
199 int errorno = errno;
200 345
201 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback)) 346 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
202 return; 347 {
203
204 errno = req->errorno; 348 errno = req->errorno;
205 349
206 ENTER; 350 ENTER;
207 SAVETMPS; 351 SAVETMPS;
208 PUSHMARK (SP); 352 PUSHMARK (SP);
209 EXTEND (SP, 1); 353 EXTEND (SP, 1);
210 354
211 switch (req->type) 355 switch (req->type)
212 {
213 case REQ_READDIR:
214 { 356 {
215 SV *rv = &PL_sv_undef; 357 case REQ_READDIR:
216
217 if (req->result >= 0)
218 { 358 {
219 char *buf = req->data2ptr; 359 SV *rv = &PL_sv_undef;
220 AV *av = newAV ();
221 360
222 while (req->result) 361 if (req->result >= 0)
223 { 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 {
224 SV *sv = newSVpv (buf, 0); 371 SV *sv = newSVpv (buf, 0);
225 372
226 av_push (av, sv); 373 av_store (av, i, sv);
227 buf += SvCUR (sv) + 1; 374 buf += SvCUR (sv) + 1;
228 req->result--; 375 }
376
377 rv = sv_2mortal (newRV_noinc ((SV *)av));
229 } 378 }
230 379
231 rv = sv_2mortal (newRV_noinc ((SV *)av)); 380 PUSHs (rv);
232 } 381 }
382 break;
233 383
234 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;
235 } 422 }
236 break;
237 423
238 case REQ_OPEN:
239 {
240 /* convert fd to fh */
241 SV *fh;
242 424
243 PUSHs (sv_2mortal (newSViv (req->result)));
244 PUTBACK; 425 PUTBACK;
245 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
246 SPAGAIN;
247
248 fh = SvREFCNT_inc (POPs);
249
250 PUSHMARK (SP);
251 XPUSHs (sv_2mortal (fh));
252 }
253 break;
254
255 case REQ_GROUP:
256 req->fd = 2; /* mark group as finished */
257
258 if (req->data)
259 {
260 int i;
261 AV *av = (AV *)req->data;
262
263 EXTEND (SP, AvFILL (av) + 1);
264 for (i = 0; i <= AvFILL (av); ++i)
265 PUSHs (*av_fetch (av, i, 0));
266 }
267 break;
268
269 case REQ_NOP:
270 case REQ_SLEEP:
271 break;
272
273 default:
274 PUSHs (sv_2mortal (newSViv (req->result)));
275 break;
276 }
277
278
279 PUTBACK;
280 call_sv (req->callback, G_VOID | G_EVAL); 426 call_sv (req->callback, G_VOID | G_EVAL);
281 SPAGAIN; 427 SPAGAIN;
282 428
283 FREETMPS; 429 FREETMPS;
284 LEAVE; 430 LEAVE;
285
286 errno = errorno;
287
288 if (SvTRUE (ERRSV))
289 { 431 }
290 req_free (req);
291 croak (0);
292 }
293}
294 432
295static void req_free (aio_req req)
296{
297 if (req->grp) 433 if (req->grp)
298 { 434 {
299 aio_req grp = req->grp; 435 aio_req grp = req->grp;
300 436
301 /* unlink request */ 437 /* unlink request */
… …
306 grp->grp_first = req->grp_next; 442 grp->grp_first = req->grp_next;
307 443
308 aio_grp_dec (grp); 444 aio_grp_dec (grp);
309 } 445 }
310 446
447 if (SvTRUE (ERRSV))
448 {
449 req_free (req);
450 croak (0);
451 }
452}
453
454static void req_free (aio_req req)
455{
311 if (req->self) 456 if (req->self)
312 { 457 {
313 sv_unmagic (req->self, PERL_MAGIC_ext); 458 sv_unmagic (req->self, PERL_MAGIC_ext);
314 SvREFCNT_dec (req->self); 459 SvREFCNT_dec (req->self);
315 } 460 }
… …
318 SvREFCNT_dec (req->fh); 463 SvREFCNT_dec (req->fh);
319 SvREFCNT_dec (req->fh2); 464 SvREFCNT_dec (req->fh2);
320 SvREFCNT_dec (req->callback); 465 SvREFCNT_dec (req->callback);
321 Safefree (req->statdata); 466 Safefree (req->statdata);
322 467
323 if (req->type == REQ_READDIR && req->result >= 0) 468 if (req->type == REQ_READDIR)
324 free (req->data2ptr); 469 free (req->data2ptr);
325 470
326 Safefree (req); 471 Safefree (req);
327} 472}
328 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
329static void req_cancel (aio_req req) 488static void req_cancel (aio_req req)
330{ 489{
331 req->flags |= FLAG_CANCELLED; 490 req->flags |= FLAG_CANCELLED;
332 491
333 if (req->type == REQ_GROUP) 492 req_cancel_subs (req);
334 {
335 aio_req sub;
336
337 for (sub = req->grp_first; sub; sub = sub->grp_next)
338 req_cancel (sub);
339 }
340} 493}
341 494
342static int poll_cb () 495static int poll_cb ()
343{ 496{
344 dSP; 497 dSP;
… …
346 int do_croak = 0; 499 int do_croak = 0;
347 aio_req req; 500 aio_req req;
348 501
349 for (;;) 502 for (;;)
350 { 503 {
351 pthread_mutex_lock (&reslock); 504 LOCK (reslock);
352 req = ress; 505 req = reqq_shift (&res_queue);
353 506
354 if (req) 507 if (req)
355 { 508 {
356 ress = req->next;
357
358 if (!ress) 509 if (!res_queue.size)
359 { 510 {
360 /* read any signals sent by the worker threads */ 511 /* read any signals sent by the worker threads */
361 char buf [32]; 512 char buf [32];
362 while (read (respipe [0], buf, 32) == 32) 513 while (read (respipe [0], buf, 32) == 32)
363 ; 514 ;
364
365 rese = 0;
366 } 515 }
367 } 516 }
368 517
369 pthread_mutex_unlock (&reslock); 518 UNLOCK (reslock);
370 519
371 if (!req) 520 if (!req)
372 break; 521 break;
373 522
374 --nreqs; 523 --nreqs;
… …
409static void *aio_proc(void *arg); 558static void *aio_proc(void *arg);
410 559
411static void start_thread (void) 560static void start_thread (void)
412{ 561{
413 sigset_t fullsigset, oldsigset; 562 sigset_t fullsigset, oldsigset;
414 pthread_t tid;
415 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");
416 569
417 pthread_attr_init (&attr); 570 pthread_attr_init (&attr);
418 pthread_attr_setstacksize (&attr, STACKSIZE); 571 pthread_attr_setstacksize (&attr, STACKSIZE);
419 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 572 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
420 573
421 sigfillset (&fullsigset); 574 sigfillset (&fullsigset);
575
576 LOCK (wrklock);
422 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 577 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
423 578
424 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;
425 started++; 585 started++;
586 }
587 else
588 free (wrk);
426 589
427 sigprocmask (SIG_SETMASK, &oldsigset, 0); 590 sigprocmask (SIG_SETMASK, &oldsigset, 0);
591 UNLOCK (wrklock);
428} 592}
429 593
430static void req_send (aio_req req) 594static void req_send (aio_req req)
431{ 595{
432 while (started < wanted && nreqs >= started) 596 while (started < wanted && nreqs >= started)
433 start_thread (); 597 start_thread ();
434 598
435 ++nreqs; 599 ++nreqs;
436 600
437 pthread_mutex_lock (&reqlock); 601 LOCK (reqlock);
438 602 reqq_push (&req_queue, req);
439 req->next = 0;
440
441 if (reqe)
442 {
443 reqe->next = req;
444 reqe = req;
445 }
446 else
447 reqe = reqs = req;
448
449 pthread_cond_signal (&reqwait); 603 pthread_cond_signal (&reqwait);
450 pthread_mutex_unlock (&reqlock); 604 UNLOCK (reqlock);
451
452 if (nreqs > max_outstanding)
453 for (;;)
454 {
455 poll_cb ();
456
457 if (nreqs <= max_outstanding)
458 break;
459
460 poll_wait ();
461 }
462} 605}
463 606
464static void end_thread (void) 607static void end_thread (void)
465{ 608{
466 aio_req req; 609 aio_req req;
610
467 Newz (0, req, 1, aio_cb); 611 Newz (0, req, 1, aio_cb);
612
468 req->type = REQ_QUIT; 613 req->type = REQ_QUIT;
614 req->pri = PRI_MAX + PRI_BIAS;
469 615
470 req_send (req); 616 req_send (req);
471} 617}
472 618
473static void min_parallel (int nthreads) 619static void min_parallel (int nthreads)
… …
525static 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)
526{ 672{
527 ssize_t res; 673 ssize_t res;
528 off_t ooffset; 674 off_t ooffset;
529 675
530 pthread_mutex_lock (&preadwritelock); 676 LOCK (preadwritelock);
531 ooffset = lseek (fd, 0, SEEK_CUR); 677 ooffset = lseek (fd, 0, SEEK_CUR);
532 lseek (fd, offset, SEEK_SET); 678 lseek (fd, offset, SEEK_SET);
533 res = read (fd, buf, count); 679 res = read (fd, buf, count);
534 lseek (fd, ooffset, SEEK_SET); 680 lseek (fd, ooffset, SEEK_SET);
535 pthread_mutex_unlock (&preadwritelock); 681 UNLOCK (preadwritelock);
536 682
537 return res; 683 return res;
538} 684}
539 685
540static 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)
541{ 687{
542 ssize_t res; 688 ssize_t res;
543 off_t ooffset; 689 off_t ooffset;
544 690
545 pthread_mutex_lock (&preadwritelock); 691 LOCK (preadwritelock);
546 ooffset = lseek (fd, 0, SEEK_CUR); 692 ooffset = lseek (fd, 0, SEEK_CUR);
547 lseek (fd, offset, SEEK_SET); 693 lseek (fd, offset, SEEK_SET);
548 res = write (fd, buf, count); 694 res = write (fd, buf, count);
549 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
550 pthread_mutex_unlock (&preadwritelock); 696 UNLOCK (preadwritelock);
551 697
552 return res; 698 return res;
553} 699}
554#endif 700#endif
555 701
… …
560#if !HAVE_READAHEAD 706#if !HAVE_READAHEAD
561# define readahead aio_readahead 707# define readahead aio_readahead
562 708
563static ssize_t readahead (int fd, off_t offset, size_t count) 709static ssize_t readahead (int fd, off_t offset, size_t count)
564{ 710{
565 char readahead_buf[4096]; 711 dBUF;
566 712
567 while (count > 0) 713 while (count > 0)
568 { 714 {
569 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 715 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
570 716
571 pread (fd, readahead_buf, len, offset); 717 pread (fd, aio_buf, len, offset);
572 offset += len; 718 offset += len;
573 count -= len; 719 count -= len;
574 } 720 }
575 721
576 errno = 0; 722 errno = 0;
… …
585static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 731static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
586{ 732{
587 struct dirent *e; 733 struct dirent *e;
588 int errorno; 734 int errorno;
589 735
590 pthread_mutex_lock (&readdirlock); 736 LOCK (readdirlock);
591 737
592 e = readdir (dirp); 738 e = readdir (dirp);
593 errorno = errno; 739 errorno = errno;
594 740
595 if (e) 741 if (e)
… …
598 strcpy (ent->d_name, e->d_name); 744 strcpy (ent->d_name, e->d_name);
599 } 745 }
600 else 746 else
601 *res = 0; 747 *res = 0;
602 748
603 pthread_mutex_unlock (&readdirlock); 749 UNLOCK (readdirlock);
604 750
605 errno = errorno; 751 errno = errorno;
606 return e ? 0 : -1; 752 return e ? 0 : -1;
607} 753}
608#endif 754#endif
609 755
610/* sendfile always needs emulation */ 756/* sendfile always needs emulation */
611static 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)
612{ 758{
613 ssize_t res; 759 ssize_t res;
614 760
615 if (!count) 761 if (!count)
616 return 0; 762 return 0;
… …
665#endif 811#endif
666 ) 812 )
667 ) 813 )
668 { 814 {
669 /* emulate sendfile. this is a major pain in the ass */ 815 /* emulate sendfile. this is a major pain in the ass */
670 char buf[4096]; 816 dBUF;
817
671 res = 0; 818 res = 0;
672 819
673 while (count) 820 while (count)
674 { 821 {
675 ssize_t cnt; 822 ssize_t cnt;
676 823
677 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 824 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
678 825
679 if (cnt <= 0) 826 if (cnt <= 0)
680 { 827 {
681 if (cnt && !res) res = -1; 828 if (cnt && !res) res = -1;
682 break; 829 break;
683 } 830 }
684 831
685 cnt = write (ofd, buf, cnt); 832 cnt = write (ofd, aio_buf, cnt);
686 833
687 if (cnt <= 0) 834 if (cnt <= 0)
688 { 835 {
689 if (cnt && !res) res = -1; 836 if (cnt && !res) res = -1;
690 break; 837 break;
… …
698 845
699 return res; 846 return res;
700} 847}
701 848
702/* read a full directory */ 849/* read a full directory */
703static int scandir_ (const char *path, void **namesp) 850static void scandir_ (aio_req req, worker *self)
704{ 851{
705 DIR *dirp = opendir (path); 852 DIR *dirp;
706 union 853 union
707 { 854 {
708 struct dirent d; 855 struct dirent d;
709 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 856 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
710 } u; 857 } *u;
711 struct dirent *entp; 858 struct dirent *entp;
712 char *name, *names; 859 char *name, *names;
713 int memlen = 4096; 860 int memlen = 4096;
714 int memofs = 0; 861 int memofs = 0;
715 int res = 0; 862 int res = 0;
716 int errorno; 863 int errorno;
717 864
718 if (!dirp) 865 LOCK (wrklock);
719 return -1; 866 self->dirp = dirp = opendir (req->dataptr);
867 self->dbuf = u = malloc (sizeof (*u));
868 UNLOCK (wrklock);
720 869
721 names = malloc (memlen); 870 req->data2ptr = names = malloc (memlen);
722 871
872 if (dirp && u && names)
723 for (;;) 873 for (;;)
724 { 874 {
875 errno = 0;
725 errno = 0, readdir_r (dirp, &u.d, &entp); 876 readdir_r (dirp, &u->d, &entp);
726 877
727 if (!entp) 878 if (!entp)
728 break; 879 break;
729 880
730 name = entp->d_name; 881 name = entp->d_name;
731 882
732 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 883 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
733 { 884 {
734 int len = strlen (name) + 1; 885 int len = strlen (name) + 1;
735 886
736 res++; 887 res++;
737 888
738 while (memofs + len > memlen) 889 while (memofs + len > memlen)
739 { 890 {
740 memlen *= 2; 891 memlen *= 2;
892 LOCK (wrklock);
741 names = realloc (names, memlen); 893 req->data2ptr = names = realloc (names, memlen);
894 UNLOCK (wrklock);
895
742 if (!names) 896 if (!names)
743 break; 897 break;
744 } 898 }
745 899
746 memcpy (names + memofs, name, len); 900 memcpy (names + memofs, name, len);
747 memofs += len; 901 memofs += len;
748 } 902 }
749 } 903 }
750 904
751 errorno = errno;
752 closedir (dirp);
753
754 if (errorno) 905 if (errno)
755 {
756 free (names);
757 errno = errorno;
758 res = -1; 906 res = -1;
759 } 907
760 908 req->result = res;
761 *namesp = (void *)names;
762 return res;
763} 909}
764 910
765/*****************************************************************************/ 911/*****************************************************************************/
766 912
767static void *aio_proc (void *thr_arg) 913static void *aio_proc (void *thr_arg)
768{ 914{
769 aio_req req; 915 aio_req req;
770 int type; 916 int type;
917 worker *self = (worker *)thr_arg;
771 918
772 do 919 do
773 { 920 {
774 pthread_mutex_lock (&reqlock); 921 LOCK (reqlock);
775 922
776 for (;;) 923 for (;;)
777 { 924 {
778 req = reqs; 925 self->req = req = reqq_shift (&req_queue);
779
780 if (reqs)
781 {
782 reqs = reqs->next;
783 if (!reqs) reqe = 0;
784 }
785 926
786 if (req) 927 if (req)
787 break; 928 break;
788 929
789 pthread_cond_wait (&reqwait, &reqlock); 930 pthread_cond_wait (&reqwait, &reqlock);
790 } 931 }
791 932
792 pthread_mutex_unlock (&reqlock); 933 UNLOCK (reqlock);
793 934
794 errno = 0; /* strictly unnecessary */ 935 errno = 0; /* strictly unnecessary */
936 type = req->type; /* remember type for QUIT check */
795 937
796 if (!(req->flags & FLAG_CANCELLED)) 938 if (!(req->flags & FLAG_CANCELLED))
797 switch (type = req->type) /* remember type for QUIT check */ 939 switch (type)
798 { 940 {
799 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;
800 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;
801 943
802 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;
803 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;
804 946
805 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 947 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
806 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 948 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
807 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 949 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
808 950
… …
814 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 956 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
815 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 957 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
816 958
817 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 959 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
818 case REQ_FSYNC: req->result = fsync (req->fd); break; 960 case REQ_FSYNC: req->result = fsync (req->fd); break;
819 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 961 case REQ_READDIR: scandir_ (req, self); break;
820 962
821 case REQ_SLEEP: 963 case REQ_BUSY:
822 { 964 {
823 struct timeval tv; 965 struct timeval tv;
824 966
825 tv.tv_sec = req->fd; 967 tv.tv_sec = req->fd;
826 tv.tv_usec = req->fd2; 968 tv.tv_usec = req->fd2;
… …
838 break; 980 break;
839 } 981 }
840 982
841 req->errorno = errno; 983 req->errorno = errno;
842 984
843 pthread_mutex_lock (&reslock); 985 LOCK (reslock);
844 986
845 req->next = 0; 987 if (!reqq_push (&res_queue, req))
846
847 if (rese)
848 {
849 rese->next = req;
850 rese = req;
851 }
852 else
853 {
854 rese = ress = req;
855
856 /* write a dummy byte to the pipe so fh becomes ready */ 988 /* write a dummy byte to the pipe so fh becomes ready */
857 write (respipe [1], &respipe, 1); 989 write (respipe [1], &respipe, 1);
858 }
859 990
860 pthread_mutex_unlock (&reslock); 991 self->req = 0;
992 worker_clear (self);
993
994 UNLOCK (reslock);
861 } 995 }
862 while (type != REQ_QUIT); 996 while (type != REQ_QUIT);
863 997
998 LOCK (wrklock);
999 worker_free (self);
1000 UNLOCK (wrklock);
1001
864 return 0; 1002 return 0;
865} 1003}
866 1004
867/*****************************************************************************/ 1005/*****************************************************************************/
868 1006
869static void atfork_prepare (void) 1007static void atfork_prepare (void)
870{ 1008{
871 pthread_mutex_lock (&reqlock); 1009 LOCK (wrklock);
872 pthread_mutex_lock (&reslock); 1010 LOCK (reqlock);
1011 LOCK (reslock);
873#if !HAVE_PREADWRITE 1012#if !HAVE_PREADWRITE
874 pthread_mutex_lock (&preadwritelock); 1013 LOCK (preadwritelock);
875#endif 1014#endif
876#if !HAVE_READDIR_R 1015#if !HAVE_READDIR_R
877 pthread_mutex_lock (&readdirlock); 1016 LOCK (readdirlock);
878#endif 1017#endif
879} 1018}
880 1019
881static void atfork_parent (void) 1020static void atfork_parent (void)
882{ 1021{
883#if !HAVE_READDIR_R 1022#if !HAVE_READDIR_R
884 pthread_mutex_unlock (&readdirlock); 1023 UNLOCK (readdirlock);
885#endif 1024#endif
886#if !HAVE_PREADWRITE 1025#if !HAVE_PREADWRITE
887 pthread_mutex_unlock (&preadwritelock); 1026 UNLOCK (preadwritelock);
888#endif 1027#endif
889 pthread_mutex_unlock (&reslock); 1028 UNLOCK (reslock);
890 pthread_mutex_unlock (&reqlock); 1029 UNLOCK (reqlock);
1030 UNLOCK (wrklock);
891} 1031}
892 1032
893static void atfork_child (void) 1033static void atfork_child (void)
894{ 1034{
895 aio_req prv; 1035 aio_req prv;
896 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
897 started = 0; 1054 started = 0;
898 1055 nreqs = 0;
899 while (reqs)
900 {
901 prv = reqs;
902 reqs = prv->next;
903 req_free (prv);
904 }
905
906 reqs = reqe = 0;
907
908 while (ress)
909 {
910 prv = ress;
911 ress = prv->next;
912 req_free (prv);
913 }
914
915 ress = rese = 0;
916 1056
917 close (respipe [0]); 1057 close (respipe [0]);
918 close (respipe [1]); 1058 close (respipe [1]);
919 create_pipe (); 1059 create_pipe ();
920 1060
921 atfork_parent (); 1061 atfork_parent ();
922} 1062}
923 1063
924#define dREQ \ 1064#define dREQ \
925 aio_req req; \ 1065 aio_req req; \
1066 int req_pri = next_pri; \
1067 next_pri = DEFAULT_PRI + PRI_BIAS; \
926 \ 1068 \
927 if (SvOK (callback) && !SvROK (callback)) \ 1069 if (SvOK (callback) && !SvROK (callback)) \
928 croak ("callback must be undef or of reference type"); \ 1070 croak ("callback must be undef or of reference type"); \
929 \ 1071 \
930 Newz (0, req, 1, aio_cb); \ 1072 Newz (0, req, 1, aio_cb); \
931 if (!req) \ 1073 if (!req) \
932 croak ("out of memory during aio_req allocation"); \ 1074 croak ("out of memory during aio_req allocation"); \
933 \ 1075 \
934 req->callback = newSVsv (callback) 1076 req->callback = newSVsv (callback); \
1077 req->pri = req_pri
935 1078
936#define REQ_SEND \ 1079#define REQ_SEND \
937 req_send (req); \ 1080 req_send (req); \
938 \ 1081 \
939 if (GIMME_V != G_VOID) \ 1082 if (GIMME_V != G_VOID) \
… …
961 1104
962void 1105void
963max_parallel (nthreads) 1106max_parallel (nthreads)
964 int nthreads 1107 int nthreads
965 PROTOTYPE: $ 1108 PROTOTYPE: $
966
967int
968max_outstanding (nreqs)
969 int nreqs
970 PROTOTYPE: $
971 CODE:
972 RETVAL = max_outstanding;
973 max_outstanding = nreqs;
974 1109
975void 1110void
976aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1111aio_open (pathname,flags,mode,callback=&PL_sv_undef)
977 SV * pathname 1112 SV * pathname
978 int flags 1113 int flags
… …
1193 1328
1194 REQ_SEND; 1329 REQ_SEND;
1195} 1330}
1196 1331
1197void 1332void
1198aio_sleep (delay,callback=&PL_sv_undef) 1333aio_busy (delay,callback=&PL_sv_undef)
1199 double delay 1334 double delay
1200 SV * callback 1335 SV * callback
1201 PPCODE: 1336 PPCODE:
1202{ 1337{
1203 dREQ; 1338 dREQ;
1204 1339
1205 req->type = REQ_SLEEP; 1340 req->type = REQ_BUSY;
1206 req->fd = delay < 0. ? 0 : delay; 1341 req->fd = delay < 0. ? 0 : delay;
1207 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1342 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1208 1343
1209 REQ_SEND; 1344 REQ_SEND;
1210} 1345}
… …
1214 SV * callback 1349 SV * callback
1215 PROTOTYPE: ;$ 1350 PROTOTYPE: ;$
1216 PPCODE: 1351 PPCODE:
1217{ 1352{
1218 dREQ; 1353 dREQ;
1354
1219 req->type = REQ_GROUP; 1355 req->type = REQ_GROUP;
1220 req_send (req); 1356 req_send (req);
1357
1221 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1358 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1222} 1359}
1223 1360
1224void 1361void
1225aio_nop (callback=&PL_sv_undef) 1362aio_nop (callback=&PL_sv_undef)
… …
1230 1367
1231 req->type = REQ_NOP; 1368 req->type = REQ_NOP;
1232 1369
1233 REQ_SEND; 1370 REQ_SEND;
1234} 1371}
1372
1373void
1374aioreq_pri (int pri = DEFAULT_PRI)
1375 CODE:
1376 if (pri < PRI_MIN) pri = PRI_MIN;
1377 if (pri > PRI_MAX) pri = PRI_MAX;
1378 next_pri = pri + PRI_BIAS;
1379
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;
1235 1387
1236void 1388void
1237flush () 1389flush ()
1238 PROTOTYPE: 1390 PROTOTYPE:
1239 CODE: 1391 CODE:
… …
1288 1440
1289MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1441MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1290 1442
1291void 1443void
1292cancel (aio_req_ornot req) 1444cancel (aio_req_ornot req)
1293 PROTOTYPE:
1294 CODE: 1445 CODE:
1295 req_cancel (req); 1446 req_cancel (req);
1296 1447
1297void 1448void
1298cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1449cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
… …
1334 } 1485 }
1335 } 1486 }
1336} 1487}
1337 1488
1338void 1489void
1490cancel_subs (aio_req_ornot req)
1491 CODE:
1492 req_cancel_subs (req);
1493
1494void
1339result (aio_req grp, ...) 1495result (aio_req grp, ...)
1340 CODE: 1496 CODE:
1341{ 1497{
1342 int i; 1498 int i;
1343 AV *av = newAV (); 1499 AV *av = newAV ();
… …
1348 SvREFCNT_dec (grp->data); 1504 SvREFCNT_dec (grp->data);
1349 grp->data = (SV *)av; 1505 grp->data = (SV *)av;
1350} 1506}
1351 1507
1352void 1508void
1353feed_limit (aio_req grp, int limit) 1509limit (aio_req grp, int limit)
1354 CODE: 1510 CODE:
1355 grp->fd2 = limit; 1511 grp->fd2 = limit;
1356 aio_grp_feed (grp); 1512 aio_grp_feed (grp);
1357 1513
1358void 1514void

Diff Legend

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