[ViewVC] Diff of: cvs/libeio/eio.c

Comparing libeio/eio.c (file contents):
Revision 1.69 by root, Fri Jun 10 06:50:42 2011 UTC vs.
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC

 #ifndef _WIN32
 # include "config.h"
 #endif
 #include "eio.h"
+#include "ecb.h"
 #ifdef EIO_STACKSIZE
 # define XTHREAD_STACKSIZE EIO_STACKSIZE
 #endif
 #include "xthread.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/statvfs.h>
 #include <limits.h>
 #include <fcntl.h>
 #include <assert.h>
 /* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
-/* intptr_t only comes form stdint.h, says idiot openbsd coder */
+/* intptr_t only comes from stdint.h, says idiot openbsd coder */
 #if HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifndef ECANCELED
+# define ECANCELED EDOM
+#endif
+static void eio_destroy (eio_req *req);
 #ifndef EIO_FINISH
 # define EIO_FINISH(req)  ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
 #endif
 #ifndef EIO_DESTROY
 #ifndef EIO_FEED
 # define EIO_FEED(req)    do { if ((req)->feed   ) (req)->feed    (req); } while (0)
 #endif
+#ifndef EIO_FD_TO_WIN32_HANDLE
+# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
+#endif
+#ifndef EIO_WIN32_HANDLE_TO_FD
+# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
+#endif
+#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
+#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
 #ifdef _WIN32
-  /*doh*/
+  #define PAGESIZE 4096 /* GetSystemInfo? */
+  #ifdef EIO_STRUCT_STATI64
+    #define stat(path,buf)       _stati64 (path,buf)
+    #define fstat(fd,buf)        _fstati64 (path,buf)
+  #endif
+  #define lstat(path,buf)      stat (path,buf)
+  #define fsync(fd)            (FlushFileBuffers (EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
+  #define mkdir(path,mode)     _mkdir (path)
+  #define link(old,neu)        (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
+  #define chown(path,uid,gid)  EIO_ENOSYS ()
+  #define fchown(fd,uid,gid)   EIO_ENOSYS ()
+  #define truncate(path,offs)  EIO_ENOSYS () /* far-miss: SetEndOfFile */
+  #define ftruncate(fd,offs)   EIO_ENOSYS () /* near-miss: SetEndOfFile */
+  #define mknod(path,mode,dev) EIO_ENOSYS ()
+  #define sync()               EIO_ENOSYS ()
+  /* we could even stat and see if it exists */
+  static int
+  symlink (const char *old, const char *neu)
+  {
+    if (CreateSymbolicLink (neu, old, 1))
+      return 0;
+    if (CreateSymbolicLink (neu, old, 0))
+      return 0;
+    return EIO_ERRNO (ENOENT, -1);
+  }
 #else
-# include <sys/time.h>
+  #include <sys/time.h>
-# include <sys/select.h>
+  #include <sys/select.h>
+  #include <sys/statvfs.h>
-# include <unistd.h>
+  #include <unistd.h>
-# include <utime.h>
+  #include <utime.h>
-# include <signal.h>
+  #include <signal.h>
-# include <dirent.h>
+  #include <dirent.h>
-#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
+  #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
-# include <sys/mman.h>
+    #include <sys/mman.h>
-#endif
+  #endif
-/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
+  /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
-# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
+  #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
-#  define _DIRENT_HAVE_D_TYPE /* sigh */
+    #define _DIRENT_HAVE_D_TYPE /* sigh */
-#  define D_INO(de) (de)->d_fileno
+    #define D_INO(de) (de)->d_fileno
-#  define D_NAMLEN(de) (de)->d_namlen
+    #define D_NAMLEN(de) (de)->d_namlen
-# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
+  #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
-#  define D_INO(de) (de)->d_ino
+    #define D_INO(de) (de)->d_ino
-# endif
+  #endif
-#ifdef _D_EXACT_NAMLEN
+  #ifdef _D_EXACT_NAMLEN
-# undef D_NAMLEN
+    #undef D_NAMLEN
-# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
+    #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
-#endif
+  #endif
-# ifdef _DIRENT_HAVE_D_TYPE
+  #ifdef _DIRENT_HAVE_D_TYPE
-#  define D_TYPE(de) (de)->d_type
+    #define D_TYPE(de) (de)->d_type
-# endif
+  #endif
-# ifndef EIO_STRUCT_DIRENT
+  #ifndef EIO_STRUCT_DIRENT
-#  define EIO_STRUCT_DIRENT struct dirent
+    #define EIO_STRUCT_DIRENT struct dirent
-# endif
+  #endif
 #endif
 #if HAVE_SENDFILE
 # if __linux
   if (!eio_buf)					\
     return -1;
 #define EIO_TICKS ((1000000 + 1023) >> 10)
-/*****************************************************************************/
-#if __GNUC__ >= 3
-# define expect(expr,value) __builtin_expect ((expr),(value))
-#else
-# define expect(expr,value) (expr)
-#endif
-#define expect_false(expr) expect ((expr) != 0, 0)
-#define expect_true(expr)  expect ((expr) != 0, 1)
-/*****************************************************************************/
 #define ETP_PRI_MIN EIO_PRI_MIN
 #define ETP_PRI_MAX EIO_PRI_MAX
 struct etp_worker;
 /*****************************************************************************/
 #define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
 /* calculate time difference in ~1/EIO_TICKS of a second */
+ecb_inline int
-static int tvdiff (struct timeval *tv1, struct timeval *tv2)
+tvdiff (struct timeval *tv1, struct timeval *tv2)
 {
   return  (tv2->tv_sec  - tv1->tv_sec ) * EIO_TICKS
        + ((tv2->tv_usec - tv1->tv_usec) >> 10);
 }
 #define ETP_WORKER_LOCK(wrk)   X_LOCK   (wrklock)
 #define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
 /* worker threads management */
+static void ecb_cold
-static void etp_worker_clear (etp_worker *wrk)
+etp_worker_clear (etp_worker *wrk)
 {
   ETP_WORKER_CLEAR (wrk);
 }
+static void ecb_cold
-static void etp_worker_free (etp_worker *wrk)
+etp_worker_free (etp_worker *wrk)
 {
   wrk->next->prev = wrk->prev;
   wrk->prev->next = wrk->next;
   free (wrk);
 }
-static unsigned int etp_nreqs (void)
+static unsigned int
+etp_nreqs (void)
 {
   int retval;
   if (WORDACCESS_UNSAFE) X_LOCK   (reqlock);
   retval = nreqs;
   if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
   return retval;
 }
-static unsigned int etp_nready (void)
+static unsigned int
+etp_nready (void)
 {
   unsigned int retval;
   if (WORDACCESS_UNSAFE) X_LOCK   (reqlock);
   retval = nready;
   if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
   return retval;
 }
-static unsigned int etp_npending (void)
+static unsigned int
+etp_npending (void)
 {
   unsigned int retval;
   if (WORDACCESS_UNSAFE) X_LOCK   (reqlock);
   retval = npending;
   if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
   return retval;
 }
-static unsigned int etp_nthreads (void)
+static unsigned int
+etp_nthreads (void)
 {
   unsigned int retval;
   if (WORDACCESS_UNSAFE) X_LOCK   (reqlock);
   retval = started;
 } etp_reqq;
 static etp_reqq req_queue;
 static etp_reqq res_queue;
+static int ecb_noinline
-static int reqq_push (etp_reqq *q, ETP_REQ *req)
+reqq_push (etp_reqq *q, ETP_REQ *req)
 {
   int pri = req->pri;
   req->next = 0;
   if (q->qe[pri])
     q->qe[pri] = q->qs[pri] = req;
   return q->size++;
 }
+static ETP_REQ * ecb_noinline
-static ETP_REQ *reqq_shift (etp_reqq *q)
+reqq_shift (etp_reqq *q)
 {
   int pri;
   if (!q->size)
     return 0;
     }
   abort ();
 }
+static void ecb_cold
-static void etp_thread_init (void)
+etp_thread_init (void)
 {
+#if !HAVE_PREADWRITE
+  X_MUTEX_CREATE (preadwritelock);
+#endif
   X_MUTEX_CREATE (wrklock);
   X_MUTEX_CREATE (reslock);
   X_MUTEX_CREATE (reqlock);
   X_COND_CREATE  (reqwait);
 }
+static void ecb_cold
-static void etp_atfork_prepare (void)
+etp_atfork_prepare (void)
 {
-  X_LOCK (wrklock);
-  X_LOCK (reqlock);
-  X_LOCK (reslock);
-#if !HAVE_PREADWRITE
-  X_LOCK (preadwritelock);
-#endif
 }
+static void ecb_cold
-static void etp_atfork_parent (void)
+etp_atfork_parent (void)
 {
-#if !HAVE_PREADWRITE
-  X_UNLOCK (preadwritelock);
-#endif
-  X_UNLOCK (reslock);
-  X_UNLOCK (reqlock);
-  X_UNLOCK (wrklock);
 }
+static void ecb_cold
-static void etp_atfork_child (void)
+etp_atfork_child (void)
 {
   ETP_REQ *prv;
   while ((prv = reqq_shift (&req_queue)))
     ETP_DESTROY (prv);
   npending = 0;
   etp_thread_init ();
 }
-static void
+static void ecb_cold
 etp_once_init (void)
 {
   etp_thread_init ();
   X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
 }
-static int
+static int ecb_cold
 etp_init (void (*want_poll)(void), void (*done_poll)(void))
 {
   static pthread_once_t doinit = PTHREAD_ONCE_INIT;
   pthread_once (&doinit, etp_once_init);
   return 0;
 }
 X_THREAD_PROC (etp_proc);
+static void ecb_cold
-static void etp_start_thread (void)
+etp_start_thread (void)
 {
   etp_worker *wrk = calloc (1, sizeof (etp_worker));
   /*TODO*/
   assert (("unable to allocate worker thread data", wrk));
     free (wrk);
   X_UNLOCK (wrklock);
 }
+static void
-static void etp_maybe_start_thread (void)
+etp_maybe_start_thread (void)
 {
-  if (expect_true (etp_nthreads () >= wanted))
+  if (ecb_expect_true (etp_nthreads () >= wanted))
     return;
   /* todo: maybe use idle here, but might be less exact */
-  if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
+  if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
     return;
   etp_start_thread ();
 }
+static void ecb_cold
-static void etp_end_thread (void)
+etp_end_thread (void)
 {
   eio_req *req = calloc (1, sizeof (eio_req));
   req->type = -1;
   req->pri  = ETP_PRI_MAX - ETP_PRI_MIN;
   X_LOCK (wrklock);
   --started;
   X_UNLOCK (wrklock);
 }
-static int etp_poll (void)
+static int
+etp_poll (void)
 {
   unsigned int maxreqs;
   unsigned int maxtime;
   struct timeval tv_start, tv_now;
       X_LOCK (reqlock);
       --nreqs;
       X_UNLOCK (reqlock);
-      if (expect_false (req->type == EIO_GROUP && req->size))
+      if (ecb_expect_false (req->type == EIO_GROUP && req->size))
         {
           req->int1 = 1; /* mark request as delayed */
           continue;
         }
       else
         {
           int res = ETP_FINISH (req);
-          if (expect_false (res))
+          if (ecb_expect_false (res))
             return res;
         }
-      if (expect_false (maxreqs && !--maxreqs))
+      if (ecb_expect_false (maxreqs && !--maxreqs))
         break;
       if (maxtime)
         {
           gettimeofday (&tv_now, 0);
   errno = EAGAIN;
   return -1;
 }
+static void
-static void etp_cancel (ETP_REQ *req)
+etp_cancel (ETP_REQ *req)
 {
-  X_LOCK   (wrklock);
+  req->cancelled = 1;
-  req->flags |= EIO_FLAG_CANCELLED;
-  X_UNLOCK (wrklock);
   eio_grp_cancel (req);
 }
+static void
-static void etp_submit (ETP_REQ *req)
+etp_submit (ETP_REQ *req)
 {
   req->pri -= ETP_PRI_MIN;
-  if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
+  if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
-  if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
+  if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
-  if (expect_false (req->type == EIO_GROUP))
+  if (ecb_expect_false (req->type == EIO_GROUP))
     {
       /* I hope this is worth it :/ */
       X_LOCK (reqlock);
       ++nreqs;
       X_UNLOCK (reqlock);
       etp_maybe_start_thread ();
     }
 }
+static void ecb_cold
-static void etp_set_max_poll_time (double nseconds)
+etp_set_max_poll_time (double nseconds)
 {
   if (WORDACCESS_UNSAFE) X_LOCK   (reslock);
   max_poll_time = nseconds * EIO_TICKS;
   if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
 }
+static void ecb_cold
-static void etp_set_max_poll_reqs (unsigned int maxreqs)
+etp_set_max_poll_reqs (unsigned int maxreqs)
 {
   if (WORDACCESS_UNSAFE) X_LOCK   (reslock);
   max_poll_reqs = maxreqs;
   if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
 }
+static void ecb_cold
-static void etp_set_max_idle (unsigned int nthreads)
+etp_set_max_idle (unsigned int nthreads)
 {
   if (WORDACCESS_UNSAFE) X_LOCK   (reqlock);
   max_idle = nthreads;
   if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
 }
+static void ecb_cold
-static void etp_set_idle_timeout (unsigned int seconds)
+etp_set_idle_timeout (unsigned int seconds)
 {
   if (WORDACCESS_UNSAFE) X_LOCK   (reqlock);
   idle_timeout = seconds;
   if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
 }
+static void ecb_cold
-static void etp_set_min_parallel (unsigned int nthreads)
+etp_set_min_parallel (unsigned int nthreads)
 {
   if (wanted < nthreads)
     wanted = nthreads;
 }
+static void ecb_cold
-static void etp_set_max_parallel (unsigned int nthreads)
+etp_set_max_parallel (unsigned int nthreads)
 {
   if (wanted > nthreads)
     wanted = nthreads;
   while (started > wanted)
     etp_end_thread ();
 }
 /*****************************************************************************/
+static void
-static void grp_try_feed (eio_req *grp)
+grp_try_feed (eio_req *grp)
 {
   while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
     {
       grp->flags &= ~EIO_FLAG_GROUPADD;
           break;
         }
     }
 }
+static int
-static int grp_dec (eio_req *grp)
+grp_dec (eio_req *grp)
 {
   --grp->size;
   /* call feeder, if applicable */
   grp_try_feed (grp);
     return eio_finish (grp);
   else
     return 0;
 }
+static void
-void eio_destroy (eio_req *req)
+eio_destroy (eio_req *req)
 {
   if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
   if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
   EIO_DESTROY (req);
 }
+static int
-static int eio_finish (eio_req *req)
+eio_finish (eio_req *req)
 {
   int res = EIO_FINISH (req);
   if (req->grp)
     {
       if (grp->grp_first == req)
         grp->grp_first = req->grp_next;
       res2 = grp_dec (grp);
-      if (!res && res2)
+      if (!res)
         res = res2;
     }
   eio_destroy (req);
   return res;
 }
+void
-void eio_grp_cancel (eio_req *grp)
+eio_grp_cancel (eio_req *grp)
 {
   for (grp = grp->grp_first; grp; grp = grp->grp_next)
     eio_cancel (grp);
 }
+void
-void eio_cancel (eio_req *req)
+eio_cancel (eio_req *req)
 {
   etp_cancel (req);
 }
+void
-void eio_submit (eio_req *req)
+eio_submit (eio_req *req)
 {
   etp_submit (req);
 }
-unsigned int eio_nreqs (void)
+unsigned int
+eio_nreqs (void)
 {
   return etp_nreqs ();
 }
-unsigned int eio_nready (void)
+unsigned int
+eio_nready (void)
 {
   return etp_nready ();
 }
-unsigned int eio_npending (void)
+unsigned int
+eio_npending (void)
 {
   return etp_npending ();
 }
-unsigned int eio_nthreads (void)
+unsigned int ecb_cold
+eio_nthreads (void)
 {
   return etp_nthreads ();
 }
+void ecb_cold
-void eio_set_max_poll_time (double nseconds)
+eio_set_max_poll_time (double nseconds)
 {
   etp_set_max_poll_time (nseconds);
 }
+void ecb_cold
-void eio_set_max_poll_reqs (unsigned int maxreqs)
+eio_set_max_poll_reqs (unsigned int maxreqs)
 {
   etp_set_max_poll_reqs (maxreqs);
 }
+void ecb_cold
-void eio_set_max_idle (unsigned int nthreads)
+eio_set_max_idle (unsigned int nthreads)
 {
   etp_set_max_idle (nthreads);
 }
+void ecb_cold
-void eio_set_idle_timeout (unsigned int seconds)
+eio_set_idle_timeout (unsigned int seconds)
 {
   etp_set_idle_timeout (seconds);
 }
+void ecb_cold
-void eio_set_min_parallel (unsigned int nthreads)
+eio_set_min_parallel (unsigned int nthreads)
 {
   etp_set_min_parallel (nthreads);
 }
+void ecb_cold
-void eio_set_max_parallel (unsigned int nthreads)
+eio_set_max_parallel (unsigned int nthreads)
 {
   etp_set_max_parallel (nthreads);
 }
 int eio_poll (void)
 # undef pread
 # undef pwrite
 # define pread  eio__pread
 # define pwrite eio__pwrite
-static ssize_t
+static eio_ssize_t
 eio__pread (int fd, void *buf, size_t count, off_t offset)
 {
-  ssize_t res;
+  eio_ssize_t res;
   off_t ooffset;
   X_LOCK (preadwritelock);
   ooffset = lseek (fd, 0, SEEK_CUR);
   lseek (fd, offset, SEEK_SET);
   X_UNLOCK (preadwritelock);
   return res;
 }
-static ssize_t
+static eio_ssize_t
 eio__pwrite (int fd, void *buf, size_t count, off_t offset)
 {
-  ssize_t res;
+  eio_ssize_t res;
   off_t ooffset;
   X_LOCK (preadwritelock);
   ooffset = lseek (fd, 0, SEEK_CUR);
   lseek (fd, offset, SEEK_SET);
 #ifndef HAVE_FUTIMES
 # undef futimes
 # define futimes(fd,times) eio__futimes (fd, times)
+static int
-static int eio__futimes (int fd, const struct timeval tv[2])
+eio__futimes (int fd, const struct timeval tv[2])
 {
   errno = ENOSYS;
   return -1;
 }
 # undef fdatasync
 # define fdatasync(fd) fsync (fd)
 #endif
 /* sync_file_range always needs emulation */
-int
+static int
 eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
 {
 #if HAVE_SYNC_FILE_RANGE
   int res;
   /* even though we could play tricks with the flags, it's better to always
    * call fdatasync, as that matches the expectation of its users best */
   return fdatasync (fd);
 }
+static int
+eio__fallocate (int fd, int mode, off_t offset, size_t len)
+{
+#if HAVE_FALLOCATE
+  return fallocate (fd, mode, offset, len);
+#else
+  errno = ENOSYS;
+  return -1;
+#endif
+}
 #if !HAVE_READAHEAD
 # undef readahead
 # define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
-static ssize_t
+static eio_ssize_t
 eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
 {
   size_t todo = count;
   dBUF;
 }
 #endif
 /* sendfile always needs emulation */
-static ssize_t
+static eio_ssize_t
 eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
 {
-  ssize_t written = 0;
+  eio_ssize_t written = 0;
-  ssize_t res;
+  eio_ssize_t res;
   if (!count)
     return 0;
   for (;;)
     {
+#ifdef __APPLE__
+# undef HAVE_SENDFILE /* broken, as everything on os x */
+#endif
 #if HAVE_SENDFILE
 # if __linux
       off_t soffset = offset;
       res = sendfile (ofd, ifd, &soffset, count);
       if (res < 0 && sbytes)
         res = sbytes;
 # endif
-#elif defined (_WIN32)
+#elif defined (_WIN32) && 0
       /* does not work, just for documentation of what would need to be done */
+      /* actually, cannot be done like this, as TransmitFile changes the file offset, */
+      /* libeio guarantees that the file offset does not change, and windows */
+      /* has no way to get an independent handle to the same file description */
       HANDLE h = TO_SOCKET (ifd);
       SetFilePointer (h, offset, 0, FILE_BEGIN);
       res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
 #else
       res = 0;
       while (count)
         {
-          ssize_t cnt;
+          eio_ssize_t cnt;
           cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
           if (cnt <= 0)
             {
           count  -= cnt;
         }
     }
   return res;
+}
+#ifdef PAGESIZE
+# define eio_pagesize() PAGESIZE
+#else
+static intptr_t
+eio_pagesize (void)
+{
+  static intptr_t page;
+  if (!page)
+    page = sysconf (_SC_PAGESIZE);
+  return page;
+}
+#endif
+static void
+eio_page_align (void **addr, size_t *length)
+{
+  intptr_t mask = eio_pagesize () - 1;
+  /* round down addr */
+  intptr_t adj = mask & (intptr_t)*addr;
+  *addr   = (void *)((intptr_t)*addr - adj);
+  *length += adj;
+  /* round up length */
+  *length = (*length + mask) & ~mask;
+}
+#if !_POSIX_MEMLOCK
+# define eio__mlockall(a) EIO_ENOSYS ()
+#else
+static int
+eio__mlockall (int flags)
+{
+  #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
+    extern int mallopt (int, int);
+    mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
+  #endif
+  if (EIO_MCL_CURRENT   != MCL_CURRENT
+      || EIO_MCL_FUTURE != MCL_FUTURE)
+    {
+      flags = 0
+         | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
+         | (flags & EIO_MCL_FUTURE  ? MCL_FUTURE : 0);
+    }
+  return mlockall (flags);
+}
+#endif
+#if !_POSIX_MEMLOCK_RANGE
+# define eio__mlock(a,b) EIO_ENOSYS ()
+#else
+static int
+eio__mlock (void *addr, size_t length)
+{
+  eio_page_align (&addr, &length);
+  return mlock (addr, length);
+}
+#endif
+#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
+# define eio__msync(a,b,c) EIO_ENOSYS ()
+#else
+static int
+eio__msync (void *mem, size_t len, int flags)
+{
+  eio_page_align (&mem, &len);
+  if (EIO_MS_ASYNC         != MS_SYNC
+      || EIO_MS_INVALIDATE != MS_INVALIDATE
+      || EIO_MS_SYNC       != MS_SYNC)
+    {
+      flags = 0
+         | (flags & EIO_MS_ASYNC      ? MS_ASYNC : 0)
+         | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
+         | (flags & EIO_MS_SYNC       ? MS_SYNC : 0);
+    }
+  return msync (mem, len, flags);
+}
+#endif
+static int
+eio__mtouch (eio_req *req)
+{
+  void *mem  = req->ptr2;
+  size_t len = req->size;
+  int flags  = req->int1;
+  eio_page_align (&mem, &len);
+  {
+    intptr_t addr = (intptr_t)mem;
+    intptr_t end = addr + len;
+    intptr_t page = eio_pagesize ();
+    if (addr < end)
+      if (flags & EIO_MT_MODIFY) /* modify */
+        do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
+      else
+        do { *((volatile sig_atomic_t *)addr)     ; } while ((addr += page) < len && !EIO_CANCELLED (req));
+  }
+  return 0;
+}
+/*****************************************************************************/
+/* requests implemented outside eio_execute, because they are so large */
+static void
+eio__realpath (eio_req *req, etp_worker *self)
+{
+  char *rel = req->ptr1;
+  char *res;
+  char *tmp1, *tmp2;
+#if SYMLOOP_MAX > 32
+  int symlinks = SYMLOOP_MAX;
+#else
+  int symlinks = 32;
+#endif
+  req->result = -1;
+  errno = EINVAL;
+  if (!rel)
+    return;
+  errno = ENOENT;
+  if (!*rel)
+    return;
+  if (!req->ptr2)
+    {
+      X_LOCK (wrklock);
+      req->flags |= EIO_FLAG_PTR2_FREE;
+      X_UNLOCK (wrklock);
+      req->ptr2 = malloc (PATH_MAX * 3);
+      errno = ENOMEM;
+      if (!req->ptr2)
+        return;
+    }
+  res  = req->ptr2;
+  tmp1 = res  + PATH_MAX;
+  tmp2 = tmp1 + PATH_MAX;
+#if 0 /* disabled, the musl way to do things is just too racy */
+#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
+  /* on linux we may be able to ask the kernel */
+  {
+    int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
+    if (fd >= 0)
+      {
+        sprintf (tmp1, "/proc/self/fd/%d", fd);
+        req->result = readlink (tmp1, res, PATH_MAX);
+        close (fd);
+        /* here we should probably stat the open file and the disk file, to make sure they still match */
+        if (req->result > 0)
+          goto done;
+      }
+    else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
+      return;
+  }
+#endif
+#endif
+  if (*rel != '/')
+    {
+      if (!getcwd (res, PATH_MAX))
+        return;
+      if (res [1]) /* only use if not / */
+        res += strlen (res);
+    }
+  while (*rel)
+    {
+      eio_ssize_t len, linklen;
+      char *beg = rel;
+      while (*rel && *rel != '/')
+        ++rel;
+      len = rel - beg;
+      if (!len) /* skip slashes */
+        {
+          ++rel;
+          continue;
+        }
+      if (beg [0] == '.')
+        {
+          if (len == 1)
+            continue; /* . - nop */
+          if (beg [1] == '.' && len == 2)
+            {
+              /* .. - back up one component, if possible */
+              while (res != req->ptr2)
+                if (*--res == '/')
+                  break;
+              continue;
+            }
+        }
+        errno = ENAMETOOLONG;
+        if (res + 1 + len + 1 >= tmp1)
+          return;
+        /* copy one component */
+        *res = '/';
+        memcpy (res + 1, beg, len);
+        /* zero-terminate, for readlink */
+        res [len + 1] = 0;
+        /* now check if it's a symlink */
+        linklen = readlink (req->ptr2, tmp1, PATH_MAX);
+        if (linklen < 0)
+          {
+            if (errno != EINVAL)
+              return;
+            /* it's a normal directory. hopefully */
+            res += len + 1;
+          }
+        else
+          {
+            /* yay, it was a symlink - build new path in tmp2 */
+            int rellen = strlen (rel);
+            errno = ENAMETOOLONG;
+            if (linklen + 1 + rellen >= PATH_MAX)
+              return;
+            errno = ELOOP;
+            if (!--symlinks)
+              return;
+            if (*tmp1 == '/')
+              res = req->ptr2; /* symlink resolves to an absolute path */
+            /* we need to be careful, as rel might point into tmp2 already */
+            memmove (tmp2 + linklen + 1, rel, rellen + 1);
+            tmp2 [linklen] = '/';
+            memcpy (tmp2, tmp1, linklen);
+            rel = tmp2;
+          }
+    }
+  /* special case for the lone root path */
+  if (res == req->ptr2)
+    *res++ = '/';
+  req->result = res - (char *)req->ptr2;
+done:
+  req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
 }
 static signed char
 eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
 {
   X_LOCK (wrklock);
   /* the corresponding closedir is in ETP_WORKER_CLEAR */
   self->dirp = dirp = opendir (req->ptr1);
+  if (req->flags & EIO_FLAG_PTR1_FREE)
+    free (req->ptr1);
   req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
   req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
   req->ptr2 = names = malloc (namesalloc);
   X_UNLOCK (wrklock);
         /* skip . and .. entries */
         if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
           {
             int len = D_NAMLEN (entp) + 1;
-            while (expect_false (namesoffs + len > namesalloc))
+            while (ecb_expect_false (namesoffs + len > namesalloc))
               {
                 namesalloc *= 2;
                 X_LOCK (wrklock);
                 req->ptr2 = names = realloc (names, namesalloc);
                 X_UNLOCK (wrklock);
             if (dents)
               {
                 struct eio_dirent *ent;
-                if (expect_false (dentoffs == dentalloc))
+                if (ecb_expect_false (dentoffs == dentalloc))
                   {
                     dentalloc *= 2;
                     X_LOCK (wrklock);
                     req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
                     X_UNLOCK (wrklock);
             break;
           }
       }
 }
-#ifdef PAGESIZE
-# define eio_pagesize() PAGESIZE
-#else
-static intptr_t
-eio_pagesize (void)
-{
-  static intptr_t page;
-  if (!page)
-    page = sysconf (_SC_PAGESIZE);
-  return page;
-}
-#endif
-static void
-eio_page_align (void **addr, size_t *length)
-{
-  intptr_t mask = eio_pagesize () - 1;
-  /* round down addr */
-  intptr_t adj = mask & (intptr_t)*addr;
-  *addr   = (void *)((intptr_t)*addr - adj);
-  *length += adj;
-  /* round up length */
-  *length = (*length + mask) & ~mask;
-}
-#if !_POSIX_MEMLOCK
-# define eio__mlockall(a) ((errno = ENOSYS), -1)
-#else
-static int
-eio__mlockall (int flags)
-{
-  #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
-    extern int mallopt (int, int);
-    mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
-  #endif
-  if (EIO_MCL_CURRENT   != MCL_CURRENT
-      || EIO_MCL_FUTURE != MCL_FUTURE)
-    {
-      flags = 0
-         | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
-         | (flags & EIO_MCL_FUTURE  ? MCL_FUTURE : 0);
-    }
-  return mlockall (flags);
-}
-#endif
-#if !_POSIX_MEMLOCK_RANGE
-# define eio__mlock(a,b) ((errno = ENOSYS), -1)
-#else
-static int
-eio__mlock (void *addr, size_t length)
-{
-  eio_page_align (&addr, &length);
-  return mlock (addr, length);
-}
-#endif
-#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
-# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
-#else
-int
-eio__msync (void *mem, size_t len, int flags)
-{
-  eio_page_align (&mem, &len);
-  if (EIO_MS_ASYNC         != MS_SYNC
-      || EIO_MS_INVALIDATE != MS_INVALIDATE
-      || EIO_MS_SYNC       != MS_SYNC)
-    {
-      flags = 0
-         | (flags & EIO_MS_ASYNC      ? MS_ASYNC : 0)
-         | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
-         | (flags & EIO_MS_SYNC       ? MS_SYNC : 0);
-    }
-  return msync (mem, len, flags);
-}
-#endif
-int
-eio__mtouch (eio_req *req)
-{
-  void *mem  = req->ptr2;
-  size_t len = req->size;
-  int flags  = req->int1;
-  eio_page_align (&mem, &len);
-  {
-    intptr_t addr = (intptr_t)mem;
-    intptr_t end = addr + len;
-    intptr_t page = eio_pagesize ();
-    if (addr < end)
-      if (flags & EIO_MT_MODIFY) /* modify */
-        do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
-      else
-        do { *((volatile sig_atomic_t *)addr)     ; } while ((addr += page) < len && !EIO_CANCELLED (req));
-  }
-  return 0;
-}
 /*****************************************************************************/
 #define ALLOC(len)				\
   if (!req->ptr2)				\
     {						\
 X_THREAD_PROC (etp_proc)
 {
   ETP_REQ *req;
   struct timespec ts;
   etp_worker *self = (etp_worker *)thr_arg;
+  int timeout;
-  /* try to distribute timeouts somewhat randomly */
+  /* try to distribute timeouts somewhat evenly */
   ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
   for (;;)
     {
+      ts.tv_sec = 0;
       X_LOCK (reqlock);
       for (;;)
         {
           self->req = req = reqq_shift (&req_queue);
           if (req)
             break;
+          if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
+            {
+              X_UNLOCK (reqlock);
+              X_LOCK (wrklock);
+              --started;
+              X_UNLOCK (wrklock);
+              goto quit;
+            }
           ++idle;
-          ts.tv_sec = time (0) + idle_timeout;
+          if (idle <= max_idle)
-          if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
+            /* we are allowed to idle, so do so without any timeout */
+            X_COND_WAIT (reqwait, reqlock);
+          else
             {
-              if (idle > max_idle)
+              /* initialise timeout once */
-                {
+              if (!ts.tv_sec)
-                  --idle;
+                ts.tv_sec = time (0) + idle_timeout;
-                  X_UNLOCK (reqlock);
-                  X_LOCK (wrklock);
-                  --started;
-                  X_UNLOCK (wrklock);
-                  goto quit;
-                }
-              /* we are allowed to idle, so do so without any timeout */
-              X_COND_WAIT (reqwait, reqlock);
+              if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
+                ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
             }
           --idle;
         }
       X_UNLOCK (reqlock);
       if (req->type < 0)
         goto quit;
-      if (!EIO_CANCELLED (req))
-        ETP_EXECUTE (self, req);
+      ETP_EXECUTE (self, req);
       X_LOCK (reslock);
       ++npending;
   return 0;
 }
 /*****************************************************************************/
+int ecb_cold
-int eio_init (void (*want_poll)(void), void (*done_poll)(void))
+eio_init (void (*want_poll)(void), void (*done_poll)(void))
 {
   return etp_init (want_poll, done_poll);
 }
+ecb_inline void
-static void eio_api_destroy (eio_req *req)
+eio_api_destroy (eio_req *req)
 {
   free (req);
 }
 #define REQ(rtype)                                            	\
     {								\
       eio_api_destroy (req);					\
       return 0;							\
     }
+static void
-static void eio_execute (etp_worker *self, eio_req *req)
+eio_execute (etp_worker *self, eio_req *req)
 {
+  if (ecb_expect_false (EIO_CANCELLED (req)))
+    {
+      req->result  = -1;
+      req->errorno = ECANCELED;
+      return;
+    }
   switch (req->type)
     {
       case EIO_READ:      ALLOC (req->size);
                           req->result = req->offs >= 0
                                       ? pread     (req->int1, req->ptr2, req->size, req->offs)
       case EIO_RENAME:    req->result = rename    (req->ptr1, req->ptr2); break;
       case EIO_LINK:      req->result = link      (req->ptr1, req->ptr2); break;
       case EIO_SYMLINK:   req->result = symlink   (req->ptr1, req->ptr2); break;
       case EIO_MKNOD:     req->result = mknod     (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
+      case EIO_REALPATH:  eio__realpath (req, self); break;
       case EIO_READLINK:  ALLOC (PATH_MAX);
                           req->result = readlink  (req->ptr1, req->ptr2, PATH_MAX); break;
       case EIO_SYNC:      req->result = 0; sync (); break;
       case EIO_FSYNC:     req->result = fsync     (req->int1); break;
       case EIO_MSYNC:     req->result = eio__msync (req->ptr2, req->size, req->int1); break;
       case EIO_MTOUCH:    req->result = eio__mtouch (req); break;
       case EIO_MLOCK:     req->result = eio__mlock (req->ptr2, req->size); break;
       case EIO_MLOCKALL:  req->result = eio__mlockall (req->int1); break;
       case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
+      case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
       case EIO_READDIR:   eio__scandir (req, self); break;
       case EIO_BUSY:
 #ifdef _WIN32
 eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
 {
   REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
 }
+eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
+{
+  REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
+}
 eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
 {
   REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
 }
 eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
 {
   REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
 }
-eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)
+eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
 {
   REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
 }
 eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
 eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
 {
   REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
 }
-eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)
+eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
 {
   REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
 }
 eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
 }
 eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
 {
   return eio__1path (EIO_READLINK, path, pri, cb, data);
+}
+eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
+{
+  return eio__1path (EIO_REALPATH, path, pri, cb, data);
 }
 eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
 {
   return eio__1path (EIO_STAT, path, pri, cb, data);
 eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
 {
   return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
 }
-eio_req *eio_custom (void (*)(eio_req *) execute, int pri, eio_cb cb, void *data);
+eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
 {
   REQ (EIO_CUSTOM); req->feed = execute; SEND;
 }
 #endif
 #undef SEND
 /*****************************************************************************/
 /* grp functions */
+void
-void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
+eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
 {
   grp->int2 = limit;
   grp->feed = feed;
   grp_try_feed (grp);
 }
+void
-void eio_grp_limit (eio_req *grp, int limit)
+eio_grp_limit (eio_req *grp, int limit)
 {
   grp->int2 = limit;
   grp_try_feed (grp);
 }
+void
-void eio_grp_add (eio_req *grp, eio_req *req)
+eio_grp_add (eio_req *grp, eio_req *req)
 {
   assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
   grp->flags |= EIO_FLAG_GROUPADD;
 }
 /*****************************************************************************/
 /* misc garbage */
+eio_ssize_t
-ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
+eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
 {
   etp_worker wrk;
-  ssize_t ret;
+  eio_ssize_t ret;
   wrk.dbuf = 0;
   ret = eio__sendfile (ofd, ifd, offset, count, &wrk);

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.69 by root, Fri Jun 10 06:50:42 2011 UTC vs. Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.69 by root, Fri Jun 10 06:50:42 2011 UTC vs.
Revision 1.89 by root, Thu Jul 14 22:36:17 2011 UTC