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.44 by root, Sat Oct 21 23:20:29 2006 UTC vs.
Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC

… …
9 9
10#include <pthread.h> 10#include <pthread.h>
11 11
12#include <stddef.h> 12#include <stddef.h>
13#include <errno.h> 13#include <errno.h>
14#include <sys/time.h>
15#include <sys/select.h>
14#include <sys/types.h> 16#include <sys/types.h>
15#include <sys/stat.h> 17#include <sys/stat.h>
16#include <limits.h> 18#include <limits.h>
17#include <unistd.h> 19#include <unistd.h>
18#include <fcntl.h> 20#include <fcntl.h>
… …
53 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 55 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
54 REQ_FSYNC, REQ_FDATASYNC, 56 REQ_FSYNC, REQ_FDATASYNC,
55 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
56 REQ_READDIR, 58 REQ_READDIR,
57 REQ_LINK, REQ_SYMLINK, 59 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP,
58 REQ_GROUP, 61 REQ_GROUP,
59}; 62};
60 63
61#define AIO_REQ_KLASS "IO::AIO::REQ" 64#define AIO_REQ_KLASS "IO::AIO::REQ"
62#define AIO_GRP_KLASS "IO::AIO::GRP" 65#define AIO_GRP_KLASS "IO::AIO::GRP"
… …
85 unsigned char cancelled; 88 unsigned char cancelled;
86} aio_cb; 89} aio_cb;
87 90
88typedef aio_cb *aio_req; 91typedef aio_cb *aio_req;
89typedef aio_cb *aio_req_ornot; 92typedef aio_cb *aio_req_ornot;
90typedef aio_cb *aio_group;
91 93
92static int started, wanted; 94static int started, wanted;
93static volatile int nreqs; 95static volatile int nreqs;
94static int max_outstanding = 1<<30; 96static int max_outstanding = 1<<30;
95static int respipe [2]; 97static int respipe [2];
… …
99static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
100 102
101static volatile aio_req reqs, reqe; /* queue start, queue end */ 103static volatile aio_req reqs, reqe; /* queue start, queue end */
102static volatile aio_req ress, rese; /* queue start, queue end */ 104static volatile aio_req ress, rese; /* queue start, queue end */
103 105
106static void req_free (aio_req req);
107
104/* must be called at most once */ 108/* must be called at most once */
105static SV *req_sv (aio_req req, const char *klass) 109static SV *req_sv (aio_req req, const char *klass)
106{ 110{
107 req->self = (SV *)newHV (); 111 req->self = (SV *)newHV ();
108 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 112 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
109 113
110 return sv_2mortal (sv_bless (newRV_noinc (req->self), gv_stashpv (klass, 1))); 114 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
111} 115}
112 116
113static aio_req SvAIO_REQ (SV *sv, const char *klass) 117static aio_req SvAIO_REQ (SV *sv)
114{ 118{
115 if (!sv_derived_from (sv, klass) || !SvROK (sv)) 119 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
116 croak ("object of class %s expected", klass); 120 croak ("object of class " AIO_REQ_KLASS " expected");
117 121
118 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
119 123
120 return mg ? (aio_req)mg->mg_ptr : 0; 124 return mg ? (aio_req)mg->mg_ptr : 0;
121} 125}
122 126
123static void req_free (aio_req req) 127static void poll_wait ()
124{
125 if (req->self)
126 {
127 sv_unmagic (req->self, PERL_MAGIC_ext);
128 SvREFCNT_dec (req->self);
129 }
130
131 if (req->data)
132 SvREFCNT_dec (req->data);
133
134 if (req->fh)
135 SvREFCNT_dec (req->fh);
136
137 if (req->fh2)
138 SvREFCNT_dec (req->fh2);
139
140 if (req->statdata)
141 Safefree (req->statdata);
142
143 if (req->callback)
144 SvREFCNT_dec (req->callback);
145
146 if (req->type == REQ_READDIR && req->result >= 0)
147 free (req->data2ptr);
148
149 Safefree (req);
150}
151
152static void
153poll_wait ()
154{ 128{
155 if (nreqs && !ress) 129 if (nreqs && !ress)
156 { 130 {
157 fd_set rfd; 131 fd_set rfd;
158 FD_ZERO(&rfd); 132 FD_ZERO(&rfd);
… …
160 134
161 select (respipe [0] + 1, &rfd, 0, 0, 0); 135 select (respipe [0] + 1, &rfd, 0, 0, 0);
162 } 136 }
163} 137}
164 138
165static int 139static void req_invoke (aio_req req)
166poll_cb () 140{
141 dSP;
142 int errorno = errno;
143
144 if (req->cancelled || !SvOK (req->callback))
145 return;
146
147 errno = req->errorno;
148
149 ENTER;
150 PUSHMARK (SP);
151 EXTEND (SP, 1);
152
153 switch (req->type)
154 {
155 case REQ_READDIR:
156 {
157 SV *rv = &PL_sv_undef;
158
159 if (req->result >= 0)
160 {
161 char *buf = req->data2ptr;
162 AV *av = newAV ();
163
164 while (req->result)
165 {
166 SV *sv = newSVpv (buf, 0);
167
168 av_push (av, sv);
169 buf += SvCUR (sv) + 1;
170 req->result--;
171 }
172
173 rv = sv_2mortal (newRV_noinc ((SV *)av));
174 }
175
176 PUSHs (rv);
177 }
178 break;
179
180 case REQ_OPEN:
181 {
182 /* convert fd to fh */
183 SV *fh;
184
185 PUSHs (sv_2mortal (newSViv (req->result)));
186 PUTBACK;
187 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
188 SPAGAIN;
189
190 fh = SvREFCNT_inc (POPs);
191
192 PUSHMARK (SP);
193 XPUSHs (sv_2mortal (fh));
194 }
195 break;
196
197 case REQ_GROUP:
198 if (req->data)
199 {
200 int i;
201 AV *av = (AV *)req->data;
202
203 EXTEND (SP, AvFILL (av) + 1);
204 for (i = 0; i <= AvFILL (av); ++i)
205 PUSHs (*av_fetch (av, i, 0));
206 }
207 break;
208
209 case REQ_SLEEP:
210 break;
211
212 default:
213 PUSHs (sv_2mortal (newSViv (req->result)));
214 break;
215 }
216
217
218 PUTBACK;
219 call_sv (req->callback, G_VOID | G_EVAL);
220 SPAGAIN;
221
222 if (SvTRUE (ERRSV))
223 {
224 req_free (req);
225 croak (0);
226 }
227
228 LEAVE;
229
230 errno = errorno;
231}
232
233static void req_free (aio_req req)
234{
235 if (req->grp)
236 {
237 aio_req grp = req->grp;
238
239 /* unlink request */
240 req->grp_next->grp_prev = req->grp_prev;
241 req->grp_prev->grp_next = req->grp_next;
242
243 if (grp->grp_next == grp && grp->fd)
244 {
245 req_invoke (grp);
246 req_free (grp);
247 }
248 }
249
250 if (req->self)
251 {
252 sv_unmagic (req->self, PERL_MAGIC_ext);
253 SvREFCNT_dec (req->self);
254 }
255
256 if (req->data)
257 SvREFCNT_dec (req->data);
258
259 if (req->fh)
260 SvREFCNT_dec (req->fh);
261
262 if (req->fh2)
263 SvREFCNT_dec (req->fh2);
264
265 if (req->statdata)
266 Safefree (req->statdata);
267
268 if (req->callback)
269 SvREFCNT_dec (req->callback);
270
271 if (req->type == REQ_READDIR && req->result >= 0)
272 free (req->data2ptr);
273
274 Safefree (req);
275}
276
277static void req_cancel (aio_req req)
278{
279 req->cancelled = 1;
280
281 if (req->type == REQ_GROUP)
282 {
283 aio_req sub;
284
285 for (sub = req->grp_next; sub != req; sub = sub->grp_next)
286 req_cancel (sub);
287 }
288}
289
290static int poll_cb ()
167{ 291{
168 dSP; 292 dSP;
169 int count = 0; 293 int count = 0;
170 int do_croak = 0; 294 int do_croak = 0;
171 aio_req req; 295 aio_req req;
… …
197 321
198 nreqs--; 322 nreqs--;
199 323
200 if (req->type == REQ_QUIT) 324 if (req->type == REQ_QUIT)
201 started--; 325 started--;
326 else if (req->type == REQ_GROUP && req->grp_next != req)
327 {
328 req->fd = 1; /* mark request as delayed */
329 continue;
330 }
202 else 331 else
203 { 332 {
204 int errorno = errno;
205 errno = req->errorno;
206
207 if (req->type == REQ_READ) 333 if (req->type == REQ_READ)
208 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0)); 334 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
209 335
210 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE)) 336 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
211 SvREADONLY_off (req->data); 337 SvREADONLY_off (req->data);
… …
215 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 341 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
216 PL_laststatval = req->result; 342 PL_laststatval = req->result;
217 PL_statcache = *(req->statdata); 343 PL_statcache = *(req->statdata);
218 } 344 }
219 345
220 ENTER; 346 req_invoke (req);
221 PUSHMARK (SP);
222 347
223 if (req->type == REQ_READDIR)
224 {
225 SV *rv = &PL_sv_undef;
226
227 if (req->result >= 0)
228 {
229 char *buf = req->data2ptr;
230 AV *av = newAV ();
231
232 while (req->result)
233 {
234 SV *sv = newSVpv (buf, 0);
235
236 av_push (av, sv);
237 buf += SvCUR (sv) + 1;
238 req->result--;
239 }
240
241 rv = sv_2mortal (newRV_noinc ((SV *)av));
242 }
243
244 XPUSHs (rv);
245 }
246 else
247 {
248 XPUSHs (sv_2mortal (newSViv (req->result)));
249
250 if (req->type == REQ_OPEN)
251 {
252 /* convert fd to fh */
253 SV *fh;
254
255 PUTBACK;
256 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
257 SPAGAIN;
258
259 fh = SvREFCNT_inc (POPs);
260
261 PUSHMARK (SP);
262 XPUSHs (sv_2mortal (fh));
263 }
264 }
265
266 if (SvOK (req->callback) && !req->cancelled)
267 {
268 PUTBACK;
269 call_sv (req->callback, G_VOID | G_EVAL);
270 SPAGAIN;
271
272 if (SvTRUE (ERRSV))
273 {
274 req_free (req);
275 croak (0);
276 }
277 }
278
279 LEAVE;
280
281 errno = errorno;
282 count++; 348 count++;
283 } 349 }
284 350
285 req_free (req); 351 req_free (req);
286 } 352 }
… …
288 return count; 354 return count;
289} 355}
290 356
291static void *aio_proc(void *arg); 357static void *aio_proc(void *arg);
292 358
293static void
294start_thread (void) 359static void start_thread (void)
295{ 360{
296 sigset_t fullsigset, oldsigset; 361 sigset_t fullsigset, oldsigset;
297 pthread_t tid; 362 pthread_t tid;
298 pthread_attr_t attr; 363 pthread_attr_t attr;
299 364
… …
308 started++; 373 started++;
309 374
310 sigprocmask (SIG_SETMASK, &oldsigset, 0); 375 sigprocmask (SIG_SETMASK, &oldsigset, 0);
311} 376}
312 377
313static void
314req_send (aio_req req) 378static void req_send (aio_req req)
315{ 379{
316 while (started < wanted && nreqs >= started) 380 while (started < wanted && nreqs >= started)
317 start_thread (); 381 start_thread ();
318 382
319 nreqs++; 383 nreqs++;
… …
343 407
344 poll_wait (); 408 poll_wait ();
345 } 409 }
346} 410}
347 411
348static void 412static void end_thread (void)
349end_thread (void)
350{ 413{
351 aio_req req; 414 aio_req req;
352 Newz (0, req, 1, aio_cb); 415 Newz (0, req, 1, aio_cb);
353 req->type = REQ_QUIT; 416 req->type = REQ_QUIT;
354 417
… …
405 * normal read/write by using a mutex. slows down execution a lot, 468 * normal read/write by using a mutex. slows down execution a lot,
406 * but that's your problem, not mine. 469 * but that's your problem, not mine.
407 */ 470 */
408static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; 471static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
409 472
410static ssize_t 473static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
411pread (int fd, void *buf, size_t count, off_t offset)
412{ 474{
413 ssize_t res; 475 ssize_t res;
414 off_t ooffset; 476 off_t ooffset;
415 477
416 pthread_mutex_lock (&preadwritelock); 478 pthread_mutex_lock (&preadwritelock);
… …
421 pthread_mutex_unlock (&preadwritelock); 483 pthread_mutex_unlock (&preadwritelock);
422 484
423 return res; 485 return res;
424} 486}
425 487
426static ssize_t
427pwrite (int fd, void *buf, size_t count, off_t offset) 488static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
428{ 489{
429 ssize_t res; 490 ssize_t res;
430 off_t ooffset; 491 off_t ooffset;
431 492
432 pthread_mutex_lock (&preadwritelock); 493 pthread_mutex_lock (&preadwritelock);
… …
445#endif 506#endif
446 507
447#if !HAVE_READAHEAD 508#if !HAVE_READAHEAD
448# define readahead aio_readahead 509# define readahead aio_readahead
449 510
450static ssize_t
451readahead (int fd, off_t offset, size_t count) 511static ssize_t readahead (int fd, off_t offset, size_t count)
452{ 512{
453 char readahead_buf[4096]; 513 char readahead_buf[4096];
454 514
455 while (count > 0) 515 while (count > 0)
456 { 516 {
… …
468#if !HAVE_READDIR_R 528#if !HAVE_READDIR_R
469# define readdir_r aio_readdir_r 529# define readdir_r aio_readdir_r
470 530
471static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; 531static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
472 532
473static int
474readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 533static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
475{ 534{
476 struct dirent *e; 535 struct dirent *e;
477 int errorno; 536 int errorno;
478 537
479 pthread_mutex_lock (&readdirlock); 538 pthread_mutex_lock (&readdirlock);
… …
495 return e ? 0 : -1; 554 return e ? 0 : -1;
496} 555}
497#endif 556#endif
498 557
499/* sendfile always needs emulation */ 558/* sendfile always needs emulation */
500static ssize_t
501sendfile_ (int ofd, int ifd, off_t offset, size_t count) 559static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
502{ 560{
503 ssize_t res; 561 ssize_t res;
504 562
505 if (!count) 563 if (!count)
506 return 0; 564 return 0;
… …
588 646
589 return res; 647 return res;
590} 648}
591 649
592/* read a full directory */ 650/* read a full directory */
593static int
594scandir_ (const char *path, void **namesp) 651static int scandir_ (const char *path, void **namesp)
595{ 652{
596 DIR *dirp = opendir (path); 653 DIR *dirp = opendir (path);
597 union 654 union
598 { 655 {
599 struct dirent d; 656 struct dirent d;
… …
653 return res; 710 return res;
654} 711}
655 712
656/*****************************************************************************/ 713/*****************************************************************************/
657 714
658static void *
659aio_proc (void *thr_arg) 715static void *aio_proc (void *thr_arg)
660{ 716{
661 aio_req req; 717 aio_req req;
662 int type; 718 int type;
663 719
664 do 720 do
… …
707 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 763 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
708 764
709 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 765 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
710 case REQ_FSYNC: req->result = fsync (req->fd); break; 766 case REQ_FSYNC: req->result = fsync (req->fd); break;
711 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 767 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
768
769 case REQ_SLEEP:
770 {
771 struct timeval tv;
772
773 tv.tv_sec = req->fd;
774 tv.tv_usec = req->fd2;
775
776 req->result = select (0, 0, 0, 0, &tv);
777 }
712 778
713 case REQ_QUIT: 779 case REQ_QUIT:
714 break; 780 break;
715 781
716 default: 782 default:
… …
1073 1139
1074 REQ_SEND; 1140 REQ_SEND;
1075} 1141}
1076 1142
1077void 1143void
1144aio_sleep (delay,callback=&PL_sv_undef)
1145 double delay
1146 SV * callback
1147 PPCODE:
1148{
1149 dREQ;
1150
1151 req->type = REQ_SLEEP;
1152 req->fd = delay < 0. ? 0 : delay;
1153 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1154
1155 REQ_SEND;
1156}
1157
1158void
1078aio_group (callback=&PL_sv_undef) 1159aio_group (callback=&PL_sv_undef)
1079 SV * callback 1160 SV * callback
1080 PROTOTYPE: ;& 1161 PROTOTYPE: ;$
1081 PPCODE: 1162 PPCODE:
1082{ 1163{
1083 dREQ; 1164 dREQ;
1084 req->type = REQ_GROUP; 1165 req->type = REQ_GROUP;
1166 req->grp_next = req;
1167 req->grp_prev = req;
1168
1169 req_send (req);
1085 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1170 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1086} 1171}
1087 1172
1088void 1173void
1089flush () 1174flush ()
… …
1134 CODE: 1219 CODE:
1135 RETVAL = nreqs; 1220 RETVAL = nreqs;
1136 OUTPUT: 1221 OUTPUT:
1137 RETVAL 1222 RETVAL
1138 1223
1224PROTOTYPES: DISABLE
1225
1139MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1226MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1140 1227
1141void 1228void
1142cancel (aio_req_ornot req) 1229cancel (aio_req_ornot req)
1143 PROTOTYPE: 1230 PROTOTYPE:
1144 CODE: 1231 CODE:
1145 req->cancelled = 1; 1232 req_cancel (req);
1146 1233
1234MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1235
1236void
1237add (aio_req grp, ...)
1238 PPCODE:
1239{
1240 int i;
1241
1242 for (i = 1; i < items; ++i )
1243 {
1244 if (GIMME_V != G_VOID)
1245 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1246
1247 aio_req req = SvAIO_REQ (ST (i));
1248
1249 if (req)
1250 {
1251 req->grp_prev = grp;
1252 req->grp_next = grp->grp_next;
1253 grp->grp_next->grp_prev = req;
1254 grp->grp_next = req;
1255
1256 req->grp = grp;
1257 }
1258 }
1259}
1260
1261void
1262result (aio_req grp, ...)
1263 CODE:
1264{
1265 int i;
1266 AV *av = newAV ();
1267
1268 if (grp->data)
1269 SvREFCNT_dec (grp->data);
1270
1271 for (i = 1; i < items; ++i )
1272 av_push (av, newSVsv (ST (i)));
1273
1274 grp->data = (SV *)av;
1275}
1276

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines