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.46 by root, Sun Oct 22 00:49:29 2006 UTC vs.
Revision 1.90 by root, Tue Oct 31 00:32:19 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines