ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/eio.c
(Generate patch)

Comparing libeio/eio.c (file contents):
Revision 1.132 by root, Sun Sep 7 14:50:00 2014 UTC vs.
Revision 1.144 by root, Tue Dec 27 09:58:44 2016 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
42#endif 42#endif
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE
48# define X_STACKSIZE EIO_STACKSIZE
49#endif
50#include "xthread.h"
51
52#include <errno.h> 47#include <errno.h>
53#include <stddef.h> 48#include <stddef.h>
54#include <stdlib.h> 49#include <stdlib.h>
55#include <string.h> 50#include <string.h>
56#include <errno.h> 51#include <errno.h>
… …
120 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1)) 115 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
121 116
122 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
125 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
126 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
127 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
128 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
203 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
204 static int 202 static int
205 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
206 { 204 {
207 #if WINVER >= 0x0600 205 #if WINVER >= 0x0600
206 int flags;
207
208 /* This tries out all combinations of SYMBOLIC_LINK_FLAG_DIRECTORY
209 * and SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE,
210 * with directory first.
211 */
212 for (flags = 3; flags >= 0; --flags)
208 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
209 return 0; 214 return 0;
210
211 if (CreateSymbolicLink (neu, old, 0))
212 return 0;
213 #endif 215 #endif
214 216
215 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
216 } 218 }
217 219
… …
280# include <utime.h> 282# include <utime.h>
281#endif 283#endif
282 284
283#if HAVE_SYS_SYSCALL_H 285#if HAVE_SYS_SYSCALL_H
284# include <sys/syscall.h> 286# include <sys/syscall.h>
285#endif
286
287#if HAVE_SYS_PRCTL_H
288# include <sys/prctl.h>
289#endif 287#endif
290 288
291#if HAVE_SENDFILE 289#if HAVE_SENDFILE
292# if __linux 290# if __linux
293# include <sys/sendfile.h> 291# include <sys/sendfile.h>
… …
318# define NAME_MAX 4096 316# define NAME_MAX 4096
319#endif 317#endif
320 318
321/* used for readlink etc. */ 319/* used for readlink etc. */
322#ifndef PATH_MAX 320#ifndef PATH_MAX
323# define PATH_MAX 4096 321# define PATH_MAX 0
324#endif 322#endif
323
324#ifndef EIO_PATH_MIN
325# define EIO_PATH_MIN 8160
326#endif
327
328#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
325 329
326/* buffer size for various temporary buffers */ 330/* buffer size for various temporary buffers */
327#define EIO_BUFSIZE 65536 331#define EIO_BUFSIZE 65536
328 332
329#define dBUF \ 333#define dBUF \
… …
335#define FUBd \ 339#define FUBd \
336 free (eio_buf) 340 free (eio_buf)
337 341
338/*****************************************************************************/ 342/*****************************************************************************/
339 343
340struct tmpbuf
341{
342 void *ptr;
343 int len;
344};
345
346static void *
347tmpbuf_get (struct tmpbuf *buf, int len)
348{
349 if (buf->len < len)
350 {
351 free (buf->ptr);
352 buf->ptr = malloc (buf->len = len);
353 }
354
355 return buf->ptr;
356}
357
358struct tmpbuf; 344struct etp_tmpbuf;
359 345
360#if _POSIX_VERSION >= 200809L 346#if _POSIX_VERSION >= 200809L
361 #define HAVE_AT 1 347 #define HAVE_AT 1
362 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD) 348 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
363 #ifndef O_SEARCH 349 #ifndef O_SEARCH
364 #define O_SEARCH O_RDONLY 350 #define O_SEARCH O_RDONLY
365 #endif 351 #endif
366#else 352#else
367 #define HAVE_AT 0 353 #define HAVE_AT 0
368 static const char *wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path); 354 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
369#endif 355#endif
370 356
371struct eio_pwd 357struct eio_pwd
372{ 358{
373#if HAVE_AT 359#if HAVE_AT
… …
383#define ETP_PRI_MAX EIO_PRI_MAX 369#define ETP_PRI_MAX EIO_PRI_MAX
384 370
385#define ETP_TYPE_QUIT -1 371#define ETP_TYPE_QUIT -1
386#define ETP_TYPE_GROUP EIO_GROUP 372#define ETP_TYPE_GROUP EIO_GROUP
387 373
374static void eio_nop_callback (void) { }
375static void (*eio_want_poll_cb)(void) = eio_nop_callback;
376static void (*eio_done_poll_cb)(void) = eio_nop_callback;
377
378#define ETP_WANT_POLL(pool) eio_want_poll_cb ()
379#define ETP_DONE_POLL(pool) eio_done_poll_cb ()
380
388struct etp_worker; 381struct etp_worker;
389
390#define ETP_REQ eio_req 382#define ETP_REQ eio_req
391#define ETP_DESTROY(req) eio_destroy (req) 383#define ETP_DESTROY(req) eio_destroy (req)
392static int eio_finish (eio_req *req); 384static int eio_finish (eio_req *req);
393#define ETP_FINISH(req) eio_finish (req) 385#define ETP_FINISH(req) eio_finish (req)
394static void eio_execute (struct etp_worker *self, eio_req *req); 386static void eio_execute (struct etp_worker *self, eio_req *req);
395#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req) 387#define ETP_EXECUTE(wrk,req) eio_execute (wrk, req)
396 388
397#include "etp.c" 389#include "etp.c"
398 390
391static struct etp_pool eio_pool;
392#define EIO_POOL (&eio_pool)
393
399/*****************************************************************************/ 394/*****************************************************************************/
400 395
401static void 396static void
402grp_try_feed (eio_req *grp) 397grp_try_feed (eio_req *grp)
403{ 398{
404 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 399 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
405 { 400 {
406 grp->flags &= ~EIO_FLAG_GROUPADD; 401 grp->flags &= ~ETP_FLAG_GROUPADD;
407 402
408 EIO_FEED (grp); 403 EIO_FEED (grp);
409 404
410 /* stop if no progress has been made */ 405 /* stop if no progress has been made */
411 if (!(grp->flags & EIO_FLAG_GROUPADD)) 406 if (!(grp->flags & ETP_FLAG_GROUPADD))
412 { 407 {
413 grp->feed = 0; 408 grp->feed = 0;
414 break; 409 break;
415 } 410 }
416 } 411 }
… …
423 418
424 /* call feeder, if applicable */ 419 /* call feeder, if applicable */
425 grp_try_feed (grp); 420 grp_try_feed (grp);
426 421
427 /* finish, if done */ 422 /* finish, if done */
428 if (!grp->size && grp->int1) 423 if (!grp->size && grp->flags & ETP_FLAG_DELAYED)
429 return eio_finish (grp); 424 return eio_finish (grp);
430 else 425 else
431 return 0; 426 return 0;
432} 427}
433 428
… …
469} 464}
470 465
471void 466void
472eio_grp_cancel (eio_req *grp) 467eio_grp_cancel (eio_req *grp)
473{ 468{
474 etp_grp_cancel (grp); 469 etp_grp_cancel (EIO_POOL, grp);
475} 470}
476 471
477void 472void
478eio_cancel (eio_req *req) 473eio_cancel (eio_req *req)
479{ 474{
480 etp_cancel (req); 475 etp_cancel (EIO_POOL, req);
481} 476}
482 477
483void 478void
484eio_submit (eio_req *req) 479eio_submit (eio_req *req)
485{ 480{
486 etp_submit (req); 481 etp_submit (EIO_POOL, req);
487} 482}
488 483
489unsigned int 484unsigned int
490eio_nreqs (void) 485eio_nreqs (void)
491{ 486{
492 return etp_nreqs (); 487 return etp_nreqs (EIO_POOL);
493} 488}
494 489
495unsigned int 490unsigned int
496eio_nready (void) 491eio_nready (void)
497{ 492{
498 return etp_nready (); 493 return etp_nready (EIO_POOL);
499} 494}
500 495
501unsigned int 496unsigned int
502eio_npending (void) 497eio_npending (void)
503{ 498{
504 return etp_npending (); 499 return etp_npending (EIO_POOL);
505} 500}
506 501
507unsigned int ecb_cold 502unsigned int ecb_cold
508eio_nthreads (void) 503eio_nthreads (void)
509{ 504{
510 return etp_nthreads (); 505 return etp_nthreads (EIO_POOL);
511} 506}
512 507
513void ecb_cold 508void ecb_cold
514eio_set_max_poll_time (double nseconds) 509eio_set_max_poll_time (double nseconds)
515{ 510{
516 etp_set_max_poll_time (nseconds); 511 etp_set_max_poll_time (EIO_POOL, nseconds);
517} 512}
518 513
519void ecb_cold 514void ecb_cold
520eio_set_max_poll_reqs (unsigned int maxreqs) 515eio_set_max_poll_reqs (unsigned int maxreqs)
521{ 516{
522 etp_set_max_poll_reqs (maxreqs); 517 etp_set_max_poll_reqs (EIO_POOL, maxreqs);
523} 518}
524 519
525void ecb_cold 520void ecb_cold
526eio_set_max_idle (unsigned int nthreads) 521eio_set_max_idle (unsigned int nthreads)
527{ 522{
528 etp_set_max_idle (nthreads); 523 etp_set_max_idle (EIO_POOL, nthreads);
529} 524}
530 525
531void ecb_cold 526void ecb_cold
532eio_set_idle_timeout (unsigned int seconds) 527eio_set_idle_timeout (unsigned int seconds)
533{ 528{
534 etp_set_idle_timeout (seconds); 529 etp_set_idle_timeout (EIO_POOL, seconds);
535} 530}
536 531
537void ecb_cold 532void ecb_cold
538eio_set_min_parallel (unsigned int nthreads) 533eio_set_min_parallel (unsigned int nthreads)
539{ 534{
540 etp_set_min_parallel (nthreads); 535 etp_set_min_parallel (EIO_POOL, nthreads);
541} 536}
542 537
543void ecb_cold 538void ecb_cold
544eio_set_max_parallel (unsigned int nthreads) 539eio_set_max_parallel (unsigned int nthreads)
545{ 540{
546 etp_set_max_parallel (nthreads); 541 etp_set_max_parallel (EIO_POOL, nthreads);
547} 542}
548 543
549int eio_poll (void) 544int eio_poll (void)
550{ 545{
551 return etp_poll (); 546 return etp_poll (EIO_POOL);
552} 547}
553 548
554/*****************************************************************************/ 549/*****************************************************************************/
555/* work around various missing functions */ 550/* work around various missing functions */
556 551
… …
966 req->result = req->offs == (off_t)-1 ? -1 : 0; 961 req->result = req->offs == (off_t)-1 ? -1 : 0;
967} 962}
968 963
969/* result will always end up in tmpbuf, there is always space for adding a 0-byte */ 964/* result will always end up in tmpbuf, there is always space for adding a 0-byte */
970static int 965static int
971eio__realpath (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 966eio__realpath (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
972{ 967{
973 char *res; 968 char *res;
974 const char *rel = path; 969 const char *rel = path;
975 char *tmp1, *tmp2; 970 char *tmp1, *tmp2;
976#if SYMLOOP_MAX > 32 971#if SYMLOOP_MAX > 32
… …
985 980
986 errno = ENOENT; 981 errno = ENOENT;
987 if (!*rel) 982 if (!*rel)
988 return -1; 983 return -1;
989 984
990 res = tmpbuf_get (tmpbuf, PATH_MAX * 3); 985 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
991#ifdef _WIN32 986#ifdef _WIN32
992 if (_access (rel, 4) != 0) 987 if (_access (rel, 4) != 0)
993 return -1; 988 return -1;
994 989
995 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 990 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
996 991
997 errno = ENAMETOOLONG; 992 errno = ENAMETOOLONG;
998 if (symlinks >= PATH_MAX * 3) 993 if (symlinks >= EIO_PATH_MAX * 3)
999 return -1; 994 return -1;
1000 995
1001 errno = EIO; 996 errno = EIO;
1002 if (symlinks <= 0) 997 if (symlinks <= 0)
1003 return -1; 998 return -1;
1004 999
1005 return symlinks; 1000 return symlinks;
1006 1001
1007#else 1002#else
1008 tmp1 = res + PATH_MAX; 1003 tmp1 = res + EIO_PATH_MAX;
1009 tmp2 = tmp1 + PATH_MAX; 1004 tmp2 = tmp1 + EIO_PATH_MAX;
1010 1005
1011#if 0 /* disabled, the musl way to do things is just too racy */ 1006#if 0 /* disabled, the musl way to do things is just too racy */
1012#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1007#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1013 /* on linux we may be able to ask the kernel */ 1008 /* on linux we may be able to ask the kernel */
1014 { 1009 {
1015 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1010 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1016 1011
1017 if (fd >= 0) 1012 if (fd >= 0)
1018 { 1013 {
1019 sprintf (tmp1, "/proc/self/fd/%d", fd); 1014 sprintf (tmp1, "/proc/self/fd/%d", fd);
1020 req->result = readlink (tmp1, res, PATH_MAX); 1015 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1021 /* here we should probably stat the open file and the disk file, to make sure they still match */ 1016 /* here we should probably stat the open file and the disk file, to make sure they still match */
1022 close (fd); 1017 close (fd);
1023 1018
1024 if (req->result > 0) 1019 if (req->result > 0)
1025 goto done; 1020 goto done;
… …
1038 if (wd == EIO_INVALID_WD) 1033 if (wd == EIO_INVALID_WD)
1039 return -1; 1034 return -1;
1040 1035
1041 if (wd == EIO_CWD) 1036 if (wd == EIO_CWD)
1042 { 1037 {
1043 if (!getcwd (res, PATH_MAX)) 1038 if (!getcwd (res, EIO_PATH_MAX))
1044 return -1; 1039 return -1;
1045 1040
1046 len = strlen (res); 1041 len = strlen (res);
1047 } 1042 }
1048 else 1043 else
… …
1095 1090
1096 /* zero-terminate, for readlink */ 1091 /* zero-terminate, for readlink */
1097 res [len + 1] = 0; 1092 res [len + 1] = 0;
1098 1093
1099 /* now check if it's a symlink */ 1094 /* now check if it's a symlink */
1100 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1095 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1101 1096
1102 if (linklen < 0) 1097 if (linklen < 0)
1103 { 1098 {
1104 if (errno != EINVAL) 1099 if (errno != EINVAL)
1105 return -1; 1100 return -1;
… …
1111 { 1106 {
1112 /* yay, it was a symlink - build new path in tmp2 */ 1107 /* yay, it was a symlink - build new path in tmp2 */
1113 int rellen = strlen (rel); 1108 int rellen = strlen (rel);
1114 1109
1115 errno = ENAMETOOLONG; 1110 errno = ENAMETOOLONG;
1116 if (linklen + 1 + rellen >= PATH_MAX) 1111 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1117 return -1; 1112 return -1;
1118 1113
1119 errno = ELOOP; 1114 errno = ELOOP;
1120 if (!--symlinks) 1115 if (!--symlinks)
1121 return -1; 1116 return -1;
… …
1604#if !HAVE_AT 1599#if !HAVE_AT
1605 1600
1606/* a bit like realpath, but usually faster because it doesn'T have to return */ 1601/* a bit like realpath, but usually faster because it doesn'T have to return */
1607/* an absolute or canonical path */ 1602/* an absolute or canonical path */
1608static const char * 1603static const char *
1609wd_expand (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1604wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1610{ 1605{
1611 if (!wd || *path == '/') 1606 if (!wd || *path == '/')
1612 return path; 1607 return path;
1613 1608
1614 if (path [0] == '.' && !path [1]) 1609 if (path [0] == '.' && !path [1])
… …
1616 1611
1617 { 1612 {
1618 int l1 = wd->len; 1613 int l1 = wd->len;
1619 int l2 = strlen (path); 1614 int l2 = strlen (path);
1620 1615
1621 char *res = tmpbuf_get (tmpbuf, l1 + l2 + 2); 1616 char *res = etp_tmpbuf_get (tmpbuf, l1 + l2 + 2);
1622 1617
1623 memcpy (res, wd->str, l1); 1618 memcpy (res, wd->str, l1);
1624 res [l1] = '/'; 1619 res [l1] = '/';
1625 memcpy (res + l1 + 1, path, l2 + 1); 1620 memcpy (res + l1 + 1, path, l2 + 1);
1626 1621
… …
1629} 1624}
1630 1625
1631#endif 1626#endif
1632 1627
1633static eio_wd 1628static eio_wd
1634eio__wd_open_sync (struct tmpbuf *tmpbuf, eio_wd wd, const char *path) 1629eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
1635{ 1630{
1636 int fd; 1631 int fd;
1637 eio_wd res; 1632 eio_wd res;
1638 int len = eio__realpath (tmpbuf, wd, path); 1633 int len = eio__realpath (tmpbuf, wd, path);
1639 1634
… …
1661} 1656}
1662 1657
1663eio_wd 1658eio_wd
1664eio_wd_open_sync (eio_wd wd, const char *path) 1659eio_wd_open_sync (eio_wd wd, const char *path)
1665{ 1660{
1666 struct tmpbuf tmpbuf = { 0 }; 1661 struct etp_tmpbuf tmpbuf = { };
1667 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1662 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1668 free (tmpbuf.ptr); 1663 free (tmpbuf.ptr);
1669 1664
1670 return wd; 1665 return wd;
1671} 1666}
… …
1720/*****************************************************************************/ 1715/*****************************************************************************/
1721 1716
1722#define ALLOC(len) \ 1717#define ALLOC(len) \
1723 if (!req->ptr2) \ 1718 if (!req->ptr2) \
1724 { \ 1719 { \
1725 X_LOCK (wrklock); \ 1720 X_LOCK (EIO_POOL->wrklock); \
1726 req->flags |= EIO_FLAG_PTR2_FREE; \ 1721 req->flags |= EIO_FLAG_PTR2_FREE; \
1727 X_UNLOCK (wrklock); \ 1722 X_UNLOCK (EIO_POOL->wrklock); \
1728 req->ptr2 = malloc (len); \ 1723 req->ptr2 = malloc (len); \
1729 if (!req->ptr2) \ 1724 if (!req->ptr2) \
1730 { \ 1725 { \
1731 errno = ENOMEM; \ 1726 errno = ENOMEM; \
1732 req->result = -1; \ 1727 req->result = -1; \
1733 break; \ 1728 break; \
1734 } \ 1729 } \
1735 } 1730 }
1736 1731
1737static void ecb_noinline ecb_cold
1738etp_proc_init (void)
1739{
1740#if HAVE_PRCTL_SET_NAME
1741 /* provide a more sensible "thread name" */
1742 char name[16 + 1];
1743 const int namelen = sizeof (name) - 1;
1744 int len;
1745
1746 prctl (PR_GET_NAME, (unsigned long)name, 0, 0, 0);
1747 name [namelen] = 0;
1748 len = strlen (name);
1749 strcpy (name + (len <= namelen - 4 ? len : namelen - 4), "/eio");
1750 prctl (PR_SET_NAME, (unsigned long)name, 0, 0, 0);
1751#endif
1752}
1753
1754/* TODO: move somehow to etp.c */
1755X_THREAD_PROC (etp_proc)
1756{
1757 ETP_REQ *req;
1758 struct timespec ts;
1759 etp_worker *self = (etp_worker *)thr_arg;
1760
1761 etp_proc_init ();
1762
1763 /* try to distribute timeouts somewhat evenly */
1764 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1765
1766 for (;;)
1767 {
1768 ts.tv_sec = 0;
1769
1770 X_LOCK (reqlock);
1771
1772 for (;;)
1773 {
1774 req = reqq_shift (&req_queue);
1775
1776 if (req)
1777 break;
1778
1779 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1780 {
1781 X_UNLOCK (reqlock);
1782 X_LOCK (wrklock);
1783 --started;
1784 X_UNLOCK (wrklock);
1785 goto quit;
1786 }
1787
1788 ++idle;
1789
1790 if (idle <= max_idle)
1791 /* we are allowed to idle, so do so without any timeout */
1792 X_COND_WAIT (reqwait, reqlock);
1793 else
1794 {
1795 /* initialise timeout once */
1796 if (!ts.tv_sec)
1797 ts.tv_sec = time (0) + idle_timeout;
1798
1799 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1800 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1801 }
1802
1803 --idle;
1804 }
1805
1806 --nready;
1807
1808 X_UNLOCK (reqlock);
1809
1810 if (req->type == ETP_TYPE_QUIT)
1811 goto quit;
1812
1813 ETP_EXECUTE (self, req);
1814
1815 X_LOCK (reslock);
1816
1817 ++npending;
1818
1819 if (!reqq_push (&res_queue, req) && want_poll_cb)
1820 want_poll_cb ();
1821
1822 etp_worker_clear (self);
1823
1824 X_UNLOCK (reslock);
1825 }
1826
1827quit:
1828 free (req);
1829
1830 X_LOCK (wrklock);
1831 etp_worker_free (self);
1832 X_UNLOCK (wrklock);
1833
1834 return 0;
1835}
1836
1837/*****************************************************************************/ 1732/*****************************************************************************/
1838 1733
1839int ecb_cold 1734int ecb_cold
1840eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1735eio_init (void (*want_poll)(void), void (*done_poll)(void))
1841{ 1736{
1842 return etp_init (want_poll, done_poll); 1737 eio_want_poll_cb = want_poll;
1738 eio_done_poll_cb = done_poll;
1739
1740 return etp_init (EIO_POOL, 0, 0, 0);
1843} 1741}
1844 1742
1845ecb_inline void 1743ecb_inline void
1846eio_api_destroy (eio_req *req) 1744eio_api_destroy (eio_req *req)
1847{ 1745{
… …
1920 ? pread (req->int1, req->ptr2, req->size, req->offs) 1818 ? pread (req->int1, req->ptr2, req->size, req->offs)
1921 : read (req->int1, req->ptr2, req->size); break; 1819 : read (req->int1, req->ptr2, req->size); break;
1922 case EIO_WRITE: req->result = req->offs >= 0 1820 case EIO_WRITE: req->result = req->offs >= 0
1923 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1821 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1924 : write (req->int1, req->ptr2, req->size); break; 1822 : write (req->int1, req->ptr2, req->size); break;
1823
1824 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1825 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1925 1826
1926 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1827 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1927 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1828 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1928 1829
1929#if HAVE_AT 1830#if HAVE_AT
… …
1948 ? rename (req->wd->str, req->ptr2) 1849 ? rename (req->wd->str, req->ptr2)
1949 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1850 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break;
1950 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1851 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1951 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1852 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1952 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1853 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1953 case EIO_READLINK: ALLOC (PATH_MAX);
1954 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1955 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1854 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1956 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1855 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1856 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1857 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1858 if (req->result == EIO_PATH_MAX)
1859 {
1860 req->result = -1;
1861 errno = ENAMETOOLONG;
1862 }
1863 break;
1957 case EIO_UTIME: 1864 case EIO_UTIME:
1958 case EIO_FUTIME: 1865 case EIO_FUTIME:
1959 { 1866 {
1960 struct timespec ts[2]; 1867 struct timespec ts[2];
1961 struct timespec *times; 1868 struct timespec *times;
… …
1994 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1901 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1995 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1902 case EIO_RENAME: req->result = rename (path , req->ptr2); break;
1996 case EIO_LINK: req->result = link (path , req->ptr2); break; 1903 case EIO_LINK: req->result = link (path , req->ptr2); break;
1997 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1904 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1998 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 1905 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1999 case EIO_READLINK: ALLOC (PATH_MAX);
2000 req->result = readlink (path, req->ptr2, PATH_MAX); break;
2001 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1906 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
2002 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1907 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1908 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1909 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1910 if (req->result == EIO_PATH_MAX)
1911 {
1912 req->result = -1;
1913 errno = ENAMETOOLONG;
1914 }
1915 break;
2003 1916
2004 case EIO_UTIME: 1917 case EIO_UTIME:
2005 case EIO_FUTIME: 1918 case EIO_FUTIME:
2006 { 1919 {
2007 struct timeval tv[2]; 1920 struct timeval tv[2];
… …
2072 req->result = select (0, 0, 0, 0, &tv); 1985 req->result = select (0, 0, 0, 0, &tv);
2073 } 1986 }
2074#endif 1987#endif
2075 break; 1988 break;
2076 1989
1990#if 0
2077 case EIO_GROUP: 1991 case EIO_GROUP:
2078 abort (); /* handled in eio_request */ 1992 abort (); /* handled in eio_request */
1993#endif
2079 1994
2080 case EIO_NOP: 1995 case EIO_NOP:
2081 req->result = 0; 1996 req->result = 0;
2082 break; 1997 break;
2083 1998
… …
2186} 2101}
2187 2102
2188eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2103eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2189{ 2104{
2190 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2105 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2106}
2107
2108eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2109{
2110 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2111}
2112
2113eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2114{
2115 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2191} 2116}
2192 2117
2193eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2118eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2194{ 2119{
2195 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2120 REQ (EIO_FSTAT); req->int1 = fd; SEND;
… …
2383void 2308void
2384eio_grp_add (eio_req *grp, eio_req *req) 2309eio_grp_add (eio_req *grp, eio_req *req)
2385{ 2310{
2386 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2311 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2387 2312
2388 grp->flags |= EIO_FLAG_GROUPADD; 2313 grp->flags |= ETP_FLAG_GROUPADD;
2389 2314
2390 ++grp->size; 2315 ++grp->size;
2391 req->grp = grp; 2316 req->grp = grp;
2392 2317
2393 req->grp_prev = 0; 2318 req->grp_prev = 0;

Diff Legend

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