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

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

Diff Legend

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