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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.70 by root, Fri Jun 10 06:55:10 2011 UTC vs.
Revision 1.91 by root, Sun Jul 17 04:20:04 2011 UTC

… …
40#ifndef _WIN32 40#ifndef _WIN32
41# include "config.h" 41# include "config.h"
42#endif 42#endif
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h"
45 46
46#ifdef EIO_STACKSIZE 47#ifdef EIO_STACKSIZE
47# define XTHREAD_STACKSIZE EIO_STACKSIZE 48# define XTHREAD_STACKSIZE EIO_STACKSIZE
48#endif 49#endif
49#include "xthread.h" 50#include "xthread.h"
… …
53#include <stdlib.h> 54#include <stdlib.h>
54#include <string.h> 55#include <string.h>
55#include <errno.h> 56#include <errno.h>
56#include <sys/types.h> 57#include <sys/types.h>
57#include <sys/stat.h> 58#include <sys/stat.h>
58#include <sys/statvfs.h>
59#include <limits.h> 59#include <limits.h>
60#include <fcntl.h> 60#include <fcntl.h>
61#include <assert.h> 61#include <assert.h>
62 62
63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */ 63/* intptr_t comes from unistd.h, says POSIX/UNIX/tradition */
64/* intptr_t only comes form stdint.h, says idiot openbsd coder */ 64/* intptr_t only comes from stdint.h, says idiot openbsd coder */
65#if HAVE_STDINT_H 65#if HAVE_STDINT_H
66# include <stdint.h> 66# include <stdint.h>
67#endif 67#endif
68 68
69#ifndef ECANCELED
70# define ECANCELED EDOM
71#endif
72#ifndef ELOOP
73# define ELOOP EDOM
74#endif
75
76static void eio_destroy (eio_req *req);
77
69#ifndef EIO_FINISH 78#ifndef EIO_FINISH
70# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 79# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
71#endif 80#endif
72 81
73#ifndef EIO_DESTROY 82#ifndef EIO_DESTROY
… …
76 85
77#ifndef EIO_FEED 86#ifndef EIO_FEED
78# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0) 87# define EIO_FEED(req) do { if ((req)->feed ) (req)->feed (req); } while (0)
79#endif 88#endif
80 89
90#ifndef EIO_FD_TO_WIN32_HANDLE
91# define EIO_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
92#endif
93#ifndef EIO_WIN32_HANDLE_TO_FD
94# define EIO_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
95#endif
96
97#define EIO_ERRNO(errval,retval) ((errno = errval), retval)
98
99#define EIO_ENOSYS() EIO_ERRNO (ENOSYS, -1)
100
81#ifdef _WIN32 101#ifdef _WIN32
82 102
83 /*doh*/ 103 #undef PAGESIZE
104 #define PAGESIZE 4096 /* GetSystemInfo? */
105
106 #ifdef EIO_STRUCT_STATI64
107 #define stat(path,buf) _stati64 (path,buf)
108 #define fstat(fd,buf) _fstati64 (path,buf)
109 #endif
110 #define lstat(path,buf) stat (path,buf)
111 #define fsync(fd) (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
112 #define mkdir(path,mode) _mkdir (path)
113 #define link(old,neu) (CreateHardLink (neu, old, 0) ? 0 : EIO_ERRNO (ENOENT, -1))
114
115 #define chmod(path,mode) _chmod (path, mode)
116 #define dup(fd) _dup (fd)
117 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
118
119 #define fchmod(fd,mode) EIO_ENOSYS ()
120 #define chown(path,uid,gid) EIO_ENOSYS ()
121 #define fchown(fd,uid,gid) EIO_ENOSYS ()
122 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
123 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
124 #define mknod(path,mode,dev) EIO_ENOSYS ()
125 #define sync() EIO_ENOSYS ()
126 #define readlink(path,buf,s) EIO_ENOSYS ()
127 #define statvfs(path,buf) EIO_ENOSYS ()
128 #define fstatvfs(fd,buf) EIO_ENOSYS ()
129
130 /* we could even stat and see if it exists */
131 static int
132 symlink (const char *old, const char *neu)
133 {
134 #if WINVER >= 0x0600
135 if (CreateSymbolicLink (neu, old, 1))
136 return 0;
137
138 if (CreateSymbolicLink (neu, old, 0))
139 return 0;
140 #endif
141
142 return EIO_ERRNO (ENOENT, -1);
143 }
144
145 /* POSIX API only */
146 #define CreateHardLink(neu,old,flags) 0
147 #define CreateSymbolicLink(neu,old,flags) 0
148
149 struct statvfs
150 {
151 int dummy;
152 };
153
154 #define DT_DIR EIO_DT_DIR
155 #define DT_REG EIO_DT_REG
156 #define D_NAME(entp) entp.cFileName
157 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
158
84#else 159#else
85 160
86# include <sys/time.h> 161 #include <sys/time.h>
87# include <sys/select.h> 162 #include <sys/select.h>
163 #include <sys/statvfs.h>
88# include <unistd.h> 164 #include <unistd.h>
89# include <utime.h> 165 #include <utime.h>
90# include <signal.h> 166 #include <signal.h>
91# include <dirent.h> 167 #include <dirent.h>
92 168
93#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 169 #if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
94# include <sys/mman.h> 170 #include <sys/mman.h>
95#endif 171 #endif
96 172
173 #define D_NAME(entp) entp->d_name
174
97/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */ 175 /* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
98# if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ 176 #if __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
99# define _DIRENT_HAVE_D_TYPE /* sigh */ 177 #define _DIRENT_HAVE_D_TYPE /* sigh */
100# define D_INO(de) (de)->d_fileno 178 #define D_INO(de) (de)->d_fileno
101# define D_NAMLEN(de) (de)->d_namlen 179 #define D_NAMLEN(de) (de)->d_namlen
102# elif __linux || defined d_ino || _XOPEN_SOURCE >= 600 180 #elif __linux || defined d_ino || _XOPEN_SOURCE >= 600
103# define D_INO(de) (de)->d_ino 181 #define D_INO(de) (de)->d_ino
104# endif 182 #endif
105 183
106#ifdef _D_EXACT_NAMLEN 184 #ifdef _D_EXACT_NAMLEN
107# undef D_NAMLEN 185 #undef D_NAMLEN
108# define D_NAMLEN(de) _D_EXACT_NAMLEN (de) 186 #define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
109#endif 187 #endif
110 188
111# ifdef _DIRENT_HAVE_D_TYPE 189 #ifdef _DIRENT_HAVE_D_TYPE
112# define D_TYPE(de) (de)->d_type 190 #define D_TYPE(de) (de)->d_type
113# endif 191 #endif
114 192
115# ifndef EIO_STRUCT_DIRENT 193 #ifndef EIO_STRUCT_DIRENT
116# define EIO_STRUCT_DIRENT struct dirent 194 #define EIO_STRUCT_DIRENT struct dirent
117# endif 195 #endif
118 196
119#endif 197#endif
120 198
121#if HAVE_SENDFILE 199#if HAVE_SENDFILE
122# if __linux 200# if __linux
… …
138#endif 216#endif
139#ifndef D_INO 217#ifndef D_INO
140# define D_INO(de) 0 218# define D_INO(de) 0
141#endif 219#endif
142#ifndef D_NAMLEN 220#ifndef D_NAMLEN
143# define D_NAMLEN(de) strlen ((de)->d_name) 221# define D_NAMLEN(entp) strlen (D_NAME (entp))
144#endif 222#endif
145 223
146/* used for struct dirent, AIX doesn't provide it */ 224/* used for struct dirent, AIX doesn't provide it */
147#ifndef NAME_MAX 225#ifndef NAME_MAX
148# define NAME_MAX 4096 226# define NAME_MAX 4096
… …
165 if (!eio_buf) \ 243 if (!eio_buf) \
166 return -1; 244 return -1;
167 245
168#define EIO_TICKS ((1000000 + 1023) >> 10) 246#define EIO_TICKS ((1000000 + 1023) >> 10)
169 247
170/*****************************************************************************/
171
172#if __GNUC__ >= 3
173# define expect(expr,value) __builtin_expect ((expr),(value))
174#else
175# define expect(expr,value) (expr)
176#endif
177
178#define expect_false(expr) expect ((expr) != 0, 0)
179#define expect_true(expr) expect ((expr) != 0, 1)
180
181/*****************************************************************************/
182
183#define ETP_PRI_MIN EIO_PRI_MIN 248#define ETP_PRI_MIN EIO_PRI_MIN
184#define ETP_PRI_MAX EIO_PRI_MAX 249#define ETP_PRI_MAX EIO_PRI_MAX
185 250
186struct etp_worker; 251struct etp_worker;
187 252
… …
195#define ETP_WORKER_CLEAR(req) \ 260#define ETP_WORKER_CLEAR(req) \
196 if (wrk->dbuf) \ 261 if (wrk->dbuf) \
197 { \ 262 { \
198 free (wrk->dbuf); \ 263 free (wrk->dbuf); \
199 wrk->dbuf = 0; \ 264 wrk->dbuf = 0; \
200 } \
201 \
202 if (wrk->dirp) \
203 { \
204 closedir (wrk->dirp); \
205 wrk->dirp = 0; \
206 } 265 }
207 266
208#define ETP_WORKER_COMMON \ 267#define ETP_WORKER_COMMON \
209 void *dbuf; \ 268 void *dbuf;
210 DIR *dirp;
211 269
212/*****************************************************************************/ 270/*****************************************************************************/
213 271
214#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1) 272#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
215 273
216/* calculate time difference in ~1/EIO_TICKS of a second */ 274/* calculate time difference in ~1/EIO_TICKS of a second */
275ecb_inline int
217static int tvdiff (struct timeval *tv1, struct timeval *tv2) 276tvdiff (struct timeval *tv1, struct timeval *tv2)
218{ 277{
219 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS 278 return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
220 + ((tv2->tv_usec - tv1->tv_usec) >> 10); 279 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
221} 280}
222 281
… …
266#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock) 325#define ETP_WORKER_LOCK(wrk) X_LOCK (wrklock)
267#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock) 326#define ETP_WORKER_UNLOCK(wrk) X_UNLOCK (wrklock)
268 327
269/* worker threads management */ 328/* worker threads management */
270 329
330static void ecb_cold
271static void etp_worker_clear (etp_worker *wrk) 331etp_worker_clear (etp_worker *wrk)
272{ 332{
273 ETP_WORKER_CLEAR (wrk); 333 ETP_WORKER_CLEAR (wrk);
274} 334}
275 335
336static void ecb_cold
276static void etp_worker_free (etp_worker *wrk) 337etp_worker_free (etp_worker *wrk)
277{ 338{
278 wrk->next->prev = wrk->prev; 339 wrk->next->prev = wrk->prev;
279 wrk->prev->next = wrk->next; 340 wrk->prev->next = wrk->next;
280 341
281 free (wrk); 342 free (wrk);
282} 343}
283 344
284static unsigned int etp_nreqs (void) 345static unsigned int
346etp_nreqs (void)
285{ 347{
286 int retval; 348 int retval;
287 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 349 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
288 retval = nreqs; 350 retval = nreqs;
289 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 351 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
290 return retval; 352 return retval;
291} 353}
292 354
293static unsigned int etp_nready (void) 355static unsigned int
356etp_nready (void)
294{ 357{
295 unsigned int retval; 358 unsigned int retval;
296 359
297 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 360 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
298 retval = nready; 361 retval = nready;
299 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 362 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
300 363
301 return retval; 364 return retval;
302} 365}
303 366
304static unsigned int etp_npending (void) 367static unsigned int
368etp_npending (void)
305{ 369{
306 unsigned int retval; 370 unsigned int retval;
307 371
308 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 372 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
309 retval = npending; 373 retval = npending;
310 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 374 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
311 375
312 return retval; 376 return retval;
313} 377}
314 378
315static unsigned int etp_nthreads (void) 379static unsigned int
380etp_nthreads (void)
316{ 381{
317 unsigned int retval; 382 unsigned int retval;
318 383
319 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 384 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
320 retval = started; 385 retval = started;
… …
334} etp_reqq; 399} etp_reqq;
335 400
336static etp_reqq req_queue; 401static etp_reqq req_queue;
337static etp_reqq res_queue; 402static etp_reqq res_queue;
338 403
404static void ecb_noinline ecb_cold
405reqq_init (etp_reqq *q)
406{
407 int pri;
408
409 for (pri = 0; pri < ETP_NUM_PRI; ++pri)
410 q->qs[pri] = q->qe[pri] = 0;
411
412 q->size = 0;
413}
414
415static int ecb_noinline
339static int reqq_push (etp_reqq *q, ETP_REQ *req) 416reqq_push (etp_reqq *q, ETP_REQ *req)
340{ 417{
341 int pri = req->pri; 418 int pri = req->pri;
342 req->next = 0; 419 req->next = 0;
343 420
344 if (q->qe[pri]) 421 if (q->qe[pri])
… …
350 q->qe[pri] = q->qs[pri] = req; 427 q->qe[pri] = q->qs[pri] = req;
351 428
352 return q->size++; 429 return q->size++;
353} 430}
354 431
432static ETP_REQ * ecb_noinline
355static ETP_REQ *reqq_shift (etp_reqq *q) 433reqq_shift (etp_reqq *q)
356{ 434{
357 int pri; 435 int pri;
358 436
359 if (!q->size) 437 if (!q->size)
360 return 0; 438 return 0;
… …
375 } 453 }
376 454
377 abort (); 455 abort ();
378} 456}
379 457
458static void ecb_cold
380static void etp_thread_init (void) 459etp_thread_init (void)
381{ 460{
461#if !HAVE_PREADWRITE
462 X_MUTEX_CREATE (preadwritelock);
463#endif
382 X_MUTEX_CREATE (wrklock); 464 X_MUTEX_CREATE (wrklock);
383 X_MUTEX_CREATE (reslock); 465 X_MUTEX_CREATE (reslock);
384 X_MUTEX_CREATE (reqlock); 466 X_MUTEX_CREATE (reqlock);
385 X_COND_CREATE (reqwait); 467 X_COND_CREATE (reqwait);
386} 468}
387 469
388static void etp_atfork_prepare (void) 470static void ecb_cold
389{
390 X_LOCK (wrklock);
391 X_LOCK (reqlock);
392 X_LOCK (reslock);
393#if !HAVE_PREADWRITE
394 X_LOCK (preadwritelock);
395#endif
396}
397
398static void etp_atfork_parent (void)
399{
400#if !HAVE_PREADWRITE
401 X_UNLOCK (preadwritelock);
402#endif
403 X_UNLOCK (reslock);
404 X_UNLOCK (reqlock);
405 X_UNLOCK (wrklock);
406}
407
408static void etp_atfork_child (void) 471etp_atfork_child (void)
409{ 472{
410 ETP_REQ *prv; 473 reqq_init (&req_queue);
474 reqq_init (&res_queue);
411 475
412 while ((prv = reqq_shift (&req_queue))) 476 wrk_first.next =
413 ETP_DESTROY (prv); 477 wrk_first.prev = &wrk_first;
414
415 while ((prv = reqq_shift (&res_queue)))
416 ETP_DESTROY (prv);
417
418 while (wrk_first.next != &wrk_first)
419 {
420 etp_worker *wrk = wrk_first.next;
421
422 if (wrk->req)
423 ETP_DESTROY (wrk->req);
424
425 etp_worker_clear (wrk);
426 etp_worker_free (wrk);
427 }
428 478
429 started = 0; 479 started = 0;
430 idle = 0; 480 idle = 0;
431 nreqs = 0; 481 nreqs = 0;
432 nready = 0; 482 nready = 0;
433 npending = 0; 483 npending = 0;
434 484
435 etp_thread_init (); 485 etp_thread_init ();
436} 486}
437 487
438static void 488static void ecb_cold
439etp_once_init (void) 489etp_once_init (void)
440{ 490{
441 etp_thread_init (); 491 etp_thread_init ();
442 X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child); 492 X_THREAD_ATFORK (0, 0, etp_atfork_child);
443} 493}
444 494
445static int 495static int ecb_cold
446etp_init (void (*want_poll)(void), void (*done_poll)(void)) 496etp_init (void (*want_poll)(void), void (*done_poll)(void))
447{ 497{
448 static pthread_once_t doinit = PTHREAD_ONCE_INIT; 498 static pthread_once_t doinit = PTHREAD_ONCE_INIT;
449 499
450 pthread_once (&doinit, etp_once_init); 500 pthread_once (&doinit, etp_once_init);
… …
455 return 0; 505 return 0;
456} 506}
457 507
458X_THREAD_PROC (etp_proc); 508X_THREAD_PROC (etp_proc);
459 509
510static void ecb_cold
460static void etp_start_thread (void) 511etp_start_thread (void)
461{ 512{
462 etp_worker *wrk = calloc (1, sizeof (etp_worker)); 513 etp_worker *wrk = calloc (1, sizeof (etp_worker));
463 514
464 /*TODO*/ 515 /*TODO*/
465 assert (("unable to allocate worker thread data", wrk)); 516 assert (("unable to allocate worker thread data", wrk));
… …
478 free (wrk); 529 free (wrk);
479 530
480 X_UNLOCK (wrklock); 531 X_UNLOCK (wrklock);
481} 532}
482 533
534static void
483static void etp_maybe_start_thread (void) 535etp_maybe_start_thread (void)
484{ 536{
485 if (expect_true (etp_nthreads () >= wanted)) 537 if (ecb_expect_true (etp_nthreads () >= wanted))
486 return; 538 return;
487 539
488 /* todo: maybe use idle here, but might be less exact */ 540 /* todo: maybe use idle here, but might be less exact */
489 if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) 541 if (ecb_expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
490 return; 542 return;
491 543
492 etp_start_thread (); 544 etp_start_thread ();
493} 545}
494 546
547static void ecb_cold
495static void etp_end_thread (void) 548etp_end_thread (void)
496{ 549{
497 eio_req *req = calloc (1, sizeof (eio_req)); 550 eio_req *req = calloc (1, sizeof (eio_req));
498 551
499 req->type = -1; 552 req->type = -1;
500 req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 553 req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
… …
507 X_LOCK (wrklock); 560 X_LOCK (wrklock);
508 --started; 561 --started;
509 X_UNLOCK (wrklock); 562 X_UNLOCK (wrklock);
510} 563}
511 564
512static int etp_poll (void) 565static int
566etp_poll (void)
513{ 567{
514 unsigned int maxreqs; 568 unsigned int maxreqs;
515 unsigned int maxtime; 569 unsigned int maxtime;
516 struct timeval tv_start, tv_now; 570 struct timeval tv_start, tv_now;
517 571
… …
547 601
548 X_LOCK (reqlock); 602 X_LOCK (reqlock);
549 --nreqs; 603 --nreqs;
550 X_UNLOCK (reqlock); 604 X_UNLOCK (reqlock);
551 605
552 if (expect_false (req->type == EIO_GROUP && req->size)) 606 if (ecb_expect_false (req->type == EIO_GROUP && req->size))
553 { 607 {
554 req->int1 = 1; /* mark request as delayed */ 608 req->int1 = 1; /* mark request as delayed */
555 continue; 609 continue;
556 } 610 }
557 else 611 else
558 { 612 {
559 int res = ETP_FINISH (req); 613 int res = ETP_FINISH (req);
560 if (expect_false (res)) 614 if (ecb_expect_false (res))
561 return res; 615 return res;
562 } 616 }
563 617
564 if (expect_false (maxreqs && !--maxreqs)) 618 if (ecb_expect_false (maxreqs && !--maxreqs))
565 break; 619 break;
566 620
567 if (maxtime) 621 if (maxtime)
568 { 622 {
569 gettimeofday (&tv_now, 0); 623 gettimeofday (&tv_now, 0);
… …
575 629
576 errno = EAGAIN; 630 errno = EAGAIN;
577 return -1; 631 return -1;
578} 632}
579 633
634static void
580static void etp_cancel (ETP_REQ *req) 635etp_cancel (ETP_REQ *req)
581{ 636{
582 X_LOCK (wrklock); 637 req->cancelled = 1;
583 req->flags |= EIO_FLAG_CANCELLED;
584 X_UNLOCK (wrklock);
585 638
586 eio_grp_cancel (req); 639 eio_grp_cancel (req);
587} 640}
588 641
642static void
589static void etp_submit (ETP_REQ *req) 643etp_submit (ETP_REQ *req)
590{ 644{
591 req->pri -= ETP_PRI_MIN; 645 req->pri -= ETP_PRI_MIN;
592 646
593 if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN; 647 if (ecb_expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
594 if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN; 648 if (ecb_expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
595 649
596 if (expect_false (req->type == EIO_GROUP)) 650 if (ecb_expect_false (req->type == EIO_GROUP))
597 { 651 {
598 /* I hope this is worth it :/ */ 652 /* I hope this is worth it :/ */
599 X_LOCK (reqlock); 653 X_LOCK (reqlock);
600 ++nreqs; 654 ++nreqs;
601 X_UNLOCK (reqlock); 655 X_UNLOCK (reqlock);
… …
620 674
621 etp_maybe_start_thread (); 675 etp_maybe_start_thread ();
622 } 676 }
623} 677}
624 678
679static void ecb_cold
625static void etp_set_max_poll_time (double nseconds) 680etp_set_max_poll_time (double nseconds)
626{ 681{
627 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 682 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
628 max_poll_time = nseconds * EIO_TICKS; 683 max_poll_time = nseconds * EIO_TICKS;
629 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 684 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
630} 685}
631 686
687static void ecb_cold
632static void etp_set_max_poll_reqs (unsigned int maxreqs) 688etp_set_max_poll_reqs (unsigned int maxreqs)
633{ 689{
634 if (WORDACCESS_UNSAFE) X_LOCK (reslock); 690 if (WORDACCESS_UNSAFE) X_LOCK (reslock);
635 max_poll_reqs = maxreqs; 691 max_poll_reqs = maxreqs;
636 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock); 692 if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
637} 693}
638 694
695static void ecb_cold
639static void etp_set_max_idle (unsigned int nthreads) 696etp_set_max_idle (unsigned int nthreads)
640{ 697{
641 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 698 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
642 max_idle = nthreads; 699 max_idle = nthreads;
643 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 700 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
644} 701}
645 702
703static void ecb_cold
646static void etp_set_idle_timeout (unsigned int seconds) 704etp_set_idle_timeout (unsigned int seconds)
647{ 705{
648 if (WORDACCESS_UNSAFE) X_LOCK (reqlock); 706 if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
649 idle_timeout = seconds; 707 idle_timeout = seconds;
650 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock); 708 if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
651} 709}
652 710
711static void ecb_cold
653static void etp_set_min_parallel (unsigned int nthreads) 712etp_set_min_parallel (unsigned int nthreads)
654{ 713{
655 if (wanted < nthreads) 714 if (wanted < nthreads)
656 wanted = nthreads; 715 wanted = nthreads;
657} 716}
658 717
718static void ecb_cold
659static void etp_set_max_parallel (unsigned int nthreads) 719etp_set_max_parallel (unsigned int nthreads)
660{ 720{
661 if (wanted > nthreads) 721 if (wanted > nthreads)
662 wanted = nthreads; 722 wanted = nthreads;
663 723
664 while (started > wanted) 724 while (started > wanted)
665 etp_end_thread (); 725 etp_end_thread ();
666} 726}
667 727
668/*****************************************************************************/ 728/*****************************************************************************/
669 729
730static void
670static void grp_try_feed (eio_req *grp) 731grp_try_feed (eio_req *grp)
671{ 732{
672 while (grp->size < grp->int2 && !EIO_CANCELLED (grp)) 733 while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
673 { 734 {
674 grp->flags &= ~EIO_FLAG_GROUPADD; 735 grp->flags &= ~EIO_FLAG_GROUPADD;
675 736
… …
682 break; 743 break;
683 } 744 }
684 } 745 }
685} 746}
686 747
748static int
687static int grp_dec (eio_req *grp) 749grp_dec (eio_req *grp)
688{ 750{
689 --grp->size; 751 --grp->size;
690 752
691 /* call feeder, if applicable */ 753 /* call feeder, if applicable */
692 grp_try_feed (grp); 754 grp_try_feed (grp);
… …
696 return eio_finish (grp); 758 return eio_finish (grp);
697 else 759 else
698 return 0; 760 return 0;
699} 761}
700 762
763static void
701void eio_destroy (eio_req *req) 764eio_destroy (eio_req *req)
702{ 765{
703 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1); 766 if ((req)->flags & EIO_FLAG_PTR1_FREE) free (req->ptr1);
704 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2); 767 if ((req)->flags & EIO_FLAG_PTR2_FREE) free (req->ptr2);
705 768
706 EIO_DESTROY (req); 769 EIO_DESTROY (req);
707} 770}
708 771
772static int
709static int eio_finish (eio_req *req) 773eio_finish (eio_req *req)
710{ 774{
711 int res = EIO_FINISH (req); 775 int res = EIO_FINISH (req);
712 776
713 if (req->grp) 777 if (req->grp)
714 { 778 {
… …
722 if (grp->grp_first == req) 786 if (grp->grp_first == req)
723 grp->grp_first = req->grp_next; 787 grp->grp_first = req->grp_next;
724 788
725 res2 = grp_dec (grp); 789 res2 = grp_dec (grp);
726 790
727 if (!res && res2) 791 if (!res)
728 res = res2; 792 res = res2;
729 } 793 }
730 794
731 eio_destroy (req); 795 eio_destroy (req);
732 796
733 return res; 797 return res;
734} 798}
735 799
800void
736void eio_grp_cancel (eio_req *grp) 801eio_grp_cancel (eio_req *grp)
737{ 802{
738 for (grp = grp->grp_first; grp; grp = grp->grp_next) 803 for (grp = grp->grp_first; grp; grp = grp->grp_next)
739 eio_cancel (grp); 804 eio_cancel (grp);
740} 805}
741 806
807void
742void eio_cancel (eio_req *req) 808eio_cancel (eio_req *req)
743{ 809{
744 etp_cancel (req); 810 etp_cancel (req);
745} 811}
746 812
813void
747void eio_submit (eio_req *req) 814eio_submit (eio_req *req)
748{ 815{
749 etp_submit (req); 816 etp_submit (req);
750} 817}
751 818
752unsigned int eio_nreqs (void) 819unsigned int
820eio_nreqs (void)
753{ 821{
754 return etp_nreqs (); 822 return etp_nreqs ();
755} 823}
756 824
757unsigned int eio_nready (void) 825unsigned int
826eio_nready (void)
758{ 827{
759 return etp_nready (); 828 return etp_nready ();
760} 829}
761 830
762unsigned int eio_npending (void) 831unsigned int
832eio_npending (void)
763{ 833{
764 return etp_npending (); 834 return etp_npending ();
765} 835}
766 836
767unsigned int eio_nthreads (void) 837unsigned int ecb_cold
838eio_nthreads (void)
768{ 839{
769 return etp_nthreads (); 840 return etp_nthreads ();
770} 841}
771 842
843void ecb_cold
772void eio_set_max_poll_time (double nseconds) 844eio_set_max_poll_time (double nseconds)
773{ 845{
774 etp_set_max_poll_time (nseconds); 846 etp_set_max_poll_time (nseconds);
775} 847}
776 848
849void ecb_cold
777void eio_set_max_poll_reqs (unsigned int maxreqs) 850eio_set_max_poll_reqs (unsigned int maxreqs)
778{ 851{
779 etp_set_max_poll_reqs (maxreqs); 852 etp_set_max_poll_reqs (maxreqs);
780} 853}
781 854
855void ecb_cold
782void eio_set_max_idle (unsigned int nthreads) 856eio_set_max_idle (unsigned int nthreads)
783{ 857{
784 etp_set_max_idle (nthreads); 858 etp_set_max_idle (nthreads);
785} 859}
786 860
861void ecb_cold
787void eio_set_idle_timeout (unsigned int seconds) 862eio_set_idle_timeout (unsigned int seconds)
788{ 863{
789 etp_set_idle_timeout (seconds); 864 etp_set_idle_timeout (seconds);
790} 865}
791 866
867void ecb_cold
792void eio_set_min_parallel (unsigned int nthreads) 868eio_set_min_parallel (unsigned int nthreads)
793{ 869{
794 etp_set_min_parallel (nthreads); 870 etp_set_min_parallel (nthreads);
795} 871}
796 872
873void ecb_cold
797void eio_set_max_parallel (unsigned int nthreads) 874eio_set_max_parallel (unsigned int nthreads)
798{ 875{
799 etp_set_max_parallel (nthreads); 876 etp_set_max_parallel (nthreads);
800} 877}
801 878
802int eio_poll (void) 879int eio_poll (void)
… …
811# undef pread 888# undef pread
812# undef pwrite 889# undef pwrite
813# define pread eio__pread 890# define pread eio__pread
814# define pwrite eio__pwrite 891# define pwrite eio__pwrite
815 892
816static ssize_t 893static eio_ssize_t
817eio__pread (int fd, void *buf, size_t count, off_t offset) 894eio__pread (int fd, void *buf, size_t count, off_t offset)
818{ 895{
819 ssize_t res; 896 eio_ssize_t res;
820 off_t ooffset; 897 off_t ooffset;
821 898
822 X_LOCK (preadwritelock); 899 X_LOCK (preadwritelock);
823 ooffset = lseek (fd, 0, SEEK_CUR); 900 ooffset = lseek (fd, 0, SEEK_CUR);
824 lseek (fd, offset, SEEK_SET); 901 lseek (fd, offset, SEEK_SET);
… …
827 X_UNLOCK (preadwritelock); 904 X_UNLOCK (preadwritelock);
828 905
829 return res; 906 return res;
830} 907}
831 908
832static ssize_t 909static eio_ssize_t
833eio__pwrite (int fd, void *buf, size_t count, off_t offset) 910eio__pwrite (int fd, void *buf, size_t count, off_t offset)
834{ 911{
835 ssize_t res; 912 eio_ssize_t res;
836 off_t ooffset; 913 off_t ooffset;
837 914
838 X_LOCK (preadwritelock); 915 X_LOCK (preadwritelock);
839 ooffset = lseek (fd, 0, SEEK_CUR); 916 ooffset = lseek (fd, 0, SEEK_CUR);
840 lseek (fd, offset, SEEK_SET); 917 lseek (fd, offset, SEEK_SET);
… …
872#ifndef HAVE_FUTIMES 949#ifndef HAVE_FUTIMES
873 950
874# undef futimes 951# undef futimes
875# define futimes(fd,times) eio__futimes (fd, times) 952# define futimes(fd,times) eio__futimes (fd, times)
876 953
954static int
877static int eio__futimes (int fd, const struct timeval tv[2]) 955eio__futimes (int fd, const struct timeval tv[2])
878{ 956{
879 errno = ENOSYS; 957 errno = ENOSYS;
880 return -1; 958 return -1;
881} 959}
882 960
… …
886# undef fdatasync 964# undef fdatasync
887# define fdatasync(fd) fsync (fd) 965# define fdatasync(fd) fsync (fd)
888#endif 966#endif
889 967
890/* sync_file_range always needs emulation */ 968/* sync_file_range always needs emulation */
891int 969static int
892eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags) 970eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
893{ 971{
894#if HAVE_SYNC_FILE_RANGE 972#if HAVE_SYNC_FILE_RANGE
895 int res; 973 int res;
896 974
… …
913 /* even though we could play tricks with the flags, it's better to always 991 /* even though we could play tricks with the flags, it's better to always
914 * call fdatasync, as that matches the expectation of its users best */ 992 * call fdatasync, as that matches the expectation of its users best */
915 return fdatasync (fd); 993 return fdatasync (fd);
916} 994}
917 995
996static int
997eio__fallocate (int fd, int mode, off_t offset, size_t len)
998{
999#if HAVE_FALLOCATE
1000 return fallocate (fd, mode, offset, len);
1001#else
1002 errno = ENOSYS;
1003 return -1;
1004#endif
1005}
1006
918#if !HAVE_READAHEAD 1007#if !HAVE_READAHEAD
919# undef readahead 1008# undef readahead
920# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self) 1009# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
921 1010
922static ssize_t 1011static eio_ssize_t
923eio__readahead (int fd, off_t offset, size_t count, etp_worker *self) 1012eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
924{ 1013{
925 size_t todo = count; 1014 size_t todo = count;
926 dBUF; 1015 dBUF;
927 1016
… …
939} 1028}
940 1029
941#endif 1030#endif
942 1031
943/* sendfile always needs emulation */ 1032/* sendfile always needs emulation */
944static ssize_t 1033static eio_ssize_t
945eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) 1034eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
946{ 1035{
947 ssize_t written = 0; 1036 eio_ssize_t written = 0;
948 ssize_t res; 1037 eio_ssize_t res;
949 1038
950 if (!count) 1039 if (!count)
951 return 0; 1040 return 0;
952 1041
953 for (;;) 1042 for (;;)
954 { 1043 {
1044#ifdef __APPLE__
1045# undef HAVE_SENDFILE /* broken, as everything on os x */
1046#endif
955#if HAVE_SENDFILE 1047#if HAVE_SENDFILE
956# if __linux 1048# if __linux
957 off_t soffset = offset; 1049 off_t soffset = offset;
958 res = sendfile (ofd, ifd, &soffset, count); 1050 res = sendfile (ofd, ifd, &soffset, count);
959 1051
… …
1002 if (res < 0 && sbytes) 1094 if (res < 0 && sbytes)
1003 res = sbytes; 1095 res = sbytes;
1004 1096
1005# endif 1097# endif
1006 1098
1007#elif defined (_WIN32) 1099#elif defined (_WIN32) && 0
1008 /* does not work, just for documentation of what would need to be done */ 1100 /* does not work, just for documentation of what would need to be done */
1009 /* actually, cannot be done like this, as TransmitFile changes the file offset, */ 1101 /* actually, cannot be done like this, as TransmitFile changes the file offset, */
1010 /* libeio guarantees that the file offset does not change, and windows */ 1102 /* libeio guarantees that the file offset does not change, and windows */
1011 /* has no way to get an independent handle to the same file description */ 1103 /* has no way to get an independent handle to the same file description */
1012 HANDLE h = TO_SOCKET (ifd); 1104 HANDLE h = TO_SOCKET (ifd);
… …
1045 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK 1137 && (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
1046 /* BSDs */ 1138 /* BSDs */
1047#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */ 1139#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
1048 || errno == ENOTSUP 1140 || errno == ENOTSUP
1049#endif 1141#endif
1142#ifdef EOPNOTSUPP /* windows */
1050 || errno == EOPNOTSUPP /* BSDs */ 1143 || errno == EOPNOTSUPP /* BSDs */
1144#endif
1051#if __solaris 1145#if __solaris
1052 || errno == EAFNOSUPPORT || errno == EPROTOTYPE 1146 || errno == EAFNOSUPPORT || errno == EPROTOTYPE
1053#endif 1147#endif
1054 ) 1148 )
1055 ) 1149 )
… …
1059 1153
1060 res = 0; 1154 res = 0;
1061 1155
1062 while (count) 1156 while (count)
1063 { 1157 {
1064 ssize_t cnt; 1158 eio_ssize_t cnt;
1065 1159
1066 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); 1160 cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset);
1067 1161
1068 if (cnt <= 0) 1162 if (cnt <= 0)
1069 { 1163 {
… …
1086 } 1180 }
1087 1181
1088 return res; 1182 return res;
1089} 1183}
1090 1184
1185#ifdef PAGESIZE
1186# define eio_pagesize() PAGESIZE
1187#else
1188static intptr_t
1189eio_pagesize (void)
1190{
1191 static intptr_t page;
1192
1193 if (!page)
1194 page = sysconf (_SC_PAGESIZE);
1195
1196 return page;
1197}
1198#endif
1199
1200static void
1201eio_page_align (void **addr, size_t *length)
1202{
1203 intptr_t mask = eio_pagesize () - 1;
1204
1205 /* round down addr */
1206 intptr_t adj = mask & (intptr_t)*addr;
1207
1208 *addr = (void *)((intptr_t)*addr - adj);
1209 *length += adj;
1210
1211 /* round up length */
1212 *length = (*length + mask) & ~mask;
1213}
1214
1215#if !_POSIX_MEMLOCK
1216# define eio__mlockall(a) EIO_ENOSYS ()
1217#else
1218
1219static int
1220eio__mlockall (int flags)
1221{
1222 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1223 extern int mallopt (int, int);
1224 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1225 #endif
1226
1227 if (EIO_MCL_CURRENT != MCL_CURRENT
1228 || EIO_MCL_FUTURE != MCL_FUTURE)
1229 {
1230 flags = 0
1231 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1232 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1233 }
1234
1235 return mlockall (flags);
1236}
1237#endif
1238
1239#if !_POSIX_MEMLOCK_RANGE
1240# define eio__mlock(a,b) EIO_ENOSYS ()
1241#else
1242
1243static int
1244eio__mlock (void *addr, size_t length)
1245{
1246 eio_page_align (&addr, &length);
1247
1248 return mlock (addr, length);
1249}
1250
1251#endif
1252
1253#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1254# define eio__msync(a,b,c) EIO_ENOSYS ()
1255#else
1256
1257static int
1258eio__msync (void *mem, size_t len, int flags)
1259{
1260 eio_page_align (&mem, &len);
1261
1262 if (EIO_MS_ASYNC != MS_SYNC
1263 || EIO_MS_INVALIDATE != MS_INVALIDATE
1264 || EIO_MS_SYNC != MS_SYNC)
1265 {
1266 flags = 0
1267 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1268 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1269 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1270 }
1271
1272 return msync (mem, len, flags);
1273}
1274
1275#endif
1276
1277static int
1278eio__mtouch (eio_req *req)
1279{
1280 void *mem = req->ptr2;
1281 size_t len = req->size;
1282 int flags = req->int1;
1283
1284 eio_page_align (&mem, &len);
1285
1286 {
1287 intptr_t addr = (intptr_t)mem;
1288 intptr_t end = addr + len;
1289 intptr_t page = eio_pagesize ();
1290
1291 if (addr < end)
1292 if (flags & EIO_MT_MODIFY) /* modify */
1293 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1294 else
1295 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1296 }
1297
1298 return 0;
1299}
1300
1301/*****************************************************************************/
1302/* requests implemented outside eio_execute, because they are so large */
1303
1304static void
1305eio__realpath (eio_req *req, etp_worker *self)
1306{
1307 char *rel = req->ptr1;
1308 char *res;
1309 char *tmp1, *tmp2;
1310#if SYMLOOP_MAX > 32
1311 int symlinks = SYMLOOP_MAX;
1312#else
1313 int symlinks = 32;
1314#endif
1315
1316 req->result = -1;
1317
1318 errno = EINVAL;
1319 if (!rel)
1320 return;
1321
1322 errno = ENOENT;
1323 if (!*rel)
1324 return;
1325
1326 if (!req->ptr2)
1327 {
1328 X_LOCK (wrklock);
1329 req->flags |= EIO_FLAG_PTR2_FREE;
1330 X_UNLOCK (wrklock);
1331 req->ptr2 = malloc (PATH_MAX * 3);
1332
1333 errno = ENOMEM;
1334 if (!req->ptr2)
1335 return;
1336 }
1337
1338 res = req->ptr2;
1339 tmp1 = res + PATH_MAX;
1340 tmp2 = tmp1 + PATH_MAX;
1341
1342#if 0 /* disabled, the musl way to do things is just too racy */
1343#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1344 /* on linux we may be able to ask the kernel */
1345 {
1346 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1347
1348 if (fd >= 0)
1349 {
1350 sprintf (tmp1, "/proc/self/fd/%d", fd);
1351 req->result = readlink (tmp1, res, PATH_MAX);
1352 close (fd);
1353
1354 /* here we should probably stat the open file and the disk file, to make sure they still match */
1355
1356 if (req->result > 0)
1357 goto done;
1358 }
1359 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
1360 return;
1361 }
1362#endif
1363#endif
1364
1365 if (*rel != '/')
1366 {
1367 if (!getcwd (res, PATH_MAX))
1368 return;
1369
1370 if (res [1]) /* only use if not / */
1371 res += strlen (res);
1372 }
1373
1374 while (*rel)
1375 {
1376 eio_ssize_t len, linklen;
1377 char *beg = rel;
1378
1379 while (*rel && *rel != '/')
1380 ++rel;
1381
1382 len = rel - beg;
1383
1384 if (!len) /* skip slashes */
1385 {
1386 ++rel;
1387 continue;
1388 }
1389
1390 if (beg [0] == '.')
1391 {
1392 if (len == 1)
1393 continue; /* . - nop */
1394
1395 if (beg [1] == '.' && len == 2)
1396 {
1397 /* .. - back up one component, if possible */
1398
1399 while (res != req->ptr2)
1400 if (*--res == '/')
1401 break;
1402
1403 continue;
1404 }
1405 }
1406
1407 errno = ENAMETOOLONG;
1408 if (res + 1 + len + 1 >= tmp1)
1409 return;
1410
1411 /* copy one component */
1412 *res = '/';
1413 memcpy (res + 1, beg, len);
1414
1415 /* zero-terminate, for readlink */
1416 res [len + 1] = 0;
1417
1418 /* now check if it's a symlink */
1419 linklen = readlink (req->ptr2, tmp1, PATH_MAX);
1420
1421 if (linklen < 0)
1422 {
1423 if (errno != EINVAL)
1424 return;
1425
1426 /* it's a normal directory. hopefully */
1427 res += len + 1;
1428 }
1429 else
1430 {
1431 /* yay, it was a symlink - build new path in tmp2 */
1432 int rellen = strlen (rel);
1433
1434 errno = ENAMETOOLONG;
1435 if (linklen + 1 + rellen >= PATH_MAX)
1436 return;
1437
1438 errno = ELOOP;
1439 if (!--symlinks)
1440 return;
1441
1442 if (*tmp1 == '/')
1443 res = req->ptr2; /* symlink resolves to an absolute path */
1444
1445 /* we need to be careful, as rel might point into tmp2 already */
1446 memmove (tmp2 + linklen + 1, rel, rellen + 1);
1447 tmp2 [linklen] = '/';
1448 memcpy (tmp2, tmp1, linklen);
1449
1450 rel = tmp2;
1451 }
1452 }
1453
1454 /* special case for the lone root path */
1455 if (res == req->ptr2)
1456 *res++ = '/';
1457
1458 req->result = res - (char *)req->ptr2;
1459
1460done:
1461 req->ptr2 = realloc (req->ptr2, req->result); /* trade time for space savings */
1462}
1463
1091static signed char 1464static signed char
1092eio_dent_cmp (const eio_dirent *a, const eio_dirent *b) 1465eio_dent_cmp (const eio_dirent *a, const eio_dirent *b)
1093{ 1466{
1094 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */ 1467 return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
1095 : a->inode < b->inode ? -1 1468 : a->inode < b->inode ? -1
… …
1101 1474
1102#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */ 1475#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
1103#define EIO_SORT_FAST 60 /* when to only use insertion sort */ 1476#define EIO_SORT_FAST 60 /* when to only use insertion sort */
1104 1477
1105static void 1478static void
1106eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1479eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1107{ 1480{
1108 unsigned char bits [9 + sizeof (ino_t) * 8]; 1481 unsigned char bits [9 + sizeof (eio_ino_t) * 8];
1109 unsigned char *bit = bits; 1482 unsigned char *bit = bits;
1110 1483
1111 assert (CHAR_BIT == 8); 1484 assert (CHAR_BIT == 8);
1112 assert (sizeof (eio_dirent) * 8 < 256); 1485 assert (sizeof (eio_dirent) * 8 < 256);
1113 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */ 1486 assert (offsetof (eio_dirent, inode)); /* we use bit #0 as sentinel */
… …
1115 1488
1116 if (size <= EIO_SORT_FAST) 1489 if (size <= EIO_SORT_FAST)
1117 return; 1490 return;
1118 1491
1119 /* first prepare an array of bits to test in our radix sort */ 1492 /* first prepare an array of bits to test in our radix sort */
1120 /* try to take endianness into account, as well as differences in ino_t sizes */ 1493 /* try to take endianness into account, as well as differences in eio_ino_t sizes */
1121 /* inode_bits must contain all inodes ORed together */ 1494 /* inode_bits must contain all inodes ORed together */
1122 /* which is used to skip bits that are 0 everywhere, which is very common */ 1495 /* which is used to skip bits that are 0 everywhere, which is very common */
1123 { 1496 {
1124 ino_t endianness; 1497 eio_ino_t endianness;
1125 int i, j; 1498 int i, j;
1126 1499
1127 /* we store the byte offset of byte n into byte n of "endianness" */ 1500 /* we store the byte offset of byte n into byte n of "endianness" */
1128 for (i = 0; i < sizeof (ino_t); ++i) 1501 for (i = 0; i < sizeof (eio_ino_t); ++i)
1129 ((unsigned char *)&endianness)[i] = i; 1502 ((unsigned char *)&endianness)[i] = i;
1130 1503
1131 *bit++ = 0; 1504 *bit++ = 0;
1132 1505
1133 for (i = 0; i < sizeof (ino_t); ++i) 1506 for (i = 0; i < sizeof (eio_ino_t); ++i)
1134 { 1507 {
1135 /* shifting off the byte offsets out of "endianness" */ 1508 /* shifting off the byte offsets out of "endianness" */
1136 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8; 1509 int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
1137 endianness >>= 8; 1510 endianness >>= 8;
1138 1511
1139 for (j = 0; j < 8; ++j) 1512 for (j = 0; j < 8; ++j)
1140 if (inode_bits & (((ino_t)1) << (i * 8 + j))) 1513 if (inode_bits & (((eio_ino_t)1) << (i * 8 + j)))
1141 *bit++ = offs + j; 1514 *bit++ = offs + j;
1142 } 1515 }
1143 1516
1144 for (j = 0; j < 8; ++j) 1517 for (j = 0; j < 8; ++j)
1145 if (score_bits & (1 << j)) 1518 if (score_bits & (1 << j))
1146 *bit++ = offsetof (eio_dirent, score) * 8 + j; 1519 *bit++ = offsetof (eio_dirent, score) * 8 + j;
1147 } 1520 }
1148 1521
1149 /* now actually do the sorting (a variant of MSD radix sort) */ 1522 /* now actually do the sorting (a variant of MSD radix sort) */
1150 { 1523 {
1151 eio_dirent *base_stk [9 + sizeof (ino_t) * 8], *base; 1524 eio_dirent *base_stk [9 + sizeof (eio_ino_t) * 8], *base;
1152 eio_dirent *end_stk [9 + sizeof (ino_t) * 8], *end; 1525 eio_dirent *end_stk [9 + sizeof (eio_ino_t) * 8], *end;
1153 unsigned char *bit_stk [9 + sizeof (ino_t) * 8]; 1526 unsigned char *bit_stk [9 + sizeof (eio_ino_t) * 8];
1154 int stk_idx = 0; 1527 int stk_idx = 0;
1155 1528
1156 base_stk [stk_idx] = dents; 1529 base_stk [stk_idx] = dents;
1157 end_stk [stk_idx] = dents + size; 1530 end_stk [stk_idx] = dents + size;
1158 bit_stk [stk_idx] = bit - 1; 1531 bit_stk [stk_idx] = bit - 1;
… …
1237 } 1610 }
1238 } 1611 }
1239} 1612}
1240 1613
1241static void 1614static void
1242eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits) 1615eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, eio_ino_t inode_bits)
1243{ 1616{
1244 if (size <= 1) 1617 if (size <= 1)
1245 return; /* our insertion sort relies on size > 0 */ 1618 return; /* our insertion sort relies on size > 0 */
1246 1619
1247 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */ 1620 /* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
… …
1255 1628
1256/* read a full directory */ 1629/* read a full directory */
1257static void 1630static void
1258eio__scandir (eio_req *req, etp_worker *self) 1631eio__scandir (eio_req *req, etp_worker *self)
1259{ 1632{
1260 DIR *dirp;
1261 EIO_STRUCT_DIRENT *entp;
1262 char *name, *names; 1633 char *name, *names;
1263 int namesalloc = 4096; 1634 int namesalloc = 4096 - sizeof (void *) * 4;
1264 int namesoffs = 0; 1635 int namesoffs = 0;
1265 int flags = req->int1; 1636 int flags = req->int1;
1266 eio_dirent *dents = 0; 1637 eio_dirent *dents = 0;
1267 int dentalloc = 128; 1638 int dentalloc = 128;
1268 int dentoffs = 0; 1639 int dentoffs = 0;
1269 ino_t inode_bits = 0; 1640 eio_ino_t inode_bits = 0;
1641#ifdef _WIN32
1642 HANDLE dirp;
1643 WIN32_FIND_DATA entp;
1644#else
1645 DIR *dirp;
1646 EIO_STRUCT_DIRENT *entp;
1647#endif
1270 1648
1271 req->result = -1; 1649 req->result = -1;
1272 1650
1273 if (!(flags & EIO_READDIR_DENTS)) 1651 if (!(flags & EIO_READDIR_DENTS))
1274 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER); 1652 flags &= ~(EIO_READDIR_DIRS_FIRST | EIO_READDIR_STAT_ORDER);
1275 1653
1276 X_LOCK (wrklock); 1654#ifdef _WIN32
1277 /* the corresponding closedir is in ETP_WORKER_CLEAR */ 1655 {
1656 char *path = malloc (MAX_PATH);
1657 _snprintf (path, MAX_PATH, "%s/*", (const char *)req->ptr1);
1658 dirp = FindFirstFile (path, &entp);
1659 free (path);
1660
1661 if (!dirp)
1662 {
1663 switch (GetLastError ())
1664 {
1665 case ERROR_FILE_NOT_FOUND:
1666 req->result = 0;
1667 break;
1668
1669 case ERROR_PATH_NOT_FOUND:
1670 case ERROR_NO_MORE_FILES:
1671 errno = ENOENT;
1672 break;
1673
1674 case ERROR_NOT_ENOUGH_MEMORY:
1675 errno = ENOMEM;
1676 break;
1677
1678 default:
1679 errno = EINVAL;
1680 break;
1681 }
1682
1683 }
1684 }
1685#else
1278 self->dirp = dirp = opendir (req->ptr1); 1686 dirp = opendir (req->ptr1);
1687#endif
1688
1689 if (req->flags & EIO_FLAG_PTR1_FREE)
1690 free (req->ptr1);
1279 1691
1280 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE; 1692 req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
1281 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0; 1693 req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
1282 req->ptr2 = names = malloc (namesalloc); 1694 req->ptr2 = names = malloc (namesalloc);
1283 X_UNLOCK (wrklock);
1284 1695
1285 if (dirp && names && (!flags || dents)) 1696 if (dirp && names && (!flags || dents))
1286 for (;;) 1697 for (;;)
1287 { 1698 {
1699 int more;
1700
1701#ifdef _WIN32
1702 more = dirp;
1703#else
1288 errno = 0; 1704 errno = 0;
1289 entp = readdir (dirp); 1705 entp = readdir (dirp);
1706 more = entp;
1707#endif
1290 1708
1291 if (!entp) 1709 if (!more)
1292 { 1710 {
1711#ifndef _WIN32
1712 int old_errno = errno;
1713 closedir (dirp);
1714 errno = old_errno;
1715
1293 if (errno) 1716 if (errno)
1294 break; 1717 break;
1718#endif
1295 1719
1296 /* sort etc. */ 1720 /* sort etc. */
1297 req->int1 = flags; 1721 req->int1 = flags;
1298 req->result = dentoffs; 1722 req->result = dentoffs;
1299 1723
… …
1328 1752
1329 break; 1753 break;
1330 } 1754 }
1331 1755
1332 /* now add the entry to our list(s) */ 1756 /* now add the entry to our list(s) */
1333 name = entp->d_name; 1757 name = D_NAME (entp);
1334 1758
1335 /* skip . and .. entries */ 1759 /* skip . and .. entries */
1336 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 1760 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
1337 { 1761 {
1338 int len = D_NAMLEN (entp) + 1; 1762 int len = D_NAMLEN (entp) + 1;
1339 1763
1340 while (expect_false (namesoffs + len > namesalloc)) 1764 while (ecb_expect_false (namesoffs + len > namesalloc))
1341 { 1765 {
1342 namesalloc *= 2; 1766 namesalloc *= 2;
1343 X_LOCK (wrklock);
1344 req->ptr2 = names = realloc (names, namesalloc); 1767 req->ptr2 = names = realloc (names, namesalloc);
1345 X_UNLOCK (wrklock);
1346 1768
1347 if (!names) 1769 if (!names)
1348 break; 1770 break;
1349 } 1771 }
1350 1772
… …
1352 1774
1353 if (dents) 1775 if (dents)
1354 { 1776 {
1355 struct eio_dirent *ent; 1777 struct eio_dirent *ent;
1356 1778
1357 if (expect_false (dentoffs == dentalloc)) 1779 if (ecb_expect_false (dentoffs == dentalloc))
1358 { 1780 {
1359 dentalloc *= 2; 1781 dentalloc *= 2;
1360 X_LOCK (wrklock);
1361 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent)); 1782 req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
1362 X_UNLOCK (wrklock);
1363 1783
1364 if (!dents) 1784 if (!dents)
1365 break; 1785 break;
1366 } 1786 }
1367 1787
… …
1447 if (EIO_CANCELLED (req)) 1867 if (EIO_CANCELLED (req))
1448 { 1868 {
1449 errno = ECANCELED; 1869 errno = ECANCELED;
1450 break; 1870 break;
1451 } 1871 }
1872
1873#ifdef _WIN32
1874 if (!FindNextFile (dirp, &entp))
1875 {
1876 FindClose (dirp);
1877 dirp = 0;
1878 }
1879#endif
1452 } 1880 }
1453}
1454
1455#ifdef PAGESIZE
1456# define eio_pagesize() PAGESIZE
1457#else
1458static intptr_t
1459eio_pagesize (void)
1460{
1461 static intptr_t page;
1462
1463 if (!page)
1464 page = sysconf (_SC_PAGESIZE);
1465
1466 return page;
1467}
1468#endif
1469
1470static void
1471eio_page_align (void **addr, size_t *length)
1472{
1473 intptr_t mask = eio_pagesize () - 1;
1474
1475 /* round down addr */
1476 intptr_t adj = mask & (intptr_t)*addr;
1477
1478 *addr = (void *)((intptr_t)*addr - adj);
1479 *length += adj;
1480
1481 /* round up length */
1482 *length = (*length + mask) & ~mask;
1483}
1484
1485#if !_POSIX_MEMLOCK
1486# define eio__mlockall(a) ((errno = ENOSYS), -1)
1487#else
1488
1489static int
1490eio__mlockall (int flags)
1491{
1492 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
1493 extern int mallopt (int, int);
1494 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1495 #endif
1496
1497 if (EIO_MCL_CURRENT != MCL_CURRENT
1498 || EIO_MCL_FUTURE != MCL_FUTURE)
1499 {
1500 flags = 0
1501 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
1502 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
1503 }
1504
1505 return mlockall (flags);
1506}
1507#endif
1508
1509#if !_POSIX_MEMLOCK_RANGE
1510# define eio__mlock(a,b) ((errno = ENOSYS), -1)
1511#else
1512
1513static int
1514eio__mlock (void *addr, size_t length)
1515{
1516 eio_page_align (&addr, &length);
1517
1518 return mlock (addr, length);
1519}
1520
1521#endif
1522
1523#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
1524# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
1525#else
1526
1527int
1528eio__msync (void *mem, size_t len, int flags)
1529{
1530 eio_page_align (&mem, &len);
1531
1532 if (EIO_MS_ASYNC != MS_SYNC
1533 || EIO_MS_INVALIDATE != MS_INVALIDATE
1534 || EIO_MS_SYNC != MS_SYNC)
1535 {
1536 flags = 0
1537 | (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
1538 | (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
1539 | (flags & EIO_MS_SYNC ? MS_SYNC : 0);
1540 }
1541
1542 return msync (mem, len, flags);
1543}
1544
1545#endif
1546
1547int
1548eio__mtouch (eio_req *req)
1549{
1550 void *mem = req->ptr2;
1551 size_t len = req->size;
1552 int flags = req->int1;
1553
1554 eio_page_align (&mem, &len);
1555
1556 {
1557 intptr_t addr = (intptr_t)mem;
1558 intptr_t end = addr + len;
1559 intptr_t page = eio_pagesize ();
1560
1561 if (addr < end)
1562 if (flags & EIO_MT_MODIFY) /* modify */
1563 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req));
1564 else
1565 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req));
1566 }
1567
1568 return 0;
1569} 1881}
1570 1882
1571/*****************************************************************************/ 1883/*****************************************************************************/
1572 1884
1573#define ALLOC(len) \ 1885#define ALLOC(len) \
… …
1589{ 1901{
1590 ETP_REQ *req; 1902 ETP_REQ *req;
1591 struct timespec ts; 1903 struct timespec ts;
1592 etp_worker *self = (etp_worker *)thr_arg; 1904 etp_worker *self = (etp_worker *)thr_arg;
1593 1905
1594 /* try to distribute timeouts somewhat randomly */ 1906 /* try to distribute timeouts somewhat evenly */
1595 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL); 1907 ts.tv_nsec = ((unsigned long)self & 1023UL) * (1000000000UL / 1024UL);
1596 1908
1597 for (;;) 1909 for (;;)
1598 { 1910 {
1911 ts.tv_sec = 0;
1912
1599 X_LOCK (reqlock); 1913 X_LOCK (reqlock);
1600 1914
1601 for (;;) 1915 for (;;)
1602 { 1916 {
1603 self->req = req = reqq_shift (&req_queue); 1917 self->req = req = reqq_shift (&req_queue);
1604 1918
1605 if (req) 1919 if (req)
1606 break; 1920 break;
1607 1921
1922 if (ts.tv_sec == 1) /* no request, but timeout detected, let's quit */
1923 {
1924 X_UNLOCK (reqlock);
1925 X_LOCK (wrklock);
1926 --started;
1927 X_UNLOCK (wrklock);
1928 goto quit;
1929 }
1930
1608 ++idle; 1931 ++idle;
1609 1932
1610 ts.tv_sec = time (0) + idle_timeout; 1933 if (idle <= max_idle)
1611 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) 1934 /* we are allowed to idle, so do so without any timeout */
1935 X_COND_WAIT (reqwait, reqlock);
1936 else
1612 { 1937 {
1613 if (idle > max_idle) 1938 /* initialise timeout once */
1614 { 1939 if (!ts.tv_sec)
1615 --idle; 1940 ts.tv_sec = time (0) + idle_timeout;
1616 X_UNLOCK (reqlock);
1617 X_LOCK (wrklock);
1618 --started;
1619 X_UNLOCK (wrklock);
1620 goto quit;
1621 }
1622 1941
1623 /* we are allowed to idle, so do so without any timeout */
1624 X_COND_WAIT (reqwait, reqlock); 1942 if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
1943 ts.tv_sec = 1; /* assuming this is not a value computed above.,.. */
1625 } 1944 }
1626 1945
1627 --idle; 1946 --idle;
1628 } 1947 }
1629 1948
… …
1632 X_UNLOCK (reqlock); 1951 X_UNLOCK (reqlock);
1633 1952
1634 if (req->type < 0) 1953 if (req->type < 0)
1635 goto quit; 1954 goto quit;
1636 1955
1637 if (!EIO_CANCELLED (req))
1638 ETP_EXECUTE (self, req); 1956 ETP_EXECUTE (self, req);
1639 1957
1640 X_LOCK (reslock); 1958 X_LOCK (reslock);
1641 1959
1642 ++npending; 1960 ++npending;
1643 1961
… …
1658 return 0; 1976 return 0;
1659} 1977}
1660 1978
1661/*****************************************************************************/ 1979/*****************************************************************************/
1662 1980
1981int ecb_cold
1663int eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1982eio_init (void (*want_poll)(void), void (*done_poll)(void))
1664{ 1983{
1665 return etp_init (want_poll, done_poll); 1984 return etp_init (want_poll, done_poll);
1666} 1985}
1667 1986
1987ecb_inline void
1668static void eio_api_destroy (eio_req *req) 1988eio_api_destroy (eio_req *req)
1669{ 1989{
1670 free (req); 1990 free (req);
1671} 1991}
1672 1992
1673#define REQ(rtype) \ 1993#define REQ(rtype) \
… …
1692 { \ 2012 { \
1693 eio_api_destroy (req); \ 2013 eio_api_destroy (req); \
1694 return 0; \ 2014 return 0; \
1695 } 2015 }
1696 2016
2017static void
1697static void eio_execute (etp_worker *self, eio_req *req) 2018eio_execute (etp_worker *self, eio_req *req)
1698{ 2019{
2020 if (ecb_expect_false (EIO_CANCELLED (req)))
2021 {
2022 req->result = -1;
2023 req->errorno = ECANCELED;
2024 return;
2025 }
2026
1699 switch (req->type) 2027 switch (req->type)
1700 { 2028 {
1701 case EIO_READ: ALLOC (req->size); 2029 case EIO_READ: ALLOC (req->size);
1702 req->result = req->offs >= 0 2030 req->result = req->offs >= 0
1703 ? pread (req->int1, req->ptr2, req->size, req->offs) 2031 ? pread (req->int1, req->ptr2, req->size, req->offs)
… …
1737 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break; 2065 case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1738 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break; 2066 case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1739 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break; 2067 case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1740 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 2068 case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1741 2069
2070 case EIO_REALPATH: eio__realpath (req, self); break;
2071
1742 case EIO_READLINK: ALLOC (PATH_MAX); 2072 case EIO_READLINK: ALLOC (PATH_MAX);
1743 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break; 2073 req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1744 2074
1745 case EIO_SYNC: req->result = 0; sync (); break; 2075 case EIO_SYNC: req->result = 0; sync (); break;
1746 case EIO_FSYNC: req->result = fsync (req->int1); break; 2076 case EIO_FSYNC: req->result = fsync (req->int1); break;
… …
1748 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break; 2078 case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
1749 case EIO_MTOUCH: req->result = eio__mtouch (req); break; 2079 case EIO_MTOUCH: req->result = eio__mtouch (req); break;
1750 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break; 2080 case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
1751 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break; 2081 case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
1752 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break; 2082 case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
2083 case EIO_FALLOCATE: req->result = eio__fallocate (req->int1, req->int2, req->offs, req->size); break;
1753 2084
1754 case EIO_READDIR: eio__scandir (req, self); break; 2085 case EIO_READDIR: eio__scandir (req, self); break;
1755 2086
1756 case EIO_BUSY: 2087 case EIO_BUSY:
1757#ifdef _WIN32 2088#ifdef _WIN32
… …
1857eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) 2188eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data)
1858{ 2189{
1859 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND; 2190 REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
1860} 2191}
1861 2192
2193eio_req *eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data)
2194{
2195 REQ (EIO_FALLOCATE); req->int1 = fd; req->int2 = mode; req->offs = offset; req->size = len; SEND;
2196}
2197
1862eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data) 2198eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data)
1863{ 2199{
1864 REQ (EIO_FDATASYNC); req->int1 = fd; SEND; 2200 REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1865} 2201}
1866 2202
… …
1907eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) 2243eio_req *eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data)
1908{ 2244{
1909 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND; 2245 REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1910} 2246}
1911 2247
1912eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2248eio_req *eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1913{ 2249{
1914 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2250 REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1915} 2251}
1916 2252
1917eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) 2253eio_req *eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data)
… …
1937eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) 2273eio_req *eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data)
1938{ 2274{
1939 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND; 2275 REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1940} 2276}
1941 2277
1942eio_req *eio_chown (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data) 2278eio_req *eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data)
1943{ 2279{
1944 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND; 2280 REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1945} 2281}
1946 2282
1947eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) 2283eio_req *eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data)
… …
1961} 2297}
1962 2298
1963eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data) 2299eio_req *eio_readlink (const char *path, int pri, eio_cb cb, void *data)
1964{ 2300{
1965 return eio__1path (EIO_READLINK, path, pri, cb, data); 2301 return eio__1path (EIO_READLINK, path, pri, cb, data);
2302}
2303
2304eio_req *eio_realpath (const char *path, int pri, eio_cb cb, void *data)
2305{
2306 return eio__1path (EIO_REALPATH, path, pri, cb, data);
1966} 2307}
1967 2308
1968eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data) 2309eio_req *eio_stat (const char *path, int pri, eio_cb cb, void *data)
1969{ 2310{
1970 return eio__1path (EIO_STAT, path, pri, cb, data); 2311 return eio__1path (EIO_STAT, path, pri, cb, data);
… …
2029eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2370eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2030{ 2371{
2031 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2372 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2032} 2373}
2033 2374
2034eio_req *eio_custom (void (*)(eio_req *) execute, int pri, eio_cb cb, void *data); 2375eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2035{ 2376{
2036 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2377 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2037} 2378}
2038 2379
2039#endif 2380#endif
… …
2050#undef SEND 2391#undef SEND
2051 2392
2052/*****************************************************************************/ 2393/*****************************************************************************/
2053/* grp functions */ 2394/* grp functions */
2054 2395
2396void
2055void eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit) 2397eio_grp_feed (eio_req *grp, void (*feed)(eio_req *req), int limit)
2056{ 2398{
2057 grp->int2 = limit; 2399 grp->int2 = limit;
2058 grp->feed = feed; 2400 grp->feed = feed;
2059 2401
2060 grp_try_feed (grp); 2402 grp_try_feed (grp);
2061} 2403}
2062 2404
2405void
2063void eio_grp_limit (eio_req *grp, int limit) 2406eio_grp_limit (eio_req *grp, int limit)
2064{ 2407{
2065 grp->int2 = limit; 2408 grp->int2 = limit;
2066 2409
2067 grp_try_feed (grp); 2410 grp_try_feed (grp);
2068} 2411}
2069 2412
2413void
2070void eio_grp_add (eio_req *grp, eio_req *req) 2414eio_grp_add (eio_req *grp, eio_req *req)
2071{ 2415{
2072 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2)); 2416 assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
2073 2417
2074 grp->flags |= EIO_FLAG_GROUPADD; 2418 grp->flags |= EIO_FLAG_GROUPADD;
2075 2419
… …
2086} 2430}
2087 2431
2088/*****************************************************************************/ 2432/*****************************************************************************/
2089/* misc garbage */ 2433/* misc garbage */
2090 2434
2435eio_ssize_t
2091ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2436eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2092{ 2437{
2093 etp_worker wrk; 2438 etp_worker wrk;
2094 ssize_t ret; 2439 eio_ssize_t ret;
2095 2440
2096 wrk.dbuf = 0; 2441 wrk.dbuf = 0;
2097 2442
2098 ret = eio__sendfile (ofd, ifd, offset, count, &wrk); 2443 ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
2099 2444

Diff Legend

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