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.111 by root, Sun Mar 30 06:31:49 2008 UTC vs.
Revision 1.114 by root, Sat Apr 26 12:00:23 2008 UTC

… …
1178 res = -1; 1178 res = -1;
1179 1179
1180 req->result = res; 1180 req->result = res;
1181} 1181}
1182 1182
1183static int
1184aio_close (int fd)
1185{
1186 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1187
1188 X_LOCK (wrklock);
1189
1190 if (close_pipe < 0)
1191 {
1192 int pipefd [2];
1193
1194 if (pipe (pipefd) < 0
1195 || close (pipefd [1]) < 0
1196 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)
1197 {
1198 X_UNLOCK (wrklock);
1199 return -1;
1200 }
1201
1202 close_pipe = pipefd [0];
1203 }
1204
1205 X_UNLOCK (wrklock);
1206
1207 return dup2 (close_pipe, fd) < 0 ? -1 : 0;
1208}
1209
1183/*****************************************************************************/ 1210/*****************************************************************************/
1184 1211
1185X_THREAD_PROC (aio_proc) 1212X_THREAD_PROC (aio_proc)
1186{ 1213{
1187 {//D
1188 aio_req req; 1214 aio_req req;
1189 struct timespec ts; 1215 struct timespec ts;
1190 worker *self = (worker *)thr_arg; 1216 worker *self = (worker *)thr_arg;
1191 1217
1192 /* try to distribute timeouts somewhat randomly */ 1218 /* try to distribute timeouts somewhat randomly */
… …
1257 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break; 1283 case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break;
1258 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break; 1284 case REQ_TRUNCATE: req->result = truncate (req->ptr1, req->offs); break;
1259 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 1285 case REQ_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1260 1286
1261 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; 1287 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1262 case REQ_CLOSE: req->result = close (req->int1); break; 1288 case REQ_CLOSE: req->result = aio_close (req->int1); break;
1263 case REQ_UNLINK: req->result = unlink (req->ptr1); break; 1289 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1264 case REQ_RMDIR: req->result = rmdir (req->ptr1); break; 1290 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1265 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break; 1291 case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break;
1266 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; 1292 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1267 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; 1293 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
… …
1352 X_LOCK (wrklock); 1378 X_LOCK (wrklock);
1353 worker_free (self); 1379 worker_free (self);
1354 X_UNLOCK (wrklock); 1380 X_UNLOCK (wrklock);
1355 1381
1356 return 0; 1382 return 0;
1357 }//D
1358} 1383}
1359 1384
1360/*****************************************************************************/ 1385/*****************************************************************************/
1361 1386
1362static void atfork_prepare (void) 1387static void atfork_prepare (void)
… …
1536 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 1561 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1537 1562
1538 REQ_SEND (req); 1563 REQ_SEND (req);
1539} 1564}
1540 1565
1541int
1542_dup (int fd)
1543 PROTOTYPE: $
1544 CODE:
1545 RETVAL = dup (fd);
1546 OUTPUT:
1547 RETVAL
1548
1549void 1566void
1550_aio_close (int fd, SV *callback=&PL_sv_undef) 1567aio_close (SV *fh, SV *callback=&PL_sv_undef)
1551 PROTOTYPE: $;$ 1568 PROTOTYPE: $;$
1552 PPCODE: 1569 PPCODE:
1553{ 1570{
1554 dREQ; 1571 dREQ;
1555 1572
1556 req->type = REQ_CLOSE; 1573 req->type = REQ_CLOSE;
1557 req->int1 = fd; 1574 req->sv1 = newSVsv (fh);
1575 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1558 1576
1559 REQ_SEND (req); 1577 REQ_SEND (req);
1560} 1578}
1561 1579
1562void 1580void

Diff Legend

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