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.51 by root, Sun Oct 22 22:14:33 2006 UTC vs.
Revision 1.75 by root, Thu Oct 26 06:44:48 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"
39/* used for struct dirent, AIX doesn't provide it */ 47/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 48#ifndef NAME_MAX
41# define NAME_MAX 4096 49# define NAME_MAX 4096
42#endif 50#endif
43 51
52#ifndef PTHREAD_STACK_MIN
53/* care for broken platforms, e.g. windows */
54# define PTHREAD_STACK_MIN 16384
55#endif
56
44#if __ia64 57#if __ia64
45# define STACKSIZE 65536 58# define STACKSIZE 65536
59#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
60# define STACKSIZE PTHREAD_STACK_MIN
46#else 61#else
47# define STACKSIZE 8192 62# define STACKSIZE 16384
48#endif 63#endif
64
65/* buffer size for various temporary buffers */
66#define AIO_BUFSIZE 65536
67
68#define dBUF \
69 char *aio_buf; \
70 LOCK (wrklock); \
71 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
72 UNLOCK (wrklock); \
73 if (!aio_buf) \
74 return -1;
49 75
50enum { 76enum {
51 REQ_QUIT, 77 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 78 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 79 REQ_READ, REQ_WRITE, REQ_READAHEAD,
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 81 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 82 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 83 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 84 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 85 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP, 86 REQ_GROUP, REQ_NOP,
61 REQ_GROUP, 87 REQ_BUSY,
62}; 88};
63 89
64#define AIO_REQ_KLASS "IO::AIO::REQ" 90#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 91#define AIO_GRP_KLASS "IO::AIO::GRP"
66 92
67typedef struct aio_cb 93typedef struct aio_cb
68{ 94{
69 struct aio_cb *volatile next; 95 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 96
75 SV *data, *callback; 97 SV *data, *callback;
76 SV *fh, *fh2; 98 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 99 void *dataptr, *data2ptr;
78 Stat_t *statdata; 100 Stat_t *statdata;
79 off_t offset; 101 off_t offset;
80 size_t length; 102 size_t length;
81 ssize_t result; 103 ssize_t result;
82 104
105 STRLEN dataoffset;
83 int type; 106 int type;
84 int fd, fd2; 107 int fd, fd2;
85 int errorno; 108 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 109 mode_t mode; /* open */
110
88 unsigned char cancelled; 111 unsigned char flags;
112 unsigned char pri;
113
114 SV *self; /* the perl counterpart of this request, if any */
115 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 116} aio_cb;
117
118enum {
119 FLAG_CANCELLED = 0x01,
120};
90 121
91typedef aio_cb *aio_req; 122typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 123typedef aio_cb *aio_req_ornot;
93 124
125enum {
126 PRI_MIN = -4,
127 PRI_MAX = 4,
128
129 DEFAULT_PRI = 0,
130 PRI_BIAS = -PRI_MIN,
131 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
132};
133
134static int next_pri = DEFAULT_PRI + PRI_BIAS;
135
94static int started, wanted; 136static int started, wanted;
95static volatile int nreqs; 137static volatile int nreqs;
96static int max_outstanding = 1<<30;
97static int respipe [2]; 138static int respipe [2];
98 139
140#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
141# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
142#else
143# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
144#endif
145
146#define LOCK(mutex) pthread_mutex_lock (&(mutex))
147#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
148
149/* worker threasd management */
150static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
151
152typedef struct worker {
153 /* locked by wrklock */
154 struct worker *prev, *next;
155
156 pthread_t tid;
157
158 /* locked by reslock, reqlock or wrklock */
159 aio_req req; /* currently processed request */
160 void *dbuf;
161 DIR *dirp;
162} worker;
163
164static worker wrk_first = { &wrk_first, &wrk_first, 0 };
165
166static void worker_clear (worker *wrk)
167{
168 if (wrk->dirp)
169 {
170 closedir (wrk->dirp);
171 wrk->dirp = 0;
172 }
173
174 if (wrk->dbuf)
175 {
176 free (wrk->dbuf);
177 wrk->dbuf = 0;
178 }
179}
180
181static void worker_free (worker *wrk)
182{
183 wrk->next->prev = wrk->prev;
184 wrk->prev->next = wrk->next;
185
186 free (wrk);
187}
188
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 189static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 190static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 191static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 192
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 193/*
104static volatile aio_req ress, rese; /* queue start, queue end */ 194 * a somewhat faster data structure might be nice, but
195 * with 8 priorities this actually needs <20 insns
196 * per shift, the most expensive operation.
197 */
198typedef struct {
199 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
200 int size;
201} reqq;
105 202
203static reqq req_queue;
204static reqq res_queue;
205
206int reqq_push (reqq *q, aio_req req)
207{
208 int pri = req->pri;
209 req->next = 0;
210
211 if (q->qe[pri])
212 {
213 q->qe[pri]->next = req;
214 q->qe[pri] = req;
215 }
216 else
217 q->qe[pri] = q->qs[pri] = req;
218
219 return q->size++;
220}
221
222aio_req reqq_shift (reqq *q)
223{
224 int pri;
225
226 if (!q->size)
227 return 0;
228
229 --q->size;
230
231 for (pri = NUM_PRI; pri--; )
232 {
233 aio_req req = q->qs[pri];
234
235 if (req)
236 {
237 if (!(q->qs[pri] = req->next))
238 q->qe[pri] = 0;
239
240 return req;
241 }
242 }
243
244 abort ();
245}
246
247static int poll_cb ();
106static void req_invoke (aio_req req); 248static void req_invoke (aio_req req);
107static void req_free (aio_req req); 249static void req_free (aio_req req);
250static void req_cancel (aio_req req);
108 251
109/* must be called at most once */ 252/* must be called at most once */
110static SV *req_sv (aio_req req, const char *klass) 253static SV *req_sv (aio_req req, const char *klass)
111{ 254{
112 if (!req->self) 255 if (!req->self)
118 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 261 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
119} 262}
120 263
121static aio_req SvAIO_REQ (SV *sv) 264static aio_req SvAIO_REQ (SV *sv)
122{ 265{
266 MAGIC *mg;
267
123 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 268 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
124 croak ("object of class " AIO_REQ_KLASS " expected"); 269 croak ("object of class " AIO_REQ_KLASS " expected");
125 270
126 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 271 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
127 272
128 return mg ? (aio_req)mg->mg_ptr : 0; 273 return mg ? (aio_req)mg->mg_ptr : 0;
129} 274}
130 275
131static void aio_grp_feed (aio_req grp) 276static void aio_grp_feed (aio_req grp)
132{ 277{
133 while (grp->length < grp->fd2) 278 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
134 { 279 {
135 int old_len = grp->length; 280 int old_len = grp->length;
136 281
137 if (grp->fh2 && SvOK (grp->fh2)) 282 if (grp->fh2 && SvOK (grp->fh2))
138 { 283 {
141 ENTER; 286 ENTER;
142 SAVETMPS; 287 SAVETMPS;
143 PUSHMARK (SP); 288 PUSHMARK (SP);
144 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 289 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
145 PUTBACK; 290 PUTBACK;
146 call_sv (grp->fh2, G_VOID | G_EVAL); 291 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
147 SPAGAIN; 292 SPAGAIN;
148 FREETMPS; 293 FREETMPS;
149 LEAVE; 294 LEAVE;
150 } 295 }
151 296
174 } 319 }
175} 320}
176 321
177static void poll_wait () 322static void poll_wait ()
178{ 323{
179 if (nreqs && !ress)
180 {
181 fd_set rfd; 324 fd_set rfd;
325
326 while (nreqs)
327 {
328 int size;
329#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
330 LOCK (reslock);
331#endif
332 size = res_queue.size;
333#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
334 UNLOCK (reslock);
335#endif
336
337 if (size)
338 return;
339
182 FD_ZERO(&rfd); 340 FD_ZERO(&rfd);
183 FD_SET(respipe [0], &rfd); 341 FD_SET(respipe [0], &rfd);
184 342
185 select (respipe [0] + 1, &rfd, 0, 0, 0); 343 select (respipe [0] + 1, &rfd, 0, 0, 0);
186 } 344 }
187} 345}
188 346
189static void req_invoke (aio_req req) 347static void req_invoke (aio_req req)
190{ 348{
191 dSP; 349 dSP;
192 int errorno = errno;
193 350
194 if (req->cancelled || !SvOK (req->callback)) 351 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
195 return; 352 {
196
197 errno = req->errorno; 353 errno = req->errorno;
198 354
199 ENTER; 355 ENTER;
200 SAVETMPS; 356 SAVETMPS;
201 PUSHMARK (SP); 357 PUSHMARK (SP);
202 EXTEND (SP, 1); 358 EXTEND (SP, 1);
203 359
204 switch (req->type) 360 switch (req->type)
205 {
206 case REQ_READDIR:
207 { 361 {
208 SV *rv = &PL_sv_undef; 362 case REQ_READDIR:
209
210 if (req->result >= 0)
211 { 363 {
212 char *buf = req->data2ptr; 364 SV *rv = &PL_sv_undef;
213 AV *av = newAV ();
214 365
215 while (req->result) 366 if (req->result >= 0)
216 { 367 {
368 int i;
369 char *buf = req->data2ptr;
370 AV *av = newAV ();
371
372 av_extend (av, req->result - 1);
373
374 for (i = 0; i < req->result; ++i)
375 {
217 SV *sv = newSVpv (buf, 0); 376 SV *sv = newSVpv (buf, 0);
218 377
219 av_push (av, sv); 378 av_store (av, i, sv);
220 buf += SvCUR (sv) + 1; 379 buf += SvCUR (sv) + 1;
221 req->result--; 380 }
381
382 rv = sv_2mortal (newRV_noinc ((SV *)av));
222 } 383 }
223 384
224 rv = sv_2mortal (newRV_noinc ((SV *)av)); 385 PUSHs (rv);
225 } 386 }
387 break;
226 388
227 PUSHs (rv); 389 case REQ_OPEN:
390 {
391 /* convert fd to fh */
392 SV *fh;
393
394 PUSHs (sv_2mortal (newSViv (req->result)));
395 PUTBACK;
396 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
397 SPAGAIN;
398
399 fh = SvREFCNT_inc (POPs);
400
401 PUSHMARK (SP);
402 XPUSHs (sv_2mortal (fh));
403 }
404 break;
405
406 case REQ_GROUP:
407 req->fd = 2; /* mark group as finished */
408
409 if (req->data)
410 {
411 int i;
412 AV *av = (AV *)req->data;
413
414 EXTEND (SP, AvFILL (av) + 1);
415 for (i = 0; i <= AvFILL (av); ++i)
416 PUSHs (*av_fetch (av, i, 0));
417 }
418 break;
419
420 case REQ_NOP:
421 case REQ_BUSY:
422 break;
423
424 default:
425 PUSHs (sv_2mortal (newSViv (req->result)));
426 break;
228 } 427 }
229 break;
230 428
231 case REQ_OPEN:
232 {
233 /* convert fd to fh */
234 SV *fh;
235 429
236 PUSHs (sv_2mortal (newSViv (req->result)));
237 PUTBACK; 430 PUTBACK;
238 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
239 SPAGAIN;
240
241 fh = SvREFCNT_inc (POPs);
242
243 PUSHMARK (SP);
244 XPUSHs (sv_2mortal (fh));
245 }
246 break;
247
248 case REQ_GROUP:
249 req->fd = 2; /* mark group as finished */
250
251 if (req->data)
252 {
253 int i;
254 AV *av = (AV *)req->data;
255
256 EXTEND (SP, AvFILL (av) + 1);
257 for (i = 0; i <= AvFILL (av); ++i)
258 PUSHs (*av_fetch (av, i, 0));
259 }
260 break;
261
262 case REQ_SLEEP:
263 break;
264
265 default:
266 PUSHs (sv_2mortal (newSViv (req->result)));
267 break;
268 }
269
270
271 PUTBACK;
272 call_sv (req->callback, G_VOID | G_EVAL); 431 call_sv (req->callback, G_VOID | G_EVAL);
273 SPAGAIN; 432 SPAGAIN;
274 433
275 FREETMPS; 434 FREETMPS;
276 LEAVE; 435 LEAVE;
277
278 errno = errorno;
279
280 if (SvTRUE (ERRSV))
281 { 436 }
282 req_free (req);
283 croak (0);
284 }
285}
286 437
287static void req_free (aio_req req)
288{
289 if (req->grp) 438 if (req->grp)
290 { 439 {
291 aio_req grp = req->grp; 440 aio_req grp = req->grp;
292 441
293 /* unlink request */ 442 /* unlink request */
298 grp->grp_first = req->grp_next; 447 grp->grp_first = req->grp_next;
299 448
300 aio_grp_dec (grp); 449 aio_grp_dec (grp);
301 } 450 }
302 451
452 if (SvTRUE (ERRSV))
453 {
454 req_free (req);
455 croak (0);
456 }
457}
458
459static void req_free (aio_req req)
460{
303 if (req->self) 461 if (req->self)
304 { 462 {
305 sv_unmagic (req->self, PERL_MAGIC_ext); 463 sv_unmagic (req->self, PERL_MAGIC_ext);
306 SvREFCNT_dec (req->self); 464 SvREFCNT_dec (req->self);
307 } 465 }
310 SvREFCNT_dec (req->fh); 468 SvREFCNT_dec (req->fh);
311 SvREFCNT_dec (req->fh2); 469 SvREFCNT_dec (req->fh2);
312 SvREFCNT_dec (req->callback); 470 SvREFCNT_dec (req->callback);
313 Safefree (req->statdata); 471 Safefree (req->statdata);
314 472
315 if (req->type == REQ_READDIR && req->result >= 0) 473 if (req->type == REQ_READDIR)
316 free (req->data2ptr); 474 free (req->data2ptr);
317 475
318 Safefree (req); 476 Safefree (req);
319} 477}
320 478
479static void req_cancel_subs (aio_req grp)
480{
481 aio_req sub;
482
483 if (grp->type != REQ_GROUP)
484 return;
485
486 SvREFCNT_dec (grp->fh2);
487 grp->fh2 = 0;
488
489 for (sub = grp->grp_first; sub; sub = sub->grp_next)
490 req_cancel (sub);
491}
492
321static void req_cancel (aio_req req) 493static void req_cancel (aio_req req)
322{ 494{
323 req->cancelled = 1; 495 req->flags |= FLAG_CANCELLED;
324 496
325 if (req->type == REQ_GROUP) 497 req_cancel_subs (req);
326 {
327 aio_req sub;
328
329 for (sub = req->grp_first; sub; sub = sub->grp_next)
330 req_cancel (sub);
331 }
332} 498}
333 499
334static int poll_cb () 500static int poll_cb ()
335{ 501{
336 dSP; 502 dSP;
338 int do_croak = 0; 504 int do_croak = 0;
339 aio_req req; 505 aio_req req;
340 506
341 for (;;) 507 for (;;)
342 { 508 {
343 pthread_mutex_lock (&reslock); 509 LOCK (reslock);
344 req = ress; 510 req = reqq_shift (&res_queue);
345 511
346 if (req) 512 if (req)
347 { 513 {
348 ress = req->next;
349
350 if (!ress) 514 if (!res_queue.size)
351 { 515 {
352 /* read any signals sent by the worker threads */ 516 /* read any signals sent by the worker threads */
353 char buf [32]; 517 char buf [32];
354 while (read (respipe [0], buf, 32) == 32) 518 while (read (respipe [0], buf, 32) == 32)
355 ; 519 ;
356
357 rese = 0;
358 } 520 }
359 } 521 }
360 522
361 pthread_mutex_unlock (&reslock); 523 UNLOCK (reslock);
362 524
363 if (!req) 525 if (!req)
364 break; 526 break;
365 527
366 --nreqs; 528 --nreqs;
401static void *aio_proc(void *arg); 563static void *aio_proc(void *arg);
402 564
403static void start_thread (void) 565static void start_thread (void)
404{ 566{
405 sigset_t fullsigset, oldsigset; 567 sigset_t fullsigset, oldsigset;
406 pthread_t tid;
407 pthread_attr_t attr; 568 pthread_attr_t attr;
569
570 worker *wrk = calloc (1, sizeof (worker));
571
572 if (!wrk)
573 croak ("unable to allocate worker thread data");
408 574
409 pthread_attr_init (&attr); 575 pthread_attr_init (&attr);
410 pthread_attr_setstacksize (&attr, STACKSIZE); 576 pthread_attr_setstacksize (&attr, STACKSIZE);
411 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 577 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
412 578
413 sigfillset (&fullsigset); 579 sigfillset (&fullsigset);
580
581 LOCK (wrklock);
414 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 582 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
415 583
416 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 584 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
585 {
586 wrk->prev = &wrk_first;
587 wrk->next = wrk_first.next;
588 wrk_first.next->prev = wrk;
589 wrk_first.next = wrk;
417 started++; 590 started++;
591 }
592 else
593 free (wrk);
418 594
419 sigprocmask (SIG_SETMASK, &oldsigset, 0); 595 sigprocmask (SIG_SETMASK, &oldsigset, 0);
596 UNLOCK (wrklock);
420} 597}
421 598
422static void req_send (aio_req req) 599static void req_send (aio_req req)
423{ 600{
424 while (started < wanted && nreqs >= started) 601 while (started < wanted && nreqs >= started)
425 start_thread (); 602 start_thread ();
426 603
427 ++nreqs; 604 ++nreqs;
428 605
429 pthread_mutex_lock (&reqlock); 606 LOCK (reqlock);
430 607 reqq_push (&req_queue, req);
431 req->next = 0;
432
433 if (reqe)
434 {
435 reqe->next = req;
436 reqe = req;
437 }
438 else
439 reqe = reqs = req;
440
441 pthread_cond_signal (&reqwait); 608 pthread_cond_signal (&reqwait);
442 pthread_mutex_unlock (&reqlock); 609 UNLOCK (reqlock);
443
444 if (nreqs > max_outstanding)
445 for (;;)
446 {
447 poll_cb ();
448
449 if (nreqs <= max_outstanding)
450 break;
451
452 poll_wait ();
453 }
454} 610}
455 611
456static void end_thread (void) 612static void end_thread (void)
457{ 613{
458 aio_req req; 614 aio_req req;
615
459 Newz (0, req, 1, aio_cb); 616 Newz (0, req, 1, aio_cb);
617
460 req->type = REQ_QUIT; 618 req->type = REQ_QUIT;
619 req->pri = PRI_MAX + PRI_BIAS;
461 620
462 req_send (req); 621 req_send (req);
463} 622}
464 623
465static void min_parallel (int nthreads) 624static void min_parallel (int nthreads)
517static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 676static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
518{ 677{
519 ssize_t res; 678 ssize_t res;
520 off_t ooffset; 679 off_t ooffset;
521 680
522 pthread_mutex_lock (&preadwritelock); 681 LOCK (preadwritelock);
523 ooffset = lseek (fd, 0, SEEK_CUR); 682 ooffset = lseek (fd, 0, SEEK_CUR);
524 lseek (fd, offset, SEEK_SET); 683 lseek (fd, offset, SEEK_SET);
525 res = read (fd, buf, count); 684 res = read (fd, buf, count);
526 lseek (fd, ooffset, SEEK_SET); 685 lseek (fd, ooffset, SEEK_SET);
527 pthread_mutex_unlock (&preadwritelock); 686 UNLOCK (preadwritelock);
528 687
529 return res; 688 return res;
530} 689}
531 690
532static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 691static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
533{ 692{
534 ssize_t res; 693 ssize_t res;
535 off_t ooffset; 694 off_t ooffset;
536 695
537 pthread_mutex_lock (&preadwritelock); 696 LOCK (preadwritelock);
538 ooffset = lseek (fd, 0, SEEK_CUR); 697 ooffset = lseek (fd, 0, SEEK_CUR);
539 lseek (fd, offset, SEEK_SET); 698 lseek (fd, offset, SEEK_SET);
540 res = write (fd, buf, count); 699 res = write (fd, buf, count);
541 lseek (fd, offset, SEEK_SET); 700 lseek (fd, offset, SEEK_SET);
542 pthread_mutex_unlock (&preadwritelock); 701 UNLOCK (preadwritelock);
543 702
544 return res; 703 return res;
545} 704}
546#endif 705#endif
547 706
548#if !HAVE_FDATASYNC 707#if !HAVE_FDATASYNC
549# define fdatasync fsync 708# define fdatasync fsync
550#endif 709#endif
551 710
552#if !HAVE_READAHEAD 711#if !HAVE_READAHEAD
553# define readahead aio_readahead 712# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
554 713
555static ssize_t readahead (int fd, off_t offset, size_t count) 714static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
556{ 715{
557 char readahead_buf[4096]; 716 dBUF;
558 717
559 while (count > 0) 718 while (count > 0)
560 { 719 {
561 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 720 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
562 721
563 pread (fd, readahead_buf, len, offset); 722 pread (fd, aio_buf, len, offset);
564 offset += len; 723 offset += len;
565 count -= len; 724 count -= len;
566 } 725 }
567 726
568 errno = 0; 727 errno = 0;
569} 728}
729
570#endif 730#endif
571 731
572#if !HAVE_READDIR_R 732#if !HAVE_READDIR_R
573# define readdir_r aio_readdir_r 733# define readdir_r aio_readdir_r
574 734
577static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 737static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
578{ 738{
579 struct dirent *e; 739 struct dirent *e;
580 int errorno; 740 int errorno;
581 741
582 pthread_mutex_lock (&readdirlock); 742 LOCK (readdirlock);
583 743
584 e = readdir (dirp); 744 e = readdir (dirp);
585 errorno = errno; 745 errorno = errno;
586 746
587 if (e) 747 if (e)
590 strcpy (ent->d_name, e->d_name); 750 strcpy (ent->d_name, e->d_name);
591 } 751 }
592 else 752 else
593 *res = 0; 753 *res = 0;
594 754
595 pthread_mutex_unlock (&readdirlock); 755 UNLOCK (readdirlock);
596 756
597 errno = errorno; 757 errno = errorno;
598 return e ? 0 : -1; 758 return e ? 0 : -1;
599} 759}
600#endif 760#endif
601 761
602/* sendfile always needs emulation */ 762/* sendfile always needs emulation */
603static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 763static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
604{ 764{
605 ssize_t res; 765 ssize_t res;
606 766
607 if (!count) 767 if (!count)
608 return 0; 768 return 0;
657#endif 817#endif
658 ) 818 )
659 ) 819 )
660 { 820 {
661 /* emulate sendfile. this is a major pain in the ass */ 821 /* emulate sendfile. this is a major pain in the ass */
662 char buf[4096]; 822 dBUF;
823
663 res = 0; 824 res = 0;
664 825
665 while (count) 826 while (count)
666 { 827 {
667 ssize_t cnt; 828 ssize_t cnt;
668 829
669 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 830 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
670 831
671 if (cnt <= 0) 832 if (cnt <= 0)
672 { 833 {
673 if (cnt && !res) res = -1; 834 if (cnt && !res) res = -1;
674 break; 835 break;
675 } 836 }
676 837
677 cnt = write (ofd, buf, cnt); 838 cnt = write (ofd, aio_buf, cnt);
678 839
679 if (cnt <= 0) 840 if (cnt <= 0)
680 { 841 {
681 if (cnt && !res) res = -1; 842 if (cnt && !res) res = -1;
682 break; 843 break;
690 851
691 return res; 852 return res;
692} 853}
693 854
694/* read a full directory */ 855/* read a full directory */
695static int scandir_ (const char *path, void **namesp) 856static void scandir_ (aio_req req, worker *self)
696{ 857{
697 DIR *dirp = opendir (path); 858 DIR *dirp;
698 union 859 union
699 { 860 {
700 struct dirent d; 861 struct dirent d;
701 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 862 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
702 } u; 863 } *u;
703 struct dirent *entp; 864 struct dirent *entp;
704 char *name, *names; 865 char *name, *names;
705 int memlen = 4096; 866 int memlen = 4096;
706 int memofs = 0; 867 int memofs = 0;
707 int res = 0; 868 int res = 0;
708 int errorno; 869 int errorno;
709 870
710 if (!dirp) 871 LOCK (wrklock);
711 return -1; 872 self->dirp = dirp = opendir (req->dataptr);
873 self->dbuf = u = malloc (sizeof (*u));
874 UNLOCK (wrklock);
712 875
713 names = malloc (memlen); 876 req->data2ptr = names = malloc (memlen);
714 877
878 if (dirp && u && names)
715 for (;;) 879 for (;;)
716 { 880 {
881 errno = 0;
717 errno = 0, readdir_r (dirp, &u.d, &entp); 882 readdir_r (dirp, &u->d, &entp);
718 883
719 if (!entp) 884 if (!entp)
720 break; 885 break;
721 886
722 name = entp->d_name; 887 name = entp->d_name;
723 888
724 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 889 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
725 { 890 {
726 int len = strlen (name) + 1; 891 int len = strlen (name) + 1;
727 892
728 res++; 893 res++;
729 894
730 while (memofs + len > memlen) 895 while (memofs + len > memlen)
731 { 896 {
732 memlen *= 2; 897 memlen *= 2;
898 LOCK (wrklock);
733 names = realloc (names, memlen); 899 req->data2ptr = names = realloc (names, memlen);
900 UNLOCK (wrklock);
901
734 if (!names) 902 if (!names)
735 break; 903 break;
736 } 904 }
737 905
738 memcpy (names + memofs, name, len); 906 memcpy (names + memofs, name, len);
739 memofs += len; 907 memofs += len;
740 } 908 }
741 } 909 }
742 910
743 errorno = errno;
744 closedir (dirp);
745
746 if (errorno) 911 if (errno)
747 {
748 free (names);
749 errno = errorno;
750 res = -1; 912 res = -1;
751 } 913
752 914 req->result = res;
753 *namesp = (void *)names;
754 return res;
755} 915}
756 916
757/*****************************************************************************/ 917/*****************************************************************************/
758 918
759static void *aio_proc (void *thr_arg) 919static void *aio_proc (void *thr_arg)
760{ 920{
761 aio_req req; 921 aio_req req;
762 int type; 922 int type;
923 worker *self = (worker *)thr_arg;
763 924
764 do 925 do
765 { 926 {
766 pthread_mutex_lock (&reqlock); 927 LOCK (reqlock);
767 928
768 for (;;) 929 for (;;)
769 { 930 {
770 req = reqs; 931 self->req = req = reqq_shift (&req_queue);
771
772 if (reqs)
773 {
774 reqs = reqs->next;
775 if (!reqs) reqe = 0;
776 }
777 932
778 if (req) 933 if (req)
779 break; 934 break;
780 935
781 pthread_cond_wait (&reqwait, &reqlock); 936 pthread_cond_wait (&reqwait, &reqlock);
782 } 937 }
783 938
784 pthread_mutex_unlock (&reqlock); 939 UNLOCK (reqlock);
785 940
786 errno = 0; /* strictly unnecessary */ 941 errno = 0; /* strictly unnecessary */
787
788 if (!req->cancelled)
789 switch (type = req->type) /* remember type for QUIT check */ 942 type = req->type; /* remember type for QUIT check */
943
944 if (!(req->flags & FLAG_CANCELLED))
945 switch (type)
790 { 946 {
791 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
792 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 948 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
793 949
794 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
795 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 951 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
796 952
797 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
798 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
799 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
800 956
806 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
807 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
808 964
809 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
810 case REQ_FSYNC: req->result = fsync (req->fd); break; 966 case REQ_FSYNC: req->result = fsync (req->fd); break;
811 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 967 case REQ_READDIR: scandir_ (req, self); break;
812 968
813 case REQ_SLEEP: 969 case REQ_BUSY:
814 { 970 {
815 struct timeval tv; 971 struct timeval tv;
816 972
817 tv.tv_sec = req->fd; 973 tv.tv_sec = req->fd;
818 tv.tv_usec = req->fd2; 974 tv.tv_usec = req->fd2;
819 975
820 req->result = select (0, 0, 0, 0, &tv); 976 req->result = select (0, 0, 0, 0, &tv);
821 } 977 }
822 978
979 case REQ_GROUP:
980 case REQ_NOP:
823 case REQ_QUIT: 981 case REQ_QUIT:
824 break; 982 break;
825 983
826 default: 984 default:
827 req->result = ENOSYS; 985 req->result = ENOSYS;
828 break; 986 break;
829 } 987 }
830 988
831 req->errorno = errno; 989 req->errorno = errno;
832 990
833 pthread_mutex_lock (&reslock); 991 LOCK (reslock);
834 992
835 req->next = 0; 993 if (!reqq_push (&res_queue, req))
836
837 printf ("queue rese %p\n", rese);//D
838 if (rese)
839 {
840 rese->next = req;
841 rese = req;
842 }
843 else
844 {
845 rese = ress = req;
846
847 /* write a dummy byte to the pipe so fh becomes ready */ 994 /* write a dummy byte to the pipe so fh becomes ready */
848 write (respipe [1], &respipe, 1); 995 write (respipe [1], &respipe, 1);
849 }
850 996
851 pthread_mutex_unlock (&reslock); 997 self->req = 0;
998 worker_clear (self);
999
1000 UNLOCK (reslock);
852 } 1001 }
853 while (type != REQ_QUIT); 1002 while (type != REQ_QUIT);
854 1003
1004 LOCK (wrklock);
1005 worker_free (self);
1006 UNLOCK (wrklock);
1007
855 return 0; 1008 return 0;
856} 1009}
857 1010
858/*****************************************************************************/ 1011/*****************************************************************************/
859 1012
860static void atfork_prepare (void) 1013static void atfork_prepare (void)
861{ 1014{
862 pthread_mutex_lock (&reqlock); 1015 LOCK (wrklock);
863 pthread_mutex_lock (&reslock); 1016 LOCK (reqlock);
1017 LOCK (reslock);
864#if !HAVE_PREADWRITE 1018#if !HAVE_PREADWRITE
865 pthread_mutex_lock (&preadwritelock); 1019 LOCK (preadwritelock);
866#endif 1020#endif
867#if !HAVE_READDIR_R 1021#if !HAVE_READDIR_R
868 pthread_mutex_lock (&readdirlock); 1022 LOCK (readdirlock);
869#endif 1023#endif
870} 1024}
871 1025
872static void atfork_parent (void) 1026static void atfork_parent (void)
873{ 1027{
874#if !HAVE_READDIR_R 1028#if !HAVE_READDIR_R
875 pthread_mutex_unlock (&readdirlock); 1029 UNLOCK (readdirlock);
876#endif 1030#endif
877#if !HAVE_PREADWRITE 1031#if !HAVE_PREADWRITE
878 pthread_mutex_unlock (&preadwritelock); 1032 UNLOCK (preadwritelock);
879#endif 1033#endif
880 pthread_mutex_unlock (&reslock); 1034 UNLOCK (reslock);
881 pthread_mutex_unlock (&reqlock); 1035 UNLOCK (reqlock);
1036 UNLOCK (wrklock);
882} 1037}
883 1038
884static void atfork_child (void) 1039static void atfork_child (void)
885{ 1040{
886 aio_req prv; 1041 aio_req prv;
887 1042
1043 while (prv = reqq_shift (&req_queue))
1044 req_free (prv);
1045
1046 while (prv = reqq_shift (&res_queue))
1047 req_free (prv);
1048
1049 while (wrk_first.next != &wrk_first)
1050 {
1051 worker *wrk = wrk_first.next;
1052
1053 if (wrk->req)
1054 req_free (wrk->req);
1055
1056 worker_clear (wrk);
1057 worker_free (wrk);
1058 }
1059
888 started = 0; 1060 started = 0;
889 1061 nreqs = 0;
890 while (reqs)
891 {
892 prv = reqs;
893 reqs = prv->next;
894 req_free (prv);
895 }
896
897 reqs = reqe = 0;
898
899 while (ress)
900 {
901 prv = ress;
902 ress = prv->next;
903 req_free (prv);
904 }
905
906 ress = rese = 0;
907 1062
908 close (respipe [0]); 1063 close (respipe [0]);
909 close (respipe [1]); 1064 close (respipe [1]);
910 create_pipe (); 1065 create_pipe ();
911 1066
912 atfork_parent (); 1067 atfork_parent ();
913} 1068}
914 1069
915#define dREQ \ 1070#define dREQ \
916 aio_req req; \ 1071 aio_req req; \
1072 int req_pri = next_pri; \
1073 next_pri = DEFAULT_PRI + PRI_BIAS; \
917 \ 1074 \
918 if (SvOK (callback) && !SvROK (callback)) \ 1075 if (SvOK (callback) && !SvROK (callback)) \
919 croak ("callback must be undef or of reference type"); \ 1076 croak ("callback must be undef or of reference type"); \
920 \ 1077 \
921 Newz (0, req, 1, aio_cb); \ 1078 Newz (0, req, 1, aio_cb); \
922 if (!req) \ 1079 if (!req) \
923 croak ("out of memory during aio_req allocation"); \ 1080 croak ("out of memory during aio_req allocation"); \
924 \ 1081 \
925 req->callback = newSVsv (callback) 1082 req->callback = newSVsv (callback); \
1083 req->pri = req_pri
926 1084
927#define REQ_SEND \ 1085#define REQ_SEND \
928 req_send (req); \ 1086 req_send (req); \
929 \ 1087 \
930 if (GIMME_V != G_VOID) \ 1088 if (GIMME_V != G_VOID) \
952 1110
953void 1111void
954max_parallel (nthreads) 1112max_parallel (nthreads)
955 int nthreads 1113 int nthreads
956 PROTOTYPE: $ 1114 PROTOTYPE: $
957
958int
959max_outstanding (nreqs)
960 int nreqs
961 PROTOTYPE: $
962 CODE:
963 RETVAL = max_outstanding;
964 max_outstanding = nreqs;
965 1115
966void 1116void
967aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1117aio_open (pathname,flags,mode,callback=&PL_sv_undef)
968 SV * pathname 1118 SV * pathname
969 int flags 1119 int flags
1184 1334
1185 REQ_SEND; 1335 REQ_SEND;
1186} 1336}
1187 1337
1188void 1338void
1189aio_sleep (delay,callback=&PL_sv_undef) 1339aio_busy (delay,callback=&PL_sv_undef)
1190 double delay 1340 double delay
1191 SV * callback 1341 SV * callback
1192 PPCODE: 1342 PPCODE:
1193{ 1343{
1194 dREQ; 1344 dREQ;
1195 1345
1196 req->type = REQ_SLEEP; 1346 req->type = REQ_BUSY;
1197 req->fd = delay < 0. ? 0 : delay; 1347 req->fd = delay < 0. ? 0 : delay;
1198 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1199 1349
1200 REQ_SEND; 1350 REQ_SEND;
1201} 1351}
1205 SV * callback 1355 SV * callback
1206 PROTOTYPE: ;$ 1356 PROTOTYPE: ;$
1207 PPCODE: 1357 PPCODE:
1208{ 1358{
1209 dREQ; 1359 dREQ;
1360
1210 req->type = REQ_GROUP; 1361 req->type = REQ_GROUP;
1211 req_send (req); 1362 req_send (req);
1363
1212 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1364 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1213} 1365}
1366
1367void
1368aio_nop (callback=&PL_sv_undef)
1369 SV * callback
1370 PPCODE:
1371{
1372 dREQ;
1373
1374 req->type = REQ_NOP;
1375
1376 REQ_SEND;
1377}
1378
1379void
1380aioreq_pri (int pri = DEFAULT_PRI)
1381 CODE:
1382 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS;
1385
1386void
1387aioreq_nice (int nice = 0)
1388 CODE:
1389 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS;
1214 1393
1215void 1394void
1216flush () 1395flush ()
1217 PROTOTYPE: 1396 PROTOTYPE:
1218 CODE: 1397 CODE:
1267 1446
1268MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1447MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1269 1448
1270void 1449void
1271cancel (aio_req_ornot req) 1450cancel (aio_req_ornot req)
1272 PROTOTYPE:
1273 CODE: 1451 CODE:
1274 req_cancel (req); 1452 req_cancel (req);
1275 1453
1454void
1455cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1456 CODE:
1457 SvREFCNT_dec (req->callback);
1458 req->callback = newSVsv (callback);
1459
1276MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1460MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1277 1461
1278void 1462void
1279add (aio_req grp, ...) 1463add (aio_req grp, ...)
1280 PPCODE: 1464 PPCODE:
1281{ 1465{
1282 int i; 1466 int i;
1467 aio_req req;
1283 1468
1284 if (grp->fd == 2) 1469 if (grp->fd == 2)
1285 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1470 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1286 1471
1287 for (i = 1; i < items; ++i ) 1472 for (i = 1; i < items; ++i )
1288 { 1473 {
1289 if (GIMME_V != G_VOID) 1474 if (GIMME_V != G_VOID)
1290 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1475 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1291 1476
1292 aio_req req = SvAIO_REQ (ST (i)); 1477 req = SvAIO_REQ (ST (i));
1293 1478
1294 if (req) 1479 if (req)
1295 { 1480 {
1296 ++grp->length; 1481 ++grp->length;
1297 req->grp = grp; 1482 req->grp = grp;
1306 } 1491 }
1307 } 1492 }
1308} 1493}
1309 1494
1310void 1495void
1496cancel_subs (aio_req_ornot req)
1497 CODE:
1498 req_cancel_subs (req);
1499
1500void
1311result (aio_req grp, ...) 1501result (aio_req grp, ...)
1312 CODE: 1502 CODE:
1313{ 1503{
1314 int i; 1504 int i;
1315 AV *av = newAV (); 1505 AV *av = newAV ();
1320 SvREFCNT_dec (grp->data); 1510 SvREFCNT_dec (grp->data);
1321 grp->data = (SV *)av; 1511 grp->data = (SV *)av;
1322} 1512}
1323 1513
1324void 1514void
1325lock (aio_req grp)
1326 CODE:
1327 ++grp->length;
1328
1329void
1330unlock (aio_req grp)
1331 CODE:
1332 aio_grp_dec (grp);
1333
1334void
1335feeder_limit (aio_req grp, int limit) 1515limit (aio_req grp, int limit)
1336 CODE: 1516 CODE:
1337 grp->fd2 = limit; 1517 grp->fd2 = limit;
1338 aio_grp_feed (grp); 1518 aio_grp_feed (grp);
1339 1519
1340void 1520void
1341set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1521feed (aio_req grp, SV *callback=&PL_sv_undef)
1342 CODE: 1522 CODE:
1343{ 1523{
1344 SvREFCNT_dec (grp->fh2); 1524 SvREFCNT_dec (grp->fh2);
1345 grp->fh2 = newSVsv (callback); 1525 grp->fh2 = newSVsv (callback);
1346 1526

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines