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

Diff Legend

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