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

Comparing libeio/eio.c (file contents):
Revision 1.16 by root, Fri May 30 04:50:21 2008 UTC vs.
Revision 1.62 by root, Tue Feb 15 03:15:16 2011 UTC

…		…
1	/*	1	/*
2	* libeio implementation	2	* libeio implementation
3	*	3	*
4	* Copyright (c) 2007,2008 Marc Alexander Lehmann <libeio@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libeio@schmorp.de>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without modifica-	7	* Redistribution and use in source and binary forms, with or without modifica-
8	* tion, are permitted provided that the following conditions are met:	8	* tion, are permitted provided that the following conditions are met:
9	*	9	*
36	* provisions above, a recipient may use your version of this file under	36	* provisions above, a recipient may use your version of this file under
37	* either the BSD or the GPL.	37	* either the BSD or the GPL.
38	*/	38	*/
39		39
40	#include "eio.h"	40	#include "eio.h"
		41
		42	#ifdef EIO_STACKSIZE
		43	# define XTHREAD_STACKSIZE EIO_STACKSIZE
		44	#endif
41	#include "xthread.h"	45	#include "xthread.h"
42		46
43	#include <errno.h>	47	#include <errno.h>
44	#include <stddef.h>	48	#include <stddef.h>
45	#include <stdlib.h>	49	#include <stdlib.h>
46	#include <string.h>	50	#include <string.h>
47	#include <errno.h>	51	#include <errno.h>
48	#include <sys/types.h>	52	#include <sys/types.h>
49	#include <sys/stat.h>	53	#include <sys/stat.h>
		54	#include <sys/statvfs.h>
50	#include <limits.h>	55	#include <limits.h>
51	#include <fcntl.h>	56	#include <fcntl.h>
52	#include <assert.h>	57	#include <assert.h>
53		58
54	#ifndef EIO_FINISH	59	#ifndef EIO_FINISH
…		…
64	#endif	69	#endif
65		70
66	#ifdef _WIN32	71	#ifdef _WIN32
67		72
68	/doh/	73	/doh/
69
70	#else	74	#else
71		75
72	# include "config.h"	76	# include "config.h"
73	# include <sys/time.h>	77	# include <sys/time.h>
74	# include <sys/select.h>	78	# include <sys/select.h>
75	# include <unistd.h>	79	# include <unistd.h>
76	# include <utime.h>	80	# include <utime.h>
77	# include <signal.h>	81	# include <signal.h>
78	# include <dirent.h>	82	# include <dirent.h>
79		83
		84	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
		85	# include <sys/mman.h>
		86	#endif
		87
		88	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		89	# if __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__
		90	# define _DIRENT_HAVE_D_TYPE /* sigh */
		91	# define D_INO(de) (de)->d_fileno
		92	# define D_NAMLEN(de) (de)->d_namlen
		93	# elif __linux \|\| defined d_ino \|\| _XOPEN_SOURCE >= 600
		94	# define D_INO(de) (de)->d_ino
		95	# endif
		96
		97	#ifdef _D_EXACT_NAMLEN
		98	# undef D_NAMLEN
		99	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		100	#endif
		101
		102	# ifdef _DIRENT_HAVE_D_TYPE
		103	# define D_TYPE(de) (de)->d_type
		104	# endif
		105
80	# ifndef EIO_STRUCT_DIRENT	106	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent	107	# define EIO_STRUCT_DIRENT struct dirent
82	# endif	108	# endif
83		109
84	#endif	110	#endif
85		111
86	#if HAVE_SENDFILE	112	#if HAVE_SENDFILE
87	# if __linux	113	# if __linux
88	# include <sys/sendfile.h>	114	# include <sys/sendfile.h>
89	# elif __freebsd	115	# elif __FreeBSD__ \|\| defined __APPLE__
90	# include <sys/socket.h>	116	# include <sys/socket.h>
91	# include <sys/uio.h>	117	# include <sys/uio.h>
92	# elif __hpux	118	# elif __hpux
93	# include <sys/socket.h>	119	# include <sys/socket.h>
94	# elif __solaris /* not yet */	120	# elif __solaris
95	# include <sys/sendfile.h>	121	# include <sys/sendfile.h>
96	# else	122	# else
97	# error sendfile support requested but not available	123	# error sendfile support requested but not available
98	# endif	124	# endif
99	#endif	125	#endif
100		126
101	/* number of seconds after which an idle threads exit */	127	#ifndef D_TYPE
102	#define IDLE_TIMEOUT 10	128	# define D_TYPE(de) 0
		129	#endif
		130	#ifndef D_INO
		131	# define D_INO(de) 0
		132	#endif
		133	#ifndef D_NAMLEN
		134	# define D_NAMLEN(de) strlen ((de)->d_name)
		135	#endif
103		136
104	/* used for struct dirent, AIX doesn't provide it */	137	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	138	#ifndef NAME_MAX
106	# define NAME_MAX 4096	139	# define NAME_MAX 4096
		140	#endif
		141
		142	/* used for readlink etc. */
		143	#ifndef PATH_MAX
		144	# define PATH_MAX 4096
107	#endif	145	#endif
108		146
109	/* buffer size for various temporary buffers */	147	/* buffer size for various temporary buffers */
110	#define EIO_BUFSIZE 65536	148	#define EIO_BUFSIZE 65536
111		149
…		…
117	errno = ENOMEM; \	155	errno = ENOMEM; \
118	if (!eio_buf) \	156	if (!eio_buf) \
119	return -1;	157	return -1;
120		158
121	#define EIO_TICKS ((1000000 + 1023) >> 10)	159	#define EIO_TICKS ((1000000 + 1023) >> 10)
		160
		161	/*****************************************************************************/
		162
		163	#if __GNUC__ >= 3
		164	# define expect(expr,value) __builtin_expect ((expr),(value))
		165	#else
		166	# define expect(expr,value) (expr)
		167	#endif
		168
		169	#define expect_false(expr) expect ((expr) != 0, 0)
		170	#define expect_true(expr) expect ((expr) != 0, 1)
122		171
123	/*****************************************************************************/	172	/*****************************************************************************/
124		173
125	#define ETP_PRI_MIN EIO_PRI_MIN	174	#define ETP_PRI_MIN EIO_PRI_MIN
126	#define ETP_PRI_MAX EIO_PRI_MAX	175	#define ETP_PRI_MAX EIO_PRI_MAX
…		…
144	if (wrk->dirp) \	193	if (wrk->dirp) \
145	{ \	194	{ \
146	closedir (wrk->dirp); \	195	closedir (wrk->dirp); \
147	wrk->dirp = 0; \	196	wrk->dirp = 0; \
148	}	197	}
		198
149	#define ETP_WORKER_COMMON \	199	#define ETP_WORKER_COMMON \
150	void *dbuf; \	200	void *dbuf; \
151	DIR *dirp;	201	DIR *dirp;
152		202
153	/*****************************************************************************/	203	/*****************************************************************************/
154		204
155	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)	205	#define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
156		206
157	/* calculcate time difference in ~1/EIO_TICKS of a second */	207	/* calculate time difference in ~1/EIO_TICKS of a second */
158	static int tvdiff (struct timeval tv1, struct timeval tv2)	208	static int tvdiff (struct timeval tv1, struct timeval tv2)
159	{	209	{
160	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	210	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
161	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	211	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
162	}	212	}
…		…
170	static unsigned int max_poll_reqs; /* reslock */	220	static unsigned int max_poll_reqs; /* reslock */
171		221
172	static volatile unsigned int nreqs; /* reqlock */	222	static volatile unsigned int nreqs; /* reqlock */
173	static volatile unsigned int nready; /* reqlock */	223	static volatile unsigned int nready; /* reqlock */
174	static volatile unsigned int npending; /* reqlock */	224	static volatile unsigned int npending; /* reqlock */
175	static volatile unsigned int max_idle = 4;	225	static volatile unsigned int max_idle = 4; /* maximum number of threads that can idle indefinitely */
		226	static volatile unsigned int idle_timeout = 10; /* number of seconds after which an idle threads exit */
176		227
		228	static xmutex_t wrklock;
		229	static xmutex_t reslock;
		230	static xmutex_t reqlock;
		231	static xcond_t reqwait;
		232
		233	#if !HAVE_PREADWRITE
		234	/*
		235	* make our pread/pwrite emulation safe against themselves, but not against
		236	* normal read/write by using a mutex. slows down execution a lot,
		237	* but that's your problem, not mine.
		238	*/
177	static mutex_t wrklock = X_MUTEX_INIT;	239	static xmutex_t preadwritelock = X_MUTEX_INIT;
178	static mutex_t reslock = X_MUTEX_INIT;	240	#endif
179	static mutex_t reqlock = X_MUTEX_INIT;
180	static cond_t reqwait = X_COND_INIT;
181		241
182	typedef struct etp_worker	242	typedef struct etp_worker
183	{	243	{
184	/* locked by wrklock */	244	/* locked by wrklock */
185	struct etp_worker prev, next;	245	struct etp_worker prev, next;
186		246
187	thread_t tid;	247	xthread_t tid;
188		248
189	/* locked by reslock, reqlock or wrklock */	249	/* locked by reslock, reqlock or wrklock */
190	ETP_REQ req; / currently processed request */	250	ETP_REQ req; / currently processed request */
191		251
192	ETP_WORKER_COMMON	252	ETP_WORKER_COMMON
…		…
306	}	366	}
307		367
308	abort ();	368	abort ();
309	}	369	}
310		370
		371	static void etp_thread_init (void)
		372	{
		373	X_MUTEX_CREATE (wrklock);
		374	X_MUTEX_CREATE (reslock);
		375	X_MUTEX_CREATE (reqlock);
		376	X_COND_CREATE (reqwait);
		377	}
		378
311	static void etp_atfork_prepare (void)	379	static void etp_atfork_prepare (void)
312	{	380	{
313	X_LOCK (wrklock);	381	X_LOCK (wrklock);
314	X_LOCK (reqlock);	382	X_LOCK (reqlock);
315	X_LOCK (reslock);	383	X_LOCK (reslock);
…		…
330		398
331	static void etp_atfork_child (void)	399	static void etp_atfork_child (void)
332	{	400	{
333	ETP_REQ *prv;	401	ETP_REQ *prv;
334		402
335	while (prv = reqq_shift (&req_queue))	403	while ((prv = reqq_shift (&req_queue)))
336	ETP_DESTROY (prv);	404	ETP_DESTROY (prv);
337		405
338	while (prv = reqq_shift (&res_queue))	406	while ((prv = reqq_shift (&res_queue)))
339	ETP_DESTROY (prv);	407	ETP_DESTROY (prv);
340		408
341	while (wrk_first.next != &wrk_first)	409	while (wrk_first.next != &wrk_first)
342	{	410	{
343	etp_worker *wrk = wrk_first.next;	411	etp_worker *wrk = wrk_first.next;
…		…
353	idle = 0;	421	idle = 0;
354	nreqs = 0;	422	nreqs = 0;
355	nready = 0;	423	nready = 0;
356	npending = 0;	424	npending = 0;
357		425
358	etp_atfork_parent ();	426	etp_thread_init ();
359	}	427	}
360		428
361	static void	429	static void
362	etp_once_init (void)	430	etp_once_init (void)
363	{	431	{
		432	etp_thread_init ();
364	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);	433	X_THREAD_ATFORK (etp_atfork_prepare, etp_atfork_parent, etp_atfork_child);
365	}	434	}
366		435
367	static int	436	static int
368	etp_init (void (want_poll)(void), void (done_poll)(void))	437	etp_init (void (want_poll)(void), void (done_poll)(void))
…		…
371		440
372	pthread_once (&doinit, etp_once_init);	441	pthread_once (&doinit, etp_once_init);
373		442
374	want_poll_cb = want_poll;	443	want_poll_cb = want_poll;
375	done_poll_cb = done_poll;	444	done_poll_cb = done_poll;
		445
		446	return 0;
376	}	447	}
377		448
378	X_THREAD_PROC (etp_proc);	449	X_THREAD_PROC (etp_proc);
379		450
380	static void etp_start_thread (void)	451	static void etp_start_thread (void)
…		…
400	X_UNLOCK (wrklock);	471	X_UNLOCK (wrklock);
401	}	472	}
402		473
403	static void etp_maybe_start_thread (void)	474	static void etp_maybe_start_thread (void)
404	{	475	{
405	if (etp_nthreads () >= wanted)	476	if (expect_true (etp_nthreads () >= wanted))
406	return;	477	return;
407		478
408	/* todo: maybe use idle here, but might be less exact */	479	/* todo: maybe use idle here, but might be less exact */
409	if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())	480	if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
410	return;	481	return;
411		482
412	etp_start_thread ();	483	etp_start_thread ();
413	}	484	}
414		485
…		…
467		538
468	X_LOCK (reqlock);	539	X_LOCK (reqlock);
469	--nreqs;	540	--nreqs;
470	X_UNLOCK (reqlock);	541	X_UNLOCK (reqlock);
471		542
472	if (req->type == EIO_GROUP && req->size)	543	if (expect_false (req->type == EIO_GROUP && req->size))
473	{	544	{
474	req->int1 = 1; /* mark request as delayed */	545	req->int1 = 1; /* mark request as delayed */
475	continue;	546	continue;
476	}	547	}
477	else	548	else
478	{	549	{
479	int res = ETP_FINISH (req);	550	int res = ETP_FINISH (req);
480	if (res)	551	if (expect_false (res))
481	return res;	552	return res;
482	}	553	}
483		554
484	if (maxreqs && !--maxreqs)	555	if (expect_false (maxreqs && !--maxreqs))
485	break;	556	break;
486		557
487	if (maxtime)	558	if (maxtime)
488	{	559	{
489	gettimeofday (&tv_now, 0);	560	gettimeofday (&tv_now, 0);
…		…
508		579
509	static void etp_submit (ETP_REQ *req)	580	static void etp_submit (ETP_REQ *req)
510	{	581	{
511	req->pri -= ETP_PRI_MIN;	582	req->pri -= ETP_PRI_MIN;
512		583
513	if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;	584	if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
514	if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	585	if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
515		586
		587	if (expect_false (req->type == EIO_GROUP))
		588	{
		589	/* I hope this is worth it :/ */
516	X_LOCK (reqlock);	590	X_LOCK (reqlock);
517	++nreqs;	591	++nreqs;
		592	X_UNLOCK (reqlock);
		593
		594	X_LOCK (reslock);
		595
		596	++npending;
		597
		598	if (!reqq_push (&res_queue, req) && want_poll_cb)
		599	want_poll_cb ();
		600
		601	X_UNLOCK (reslock);
		602	}
		603	else
		604	{
		605	X_LOCK (reqlock);
		606	++nreqs;
518	++nready;	607	++nready;
519	reqq_push (&req_queue, req);	608	reqq_push (&req_queue, req);
520	X_COND_SIGNAL (reqwait);	609	X_COND_SIGNAL (reqwait);
521	X_UNLOCK (reqlock);	610	X_UNLOCK (reqlock);
522		611
523	etp_maybe_start_thread ();	612	etp_maybe_start_thread ();
		613	}
524	}	614	}
525		615
526	static void etp_set_max_poll_time (double nseconds)	616	static void etp_set_max_poll_time (double nseconds)
527	{	617	{
528	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	618	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
529	max_poll_time = nseconds;	619	max_poll_time = nseconds * EIO_TICKS;
530	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);	620	if (WORDACCESS_UNSAFE) X_UNLOCK (reslock);
531	}	621	}
532		622
533	static void etp_set_max_poll_reqs (unsigned int maxreqs)	623	static void etp_set_max_poll_reqs (unsigned int maxreqs)
534	{	624	{
…		…
538	}	628	}
539		629
540	static void etp_set_max_idle (unsigned int nthreads)	630	static void etp_set_max_idle (unsigned int nthreads)
541	{	631	{
542	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);	632	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
543	max_idle = nthreads <= 0 ? 1 : nthreads;	633	max_idle = nthreads;
		634	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
		635	}
		636
		637	static void etp_set_idle_timeout (unsigned int seconds)
		638	{
		639	if (WORDACCESS_UNSAFE) X_LOCK (reqlock);
		640	idle_timeout = seconds;
544	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);	641	if (WORDACCESS_UNSAFE) X_UNLOCK (reqlock);
545	}	642	}
546		643
547	static void etp_set_min_parallel (unsigned int nthreads)	644	static void etp_set_min_parallel (unsigned int nthreads)
548	{	645	{
…		…
563		660
564	static void grp_try_feed (eio_req *grp)	661	static void grp_try_feed (eio_req *grp)
565	{	662	{
566	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	663	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
567	{	664	{
568	int old_len = grp->size;	665	grp->flags &= ~EIO_FLAG_GROUPADD;
569		666
570	EIO_FEED (grp);	667	EIO_FEED (grp);
571		668
572	/* stop if no progress has been made */	669	/* stop if no progress has been made */
573	if (old_len == grp->size)	670	if (!(grp->flags & EIO_FLAG_GROUPADD))
574	{	671	{
575	grp->feed = 0;	672	grp->feed = 0;
576	break;	673	break;
577	}	674	}
578	}	675	}
…		…
676	void eio_set_max_idle (unsigned int nthreads)	773	void eio_set_max_idle (unsigned int nthreads)
677	{	774	{
678	etp_set_max_idle (nthreads);	775	etp_set_max_idle (nthreads);
679	}	776	}
680		777
		778	void eio_set_idle_timeout (unsigned int seconds)
		779	{
		780	etp_set_idle_timeout (seconds);
		781	}
		782
681	void eio_set_min_parallel (unsigned int nthreads)	783	void eio_set_min_parallel (unsigned int nthreads)
682	{	784	{
683	etp_set_min_parallel (nthreads);	785	etp_set_min_parallel (nthreads);
684	}	786	}
685		787
…		…
695		797
696	/*****************************************************************************/	798	/*****************************************************************************/
697	/* work around various missing functions */	799	/* work around various missing functions */
698		800
699	#if !HAVE_PREADWRITE	801	#if !HAVE_PREADWRITE
		802	# undef pread
		803	# undef pwrite
700	# define pread eio__pread	804	# define pread eio__pread
701	# define pwrite eio__pwrite	805	# define pwrite eio__pwrite
702
703	/*
704	* make our pread/pwrite safe against themselves, but not against
705	* normal read/write by using a mutex. slows down execution a lot,
706	* but that's your problem, not mine.
707	*/
708	static mutex_t preadwritelock = X_MUTEX_INIT;
709		806
710	static ssize_t	807	static ssize_t
711	eio__pread (int fd, void *buf, size_t count, off_t offset)	808	eio__pread (int fd, void *buf, size_t count, off_t offset)
712	{	809	{
713	ssize_t res;	810	ssize_t res;
…		…
731		828
732	X_LOCK (preadwritelock);	829	X_LOCK (preadwritelock);
733	ooffset = lseek (fd, 0, SEEK_CUR);	830	ooffset = lseek (fd, 0, SEEK_CUR);
734	lseek (fd, offset, SEEK_SET);	831	lseek (fd, offset, SEEK_SET);
735	res = write (fd, buf, count);	832	res = write (fd, buf, count);
736	lseek (fd, offset, SEEK_SET);	833	lseek (fd, ooffset, SEEK_SET);
737	X_UNLOCK (preadwritelock);	834	X_UNLOCK (preadwritelock);
738		835
739	return res;	836	return res;
740	}	837	}
741	#endif	838	#endif
742		839
743	#ifndef HAVE_FUTIMES	840	#ifndef HAVE_UTIMES
744		841
		842	# undef utimes
745	# define utimes(path,times) eio__utimes (path, times)	843	# define utimes(path,times) eio__utimes (path, times)
746	# define futimes(fd,times) eio__futimes (fd, times)
747		844
748	static int	845	static int
749	eio__utimes (const char *filename, const struct timeval times[2])	846	eio__utimes (const char *filename, const struct timeval times[2])
750	{	847	{
751	if (times)	848	if (times)
…		…
759	}	856	}
760	else	857	else
761	return utime (filename, 0);	858	return utime (filename, 0);
762	}	859	}
763		860
		861	#endif
		862
		863	#ifndef HAVE_FUTIMES
		864
		865	# undef futimes
		866	# define futimes(fd,times) eio__futimes (fd, times)
		867
764	static int eio__futimes (int fd, const struct timeval tv[2])	868	static int eio__futimes (int fd, const struct timeval tv[2])
765	{	869	{
766	errno = ENOSYS;	870	errno = ENOSYS;
767	return -1;	871	return -1;
768	}	872	}
769		873
770	#endif	874	#endif
771		875
772	#if !HAVE_FDATASYNC	876	#if !HAVE_FDATASYNC
		877	# undef fdatasync
773	# define fdatasync fsync	878	# define fdatasync(fd) fsync (fd)
774	#endif	879	#endif
		880
		881	/* sync_file_range always needs emulation */
		882	int
		883	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		884	{
		885	#if HAVE_SYNC_FILE_RANGE
		886	int res;
		887
		888	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		889	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		890	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		891	{
		892	flags = 0
		893	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		894	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		895	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		896	}
		897
		898	res = sync_file_range (fd, offset, nbytes, flags);
		899
		900	if (!res \|\| errno != ENOSYS)
		901	return res;
		902	#endif
		903
		904	/* even though we could play tricks with the flags, it's better to always
		905	* call fdatasync, as that matches the expectation of its users best */
		906	return fdatasync (fd);
		907	}
775		908
776	#if !HAVE_READAHEAD	909	#if !HAVE_READAHEAD
		910	# undef readahead
777	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	911	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
778		912
779	static ssize_t	913	static ssize_t
780	eio__readahead (int fd, off_t offset, size_t count, worker *self)	914	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
781	{	915	{
782	size_t todo = count;	916	size_t todo = count;
783	dBUF;	917	dBUF;
784		918
785	while (todo > 0)	919	while (todo > 0)
…		…
808		942
809	#if HAVE_SENDFILE	943	#if HAVE_SENDFILE
810	# if __linux	944	# if __linux
811	res = sendfile (ofd, ifd, &offset, count);	945	res = sendfile (ofd, ifd, &offset, count);
812		946
813	# elif __freebsd	947	# elif __FreeBSD__
814	/*	948	/*
815	* Of course, the freebsd sendfile is a dire hack with no thoughts	949	* Of course, the freebsd sendfile is a dire hack with no thoughts
816	* wasted on making it similar to other I/O functions.	950	* wasted on making it similar to other I/O functions.
817	*/	951	*/
818	{	952	{
819	off_t sbytes;	953	off_t sbytes;
820	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);	954	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
821		955
822	if (res < 0 && sbytes)	956	#if 0 /* according to the manpage, this is correct, but broken behaviour */
823	/* maybe only on EAGAIN: as usual, the manpage leaves you guessing */	957	/* freebsd' sendfile will return 0 on success */
		958	/* freebsd 8 documents it as only setting sbytes on EINTR and EAGAIN, but /
		959	/* not on e.g. EIO or EPIPE - sounds broken */
		960	if ((res < 0 && (errno == EAGAIN \|\| errno == EINTR) && sbytes) \|\| res == 0)
		961	res = sbytes;
		962	#endif
		963
		964	/* according to source inspection, this is correct, and useful behaviour */
		965	if (sbytes)
		966	res = sbytes;
		967	}
		968
		969	# elif defined (__APPLE__)
		970
		971	{
		972	off_t sbytes = count;
		973	res = sendfile (ifd, ofd, offset, &sbytes, 0, 0);
		974
		975	/* according to the manpage, sbytes is always valid */
		976	if (sbytes)
824	res = sbytes;	977	res = sbytes;
825	}	978	}
826		979
827	# elif __hpux	980	# elif __hpux
828	res = sendfile (ofd, ifd, offset, count, 0, 0);	981	res = sendfile (ofd, ifd, offset, count, 0, 0);
…		…
842	if (res < 0 && sbytes)	995	if (res < 0 && sbytes)
843	res = sbytes;	996	res = sbytes;
844	}	997	}
845		998
846	# endif	999	# endif
		1000
		1001	#elif defined (_WIN32)
		1002
		1003	/* does not work, just for documentation of what would need to be done */
		1004	{
		1005	HANDLE h = TO_SOCKET (ifd);
		1006	SetFilePointer (h, offset, 0, FILE_BEGIN);
		1007	res = TransmitFile (TO_SOCKET (ofd), h, count, 0, 0, 0, 0);
		1008	}
		1009
847	#else	1010	#else
848	res = -1;	1011	res = -1;
849	errno = ENOSYS;	1012	errno = ENOSYS;
850	#endif	1013	#endif
851		1014
852	if (res < 0	1015	if (res < 0
853	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK	1016	&& (errno == ENOSYS \|\| errno == EINVAL \|\| errno == ENOTSOCK
		1017	/* BSDs */
		1018	#ifdef ENOTSUP /* sigh, if the steenking pile called openbsd would only try to at least compile posix code... */
		1019	\|\| errno == ENOTSUP
		1020	#endif
		1021	\|\| errno == EOPNOTSUPP /* BSDs */
854	#if __solaris	1022	#if __solaris
855	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE	1023	\|\| errno == EAFNOSUPPORT \|\| errno == EPROTOTYPE
856	#endif	1024	#endif
857	)	1025	)
858	)	1026	)
…		…
889	}	1057	}
890		1058
891	return res;	1059	return res;
892	}	1060	}
893		1061
		1062	static signed char
		1063	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
		1064	{
		1065	return a->score - b->score ? a->score - b->score /* works because our signed char is always 0..100 */
		1066	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
		1067	}
		1068
		1069	#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
		1070
		1071	#define EIO_SORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1072	#define EIO_SORT_FAST 60 /* when to only use insertion sort */
		1073
		1074	static void
		1075	eio_dent_radix_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1076	{
		1077	unsigned char bits [9 + sizeof (ino_t) * 8];
		1078	unsigned char *bit = bits;
		1079
		1080	assert (CHAR_BIT == 8);
		1081	assert (sizeof (eio_dirent) * 8 < 256);
		1082	assert (offsetof (eio_dirent, inode)); /* we use 0 as sentinel */
		1083	assert (offsetof (eio_dirent, score)); /* we use 0 as sentinel */
		1084
		1085	if (size <= EIO_SORT_FAST)
		1086	return;
		1087
		1088	/* first prepare an array of bits to test in our radix sort */
		1089	/* try to take endianness into account, as well as differences in ino_t sizes */
		1090	/* inode_bits must contain all inodes ORed together */
		1091	/* which is used to skip bits that are 0 everywhere, which is very common */
		1092	{
		1093	ino_t endianness;
		1094	int i, j;
		1095
		1096	/* we store the byte offset of byte n into byte n of "endianness" */
		1097	for (i = 0; i < sizeof (ino_t); ++i)
		1098	((unsigned char *)&endianness)[i] = i;
		1099
		1100	*bit++ = 0;
		1101
		1102	for (i = 0; i < sizeof (ino_t); ++i)
		1103	{
		1104	/* shifting off the byte offsets out of "endianness" */
		1105	int offs = (offsetof (eio_dirent, inode) + (endianness & 0xff)) * 8;
		1106	endianness >>= 8;
		1107
		1108	for (j = 0; j < 8; ++j)
		1109	if (inode_bits & (((ino_t)1) << (i * 8 + j)))
		1110	*bit++ = offs + j;
		1111	}
		1112
		1113	for (j = 0; j < 8; ++j)
		1114	if (score_bits & (1 << j))
		1115	bit++ = offsetof (eio_dirent, score) 8 + j;
		1116	}
		1117
		1118	/* now actually do the sorting (a variant of MSD radix sort) */
		1119	{
		1120	eio_dirent base_stk [9 + sizeof (ino_t) 8], *base;
		1121	eio_dirent end_stk [9 + sizeof (ino_t) 8], *end;
		1122	unsigned char bit_stk [9 + sizeof (ino_t) 8];
		1123	int stk_idx = 0;
		1124
		1125	base_stk [stk_idx] = dents;
		1126	end_stk [stk_idx] = dents + size;
		1127	bit_stk [stk_idx] = bit - 1;
		1128
		1129	do
		1130	{
		1131	base = base_stk [stk_idx];
		1132	end = end_stk [stk_idx];
		1133	bit = bit_stk [stk_idx];
		1134
		1135	for (;;)
		1136	{
		1137	unsigned char O = *bit >> 3;
		1138	unsigned char M = 1 << (*bit & 7);
		1139
		1140	eio_dirent *a = base;
		1141	eio_dirent *b = end;
		1142
		1143	if (b - a < EIO_SORT_CUTOFF)
		1144	break;
		1145
		1146	/* now bit-partition the array on the bit */
		1147	/* this ugly asymmetric loop seems to perform much better than typical */
		1148	/* partition algos found in the literature */
		1149	do
		1150	if (!(((unsigned char *)a)[O] & M))
		1151	++a;
		1152	else if (!(((unsigned char *)--b)[O] & M))
		1153	{
		1154	eio_dirent tmp = a; a = b; b = tmp;
		1155	++a;
		1156	}
		1157	while (b > a);
		1158
		1159	/* next bit, or stop, if no bits left in this path */
		1160	if (!*--bit)
		1161	break;
		1162
		1163	base_stk [stk_idx] = a;
		1164	end_stk [stk_idx] = end;
		1165	bit_stk [stk_idx] = bit;
		1166	++stk_idx;
		1167
		1168	end = a;
		1169	}
		1170	}
		1171	while (stk_idx--);
		1172	}
		1173	}
		1174
		1175	static void
		1176	eio_dent_insertion_sort (eio_dirent *dents, int size)
		1177	{
		1178	/* first move the smallest element to the front, to act as a sentinel */
		1179	{
		1180	int i;
		1181	eio_dirent *min = dents;
		1182
		1183	/* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */
		1184	for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; )
		1185	if (EIO_DENT_CMP (dents [i], <, *min))
		1186	min = &dents [i];
		1187
		1188	/* swap elements 0 and j (minimum) */
		1189	{
		1190	eio_dirent tmp = dents; dents = min; min = tmp;
		1191	}
		1192	}
		1193
		1194	/* then do standard insertion sort, assuming that all elements are >= dents [0] */
		1195	{
		1196	eio_dirent i, j;
		1197
		1198	for (i = dents + 1; i < dents + size; ++i)
		1199	{
		1200	eio_dirent value = *i;
		1201
		1202	for (j = i - 1; EIO_DENT_CMP (*j, >, value); --j)
		1203	j [1] = j [0];
		1204
		1205	j [1] = value;
		1206	}
		1207	}
		1208	}
		1209
		1210	static void
		1211	eio_dent_sort (eio_dirent *dents, int size, signed char score_bits, ino_t inode_bits)
		1212	{
		1213	if (size <= 1)
		1214	return; /* our insertion sort relies on size > 0 */
		1215
		1216	/* first we use a radix sort, but only for dirs >= EIO_SORT_FAST */
		1217	/* and stop sorting when the partitions are <= EIO_SORT_CUTOFF */
		1218	eio_dent_radix_sort (dents, size, score_bits, inode_bits);
		1219
		1220	/* use an insertion sort at the end, or for small arrays, */
		1221	/* as insertion sort is more efficient for small partitions */
		1222	eio_dent_insertion_sort (dents, size);
		1223	}
		1224
894	/* read a full directory */	1225	/* read a full directory */
895	static void	1226	static void
896	eio__scandir (eio_req req, etp_worker self)	1227	eio__scandir (eio_req req, etp_worker self)
897	{	1228	{
898	DIR *dirp;	1229	DIR *dirp;
899	EIO_STRUCT_DIRENT *entp;	1230	EIO_STRUCT_DIRENT *entp;
900	char name, names;	1231	char name, names;
901	int memlen = 4096;	1232	int namesalloc = 4096;
902	int memofs = 0;	1233	int namesoffs = 0;
		1234	int flags = req->int1;
		1235	eio_dirent *dents = 0;
		1236	int dentalloc = 128;
903	int res = 0;	1237	int dentoffs = 0;
		1238	ino_t inode_bits = 0;
		1239
		1240	req->result = -1;
		1241
		1242	if (!(flags & EIO_READDIR_DENTS))
		1243	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
904		1244
905	X_LOCK (wrklock);	1245	X_LOCK (wrklock);
		1246	/* the corresponding closedir is in ETP_WORKER_CLEAR */
906	self->dirp = dirp = opendir (req->ptr1);	1247	self->dirp = dirp = opendir (req->ptr1);
907	req->flags \|= EIO_FLAG_PTR2_FREE;	1248	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
		1249	req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
908	req->ptr2 = names = malloc (memlen);	1250	req->ptr2 = names = malloc (namesalloc);
909	X_UNLOCK (wrklock);	1251	X_UNLOCK (wrklock);
910		1252
911	if (dirp && names)	1253	if (dirp && names && (!flags \|\| dents))
912	for (;;)	1254	for (;;)
913	{	1255	{
914	errno = 0;	1256	errno = 0;
915	entp = readdir (dirp);	1257	entp = readdir (dirp);
916		1258
917	if (!entp)	1259	if (!entp)
		1260	{
		1261	if (errno)
		1262	break;
		1263
		1264	/* sort etc. */
		1265	req->int1 = flags;
		1266	req->result = dentoffs;
		1267
		1268	if (flags & EIO_READDIR_STAT_ORDER)
		1269	eio_dent_sort (dents, dentoffs, 0, inode_bits); /* sort by inode exclusively */
		1270	else if (flags & EIO_READDIR_DIRS_FIRST)
		1271	if (flags & EIO_READDIR_FOUND_UNKNOWN)
		1272	eio_dent_sort (dents, dentoffs, 7, inode_bits); /* sort by score and inode */
		1273	else
		1274	{
		1275	/* in this case, all is known, and we just put dirs first and sort them */
		1276	eio_dirent *oth = dents + dentoffs;
		1277	eio_dirent *dir = dents;
		1278
		1279	/* now partition dirs to the front, and non-dirs to the back */
		1280	/* by walking from both sides and swapping if necessary */
		1281	/* also clear score, so it doesn't influence sorting */
		1282	while (oth > dir)
		1283	{
		1284	if (dir->type == EIO_DT_DIR)
		1285	++dir;
		1286	else if ((--oth)->type == EIO_DT_DIR)
		1287	{
		1288	eio_dirent tmp = dir; dir = oth; oth = tmp;
		1289
		1290	++dir;
		1291	}
		1292	}
		1293
		1294	/* now sort the dirs only */
		1295	eio_dent_sort (dents, dir - dents, 0, inode_bits);
		1296	}
		1297
918	break;	1298	break;
		1299	}
919		1300
		1301	/* now add the entry to our list(s) */
920	name = entp->d_name;	1302	name = entp->d_name;
921		1303
		1304	/* skip . and .. entries */
922	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1305	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
923	{	1306	{
924	int len = strlen (name) + 1;	1307	int len = D_NAMLEN (entp) + 1;
925		1308
926	res++;	1309	while (expect_false (namesoffs + len > namesalloc))
927
928	while (memofs + len > memlen)
929	{	1310	{
930	memlen *= 2;	1311	namesalloc *= 2;
931	X_LOCK (wrklock);	1312	X_LOCK (wrklock);
932	req->ptr2 = names = realloc (names, memlen);	1313	req->ptr2 = names = realloc (names, namesalloc);
933	X_UNLOCK (wrklock);	1314	X_UNLOCK (wrklock);
934		1315
935	if (!names)	1316	if (!names)
936	break;	1317	break;
937	}	1318	}
938		1319
939	memcpy (names + memofs, name, len);	1320	memcpy (names + namesoffs, name, len);
		1321
		1322	if (dents)
		1323	{
		1324	struct eio_dirent *ent;
		1325
		1326	if (expect_false (dentoffs == dentalloc))
		1327	{
		1328	dentalloc *= 2;
		1329	X_LOCK (wrklock);
		1330	req->ptr1 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1331	X_UNLOCK (wrklock);
		1332
		1333	if (!dents)
		1334	break;
		1335	}
		1336
		1337	ent = dents + dentoffs;
		1338
		1339	ent->nameofs = namesoffs; /* rather dirtily we store the offset in the pointer */
		1340	ent->namelen = len - 1;
		1341	ent->inode = D_INO (entp);
		1342
		1343	inode_bits \|= ent->inode;
		1344
		1345	switch (D_TYPE (entp))
		1346	{
		1347	default:
		1348	ent->type = EIO_DT_UNKNOWN;
		1349	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1350	break;
		1351
		1352	#ifdef DT_FIFO
		1353	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1354	#endif
		1355	#ifdef DT_CHR
		1356	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1357	#endif
		1358	#ifdef DT_MPC
		1359	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1360	#endif
		1361	#ifdef DT_DIR
		1362	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1363	#endif
		1364	#ifdef DT_NAM
		1365	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1366	#endif
		1367	#ifdef DT_BLK
		1368	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1369	#endif
		1370	#ifdef DT_MPB
		1371	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1372	#endif
		1373	#ifdef DT_REG
		1374	case DT_REG: ent->type = EIO_DT_REG; break;
		1375	#endif
		1376	#ifdef DT_NWK
		1377	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1378	#endif
		1379	#ifdef DT_CMP
		1380	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1381	#endif
		1382	#ifdef DT_LNK
		1383	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1384	#endif
		1385	#ifdef DT_SOCK
		1386	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1387	#endif
		1388	#ifdef DT_DOOR
		1389	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1390	#endif
		1391	#ifdef DT_WHT
		1392	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1393	#endif
		1394	}
		1395
		1396	ent->score = 7;
		1397
		1398	if (flags & EIO_READDIR_DIRS_FIRST)
		1399	{
		1400	if (ent->type == EIO_DT_UNKNOWN)
		1401	{
		1402	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1403	ent->score = 1;
		1404	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1405	ent->score = len <= 2 ? 4 - len : len <= 4 ? 4 : len <= 7 ? 5 : 6; /* shorter == more likely dir, but avoid too many classes */
		1406	}
		1407	else if (ent->type == EIO_DT_DIR)
		1408	ent->score = 0;
		1409	}
		1410	}
		1411
940	memofs += len;	1412	namesoffs += len;
		1413	++dentoffs;
		1414	}
		1415
		1416	if (EIO_CANCELLED (req))
		1417	{
		1418	errno = ECANCELED;
		1419	break;
941	}	1420	}
942	}	1421	}
		1422	}
943		1423
944	if (errno)	1424	#ifdef PAGESIZE
945	res = -1;	1425	# define eio_pagesize() PAGESIZE
		1426	#else
		1427	static intptr_t
		1428	eio_pagesize (void)
		1429	{
		1430	static intptr_t page;
		1431
		1432	if (!page)
		1433	page = sysconf (_SC_PAGESIZE);
		1434
		1435	return page;
		1436	}
		1437	#endif
		1438
		1439	static void
		1440	eio_page_align (void *addr, size_t length)
		1441	{
		1442	intptr_t mask = eio_pagesize () - 1;
		1443
		1444	/* round down addr */
		1445	intptr_t adj = mask & (intptr_t)*addr;
		1446
		1447	addr = (void )((intptr_t)*addr - adj);
		1448	*length += adj;
		1449
		1450	/* round up length */
		1451	length = (length + mask) & ~mask;
		1452	}
		1453
		1454	#if !_POSIX_MEMLOCK
		1455	# define eio__mlockall(a) ((errno = ENOSYS), -1)
		1456	#else
		1457
		1458	static int
		1459	eio__mlockall (int flags)
		1460	{
		1461	#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
		1462	extern int mallopt (int, int);
		1463	mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
		1464	#endif
		1465
		1466	if (EIO_MCL_CURRENT != MCL_CURRENT
		1467	\|\| EIO_MCL_FUTURE != MCL_FUTURE)
		1468	{
		1469	flags = 0
		1470	\| (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
		1471	\| (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0);
		1472	}
		1473
		1474	return mlockall (flags);
		1475	}
		1476	#endif
		1477
		1478	#if !_POSIX_MEMLOCK_RANGE
		1479	# define eio__mlock(a,b) ((errno = ENOSYS), -1)
		1480	#else
		1481
		1482	static int
		1483	eio__mlock (void *addr, size_t length)
		1484	{
		1485	eio_page_align (&addr, &length);
		1486
		1487	return mlock (addr, length);
		1488	}
		1489
		1490	#endif
		1491
		1492	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1493	# define eio__msync(a,b,c) ((errno = ENOSYS), -1)
		1494	#else
		1495
		1496	int
		1497	eio__msync (void *mem, size_t len, int flags)
		1498	{
		1499	eio_page_align (&mem, &len);
		1500
		1501	if (EIO_MS_ASYNC != MS_SYNC
		1502	\|\| EIO_MS_INVALIDATE != MS_INVALIDATE
		1503	\|\| EIO_MS_SYNC != MS_SYNC)
		1504	{
		1505	flags = 0
		1506	\| (flags & EIO_MS_ASYNC ? MS_ASYNC : 0)
		1507	\| (flags & EIO_MS_INVALIDATE ? MS_INVALIDATE : 0)
		1508	\| (flags & EIO_MS_SYNC ? MS_SYNC : 0);
		1509	}
		1510
		1511	return msync (mem, len, flags);
		1512	}
		1513
		1514	#endif
		1515
		1516	int
		1517	eio__mtouch (void *mem, size_t len, int flags)
		1518	{
		1519	eio_page_align (&mem, &len);
		1520
946		1521	{
947	req->result = res;	1522	intptr_t addr = (intptr_t)mem;
		1523	intptr_t end = addr + len;
		1524	intptr_t page = eio_pagesize ();
		1525
		1526	if (addr < end)
		1527	if (flags & EIO_MT_MODIFY) /* modify */
		1528	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
		1529	else
		1530	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1531	}
		1532
		1533	return 0;
948	}	1534	}
949		1535
950	/*****************************************************************************/	1536	/*****************************************************************************/
951		1537
952	#define ALLOC(len) \	1538	#define ALLOC(len) \
…		…
984	if (req)	1570	if (req)
985	break;	1571	break;
986		1572
987	++idle;	1573	++idle;
988		1574
989	ts.tv_sec = time (0) + IDLE_TIMEOUT;	1575	ts.tv_sec = time (0) + idle_timeout;
990	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)	1576	if (X_COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT)
991	{	1577	{
992	if (idle > max_idle)	1578	if (idle > max_idle)
993	{	1579	{
994	--idle;	1580	--idle;
…		…
1039		1625
1040	/*****************************************************************************/	1626	/*****************************************************************************/
1041		1627
1042	int eio_init (void (want_poll)(void), void (done_poll)(void))	1628	int eio_init (void (want_poll)(void), void (done_poll)(void))
1043	{	1629	{
1044	etp_init (want_poll, done_poll);	1630	return etp_init (want_poll, done_poll);
1045	}	1631	}
1046		1632
1047	static void eio_api_destroy (eio_req *req)	1633	static void eio_api_destroy (eio_req *req)
1048	{	1634	{
1049	free (req);	1635	free (req);
…		…
1073	return 0; \	1659	return 0; \
1074	}	1660	}
1075		1661
1076	static void eio_execute (etp_worker self, eio_req req)	1662	static void eio_execute (etp_worker self, eio_req req)
1077	{	1663	{
1078	errno = 0;
1079
1080	switch (req->type)	1664	switch (req->type)
1081	{	1665	{
1082	case EIO_READ: ALLOC (req->size);	1666	case EIO_READ: ALLOC (req->size);
1083	req->result = req->offs >= 0	1667	req->result = req->offs >= 0
1084	? pread (req->int1, req->ptr2, req->size, req->offs)	1668	? pread (req->int1, req->ptr2, req->size, req->offs)
…		…
1094	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	1678	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1095	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1679	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1096	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	1680	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
1097	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	1681	case EIO_FSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
1098	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;	1682	req->result = fstat (req->int1, (EIO_STRUCT_STAT *)req->ptr2); break;
		1683
		1684	case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1685	req->result = statvfs (req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
		1686	case EIO_FSTATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
		1687	req->result = fstatvfs (req->int1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1099		1688
1100	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;	1689	case EIO_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break;
1101	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;	1690	case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1102	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;	1691	case EIO_CHMOD: req->result = chmod (req->ptr1, (mode_t)req->int2); break;
1103	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;	1692	case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
…		…
1113	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;	1702	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1114	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;	1703	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1115	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;	1704	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1116	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;	1705	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1117		1706
1118	case EIO_READLINK: ALLOC (NAME_MAX);	1707	case EIO_READLINK: ALLOC (PATH_MAX);
1119	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	1708	req->result = readlink (req->ptr1, req->ptr2, PATH_MAX); break;
1120		1709
1121	case EIO_SYNC: req->result = 0; sync (); break;	1710	case EIO_SYNC: req->result = 0; sync (); break;
1122	case EIO_FSYNC: req->result = fsync (req->int1); break;	1711	case EIO_FSYNC: req->result = fsync (req->int1); break;
1123	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1712	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1713	case EIO_MSYNC: req->result = eio__msync (req->ptr2, req->size, req->int1); break;
		1714	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1715	case EIO_MLOCK: req->result = eio__mlock (req->ptr2, req->size); break;
		1716	case EIO_MLOCKALL: req->result = eio__mlockall (req->int1); break;
		1717	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1124		1718
1125	case EIO_READDIR: eio__scandir (req, self); break;	1719	case EIO_READDIR: eio__scandir (req, self); break;
1126		1720
1127	case EIO_BUSY:	1721	case EIO_BUSY:
1128	#ifdef _WIN32	1722	#ifdef _WIN32
1129	Sleep (req->nv1 * 1000.);	1723	Sleep (req->nv1 * 1e3);
1130	#else	1724	#else
1131	{	1725	{
1132	struct timeval tv;	1726	struct timeval tv;
1133		1727
1134	tv.tv_sec = req->nv1;	1728	tv.tv_sec = req->nv1;
1135	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1000000.;	1729	tv.tv_usec = (req->nv1 - tv.tv_sec) * 1e6;
1136		1730
1137	req->result = select (0, 0, 0, 0, &tv);	1731	req->result = select (0, 0, 0, 0, &tv);
1138	}	1732	}
1139	#endif	1733	#endif
1140	break;	1734	break;
…		…
1155	times = tv;	1749	times = tv;
1156	}	1750	}
1157	else	1751	else
1158	times = 0;	1752	times = 0;
1159		1753
1160
1161	req->result = req->type == EIO_FUTIME	1754	req->result = req->type == EIO_FUTIME
1162	? futimes (req->int1, times)	1755	? futimes (req->int1, times)
1163	: utimes (req->ptr1, times);	1756	: utimes (req->ptr1, times);
1164	}	1757	}
		1758	break;
1165		1759
1166	case EIO_GROUP:	1760	case EIO_GROUP:
		1761	abort (); /* handled in eio_request */
		1762
1167	case EIO_NOP:	1763	case EIO_NOP:
1168	req->result = 0;	1764	req->result = 0;
1169	break;	1765	break;
1170		1766
1171	case EIO_CUSTOM:	1767	case EIO_CUSTOM:
1172	req->feed (req);	1768	((void ()(eio_req ))req->feed) (req);
1173	break;	1769	break;
1174		1770
1175	default:	1771	default:
		1772	errno = ENOSYS;
1176	req->result = -1;	1773	req->result = -1;
1177	break;	1774	break;
1178	}	1775	}
1179		1776
1180	req->errorno = errno;	1777	req->errorno = errno;
…		…
1200	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)	1797	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
1201	{	1798	{
1202	REQ (EIO_FSYNC); req->int1 = fd; SEND;	1799	REQ (EIO_FSYNC); req->int1 = fd; SEND;
1203	}	1800	}
1204		1801
		1802	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1803	{
		1804	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1805	}
		1806
		1807	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1808	{
		1809	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1810	}
		1811
		1812	eio_req eio_mlock (void addr, size_t length, int pri, eio_cb cb, void *data)
		1813	{
		1814	REQ (EIO_MLOCK); req->ptr2 = addr; req->size = length; SEND;
		1815	}
		1816
		1817	eio_req eio_mlockall (int flags, int pri, eio_cb cb, void data)
		1818	{
		1819	REQ (EIO_MLOCKALL); req->int1 = flags; SEND;
		1820	}
		1821
		1822	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1823	{
		1824	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1825	}
		1826
1205	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1827	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1206	{	1828	{
1207	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1829	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1208	}	1830	}
1209		1831
…		…
1228	}	1850	}
1229		1851
1230	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)	1852	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)
1231	{	1853	{
1232	REQ (EIO_FSTAT); req->int1 = fd; SEND;	1854	REQ (EIO_FSTAT); req->int1 = fd; SEND;
		1855	}
		1856
		1857	eio_req eio_fstatvfs (int fd, int pri, eio_cb cb, void data)
		1858	{
		1859	REQ (EIO_FSTATVFS); req->int1 = fd; SEND;
1233	}	1860	}
1234		1861
1235	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)	1862	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)
1236	{	1863	{
1237	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;	1864	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
…		…
1311	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)	1938	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)
1312	{	1939	{
1313	return eio__1path (EIO_LSTAT, path, pri, cb, data);	1940	return eio__1path (EIO_LSTAT, path, pri, cb, data);
1314	}	1941	}
1315		1942
		1943	eio_req eio_statvfs (const char path, int pri, eio_cb cb, void *data)
		1944	{
		1945	return eio__1path (EIO_STATVFS, path, pri, cb, data);
		1946	}
		1947
1316	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)	1948	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)
1317	{	1949	{
1318	return eio__1path (EIO_UNLINK, path, pri, cb, data);	1950	return eio__1path (EIO_UNLINK, path, pri, cb, data);
1319	}	1951	}
1320		1952
1321	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1953	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1322	{	1954	{
1323	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1955	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1324	}	1956	}
1325		1957
1326	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1958	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1327	{	1959	{
1328	return eio__1path (EIO_READDIR, path, pri, cb, data);	1960	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1329	}	1961	}
1330		1962
1331	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1963	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1332	{	1964	{
1333	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND;	1965	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->offs = (off_t)dev; SEND;
1334	}	1966	}
1335		1967
1336	static eio_req *	1968	static eio_req *
1337	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	1969	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1338	{	1970	{
…		…
1364	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	1996	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1365	}	1997	}
1366		1998
1367	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)	1999	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)
1368	{	2000	{
1369	REQ (EIO_CUSTOM); req->feed = execute; SEND;	2001	REQ (EIO_CUSTOM); req->feed = (void ()(eio_req ))execute; SEND;
1370	}	2002	}
1371		2003
1372	#endif	2004	#endif
1373		2005
1374	eio_req eio_grp (eio_cb cb, void data)	2006	eio_req eio_grp (eio_cb cb, void data)
…		…
1402		2034
1403	void eio_grp_add (eio_req grp, eio_req req)	2035	void eio_grp_add (eio_req grp, eio_req req)
1404	{	2036	{
1405	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	2037	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1406		2038
		2039	grp->flags \|= EIO_FLAG_GROUPADD;
		2040
1407	++grp->size;	2041	++grp->size;
1408	req->grp = grp;	2042	req->grp = grp;
1409		2043
1410	req->grp_prev = 0;	2044	req->grp_prev = 0;
1411	req->grp_next = grp->grp_first;	2045	req->grp_next = grp->grp_first;
…		…
1420	/* misc garbage */	2054	/* misc garbage */
1421		2055
1422	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	2056	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1423	{	2057	{
1424	etp_worker wrk;	2058	etp_worker wrk;
		2059	ssize_t ret;
1425		2060
1426	wrk.dbuf = 0;	2061	wrk.dbuf = 0;
1427		2062
1428	eio__sendfile (ofd, ifd, offset, count, &wrk);	2063	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1429		2064
1430	if (wrk.dbuf)	2065	if (wrk.dbuf)
1431	free (wrk.dbuf);	2066	free (wrk.dbuf);
1432	}
1433		2067
		2068	return ret;
		2069	}
		2070

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.16 by root, Fri May 30 04:50:21 2008 UTC vs. Revision 1.62 by root, Tue Feb 15 03:15:16 2011 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.16 by root, Fri May 30 04:50:21 2008 UTC vs.
Revision 1.62 by root, Tue Feb 15 03:15:16 2011 UTC