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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.49 by root, Sun Oct 22 13:33:28 2006 UTC vs.
Revision 1.74 by root, Wed Oct 25 17:57:30 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines