ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines