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.64 by root, Mon Oct 23 23:54:41 2006 UTC vs.
Revision 1.88 by root, Mon Oct 30 23:43:17 2006 UTC

1#if __linux 1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
2# define _GNU_SOURCE 5# define _GNU_SOURCE
3#endif 6#endif
4 7
8/* just in case */
5#define _REENTRANT 1 9#define _REENTRANT 1
6 10
7#include <errno.h> 11#include <errno.h>
8 12
9#include "EXTERN.h" 13#include "EXTERN.h"
39# else 43# else
40# error sendfile support requested but not available 44# error sendfile support requested but not available
41# endif 45# endif
42#endif 46#endif
43 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
44/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
45#ifndef NAME_MAX 52#ifndef NAME_MAX
46# define NAME_MAX 4096 53# define NAME_MAX 4096
47#endif 54#endif
48 55
56#ifndef PTHREAD_STACK_MIN
57/* care for broken platforms, e.g. windows */
58# define PTHREAD_STACK_MIN 16384
59#endif
60
49#if __ia64 61#if __ia64
50# define STACKSIZE 65536 62# define STACKSIZE 65536
63#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
64# define STACKSIZE PTHREAD_STACK_MIN
51#else 65#else
52# define STACKSIZE 8192 66# define STACKSIZE 16384
53#endif 67#endif
68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
81/* buffer size for various temporary buffers */
82#define AIO_BUFSIZE 65536
83
84#define dBUF \
85 char *aio_buf; \
86 LOCK (wrklock); \
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \
89 if (!aio_buf) \
90 return -1;
54 91
55enum { 92enum {
56 REQ_QUIT, 93 REQ_QUIT,
57 REQ_OPEN, REQ_CLOSE, 94 REQ_OPEN, REQ_CLOSE,
58 REQ_READ, REQ_WRITE, REQ_READAHEAD, 95 REQ_READ, REQ_WRITE, REQ_READAHEAD,
59 REQ_SENDFILE, 96 REQ_SENDFILE,
60 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
61 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
62 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
63 REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
64 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
65 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
66 REQ_SLEEP, 103 REQ_BUSY,
67}; 104};
68 105
69#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
70#define AIO_GRP_KLASS "IO::AIO::GRP" 107#define AIO_GRP_KLASS "IO::AIO::GRP"
71 108
72typedef struct aio_cb 109typedef struct aio_cb
73{ 110{
74 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
75 112
76 SV *data, *callback; 113 SV *callback, *fh;
77 SV *fh, *fh2; 114 SV *sv1, *sv2;
78 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
79 Stat_t *statdata;
80 off_t offset; 116 off_t offs;
81 size_t length; 117 size_t size;
82 ssize_t result; 118 ssize_t result;
83 119
84 STRLEN dataoffset; 120 STRLEN stroffset;
85 int type; 121 int type;
86 int fd, fd2; 122 int int1, int2;
87 int errorno; 123 int errorno;
88 mode_t mode; /* open */ 124 mode_t mode; /* open */
89 125
90 unsigned char flags; 126 unsigned char flags;
91 unsigned char pri; 127 unsigned char pri;
93 SV *self; /* the perl counterpart of this request, if any */ 129 SV *self; /* the perl counterpart of this request, if any */
94 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 130 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
95} aio_cb; 131} aio_cb;
96 132
97enum { 133enum {
98 FLAG_CANCELLED = 0x01, 134 FLAG_CANCELLED = 0x01,
135 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
136 FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */
99}; 137};
100 138
101typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
102typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
103 141
105 PRI_MIN = -4, 143 PRI_MIN = -4,
106 PRI_MAX = 4, 144 PRI_MAX = 4,
107 145
108 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
109 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
110}; 149};
111 150
151#define AIO_TICKS ((1000000 + 1023) >> 10)
152
153static unsigned int max_poll_time = 0;
154static unsigned int max_poll_reqs = 0;
155
156/* calculcate time difference in ~1/AIO_TICKS of a second */
157static int tvdiff (struct timeval *tv1, struct timeval *tv2)
158{
159 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
160 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
161}
162
112static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
113 164
114static int started, wanted; 165static unsigned int started, idle, wanted;
115static volatile int nreqs;
116static int max_outstanding = 1<<30;
117static int respipe [2];
118 166
119#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
120# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
121#else 169#else
122# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
123#endif 171#endif
124 172
173#define LOCK(mutex) pthread_mutex_lock (&(mutex))
174#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
175
176/* worker threads management */
177static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
178
179typedef struct worker {
180 /* locked by wrklock */
181 struct worker *prev, *next;
182
183 pthread_t tid;
184
185 /* locked by reslock, reqlock or wrklock */
186 aio_req req; /* currently processed request */
187 void *dbuf;
188 DIR *dirp;
189} worker;
190
191static worker wrk_first = { &wrk_first, &wrk_first, 0 };
192
193static void worker_clear (worker *wrk)
194{
195 if (wrk->dirp)
196 {
197 closedir (wrk->dirp);
198 wrk->dirp = 0;
199 }
200
201 if (wrk->dbuf)
202 {
203 free (wrk->dbuf);
204 wrk->dbuf = 0;
205 }
206}
207
208static void worker_free (worker *wrk)
209{
210 wrk->next->prev = wrk->prev;
211 wrk->prev->next = wrk->next;
212
213 free (wrk);
214}
215
216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
218static volatile unsigned int max_outstanding = 0xffffffff;
219static int respipe [2];
220
125static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
126static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
127static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
128 224
129static volatile aio_req reqs, reqe; /* queue start, queue end */ 225#if WORDACCESS_UNSAFE
130static volatile aio_req ress, rese; /* queue start, queue end */
131 226
227static unsigned int get_nready ()
228{
229 unsigned int retval;
230
231 LOCK (reqlock);
232 retval = nready;
233 UNLOCK (reqlock);
234
235 return retval;
236}
237
238static unsigned int get_npending ()
239{
240 unsigned int retval;
241
242 LOCK (reslock);
243 retval = npending;
244 UNLOCK (reslock);
245
246 return retval;
247}
248
249static unsigned int get_nthreads ()
250{
251 unsigned int retval;
252
253 LOCK (wrklock);
254 retval = started;
255 UNLOCK (wrklock);
256
257 return retval;
258}
259
260#else
261
262# define get_nready() nready
263# define get_npending() npending
264# define get_nthreads() started
265
266#endif
267
268/*
269 * a somewhat faster data structure might be nice, but
270 * with 8 priorities this actually needs <20 insns
271 * per shift, the most expensive operation.
272 */
273typedef struct {
274 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
275 int size;
276} reqq;
277
278static reqq req_queue;
279static reqq res_queue;
280
281int reqq_push (reqq *q, aio_req req)
282{
283 int pri = req->pri;
284 req->next = 0;
285
286 if (q->qe[pri])
287 {
288 q->qe[pri]->next = req;
289 q->qe[pri] = req;
290 }
291 else
292 q->qe[pri] = q->qs[pri] = req;
293
294 return q->size++;
295}
296
297aio_req reqq_shift (reqq *q)
298{
299 int pri;
300
301 if (!q->size)
302 return 0;
303
304 --q->size;
305
306 for (pri = NUM_PRI; pri--; )
307 {
308 aio_req req = q->qs[pri];
309
310 if (req)
311 {
312 if (!(q->qs[pri] = req->next))
313 q->qe[pri] = 0;
314
315 return req;
316 }
317 }
318
319 abort ();
320}
321
322static int poll_cb ();
132static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
133static void req_free (aio_req req); 324static void req_free (aio_req req);
325static void req_cancel (aio_req req);
134 326
135/* must be called at most once */ 327/* must be called at most once */
136static SV *req_sv (aio_req req, const char *klass) 328static SV *req_sv (aio_req req, const char *klass)
137{ 329{
138 if (!req->self) 330 if (!req->self)
156 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
157} 349}
158 350
159static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
160{ 352{
161 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
162 { 354 {
163 int old_len = grp->length; 355 int old_len = grp->size;
164 356
165 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
166 { 358 {
167 dSP; 359 dSP;
168 360
169 ENTER; 361 ENTER;
170 SAVETMPS; 362 SAVETMPS;
171 PUSHMARK (SP); 363 PUSHMARK (SP);
172 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
173 PUTBACK; 365 PUTBACK;
174 call_sv (grp->fh2, G_VOID | G_EVAL); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
175 SPAGAIN; 367 SPAGAIN;
176 FREETMPS; 368 FREETMPS;
177 LEAVE; 369 LEAVE;
178 } 370 }
179 371
180 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
181 if (old_len == grp->length) 373 if (old_len == grp->size)
182 { 374 {
183 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
184 grp->fh2 = 0; 376 grp->sv2 = 0;
185 break; 377 break;
186 } 378 }
187 } 379 }
188} 380}
189 381
190static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
191{ 383{
192 --grp->length; 384 --grp->size;
193 385
194 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
195 aio_grp_feed (grp); 387 aio_grp_feed (grp);
196 388
197 /* finish, if done */ 389 /* finish, if done */
198 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
199 { 391 {
200 req_invoke (grp); 392 req_invoke (grp);
201 req_free (grp); 393 req_free (grp);
202 } 394 }
203} 395}
204 396
205static void poll_wait () 397static void req_invoke (aio_req req)
206{ 398{
207 fd_set rfd; 399 dSP;
208 400
209 while (nreqs) 401 if (req->flags & FLAG_SV1_RO_OFF)
402 SvREADONLY_off (req->sv1);
403
404 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
210 { 405 {
211 aio_req req; 406 ENTER;
212#if !(__x86 || __x86_64) /* safe without sempahore on this archs */ 407 SAVETMPS;
213 pthread_mutex_lock (&reslock); 408 PUSHMARK (SP);
214#endif 409 EXTEND (SP, 1);
215 req = ress;
216#if !(__x86 || __x86_64) /* safe without sempahore on this archs */
217 pthread_mutex_unlock (&reslock);
218#endif
219 410
220 if (req) 411 switch (req->type)
221 return; 412 {
413 case REQ_READDIR:
414 {
415 SV *rv = &PL_sv_undef;
222 416
223 FD_ZERO(&rfd); 417 if (req->result >= 0)
224 FD_SET(respipe [0], &rfd); 418 {
419 int i;
420 char *buf = req->ptr2;
421 AV *av = newAV ();
225 422
226 select (respipe [0] + 1, &rfd, 0, 0, 0); 423 av_extend (av, req->result - 1);
424
425 for (i = 0; i < req->result; ++i)
426 {
427 SV *sv = newSVpv (buf, 0);
428
429 av_store (av, i, sv);
430 buf += SvCUR (sv) + 1;
431 }
432
433 rv = sv_2mortal (newRV_noinc ((SV *)av));
434 }
435
436 PUSHs (rv);
437 }
438 break;
439
440 case REQ_OPEN:
441 {
442 /* convert fd to fh */
443 SV *fh;
444
445 PUSHs (sv_2mortal (newSViv (req->result)));
446 PUTBACK;
447 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
448 SPAGAIN;
449
450 fh = SvREFCNT_inc (POPs);
451
452 PUSHMARK (SP);
453 XPUSHs (sv_2mortal (fh));
454 }
455 break;
456
457 case REQ_GROUP:
458 req->int1 = 2; /* mark group as finished */
459
460 if (req->sv1)
461 {
462 int i;
463 AV *av = (AV *)req->sv1;
464
465 EXTEND (SP, AvFILL (av) + 1);
466 for (i = 0; i <= AvFILL (av); ++i)
467 PUSHs (*av_fetch (av, i, 0));
468 }
469 break;
470
471 case REQ_NOP:
472 case REQ_BUSY:
473 break;
474
475 case REQ_READLINK:
476 if (req->result > 0)
477 {
478 SvCUR_set (req->sv1, req->result);
479 *SvEND (req->sv1) = 0;
480 PUSHs (req->sv1);
481 }
482 break;
483
484 case REQ_STAT:
485 case REQ_LSTAT:
486 case REQ_FSTAT:
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(Stat_t *)(req->ptr2);
490 PUSHs (sv_2mortal (newSViv (req->result)));
491 break;
492
493 case REQ_READ:
494 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
495 *SvEND (req->sv1) = 0;
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
498
499 default:
500 PUSHs (sv_2mortal (newSViv (req->result)));
501 break;
502 }
503
504 errno = req->errorno;
505
506 PUTBACK;
507 call_sv (req->callback, G_VOID | G_EVAL);
508 SPAGAIN;
509
510 FREETMPS;
511 LEAVE;
227 } 512 }
228}
229 513
230static void req_invoke (aio_req req) 514 if (req->grp)
231{
232 dSP;
233 int errorno = errno;
234
235 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
236 return;
237
238 errno = req->errorno;
239
240 ENTER;
241 SAVETMPS;
242 PUSHMARK (SP);
243 EXTEND (SP, 1);
244
245 switch (req->type)
246 { 515 {
247 case REQ_READDIR: 516 aio_req grp = req->grp;
248 {
249 SV *rv = &PL_sv_undef;
250 517
251 if (req->result >= 0) 518 /* unlink request */
252 { 519 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
253 char *buf = req->data2ptr; 520 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
254 AV *av = newAV ();
255 521
256 while (req->result) 522 if (grp->grp_first == req)
257 { 523 grp->grp_first = req->grp_next;
258 SV *sv = newSVpv (buf, 0);
259 524
260 av_push (av, sv); 525 aio_grp_dec (grp);
261 buf += SvCUR (sv) + 1;
262 req->result--;
263 }
264
265 rv = sv_2mortal (newRV_noinc ((SV *)av));
266 }
267
268 PUSHs (rv);
269 }
270 break;
271
272 case REQ_OPEN:
273 {
274 /* convert fd to fh */
275 SV *fh;
276
277 PUSHs (sv_2mortal (newSViv (req->result)));
278 PUTBACK;
279 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
280 SPAGAIN;
281
282 fh = SvREFCNT_inc (POPs);
283
284 PUSHMARK (SP);
285 XPUSHs (sv_2mortal (fh));
286 }
287 break;
288
289 case REQ_GROUP:
290 req->fd = 2; /* mark group as finished */
291
292 if (req->data)
293 {
294 int i;
295 AV *av = (AV *)req->data;
296
297 EXTEND (SP, AvFILL (av) + 1);
298 for (i = 0; i <= AvFILL (av); ++i)
299 PUSHs (*av_fetch (av, i, 0));
300 }
301 break;
302
303 case REQ_NOP:
304 case REQ_SLEEP:
305 break;
306
307 default:
308 PUSHs (sv_2mortal (newSViv (req->result)));
309 break;
310 } 526 }
311
312
313 PUTBACK;
314 call_sv (req->callback, G_VOID | G_EVAL);
315 SPAGAIN;
316
317 FREETMPS;
318 LEAVE;
319
320 errno = errorno;
321 527
322 if (SvTRUE (ERRSV)) 528 if (SvTRUE (ERRSV))
323 { 529 {
324 req_free (req); 530 req_free (req);
325 croak (0); 531 croak (0);
326 } 532 }
327} 533}
328 534
329static void req_free (aio_req req) 535static void req_free (aio_req req)
330{ 536{
331 if (req->grp)
332 {
333 aio_req grp = req->grp;
334
335 /* unlink request */
336 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
337 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
338
339 if (grp->grp_first == req)
340 grp->grp_first = req->grp_next;
341
342 aio_grp_dec (grp);
343 }
344
345 if (req->self) 537 if (req->self)
346 { 538 {
347 sv_unmagic (req->self, PERL_MAGIC_ext); 539 sv_unmagic (req->self, PERL_MAGIC_ext);
348 SvREFCNT_dec (req->self); 540 SvREFCNT_dec (req->self);
349 } 541 }
350 542
351 SvREFCNT_dec (req->data);
352 SvREFCNT_dec (req->fh); 543 SvREFCNT_dec (req->fh);
544 SvREFCNT_dec (req->sv1);
353 SvREFCNT_dec (req->fh2); 545 SvREFCNT_dec (req->sv2);
354 SvREFCNT_dec (req->callback); 546 SvREFCNT_dec (req->callback);
355 Safefree (req->statdata);
356 547
357 if (req->type == REQ_READDIR && req->result >= 0) 548 if (req->flags & FLAG_PTR2_FREE)
358 free (req->data2ptr); 549 free (req->ptr2);
359 550
360 Safefree (req); 551 Safefree (req);
361} 552}
362 553
554static void req_cancel_subs (aio_req grp)
555{
556 aio_req sub;
557
558 if (grp->type != REQ_GROUP)
559 return;
560
561 SvREFCNT_dec (grp->sv2);
562 grp->sv2 = 0;
563
564 for (sub = grp->grp_first; sub; sub = sub->grp_next)
565 req_cancel (sub);
566}
567
363static void req_cancel (aio_req req) 568static void req_cancel (aio_req req)
364{ 569{
365 req->flags |= FLAG_CANCELLED; 570 req->flags |= FLAG_CANCELLED;
366 571
367 if (req->type == REQ_GROUP) 572 req_cancel_subs (req);
368 {
369 aio_req sub;
370
371 for (sub = req->grp_first; sub; sub = sub->grp_next)
372 req_cancel (sub);
373 }
374}
375
376static int poll_cb ()
377{
378 dSP;
379 int count = 0;
380 int do_croak = 0;
381 aio_req req;
382
383 for (;;)
384 {
385 pthread_mutex_lock (&reslock);
386 req = ress;
387
388 if (req)
389 {
390 ress = req->next;
391
392 if (!ress)
393 {
394 /* read any signals sent by the worker threads */
395 char buf [32];
396 while (read (respipe [0], buf, 32) == 32)
397 ;
398
399 rese = 0;
400 }
401 }
402
403 pthread_mutex_unlock (&reslock);
404
405 if (!req)
406 break;
407
408 --nreqs;
409
410 if (req->type == REQ_QUIT)
411 started--;
412 else if (req->type == REQ_GROUP && req->length)
413 {
414 req->fd = 1; /* mark request as delayed */
415 continue;
416 }
417 else
418 {
419 if (req->type == REQ_READ)
420 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
421
422 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
423 SvREADONLY_off (req->data);
424
425 if (req->statdata)
426 {
427 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
428 PL_laststatval = req->result;
429 PL_statcache = *(req->statdata);
430 }
431
432 req_invoke (req);
433
434 count++;
435 }
436
437 req_free (req);
438 }
439
440 return count;
441} 573}
442 574
443static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
444 576
445static void start_thread (void) 577static void start_thread (void)
446{ 578{
447 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
448 pthread_t tid;
449 pthread_attr_t attr; 580 pthread_attr_t attr;
581
582 worker *wrk = calloc (1, sizeof (worker));
583
584 if (!wrk)
585 croak ("unable to allocate worker thread data");
450 586
451 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
452 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
453 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
590#ifdef PTHREAD_SCOPE_PROCESS
591 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
592#endif
454 593
455 sigfillset (&fullsigset); 594 sigfillset (&fullsigset);
595
596 LOCK (wrklock);
456 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 597 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
457 598
458 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 599 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
459 started++;
460
461 sigprocmask (SIG_SETMASK, &oldsigset, 0);
462}
463
464static void req_send (aio_req req)
465{
466 while (started < wanted && nreqs >= started)
467 start_thread ();
468
469 ++nreqs;
470
471 pthread_mutex_lock (&reqlock);
472
473 req->next = 0;
474
475 if (reqe)
476 { 600 {
477 reqe->next = req; 601 wrk->prev = &wrk_first;
478 reqe = req; 602 wrk->next = wrk_first.next;
603 wrk_first.next->prev = wrk;
604 wrk_first.next = wrk;
605 ++started;
479 } 606 }
480 else 607 else
481 reqe = reqs = req; 608 free (wrk);
482 609
610 sigprocmask (SIG_SETMASK, &oldsigset, 0);
611 UNLOCK (wrklock);
612}
613
614static void maybe_start_thread ()
615{
616 if (get_nthreads () >= wanted)
617 return;
618
619 /* todo: maybe use idle here, but might be less exact */
620 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
621 return;
622
623 start_thread ();
624}
625
626static void req_send (aio_req req)
627{
628 ++nreqs;
629
630 LOCK (reqlock);
631 ++nready;
632 reqq_push (&req_queue, req);
483 pthread_cond_signal (&reqwait); 633 pthread_cond_signal (&reqwait);
484 pthread_mutex_unlock (&reqlock); 634 UNLOCK (reqlock);
485 635
486 if (nreqs > max_outstanding) 636 maybe_start_thread ();
487 for (;;)
488 {
489 poll_cb ();
490
491 if (nreqs <= max_outstanding)
492 break;
493
494 poll_wait ();
495 }
496} 637}
497 638
498static void end_thread (void) 639static void end_thread (void)
499{ 640{
500 aio_req req; 641 aio_req req;
642
501 Newz (0, req, 1, aio_cb); 643 Newz (0, req, 1, aio_cb);
644
502 req->type = REQ_QUIT; 645 req->type = REQ_QUIT;
646 req->pri = PRI_MAX + PRI_BIAS;
503 647
504 req_send (req); 648 LOCK (reqlock);
649 reqq_push (&req_queue, req);
650 pthread_cond_signal (&reqwait);
651 UNLOCK (reqlock);
652
653 LOCK (wrklock);
654 --started;
655 UNLOCK (wrklock);
656}
657
658static void set_max_idle (int nthreads)
659{
660 if (WORDACCESS_UNSAFE) LOCK (reqlock);
661 max_idle = nthreads <= 0 ? 1 : nthreads;
662 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
505} 663}
506 664
507static void min_parallel (int nthreads) 665static void min_parallel (int nthreads)
508{ 666{
509 if (wanted < nthreads) 667 if (wanted < nthreads)
510 wanted = nthreads; 668 wanted = nthreads;
511} 669}
512 670
513static void max_parallel (int nthreads) 671static void max_parallel (int nthreads)
514{ 672{
515 int cur = started;
516
517 if (wanted > nthreads) 673 if (wanted > nthreads)
518 wanted = nthreads; 674 wanted = nthreads;
519 675
520 while (cur > wanted) 676 while (started > wanted)
677 end_thread ();
678}
679
680static void poll_wait ()
681{
682 fd_set rfd;
683
684 while (nreqs)
521 { 685 {
686 int size;
687 if (WORDACCESS_UNSAFE) LOCK (reslock);
688 size = res_queue.size;
689 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
690
691 if (size)
692 return;
693
522 end_thread (); 694 maybe_start_thread ();
523 cur--; 695
696 FD_ZERO(&rfd);
697 FD_SET(respipe [0], &rfd);
698
699 select (respipe [0] + 1, &rfd, 0, 0, 0);
524 } 700 }
701}
525 702
526 while (started > wanted) 703static int poll_cb ()
704{
705 dSP;
706 int count = 0;
707 int maxreqs = max_poll_reqs;
708 int do_croak = 0;
709 struct timeval tv_start, tv_now;
710 aio_req req;
711
712 if (max_poll_time)
713 gettimeofday (&tv_start, 0);
714
715 for (;;)
527 { 716 {
717 for (;;)
718 {
719 maybe_start_thread ();
720
721 LOCK (reslock);
722 req = reqq_shift (&res_queue);
723
724 if (req)
725 {
726 --npending;
727
728 if (!res_queue.size)
729 {
730 /* read any signals sent by the worker threads */
731 char buf [32];
732 while (read (respipe [0], buf, 32) == 32)
733 ;
734 }
735 }
736
737 UNLOCK (reslock);
738
739 if (!req)
740 break;
741
742 --nreqs;
743
744 if (req->type == REQ_GROUP && req->size)
745 {
746 req->int1 = 1; /* mark request as delayed */
747 continue;
748 }
749 else
750 {
751 req_invoke (req);
752
753 count++;
754 }
755
756 req_free (req);
757
758 if (maxreqs && !--maxreqs)
759 break;
760
761 if (max_poll_time)
762 {
763 gettimeofday (&tv_now, 0);
764
765 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
766 break;
767 }
768 }
769
770 if (nreqs <= max_outstanding)
771 break;
772
528 poll_wait (); 773 poll_wait ();
529 poll_cb (); 774
775 ++maxreqs;
530 } 776 }
777
778 return count;
531} 779}
532 780
533static void create_pipe () 781static void create_pipe ()
534{ 782{
535 if (pipe (respipe)) 783 if (pipe (respipe))
559static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 807static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
560{ 808{
561 ssize_t res; 809 ssize_t res;
562 off_t ooffset; 810 off_t ooffset;
563 811
564 pthread_mutex_lock (&preadwritelock); 812 LOCK (preadwritelock);
565 ooffset = lseek (fd, 0, SEEK_CUR); 813 ooffset = lseek (fd, 0, SEEK_CUR);
566 lseek (fd, offset, SEEK_SET); 814 lseek (fd, offset, SEEK_SET);
567 res = read (fd, buf, count); 815 res = read (fd, buf, count);
568 lseek (fd, ooffset, SEEK_SET); 816 lseek (fd, ooffset, SEEK_SET);
569 pthread_mutex_unlock (&preadwritelock); 817 UNLOCK (preadwritelock);
570 818
571 return res; 819 return res;
572} 820}
573 821
574static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 822static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
575{ 823{
576 ssize_t res; 824 ssize_t res;
577 off_t ooffset; 825 off_t ooffset;
578 826
579 pthread_mutex_lock (&preadwritelock); 827 LOCK (preadwritelock);
580 ooffset = lseek (fd, 0, SEEK_CUR); 828 ooffset = lseek (fd, 0, SEEK_CUR);
581 lseek (fd, offset, SEEK_SET); 829 lseek (fd, offset, SEEK_SET);
582 res = write (fd, buf, count); 830 res = write (fd, buf, count);
583 lseek (fd, offset, SEEK_SET); 831 lseek (fd, offset, SEEK_SET);
584 pthread_mutex_unlock (&preadwritelock); 832 UNLOCK (preadwritelock);
585 833
586 return res; 834 return res;
587} 835}
588#endif 836#endif
589 837
590#if !HAVE_FDATASYNC 838#if !HAVE_FDATASYNC
591# define fdatasync fsync 839# define fdatasync fsync
592#endif 840#endif
593 841
594#if !HAVE_READAHEAD 842#if !HAVE_READAHEAD
595# define readahead aio_readahead 843# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
596 844
597static ssize_t readahead (int fd, off_t offset, size_t count) 845static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
598{ 846{
599 char readahead_buf[4096]; 847 dBUF;
600 848
601 while (count > 0) 849 while (count > 0)
602 { 850 {
603 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 851 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
604 852
605 pread (fd, readahead_buf, len, offset); 853 pread (fd, aio_buf, len, offset);
606 offset += len; 854 offset += len;
607 count -= len; 855 count -= len;
608 } 856 }
609 857
610 errno = 0; 858 errno = 0;
611} 859}
860
612#endif 861#endif
613 862
614#if !HAVE_READDIR_R 863#if !HAVE_READDIR_R
615# define readdir_r aio_readdir_r 864# define readdir_r aio_readdir_r
616 865
619static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 868static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
620{ 869{
621 struct dirent *e; 870 struct dirent *e;
622 int errorno; 871 int errorno;
623 872
624 pthread_mutex_lock (&readdirlock); 873 LOCK (readdirlock);
625 874
626 e = readdir (dirp); 875 e = readdir (dirp);
627 errorno = errno; 876 errorno = errno;
628 877
629 if (e) 878 if (e)
632 strcpy (ent->d_name, e->d_name); 881 strcpy (ent->d_name, e->d_name);
633 } 882 }
634 else 883 else
635 *res = 0; 884 *res = 0;
636 885
637 pthread_mutex_unlock (&readdirlock); 886 UNLOCK (readdirlock);
638 887
639 errno = errorno; 888 errno = errorno;
640 return e ? 0 : -1; 889 return e ? 0 : -1;
641} 890}
642#endif 891#endif
643 892
644/* sendfile always needs emulation */ 893/* sendfile always needs emulation */
645static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 894static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
646{ 895{
647 ssize_t res; 896 ssize_t res;
648 897
649 if (!count) 898 if (!count)
650 return 0; 899 return 0;
661 { 910 {
662 off_t sbytes; 911 off_t sbytes;
663 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 912 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
664 913
665 if (res < 0 && sbytes) 914 if (res < 0 && sbytes)
666 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 915 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
667 res = sbytes; 916 res = sbytes;
668 } 917 }
669 918
670# elif __hpux 919# elif __hpux
671 res = sendfile (ofd, ifd, offset, count, 0, 0); 920 res = sendfile (ofd, ifd, offset, count, 0, 0);
699#endif 948#endif
700 ) 949 )
701 ) 950 )
702 { 951 {
703 /* emulate sendfile. this is a major pain in the ass */ 952 /* emulate sendfile. this is a major pain in the ass */
704 char buf[4096]; 953 dBUF;
954
705 res = 0; 955 res = 0;
706 956
707 while (count) 957 while (count)
708 { 958 {
709 ssize_t cnt; 959 ssize_t cnt;
710 960
711 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 961 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
712 962
713 if (cnt <= 0) 963 if (cnt <= 0)
714 { 964 {
715 if (cnt && !res) res = -1; 965 if (cnt && !res) res = -1;
716 break; 966 break;
717 } 967 }
718 968
719 cnt = write (ofd, buf, cnt); 969 cnt = write (ofd, aio_buf, cnt);
720 970
721 if (cnt <= 0) 971 if (cnt <= 0)
722 { 972 {
723 if (cnt && !res) res = -1; 973 if (cnt && !res) res = -1;
724 break; 974 break;
732 982
733 return res; 983 return res;
734} 984}
735 985
736/* read a full directory */ 986/* read a full directory */
737static int scandir_ (const char *path, void **namesp) 987static void scandir_ (aio_req req, worker *self)
738{ 988{
739 DIR *dirp = opendir (path); 989 DIR *dirp;
740 union 990 union
741 { 991 {
742 struct dirent d; 992 struct dirent d;
743 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 993 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
744 } u; 994 } *u;
745 struct dirent *entp; 995 struct dirent *entp;
746 char *name, *names; 996 char *name, *names;
747 int memlen = 4096; 997 int memlen = 4096;
748 int memofs = 0; 998 int memofs = 0;
749 int res = 0; 999 int res = 0;
750 int errorno; 1000 int errorno;
751 1001
752 if (!dirp) 1002 LOCK (wrklock);
753 return -1; 1003 self->dirp = dirp = opendir (req->ptr1);
754 1004 self->dbuf = u = malloc (sizeof (*u));
1005 req->flags |= FLAG_PTR2_FREE;
755 names = malloc (memlen); 1006 req->ptr2 = names = malloc (memlen);
1007 UNLOCK (wrklock);
1008
1009 if (dirp && u && names)
1010 for (;;)
1011 {
1012 errno = 0;
1013 readdir_r (dirp, &u->d, &entp);
1014
1015 if (!entp)
1016 break;
1017
1018 name = entp->d_name;
1019
1020 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1021 {
1022 int len = strlen (name) + 1;
1023
1024 res++;
1025
1026 while (memofs + len > memlen)
1027 {
1028 memlen *= 2;
1029 LOCK (wrklock);
1030 req->ptr2 = names = realloc (names, memlen);
1031 UNLOCK (wrklock);
1032
1033 if (!names)
1034 break;
1035 }
1036
1037 memcpy (names + memofs, name, len);
1038 memofs += len;
1039 }
1040 }
1041
1042 if (errno)
1043 res = -1;
1044
1045 req->result = res;
1046}
1047
1048/*****************************************************************************/
1049
1050static void *aio_proc (void *thr_arg)
1051{
1052 aio_req req;
1053 struct timespec ts;
1054 worker *self = (worker *)thr_arg;
1055
1056 /* try to distribute timeouts somewhat evenly */
1057 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1058 * (1000000000UL / 1024UL);
756 1059
757 for (;;) 1060 for (;;)
758 { 1061 {
759 errno = 0, readdir_r (dirp, &u.d, &entp); 1062 ts.tv_sec = time (0) + IDLE_TIMEOUT;
760 1063
761 if (!entp) 1064 LOCK (reqlock);
762 break;
763
764 name = entp->d_name;
765
766 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
767 {
768 int len = strlen (name) + 1;
769
770 res++;
771
772 while (memofs + len > memlen)
773 {
774 memlen *= 2;
775 names = realloc (names, memlen);
776 if (!names)
777 break;
778 }
779
780 memcpy (names + memofs, name, len);
781 memofs += len;
782 }
783 }
784
785 errorno = errno;
786 closedir (dirp);
787
788 if (errorno)
789 {
790 free (names);
791 errno = errorno;
792 res = -1;
793 }
794
795 *namesp = (void *)names;
796 return res;
797}
798
799/*****************************************************************************/
800
801static void *aio_proc (void *thr_arg)
802{
803 aio_req req;
804 int type;
805
806 do
807 {
808 pthread_mutex_lock (&reqlock);
809 1065
810 for (;;) 1066 for (;;)
811 { 1067 {
812 req = reqs; 1068 self->req = req = reqq_shift (&req_queue);
813
814 if (reqs)
815 {
816 reqs = reqs->next;
817 if (!reqs) reqe = 0;
818 }
819 1069
820 if (req) 1070 if (req)
821 break; 1071 break;
822 1072
1073 ++idle;
1074
1075 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1076 == ETIMEDOUT)
1077 {
1078 if (idle > max_idle)
1079 {
1080 --idle;
1081 UNLOCK (reqlock);
1082 LOCK (wrklock);
1083 --started;
1084 UNLOCK (wrklock);
1085 goto quit;
1086 }
1087
1088 /* we are allowed to idle, so do so without any timeout */
823 pthread_cond_wait (&reqwait, &reqlock); 1089 pthread_cond_wait (&reqwait, &reqlock);
1090 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1091 }
1092
1093 --idle;
824 } 1094 }
825 1095
826 pthread_mutex_unlock (&reqlock); 1096 --nready;
1097
1098 UNLOCK (reqlock);
827 1099
828 errno = 0; /* strictly unnecessary */ 1100 errno = 0; /* strictly unnecessary */
829 type = req->type; /* remember type for QUIT check */
830 1101
831 if (!(req->flags & FLAG_CANCELLED)) 1102 if (!(req->flags & FLAG_CANCELLED))
832 switch (type) 1103 switch (req->type)
833 { 1104 {
834 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1105 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
835 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
836 1107
837 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1108 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
838 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 1109 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
839 1110
840 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1111 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
841 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1112 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
842 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1113 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
843 1114
844 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1115 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
845 case REQ_CLOSE: req->result = close (req->fd); break; 1116 case REQ_CLOSE: req->result = close (req->int1); break;
846 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1117 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
847 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1118 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
848 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
849 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
850 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
851 1124
852 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
853 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
854 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
855 1128
856 case REQ_SLEEP: 1129 case REQ_BUSY:
857 { 1130 {
858 struct timeval tv; 1131 struct timeval tv;
859 1132
860 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
861 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
862 1135
863 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
864 } 1137 }
865 1138
866 case REQ_GROUP: 1139 case REQ_GROUP:
867 case REQ_NOP: 1140 case REQ_NOP:
1141 break;
1142
868 case REQ_QUIT: 1143 case REQ_QUIT:
869 break; 1144 goto quit;
870 1145
871 default: 1146 default:
872 req->result = ENOSYS; 1147 req->result = ENOSYS;
873 break; 1148 break;
874 } 1149 }
875 1150
876 req->errorno = errno; 1151 req->errorno = errno;
877 1152
878 pthread_mutex_lock (&reslock); 1153 LOCK (reslock);
879 1154
880 req->next = 0; 1155 ++npending;
881 1156
882 if (rese) 1157 if (!reqq_push (&res_queue, req))
883 {
884 rese->next = req;
885 rese = req;
886 }
887 else
888 {
889 rese = ress = req;
890
891 /* write a dummy byte to the pipe so fh becomes ready */ 1158 /* write a dummy byte to the pipe so fh becomes ready */
892 write (respipe [1], &respipe, 1); 1159 write (respipe [1], &respipe, 1);
893 }
894 1160
895 pthread_mutex_unlock (&reslock); 1161 self->req = 0;
1162 worker_clear (self);
1163
1164 UNLOCK (reslock);
896 } 1165 }
897 while (type != REQ_QUIT); 1166
1167quit:
1168 LOCK (wrklock);
1169 worker_free (self);
1170 UNLOCK (wrklock);
898 1171
899 return 0; 1172 return 0;
900} 1173}
901 1174
902/*****************************************************************************/ 1175/*****************************************************************************/
903 1176
904static void atfork_prepare (void) 1177static void atfork_prepare (void)
905{ 1178{
906 pthread_mutex_lock (&reqlock); 1179 LOCK (wrklock);
907 pthread_mutex_lock (&reslock); 1180 LOCK (reqlock);
1181 LOCK (reslock);
908#if !HAVE_PREADWRITE 1182#if !HAVE_PREADWRITE
909 pthread_mutex_lock (&preadwritelock); 1183 LOCK (preadwritelock);
910#endif 1184#endif
911#if !HAVE_READDIR_R 1185#if !HAVE_READDIR_R
912 pthread_mutex_lock (&readdirlock); 1186 LOCK (readdirlock);
913#endif 1187#endif
914} 1188}
915 1189
916static void atfork_parent (void) 1190static void atfork_parent (void)
917{ 1191{
918#if !HAVE_READDIR_R 1192#if !HAVE_READDIR_R
919 pthread_mutex_unlock (&readdirlock); 1193 UNLOCK (readdirlock);
920#endif 1194#endif
921#if !HAVE_PREADWRITE 1195#if !HAVE_PREADWRITE
922 pthread_mutex_unlock (&preadwritelock); 1196 UNLOCK (preadwritelock);
923#endif 1197#endif
924 pthread_mutex_unlock (&reslock); 1198 UNLOCK (reslock);
925 pthread_mutex_unlock (&reqlock); 1199 UNLOCK (reqlock);
1200 UNLOCK (wrklock);
926} 1201}
927 1202
928static void atfork_child (void) 1203static void atfork_child (void)
929{ 1204{
930 aio_req prv; 1205 aio_req prv;
931 1206
932 started = 0; 1207 while (prv = reqq_shift (&req_queue))
1208 req_free (prv);
933 1209
934 while (reqs) 1210 while (prv = reqq_shift (&res_queue))
1211 req_free (prv);
1212
1213 while (wrk_first.next != &wrk_first)
935 { 1214 {
936 prv = reqs; 1215 worker *wrk = wrk_first.next;
937 reqs = prv->next; 1216
1217 if (wrk->req)
1218 req_free (wrk->req);
1219
1220 worker_clear (wrk);
938 req_free (prv); 1221 worker_free (wrk);
939 } 1222 }
940 1223
941 reqs = reqe = 0; 1224 started = 0;
942 1225 idle = 0;
943 while (ress) 1226 nreqs = 0;
944 { 1227 nready = 0;
945 prv = ress; 1228 npending = 0;
946 ress = prv->next;
947 req_free (prv);
948 }
949
950 ress = rese = 0;
951 1229
952 close (respipe [0]); 1230 close (respipe [0]);
953 close (respipe [1]); 1231 close (respipe [1]);
954 create_pipe (); 1232 create_pipe ();
955 1233
982PROTOTYPES: ENABLE 1260PROTOTYPES: ENABLE
983 1261
984BOOT: 1262BOOT:
985{ 1263{
986 HV *stash = gv_stashpv ("IO::AIO", 1); 1264 HV *stash = gv_stashpv ("IO::AIO", 1);
1265
987 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1266 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
988 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1267 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
989 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1268 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1269 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1270 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1271 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
990 1272
991 create_pipe (); 1273 create_pipe ();
992 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1274 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
993} 1275}
994 1276
995void 1277void
996min_parallel (nthreads) 1278max_poll_reqs (int nreqs)
997 int nthreads
998 PROTOTYPE: $ 1279 PROTOTYPE: $
1280 CODE:
1281 max_poll_reqs = nreqs;
999 1282
1000void 1283void
1001max_parallel (nthreads) 1284max_poll_time (double nseconds)
1002 int nthreads
1003 PROTOTYPE: $ 1285 PROTOTYPE: $
1286 CODE:
1287 max_poll_time = nseconds * AIO_TICKS;
1288
1289void
1290min_parallel (int nthreads)
1291 PROTOTYPE: $
1292
1293void
1294max_parallel (int nthreads)
1295 PROTOTYPE: $
1296
1297void
1298max_idle (int nthreads)
1299 PROTOTYPE: $
1300 CODE:
1301 set_max_idle (nthreads);
1004 1302
1005int 1303int
1006max_outstanding (nreqs) 1304max_outstanding (int maxreqs)
1007 int nreqs 1305 PROTOTYPE: $
1008 PROTOTYPE: $
1009 CODE: 1306 CODE:
1010 RETVAL = max_outstanding; 1307 RETVAL = max_outstanding;
1011 max_outstanding = nreqs; 1308 max_outstanding = maxreqs;
1309 OUTPUT:
1310 RETVAL
1012 1311
1013void 1312void
1014aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1313aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1015 SV * pathname 1314 SV * pathname
1016 int flags 1315 int flags
1020 PPCODE: 1319 PPCODE:
1021{ 1320{
1022 dREQ; 1321 dREQ;
1023 1322
1024 req->type = REQ_OPEN; 1323 req->type = REQ_OPEN;
1025 req->data = newSVsv (pathname); 1324 req->sv1 = newSVsv (pathname);
1026 req->dataptr = SvPVbyte_nolen (req->data); 1325 req->ptr1 = SvPVbyte_nolen (pathname);
1027 req->fd = flags; 1326 req->int1 = flags;
1028 req->mode = mode; 1327 req->mode = mode;
1029 1328
1030 REQ_SEND; 1329 REQ_SEND;
1031} 1330}
1032 1331
1042 PPCODE: 1341 PPCODE:
1043{ 1342{
1044 dREQ; 1343 dREQ;
1045 1344
1046 req->type = ix; 1345 req->type = ix;
1047 req->fh = newSVsv (fh); 1346 req->fh = newSVsv (fh);
1048 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1347 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1049 1348
1050 REQ_SEND (req); 1349 REQ_SEND (req);
1051} 1350}
1052 1351
1053void 1352void
1062 aio_read = REQ_READ 1361 aio_read = REQ_READ
1063 aio_write = REQ_WRITE 1362 aio_write = REQ_WRITE
1064 PROTOTYPE: $$$$$;$ 1363 PROTOTYPE: $$$$$;$
1065 PPCODE: 1364 PPCODE:
1066{ 1365{
1067 aio_req req;
1068 STRLEN svlen; 1366 STRLEN svlen;
1069 char *svptr = SvPVbyte (data, svlen); 1367 char *svptr = SvPVbyte (data, svlen);
1070 1368
1071 SvUPGRADE (data, SVt_PV); 1369 SvUPGRADE (data, SVt_PV);
1072 SvPOK_on (data); 1370 SvPOK_on (data);
1094 1392
1095 { 1393 {
1096 dREQ; 1394 dREQ;
1097 1395
1098 req->type = ix; 1396 req->type = ix;
1099 req->fh = newSVsv (fh); 1397 req->fh = newSVsv (fh);
1100 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1398 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1101 : IoOFP (sv_2io (fh))); 1399 : IoOFP (sv_2io (fh)));
1102 req->offset = offset; 1400 req->offs = offset;
1103 req->length = length; 1401 req->size = length;
1104 req->data = SvREFCNT_inc (data); 1402 req->sv1 = SvREFCNT_inc (data);
1105 req->dataptr = (char *)svptr + dataoffset; 1403 req->ptr1 = (char *)svptr + dataoffset;
1404 req->stroffset = dataoffset;
1106 1405
1107 if (!SvREADONLY (data)) 1406 if (!SvREADONLY (data))
1108 { 1407 {
1109 SvREADONLY_on (data); 1408 SvREADONLY_on (data);
1110 req->data2ptr = (void *)data; 1409 req->flags |= FLAG_SV1_RO_OFF;
1111 } 1410 }
1112 1411
1113 REQ_SEND; 1412 REQ_SEND;
1114 } 1413 }
1414}
1415
1416void
1417aio_readlink (path,callback=&PL_sv_undef)
1418 SV * path
1419 SV * callback
1420 PROTOTYPE: $$;$
1421 PPCODE:
1422{
1423 SV *data;
1424 dREQ;
1425
1426 data = newSV (NAME_MAX);
1427 SvPOK_on (data);
1428
1429 req->type = REQ_READLINK;
1430 req->fh = newSVsv (path);
1431 req->ptr2 = SvPVbyte_nolen (path);
1432 req->sv1 = data;
1433 req->ptr1 = SvPVbyte_nolen (data);
1434
1435 REQ_SEND;
1115} 1436}
1116 1437
1117void 1438void
1118aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1439aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1119 SV * out_fh 1440 SV * out_fh
1125 PPCODE: 1446 PPCODE:
1126{ 1447{
1127 dREQ; 1448 dREQ;
1128 1449
1129 req->type = REQ_SENDFILE; 1450 req->type = REQ_SENDFILE;
1130 req->fh = newSVsv (out_fh); 1451 req->fh = newSVsv (out_fh);
1131 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1452 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1132 req->fh2 = newSVsv (in_fh); 1453 req->sv2 = newSVsv (in_fh);
1133 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1454 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1134 req->offset = in_offset; 1455 req->offs = in_offset;
1135 req->length = length; 1456 req->size = length;
1136 1457
1137 REQ_SEND; 1458 REQ_SEND;
1138} 1459}
1139 1460
1140void 1461void
1147 PPCODE: 1468 PPCODE:
1148{ 1469{
1149 dREQ; 1470 dREQ;
1150 1471
1151 req->type = REQ_READAHEAD; 1472 req->type = REQ_READAHEAD;
1152 req->fh = newSVsv (fh); 1473 req->fh = newSVsv (fh);
1153 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1474 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1154 req->offset = offset; 1475 req->offs = offset;
1155 req->length = length; 1476 req->size = length;
1156 1477
1157 REQ_SEND; 1478 REQ_SEND;
1158} 1479}
1159 1480
1160void 1481void
1166 aio_lstat = REQ_LSTAT 1487 aio_lstat = REQ_LSTAT
1167 PPCODE: 1488 PPCODE:
1168{ 1489{
1169 dREQ; 1490 dREQ;
1170 1491
1171 New (0, req->statdata, 1, Stat_t); 1492 req->ptr2 = malloc (sizeof (Stat_t));
1172 if (!req->statdata) 1493 if (!req->ptr2)
1173 { 1494 {
1174 req_free (req); 1495 req_free (req);
1175 croak ("out of memory during aio_req->statdata allocation"); 1496 croak ("out of memory during aio_stat statdata allocation");
1176 } 1497 }
1498
1499 req->flags |= FLAG_PTR2_FREE;
1177 1500
1178 if (SvPOK (fh_or_path)) 1501 if (SvPOK (fh_or_path))
1179 { 1502 {
1180 req->type = ix; 1503 req->type = ix;
1181 req->data = newSVsv (fh_or_path); 1504 req->sv1 = newSVsv (fh_or_path);
1182 req->dataptr = SvPVbyte_nolen (req->data); 1505 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1183 } 1506 }
1184 else 1507 else
1185 { 1508 {
1186 req->type = REQ_FSTAT; 1509 req->type = REQ_FSTAT;
1187 req->fh = newSVsv (fh_or_path); 1510 req->fh = newSVsv (fh_or_path);
1188 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1511 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1189 } 1512 }
1190 1513
1191 REQ_SEND; 1514 REQ_SEND;
1192} 1515}
1193 1516
1194void 1517void
1195aio_unlink (pathname,callback=&PL_sv_undef) 1518aio_unlink (pathname,callback=&PL_sv_undef)
1196 SV * pathname 1519 SV * pathname
1197 SV * callback 1520 SV * callback
1198 ALIAS: 1521 ALIAS:
1199 aio_unlink = REQ_UNLINK 1522 aio_unlink = REQ_UNLINK
1200 aio_rmdir = REQ_RMDIR 1523 aio_rmdir = REQ_RMDIR
1201 aio_readdir = REQ_READDIR 1524 aio_readdir = REQ_READDIR
1202 PPCODE: 1525 PPCODE:
1203{ 1526{
1204 dREQ; 1527 dREQ;
1205 1528
1206 req->type = ix; 1529 req->type = ix;
1207 req->data = newSVsv (pathname); 1530 req->sv1 = newSVsv (pathname);
1208 req->dataptr = SvPVbyte_nolen (req->data); 1531 req->ptr1 = SvPVbyte_nolen (pathname);
1209 1532
1210 REQ_SEND; 1533 REQ_SEND;
1211} 1534}
1212 1535
1213void 1536void
1214aio_link (oldpath,newpath,callback=&PL_sv_undef) 1537aio_link (oldpath,newpath,callback=&PL_sv_undef)
1215 SV * oldpath 1538 SV * oldpath
1216 SV * newpath 1539 SV * newpath
1217 SV * callback 1540 SV * callback
1218 ALIAS: 1541 ALIAS:
1219 aio_link = REQ_LINK 1542 aio_link = REQ_LINK
1220 aio_symlink = REQ_SYMLINK 1543 aio_symlink = REQ_SYMLINK
1221 aio_rename = REQ_RENAME 1544 aio_rename = REQ_RENAME
1222 PPCODE: 1545 PPCODE:
1223{ 1546{
1224 dREQ; 1547 dREQ;
1225 1548
1226 req->type = ix; 1549 req->type = ix;
1227 req->fh = newSVsv (oldpath); 1550 req->fh = newSVsv (oldpath);
1228 req->data2ptr = SvPVbyte_nolen (req->fh); 1551 req->ptr2 = SvPVbyte_nolen (req->fh);
1229 req->data = newSVsv (newpath); 1552 req->sv1 = newSVsv (newpath);
1230 req->dataptr = SvPVbyte_nolen (req->data); 1553 req->ptr1 = SvPVbyte_nolen (newpath);
1231 1554
1232 REQ_SEND; 1555 REQ_SEND;
1233} 1556}
1234 1557
1235void 1558void
1236aio_sleep (delay,callback=&PL_sv_undef) 1559aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1237 double delay 1560 SV * pathname
1238 SV * callback 1561 SV * callback
1562 UV mode
1563 UV dev
1239 PPCODE: 1564 PPCODE:
1240{ 1565{
1241 dREQ; 1566 dREQ;
1567
1568 req->type = REQ_MKNOD;
1569 req->sv1 = newSVsv (pathname);
1570 req->ptr1 = SvPVbyte_nolen (pathname);
1571 req->mode = (mode_t)mode;
1572 req->offs = dev;
1573
1574 REQ_SEND;
1575}
1242 1576
1577void
1578aio_busy (delay,callback=&PL_sv_undef)
1579 double delay
1580 SV * callback
1581 PPCODE:
1582{
1583 dREQ;
1584
1243 req->type = REQ_SLEEP; 1585 req->type = REQ_BUSY;
1244 req->fd = delay < 0. ? 0 : delay; 1586 req->int1 = delay < 0. ? 0 : delay;
1245 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1587 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1246 1588
1247 REQ_SEND; 1589 REQ_SEND;
1248} 1590}
1249 1591
1250void 1592void
1254 PPCODE: 1596 PPCODE:
1255{ 1597{
1256 dREQ; 1598 dREQ;
1257 1599
1258 req->type = REQ_GROUP; 1600 req->type = REQ_GROUP;
1601
1259 req_send (req); 1602 req_send (req);
1260
1261 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1603 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1262} 1604}
1263 1605
1264void 1606void
1265aio_nop (callback=&PL_sv_undef) 1607aio_nop (callback=&PL_sv_undef)
1266 SV * callback 1608 SV * callback
1267 PPCODE: 1609 PPCODE:
1268{ 1610{
1269 dREQ; 1611 dREQ;
1270 1612
1271 req->type = REQ_NOP; 1613 req->type = REQ_NOP;
1272 1614
1273 REQ_SEND; 1615 REQ_SEND;
1274} 1616}
1275 1617
1276#if 0 1618int
1277 1619aioreq_pri (int pri = 0)
1278void 1620 PROTOTYPE: ;$
1279aio_pri (int pri = DEFAULT_PRI)
1280 CODE: 1621 CODE:
1622 RETVAL = next_pri - PRI_BIAS;
1623 if (items > 0)
1624 {
1281 if (pri < PRI_MIN) pri = PRI_MIN; 1625 if (pri < PRI_MIN) pri = PRI_MIN;
1282 if (pri > PRI_MAX) pri = PRI_MAX; 1626 if (pri > PRI_MAX) pri = PRI_MAX;
1283 next_pri = pri + PRI_BIAS; 1627 next_pri = pri + PRI_BIAS;
1628 }
1629 OUTPUT:
1630 RETVAL
1284 1631
1285#endif 1632void
1633aioreq_nice (int nice = 0)
1634 CODE:
1635 nice = next_pri - nice;
1636 if (nice < PRI_MIN) nice = PRI_MIN;
1637 if (nice > PRI_MAX) nice = PRI_MAX;
1638 next_pri = nice + PRI_BIAS;
1286 1639
1287void 1640void
1288flush () 1641flush ()
1289 PROTOTYPE: 1642 PROTOTYPE:
1290 CODE: 1643 CODE:
1291 while (nreqs) 1644 while (nreqs)
1292 { 1645 {
1293 poll_wait (); 1646 poll_wait ();
1294 poll_cb (); 1647 poll_cb (0);
1295 } 1648 }
1296 1649
1297void 1650void
1298poll() 1651poll()
1299 PROTOTYPE: 1652 PROTOTYPE:
1300 CODE: 1653 CODE:
1301 if (nreqs) 1654 if (nreqs)
1302 { 1655 {
1303 poll_wait (); 1656 poll_wait ();
1304 poll_cb (); 1657 poll_cb (0);
1305 } 1658 }
1306 1659
1307int 1660int
1308poll_fileno() 1661poll_fileno()
1309 PROTOTYPE: 1662 PROTOTYPE:
1333 CODE: 1686 CODE:
1334 RETVAL = nreqs; 1687 RETVAL = nreqs;
1335 OUTPUT: 1688 OUTPUT:
1336 RETVAL 1689 RETVAL
1337 1690
1691int
1692nready()
1693 PROTOTYPE:
1694 CODE:
1695 RETVAL = get_nready ();
1696 OUTPUT:
1697 RETVAL
1698
1699int
1700npending()
1701 PROTOTYPE:
1702 CODE:
1703 RETVAL = get_npending ();
1704 OUTPUT:
1705 RETVAL
1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1338PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1339 1718
1340MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1341 1720
1342void 1721void
1343cancel (aio_req_ornot req) 1722cancel (aio_req_ornot req)
1344 PROTOTYPE:
1345 CODE: 1723 CODE:
1346 req_cancel (req); 1724 req_cancel (req);
1347 1725
1348void 1726void
1349cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1727cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1358 PPCODE: 1736 PPCODE:
1359{ 1737{
1360 int i; 1738 int i;
1361 aio_req req; 1739 aio_req req;
1362 1740
1363 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1364 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1365 1743
1366 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1367 { 1745 {
1368 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
1370 1748
1371 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1372 1750
1373 if (req) 1751 if (req)
1374 { 1752 {
1375 ++grp->length; 1753 ++grp->size;
1376 req->grp = grp; 1754 req->grp = grp;
1377 1755
1378 req->grp_prev = 0; 1756 req->grp_prev = 0;
1379 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1380 1758
1385 } 1763 }
1386 } 1764 }
1387} 1765}
1388 1766
1389void 1767void
1768cancel_subs (aio_req_ornot req)
1769 CODE:
1770 req_cancel_subs (req);
1771
1772void
1390result (aio_req grp, ...) 1773result (aio_req grp, ...)
1391 CODE: 1774 CODE:
1392{ 1775{
1393 int i; 1776 int i;
1777 AV *av;
1778
1779 grp->errorno = errno;
1780
1394 AV *av = newAV (); 1781 av = newAV ();
1395 1782
1396 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1397 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1398 1785
1399 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1400 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1401} 1788}
1402 1789
1403void 1790void
1791errno (aio_req grp, int errorno = errno)
1792 CODE:
1793 grp->errorno = errorno;
1794
1795void
1404feed_limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1405 CODE: 1797 CODE:
1406 grp->fd2 = limit; 1798 grp->int2 = limit;
1407 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1408 1800
1409void 1801void
1410feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1411 CODE: 1803 CODE:
1412{ 1804{
1413 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1414 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1415 1807
1416 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1417 grp->fd2 = 2; 1809 grp->int2 = 2;
1418 1810
1419 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1420} 1812}
1421 1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines