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.49 by root, Sun Oct 22 13:33:28 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 ();
248static void req_invoke (aio_req req);
106static void req_free (aio_req req); 249static void req_free (aio_req req);
250static void req_cancel (aio_req req);
107 251
108/* must be called at most once */ 252/* must be called at most once */
109static SV *req_sv (aio_req req, const char *klass) 253static SV *req_sv (aio_req req, const char *klass)
110{ 254{
111 if (!req->self) 255 if (!req->self)
117 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)));
118} 262}
119 263
120static aio_req SvAIO_REQ (SV *sv) 264static aio_req SvAIO_REQ (SV *sv)
121{ 265{
266 MAGIC *mg;
267
122 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 268 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
123 croak ("object of class " AIO_REQ_KLASS " expected"); 269 croak ("object of class " AIO_REQ_KLASS " expected");
124 270
125 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 271 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
126 272
127 return mg ? (aio_req)mg->mg_ptr : 0; 273 return mg ? (aio_req)mg->mg_ptr : 0;
128} 274}
129 275
130static void aio_grp_feed (aio_req grp) 276static void aio_grp_feed (aio_req grp)
131{ 277{
132 while (grp->length < grp->fd2) 278 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
133 { 279 {
134 int old_len = grp->length; 280 int old_len = grp->length;
135 281
136 if (grp->fh2 && SvOK (grp->fh2)) 282 if (grp->fh2 && SvOK (grp->fh2))
137 { 283 {
140 ENTER; 286 ENTER;
141 SAVETMPS; 287 SAVETMPS;
142 PUSHMARK (SP); 288 PUSHMARK (SP);
143 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 289 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
144 PUTBACK; 290 PUTBACK;
145 call_sv (grp->fh2, G_VOID | G_EVAL); 291 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
146 SPAGAIN; 292 SPAGAIN;
147 FREETMPS; 293 FREETMPS;
148 LEAVE; 294 LEAVE;
149 } 295 }
150 296
156 break; 302 break;
157 } 303 }
158 } 304 }
159} 305}
160 306
307static void aio_grp_dec (aio_req grp)
308{
309 --grp->length;
310
311 /* call feeder, if applicable */
312 aio_grp_feed (grp);
313
314 /* finish, if done */
315 if (!grp->length && grp->fd)
316 {
317 req_invoke (grp);
318 req_free (grp);
319 }
320}
321
161static void poll_wait () 322static void poll_wait ()
162{ 323{
163 if (nreqs && !ress)
164 {
165 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
166 FD_ZERO(&rfd); 340 FD_ZERO(&rfd);
167 FD_SET(respipe [0], &rfd); 341 FD_SET(respipe [0], &rfd);
168 342
169 select (respipe [0] + 1, &rfd, 0, 0, 0); 343 select (respipe [0] + 1, &rfd, 0, 0, 0);
170 } 344 }
171} 345}
172 346
173static void req_invoke (aio_req req) 347static void req_invoke (aio_req req)
174{ 348{
175 dSP; 349 dSP;
176 int errorno = errno;
177 350
178 if (req->cancelled || !SvOK (req->callback)) 351 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
179 return; 352 {
180
181 errno = req->errorno; 353 errno = req->errorno;
182 354
183 ENTER; 355 ENTER;
184 SAVETMPS; 356 SAVETMPS;
185 PUSHMARK (SP); 357 PUSHMARK (SP);
186 EXTEND (SP, 1); 358 EXTEND (SP, 1);
187 359
188 switch (req->type) 360 switch (req->type)
189 {
190 case REQ_READDIR:
191 { 361 {
192 SV *rv = &PL_sv_undef; 362 case REQ_READDIR:
193
194 if (req->result >= 0)
195 { 363 {
196 char *buf = req->data2ptr; 364 SV *rv = &PL_sv_undef;
197 AV *av = newAV ();
198 365
199 while (req->result) 366 if (req->result >= 0)
200 { 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 {
201 SV *sv = newSVpv (buf, 0); 376 SV *sv = newSVpv (buf, 0);
202 377
203 av_push (av, sv); 378 av_store (av, i, sv);
204 buf += SvCUR (sv) + 1; 379 buf += SvCUR (sv) + 1;
205 req->result--; 380 }
381
382 rv = sv_2mortal (newRV_noinc ((SV *)av));
206 } 383 }
207 384
208 rv = sv_2mortal (newRV_noinc ((SV *)av)); 385 PUSHs (rv);
209 } 386 }
387 break;
210 388
211 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;
212 } 427 }
213 break;
214 428
215 case REQ_OPEN:
216 {
217 /* convert fd to fh */
218 SV *fh;
219 429
220 PUSHs (sv_2mortal (newSViv (req->result)));
221 PUTBACK; 430 PUTBACK;
222 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
223 SPAGAIN;
224
225 fh = SvREFCNT_inc (POPs);
226
227 PUSHMARK (SP);
228 XPUSHs (sv_2mortal (fh));
229 }
230 break;
231
232 case REQ_GROUP:
233 req->fd = 2; /* mark group as finished */
234
235 if (req->data)
236 {
237 int i;
238 AV *av = (AV *)req->data;
239
240 EXTEND (SP, AvFILL (av) + 1);
241 for (i = 0; i <= AvFILL (av); ++i)
242 PUSHs (*av_fetch (av, i, 0));
243 }
244 break;
245
246 case REQ_SLEEP:
247 break;
248
249 default:
250 PUSHs (sv_2mortal (newSViv (req->result)));
251 break;
252 }
253
254
255 PUTBACK;
256 call_sv (req->callback, G_VOID | G_EVAL); 431 call_sv (req->callback, G_VOID | G_EVAL);
257 SPAGAIN; 432 SPAGAIN;
258 433
259 if (SvTRUE (ERRSV))
260 {
261 req_free (req);
262 croak (0);
263 }
264
265 FREETMPS; 434 FREETMPS;
266 LEAVE; 435 LEAVE;
436 }
267 437
268 errno = errorno;
269}
270
271static void req_free (aio_req req)
272{
273 if (req->grp) 438 if (req->grp)
274 { 439 {
275 aio_req grp = req->grp; 440 aio_req grp = req->grp;
276 441
277 /* unlink request */ 442 /* unlink request */
279 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next; 444 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
280 445
281 if (grp->grp_first == req) 446 if (grp->grp_first == req)
282 grp->grp_first = req->grp_next; 447 grp->grp_first = req->grp_next;
283 448
284 --grp->length;
285
286 /* call feeder, if applicable */
287 aio_grp_feed (grp); 449 aio_grp_dec (grp);
450 }
288 451
289 /* finish, if done */ 452 if (SvTRUE (ERRSV))
290 if (!grp->length && grp->fd) 453 {
291 {
292 req_invoke (grp);
293 req_free (grp); 454 req_free (req);
294 } 455 croak (0);
295 } 456 }
457}
296 458
459static void req_free (aio_req req)
460{
297 if (req->self) 461 if (req->self)
298 { 462 {
299 sv_unmagic (req->self, PERL_MAGIC_ext); 463 sv_unmagic (req->self, PERL_MAGIC_ext);
300 SvREFCNT_dec (req->self); 464 SvREFCNT_dec (req->self);
301 } 465 }
304 SvREFCNT_dec (req->fh); 468 SvREFCNT_dec (req->fh);
305 SvREFCNT_dec (req->fh2); 469 SvREFCNT_dec (req->fh2);
306 SvREFCNT_dec (req->callback); 470 SvREFCNT_dec (req->callback);
307 Safefree (req->statdata); 471 Safefree (req->statdata);
308 472
309 if (req->type == REQ_READDIR && req->result >= 0) 473 if (req->type == REQ_READDIR)
310 free (req->data2ptr); 474 free (req->data2ptr);
311 475
312 Safefree (req); 476 Safefree (req);
313} 477}
314 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
315static void req_cancel (aio_req req) 493static void req_cancel (aio_req req)
316{ 494{
317 req->cancelled = 1; 495 req->flags |= FLAG_CANCELLED;
318 496
319 if (req->type == REQ_GROUP) 497 req_cancel_subs (req);
320 {
321 aio_req sub;
322
323 for (sub = req->grp_first; sub; sub = sub->grp_next)
324 req_cancel (sub);
325 }
326} 498}
327 499
328static int poll_cb () 500static int poll_cb ()
329{ 501{
330 dSP; 502 dSP;
332 int do_croak = 0; 504 int do_croak = 0;
333 aio_req req; 505 aio_req req;
334 506
335 for (;;) 507 for (;;)
336 { 508 {
337 pthread_mutex_lock (&reslock); 509 LOCK (reslock);
338 req = ress; 510 req = reqq_shift (&res_queue);
339 511
340 if (req) 512 if (req)
341 { 513 {
342 ress = req->next;
343
344 if (!ress) 514 if (!res_queue.size)
345 { 515 {
346 /* read any signals sent by the worker threads */ 516 /* read any signals sent by the worker threads */
347 char buf [32]; 517 char buf [32];
348 while (read (respipe [0], buf, 32) == 32) 518 while (read (respipe [0], buf, 32) == 32)
349 ; 519 ;
350
351 rese = 0;
352 } 520 }
353 } 521 }
354 522
355 pthread_mutex_unlock (&reslock); 523 UNLOCK (reslock);
356 524
357 if (!req) 525 if (!req)
358 break; 526 break;
359 527
360 nreqs--; 528 --nreqs;
361 529
362 if (req->type == REQ_QUIT) 530 if (req->type == REQ_QUIT)
363 started--; 531 started--;
364 else if (req->type == REQ_GROUP && req->length) 532 else if (req->type == REQ_GROUP && req->length)
365 { 533 {
395static void *aio_proc(void *arg); 563static void *aio_proc(void *arg);
396 564
397static void start_thread (void) 565static void start_thread (void)
398{ 566{
399 sigset_t fullsigset, oldsigset; 567 sigset_t fullsigset, oldsigset;
400 pthread_t tid;
401 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");
402 574
403 pthread_attr_init (&attr); 575 pthread_attr_init (&attr);
404 pthread_attr_setstacksize (&attr, STACKSIZE); 576 pthread_attr_setstacksize (&attr, STACKSIZE);
405 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 577 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
406 578
407 sigfillset (&fullsigset); 579 sigfillset (&fullsigset);
580
581 LOCK (wrklock);
408 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 582 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
409 583
410 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;
411 started++; 590 started++;
591 }
592 else
593 free (wrk);
412 594
413 sigprocmask (SIG_SETMASK, &oldsigset, 0); 595 sigprocmask (SIG_SETMASK, &oldsigset, 0);
596 UNLOCK (wrklock);
414} 597}
415 598
416static void req_send (aio_req req) 599static void req_send (aio_req req)
417{ 600{
418 while (started < wanted && nreqs >= started) 601 while (started < wanted && nreqs >= started)
419 start_thread (); 602 start_thread ();
420 603
421 nreqs++; 604 ++nreqs;
422 605
423 pthread_mutex_lock (&reqlock); 606 LOCK (reqlock);
424 607 reqq_push (&req_queue, req);
425 req->next = 0;
426
427 if (reqe)
428 {
429 reqe->next = req;
430 reqe = req;
431 }
432 else
433 reqe = reqs = req;
434
435 pthread_cond_signal (&reqwait); 608 pthread_cond_signal (&reqwait);
436 pthread_mutex_unlock (&reqlock); 609 UNLOCK (reqlock);
437
438 if (nreqs > max_outstanding)
439 for (;;)
440 {
441 poll_cb ();
442
443 if (nreqs <= max_outstanding)
444 break;
445
446 poll_wait ();
447 }
448} 610}
449 611
450static void end_thread (void) 612static void end_thread (void)
451{ 613{
452 aio_req req; 614 aio_req req;
615
453 Newz (0, req, 1, aio_cb); 616 Newz (0, req, 1, aio_cb);
617
454 req->type = REQ_QUIT; 618 req->type = REQ_QUIT;
619 req->pri = PRI_MAX + PRI_BIAS;
455 620
456 req_send (req); 621 req_send (req);
457} 622}
458 623
459static void min_parallel (int nthreads) 624static void min_parallel (int nthreads)
511static 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)
512{ 677{
513 ssize_t res; 678 ssize_t res;
514 off_t ooffset; 679 off_t ooffset;
515 680
516 pthread_mutex_lock (&preadwritelock); 681 LOCK (preadwritelock);
517 ooffset = lseek (fd, 0, SEEK_CUR); 682 ooffset = lseek (fd, 0, SEEK_CUR);
518 lseek (fd, offset, SEEK_SET); 683 lseek (fd, offset, SEEK_SET);
519 res = read (fd, buf, count); 684 res = read (fd, buf, count);
520 lseek (fd, ooffset, SEEK_SET); 685 lseek (fd, ooffset, SEEK_SET);
521 pthread_mutex_unlock (&preadwritelock); 686 UNLOCK (preadwritelock);
522 687
523 return res; 688 return res;
524} 689}
525 690
526static 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)
527{ 692{
528 ssize_t res; 693 ssize_t res;
529 off_t ooffset; 694 off_t ooffset;
530 695
531 pthread_mutex_lock (&preadwritelock); 696 LOCK (preadwritelock);
532 ooffset = lseek (fd, 0, SEEK_CUR); 697 ooffset = lseek (fd, 0, SEEK_CUR);
533 lseek (fd, offset, SEEK_SET); 698 lseek (fd, offset, SEEK_SET);
534 res = write (fd, buf, count); 699 res = write (fd, buf, count);
535 lseek (fd, offset, SEEK_SET); 700 lseek (fd, offset, SEEK_SET);
536 pthread_mutex_unlock (&preadwritelock); 701 UNLOCK (preadwritelock);
537 702
538 return res; 703 return res;
539} 704}
540#endif 705#endif
541 706
542#if !HAVE_FDATASYNC 707#if !HAVE_FDATASYNC
543# define fdatasync fsync 708# define fdatasync fsync
544#endif 709#endif
545 710
546#if !HAVE_READAHEAD 711#if !HAVE_READAHEAD
547# define readahead aio_readahead 712# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
548 713
549static 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)
550{ 715{
551 char readahead_buf[4096]; 716 dBUF;
552 717
553 while (count > 0) 718 while (count > 0)
554 { 719 {
555 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 720 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
556 721
557 pread (fd, readahead_buf, len, offset); 722 pread (fd, aio_buf, len, offset);
558 offset += len; 723 offset += len;
559 count -= len; 724 count -= len;
560 } 725 }
561 726
562 errno = 0; 727 errno = 0;
563} 728}
729
564#endif 730#endif
565 731
566#if !HAVE_READDIR_R 732#if !HAVE_READDIR_R
567# define readdir_r aio_readdir_r 733# define readdir_r aio_readdir_r
568 734
571static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 737static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
572{ 738{
573 struct dirent *e; 739 struct dirent *e;
574 int errorno; 740 int errorno;
575 741
576 pthread_mutex_lock (&readdirlock); 742 LOCK (readdirlock);
577 743
578 e = readdir (dirp); 744 e = readdir (dirp);
579 errorno = errno; 745 errorno = errno;
580 746
581 if (e) 747 if (e)
584 strcpy (ent->d_name, e->d_name); 750 strcpy (ent->d_name, e->d_name);
585 } 751 }
586 else 752 else
587 *res = 0; 753 *res = 0;
588 754
589 pthread_mutex_unlock (&readdirlock); 755 UNLOCK (readdirlock);
590 756
591 errno = errorno; 757 errno = errorno;
592 return e ? 0 : -1; 758 return e ? 0 : -1;
593} 759}
594#endif 760#endif
595 761
596/* sendfile always needs emulation */ 762/* sendfile always needs emulation */
597static 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)
598{ 764{
599 ssize_t res; 765 ssize_t res;
600 766
601 if (!count) 767 if (!count)
602 return 0; 768 return 0;
651#endif 817#endif
652 ) 818 )
653 ) 819 )
654 { 820 {
655 /* emulate sendfile. this is a major pain in the ass */ 821 /* emulate sendfile. this is a major pain in the ass */
656 char buf[4096]; 822 dBUF;
823
657 res = 0; 824 res = 0;
658 825
659 while (count) 826 while (count)
660 { 827 {
661 ssize_t cnt; 828 ssize_t cnt;
662 829
663 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 830 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
664 831
665 if (cnt <= 0) 832 if (cnt <= 0)
666 { 833 {
667 if (cnt && !res) res = -1; 834 if (cnt && !res) res = -1;
668 break; 835 break;
669 } 836 }
670 837
671 cnt = write (ofd, buf, cnt); 838 cnt = write (ofd, aio_buf, cnt);
672 839
673 if (cnt <= 0) 840 if (cnt <= 0)
674 { 841 {
675 if (cnt && !res) res = -1; 842 if (cnt && !res) res = -1;
676 break; 843 break;
684 851
685 return res; 852 return res;
686} 853}
687 854
688/* read a full directory */ 855/* read a full directory */
689static int scandir_ (const char *path, void **namesp) 856static void scandir_ (aio_req req, worker *self)
690{ 857{
691 DIR *dirp = opendir (path); 858 DIR *dirp;
692 union 859 union
693 { 860 {
694 struct dirent d; 861 struct dirent d;
695 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 862 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
696 } u; 863 } *u;
697 struct dirent *entp; 864 struct dirent *entp;
698 char *name, *names; 865 char *name, *names;
699 int memlen = 4096; 866 int memlen = 4096;
700 int memofs = 0; 867 int memofs = 0;
701 int res = 0; 868 int res = 0;
702 int errorno; 869 int errorno;
703 870
704 if (!dirp) 871 LOCK (wrklock);
705 return -1; 872 self->dirp = dirp = opendir (req->dataptr);
873 self->dbuf = u = malloc (sizeof (*u));
874 UNLOCK (wrklock);
706 875
707 names = malloc (memlen); 876 req->data2ptr = names = malloc (memlen);
708 877
878 if (dirp && u && names)
709 for (;;) 879 for (;;)
710 { 880 {
881 errno = 0;
711 errno = 0, readdir_r (dirp, &u.d, &entp); 882 readdir_r (dirp, &u->d, &entp);
712 883
713 if (!entp) 884 if (!entp)
714 break; 885 break;
715 886
716 name = entp->d_name; 887 name = entp->d_name;
717 888
718 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 889 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
719 { 890 {
720 int len = strlen (name) + 1; 891 int len = strlen (name) + 1;
721 892
722 res++; 893 res++;
723 894
724 while (memofs + len > memlen) 895 while (memofs + len > memlen)
725 { 896 {
726 memlen *= 2; 897 memlen *= 2;
898 LOCK (wrklock);
727 names = realloc (names, memlen); 899 req->data2ptr = names = realloc (names, memlen);
900 UNLOCK (wrklock);
901
728 if (!names) 902 if (!names)
729 break; 903 break;
730 } 904 }
731 905
732 memcpy (names + memofs, name, len); 906 memcpy (names + memofs, name, len);
733 memofs += len; 907 memofs += len;
734 } 908 }
735 } 909 }
736 910
737 errorno = errno;
738 closedir (dirp);
739
740 if (errorno) 911 if (errno)
741 {
742 free (names);
743 errno = errorno;
744 res = -1; 912 res = -1;
745 } 913
746 914 req->result = res;
747 *namesp = (void *)names;
748 return res;
749} 915}
750 916
751/*****************************************************************************/ 917/*****************************************************************************/
752 918
753static void *aio_proc (void *thr_arg) 919static void *aio_proc (void *thr_arg)
754{ 920{
755 aio_req req; 921 aio_req req;
756 int type; 922 int type;
923 worker *self = (worker *)thr_arg;
757 924
758 do 925 do
759 { 926 {
760 pthread_mutex_lock (&reqlock); 927 LOCK (reqlock);
761 928
762 for (;;) 929 for (;;)
763 { 930 {
764 req = reqs; 931 self->req = req = reqq_shift (&req_queue);
765
766 if (reqs)
767 {
768 reqs = reqs->next;
769 if (!reqs) reqe = 0;
770 }
771 932
772 if (req) 933 if (req)
773 break; 934 break;
774 935
775 pthread_cond_wait (&reqwait, &reqlock); 936 pthread_cond_wait (&reqwait, &reqlock);
776 } 937 }
777 938
778 pthread_mutex_unlock (&reqlock); 939 UNLOCK (reqlock);
779 940
780 errno = 0; /* strictly unnecessary */ 941 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
781 943
782 if (!req->cancelled) 944 if (!(req->flags & FLAG_CANCELLED))
783 switch (req->type) 945 switch (type)
784 { 946 {
785 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;
786 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;
787 949
788 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;
789 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;
790 952
791 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
792 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
793 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
794 956
800 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
801 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
802 964
803 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
804 case REQ_FSYNC: req->result = fsync (req->fd); break; 966 case REQ_FSYNC: req->result = fsync (req->fd); break;
805 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 967 case REQ_READDIR: scandir_ (req, self); break;
806 968
807 case REQ_SLEEP: 969 case REQ_BUSY:
808 { 970 {
809 struct timeval tv; 971 struct timeval tv;
810 972
811 tv.tv_sec = req->fd; 973 tv.tv_sec = req->fd;
812 tv.tv_usec = req->fd2; 974 tv.tv_usec = req->fd2;
813 975
814 req->result = select (0, 0, 0, 0, &tv); 976 req->result = select (0, 0, 0, 0, &tv);
815 } 977 }
816 978
979 case REQ_GROUP:
980 case REQ_NOP:
817 case REQ_QUIT: 981 case REQ_QUIT:
818 break; 982 break;
819 983
820 default: 984 default:
821 req->result = ENOSYS; 985 req->result = ENOSYS;
822 break; 986 break;
823 } 987 }
824 988
825 req->errorno = errno; 989 req->errorno = errno;
826 990
827 pthread_mutex_lock (&reslock); 991 LOCK (reslock);
828 992
829 req->next = 0; 993 if (!reqq_push (&res_queue, req))
830
831 if (rese)
832 {
833 rese->next = req;
834 rese = req;
835 }
836 else
837 {
838 rese = ress = req;
839
840 /* write a dummy byte to the pipe so fh becomes ready */ 994 /* write a dummy byte to the pipe so fh becomes ready */
841 write (respipe [1], &respipe, 1); 995 write (respipe [1], &respipe, 1);
842 }
843 996
844 pthread_mutex_unlock (&reslock); 997 self->req = 0;
998 worker_clear (self);
999
1000 UNLOCK (reslock);
845 } 1001 }
846 while (type != REQ_QUIT); 1002 while (type != REQ_QUIT);
847 1003
1004 LOCK (wrklock);
1005 worker_free (self);
1006 UNLOCK (wrklock);
1007
848 return 0; 1008 return 0;
849} 1009}
850 1010
851/*****************************************************************************/ 1011/*****************************************************************************/
852 1012
853static void atfork_prepare (void) 1013static void atfork_prepare (void)
854{ 1014{
855 pthread_mutex_lock (&reqlock); 1015 LOCK (wrklock);
856 pthread_mutex_lock (&reslock); 1016 LOCK (reqlock);
1017 LOCK (reslock);
857#if !HAVE_PREADWRITE 1018#if !HAVE_PREADWRITE
858 pthread_mutex_lock (&preadwritelock); 1019 LOCK (preadwritelock);
859#endif 1020#endif
860#if !HAVE_READDIR_R 1021#if !HAVE_READDIR_R
861 pthread_mutex_lock (&readdirlock); 1022 LOCK (readdirlock);
862#endif 1023#endif
863} 1024}
864 1025
865static void atfork_parent (void) 1026static void atfork_parent (void)
866{ 1027{
867#if !HAVE_READDIR_R 1028#if !HAVE_READDIR_R
868 pthread_mutex_unlock (&readdirlock); 1029 UNLOCK (readdirlock);
869#endif 1030#endif
870#if !HAVE_PREADWRITE 1031#if !HAVE_PREADWRITE
871 pthread_mutex_unlock (&preadwritelock); 1032 UNLOCK (preadwritelock);
872#endif 1033#endif
873 pthread_mutex_unlock (&reslock); 1034 UNLOCK (reslock);
874 pthread_mutex_unlock (&reqlock); 1035 UNLOCK (reqlock);
1036 UNLOCK (wrklock);
875} 1037}
876 1038
877static void atfork_child (void) 1039static void atfork_child (void)
878{ 1040{
879 aio_req prv; 1041 aio_req prv;
880 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
881 started = 0; 1060 started = 0;
882 1061 nreqs = 0;
883 while (reqs)
884 {
885 prv = reqs;
886 reqs = prv->next;
887 req_free (prv);
888 }
889
890 reqs = reqe = 0;
891
892 while (ress)
893 {
894 prv = ress;
895 ress = prv->next;
896 req_free (prv);
897 }
898
899 ress = rese = 0;
900 1062
901 close (respipe [0]); 1063 close (respipe [0]);
902 close (respipe [1]); 1064 close (respipe [1]);
903 create_pipe (); 1065 create_pipe ();
904 1066
905 atfork_parent (); 1067 atfork_parent ();
906} 1068}
907 1069
908#define dREQ \ 1070#define dREQ \
909 aio_req req; \ 1071 aio_req req; \
1072 int req_pri = next_pri; \
1073 next_pri = DEFAULT_PRI + PRI_BIAS; \
910 \ 1074 \
911 if (SvOK (callback) && !SvROK (callback)) \ 1075 if (SvOK (callback) && !SvROK (callback)) \
912 croak ("callback must be undef or of reference type"); \ 1076 croak ("callback must be undef or of reference type"); \
913 \ 1077 \
914 Newz (0, req, 1, aio_cb); \ 1078 Newz (0, req, 1, aio_cb); \
915 if (!req) \ 1079 if (!req) \
916 croak ("out of memory during aio_req allocation"); \ 1080 croak ("out of memory during aio_req allocation"); \
917 \ 1081 \
918 req->callback = newSVsv (callback) 1082 req->callback = newSVsv (callback); \
1083 req->pri = req_pri
919 1084
920#define REQ_SEND \ 1085#define REQ_SEND \
921 req_send (req); \ 1086 req_send (req); \
922 \ 1087 \
923 if (GIMME_V != G_VOID) \ 1088 if (GIMME_V != G_VOID) \
945 1110
946void 1111void
947max_parallel (nthreads) 1112max_parallel (nthreads)
948 int nthreads 1113 int nthreads
949 PROTOTYPE: $ 1114 PROTOTYPE: $
950
951int
952max_outstanding (nreqs)
953 int nreqs
954 PROTOTYPE: $
955 CODE:
956 RETVAL = max_outstanding;
957 max_outstanding = nreqs;
958 1115
959void 1116void
960aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1117aio_open (pathname,flags,mode,callback=&PL_sv_undef)
961 SV * pathname 1118 SV * pathname
962 int flags 1119 int flags
1177 1334
1178 REQ_SEND; 1335 REQ_SEND;
1179} 1336}
1180 1337
1181void 1338void
1182aio_sleep (delay,callback=&PL_sv_undef) 1339aio_busy (delay,callback=&PL_sv_undef)
1183 double delay 1340 double delay
1184 SV * callback 1341 SV * callback
1185 PPCODE: 1342 PPCODE:
1186{ 1343{
1187 dREQ; 1344 dREQ;
1188 1345
1189 req->type = REQ_SLEEP; 1346 req->type = REQ_BUSY;
1190 req->fd = delay < 0. ? 0 : delay; 1347 req->fd = delay < 0. ? 0 : delay;
1191 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1192 1349
1193 REQ_SEND; 1350 REQ_SEND;
1194} 1351}
1198 SV * callback 1355 SV * callback
1199 PROTOTYPE: ;$ 1356 PROTOTYPE: ;$
1200 PPCODE: 1357 PPCODE:
1201{ 1358{
1202 dREQ; 1359 dREQ;
1360
1203 req->type = REQ_GROUP; 1361 req->type = REQ_GROUP;
1204 req_send (req); 1362 req_send (req);
1363
1205 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1364 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1206} 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;
1207 1393
1208void 1394void
1209flush () 1395flush ()
1210 PROTOTYPE: 1396 PROTOTYPE:
1211 CODE: 1397 CODE:
1260 1446
1261MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1447MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1262 1448
1263void 1449void
1264cancel (aio_req_ornot req) 1450cancel (aio_req_ornot req)
1265 PROTOTYPE:
1266 CODE: 1451 CODE:
1267 req_cancel (req); 1452 req_cancel (req);
1268 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
1269MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1460MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1270 1461
1271void 1462void
1272add (aio_req grp, ...) 1463add (aio_req grp, ...)
1273 PPCODE: 1464 PPCODE:
1274{ 1465{
1275 int i; 1466 int i;
1467 aio_req req;
1276 1468
1277 if (grp->fd == 2) 1469 if (grp->fd == 2)
1278 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");
1279 1471
1280 for (i = 1; i < items; ++i ) 1472 for (i = 1; i < items; ++i )
1281 { 1473 {
1282 if (GIMME_V != G_VOID) 1474 if (GIMME_V != G_VOID)
1283 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1475 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1284 1476
1285 aio_req req = SvAIO_REQ (ST (i)); 1477 req = SvAIO_REQ (ST (i));
1286 1478
1287 if (req) 1479 if (req)
1288 { 1480 {
1289 ++grp->length; 1481 ++grp->length;
1290 req->grp = grp; 1482 req->grp = grp;
1299 } 1491 }
1300 } 1492 }
1301} 1493}
1302 1494
1303void 1495void
1496cancel_subs (aio_req_ornot req)
1497 CODE:
1498 req_cancel_subs (req);
1499
1500void
1304result (aio_req grp, ...) 1501result (aio_req grp, ...)
1305 CODE: 1502 CODE:
1306{ 1503{
1307 int i; 1504 int i;
1308 AV *av = newAV (); 1505 AV *av = newAV ();
1309 1506
1310 for (i = 1; i < items; ++i ) 1507 for (i = 1; i < items; ++i )
1311 av_push (av, newSVsv (ST (i))); 1508 av_push (av, newSVsv (ST (i)));
1312 1509
1313 SvREFCNT_dec (grp->data); 1510 SvREFCNT_dec (grp->data);
1314 grp->data = (SV *)av; 1511 grp->data = (SV *)av;
1315} 1512}
1316 1513
1317void 1514void
1318feeder_limit (aio_req grp, int limit) 1515limit (aio_req grp, int limit)
1319 CODE: 1516 CODE:
1320 grp->fd2 = limit; 1517 grp->fd2 = limit;
1321 aio_grp_feed (grp); 1518 aio_grp_feed (grp);
1322 1519
1323void 1520void
1324set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1521feed (aio_req grp, SV *callback=&PL_sv_undef)
1325 CODE: 1522 CODE:
1326{ 1523{
1327 SvREFCNT_dec (grp->fh2); 1524 SvREFCNT_dec (grp->fh2);
1328 grp->fh2 = newSVsv (callback); 1525 grp->fh2 = newSVsv (callback);
1329 1526

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines