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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.16 by root, Fri May 30 04:50:21 2008 UTC vs.
Revision 1.40 by root, Sat Jun 13 14:58:33 2009 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 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>
…		…
64	#endif	68	#endif
65		69
66	#ifdef _WIN32	70	#ifdef _WIN32
67		71
68	/doh/	72	/doh/
69
70	#else	73	#else
71		74
72	# include "config.h"	75	# include "config.h"
73	# include <sys/time.h>	76	# include <sys/time.h>
74	# include <sys/select.h>	77	# include <sys/select.h>
		78	# include <sys/mman.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>
		83
		84	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		85	# if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		86	# define _DIRENT_HAVE_D_TYPE /* sigh */
		87	# define D_INO(de) (de)->d_fileno
		88	# define D_NAMLEN(de) (de)->d_namlen
		89	# elif defined(__linux) \|\| defined(d_ino) \|\| _XOPEN_SOURCE >= 600
		90	# define D_INO(de) (de)->d_ino
		91	# endif
		92
		93	#ifdef _D_EXACT_NAMLEN
		94	# undef D_NAMLEN
		95	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		96	#endif
		97
		98	# ifdef _DIRENT_HAVE_D_TYPE
		99	# define D_TYPE(de) (de)->d_type
		100	# endif
79		101
80	# ifndef EIO_STRUCT_DIRENT	102	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent	103	# define EIO_STRUCT_DIRENT struct dirent
82	# endif	104	# endif
83		105
…		…
96	# else	118	# else
97	# error sendfile support requested but not available	119	# error sendfile support requested but not available
98	# endif	120	# endif
99	#endif	121	#endif
100		122
		123	#ifndef D_TYPE
		124	# define D_TYPE(de) 0
		125	#endif
		126	#ifndef D_INO
		127	# define D_INO(de) 0
		128	#endif
		129	#ifndef D_NAMLEN
		130	# define D_NAMLEN(de) strlen ((de)->d_name)
		131	#endif
		132
101	/* number of seconds after which an idle threads exit */	133	/* number of seconds after which an idle threads exit */
102	#define IDLE_TIMEOUT 10	134	#define IDLE_TIMEOUT 10
103		135
104	/* used for struct dirent, AIX doesn't provide it */	136	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	137	#ifndef NAME_MAX
…		…
117	errno = ENOMEM; \	149	errno = ENOMEM; \
118	if (!eio_buf) \	150	if (!eio_buf) \
119	return -1;	151	return -1;
120		152
121	#define EIO_TICKS ((1000000 + 1023) >> 10)	153	#define EIO_TICKS ((1000000 + 1023) >> 10)
		154
		155	/*****************************************************************************/
		156
		157	#if __GNUC__ >= 3
		158	# define expect(expr,value) __builtin_expect ((expr),(value))
		159	#else
		160	# define expect(expr,value) (expr)
		161	#endif
		162
		163	#define expect_false(expr) expect ((expr) != 0, 0)
		164	#define expect_true(expr) expect ((expr) != 0, 1)
122		165
123	/*****************************************************************************/	166	/*****************************************************************************/
124		167
125	#define ETP_PRI_MIN EIO_PRI_MIN	168	#define ETP_PRI_MIN EIO_PRI_MIN
126	#define ETP_PRI_MAX EIO_PRI_MAX	169	#define ETP_PRI_MAX EIO_PRI_MAX
…		…
144	if (wrk->dirp) \	187	if (wrk->dirp) \
145	{ \	188	{ \
146	closedir (wrk->dirp); \	189	closedir (wrk->dirp); \
147	wrk->dirp = 0; \	190	wrk->dirp = 0; \
148	}	191	}
		192
149	#define ETP_WORKER_COMMON \	193	#define ETP_WORKER_COMMON \
150	void *dbuf; \	194	void *dbuf; \
151	DIR *dirp;	195	DIR *dirp;
152		196
153	/*****************************************************************************/	197	/*****************************************************************************/
…		…
176		220
177	static mutex_t wrklock = X_MUTEX_INIT;	221	static mutex_t wrklock = X_MUTEX_INIT;
178	static mutex_t reslock = X_MUTEX_INIT;	222	static mutex_t reslock = X_MUTEX_INIT;
179	static mutex_t reqlock = X_MUTEX_INIT;	223	static mutex_t reqlock = X_MUTEX_INIT;
180	static cond_t reqwait = X_COND_INIT;	224	static cond_t reqwait = X_COND_INIT;
		225
		226	#if !HAVE_PREADWRITE
		227	/*
		228	* make our pread/pwrite emulation safe against themselves, but not against
		229	* normal read/write by using a mutex. slows down execution a lot,
		230	* but that's your problem, not mine.
		231	*/
		232	static mutex_t preadwritelock = X_MUTEX_INIT;
		233	#endif
181		234
182	typedef struct etp_worker	235	typedef struct etp_worker
183	{	236	{
184	/* locked by wrklock */	237	/* locked by wrklock */
185	struct etp_worker prev, next;	238	struct etp_worker prev, next;
…		…
330		383
331	static void etp_atfork_child (void)	384	static void etp_atfork_child (void)
332	{	385	{
333	ETP_REQ *prv;	386	ETP_REQ *prv;
334		387
335	while (prv = reqq_shift (&req_queue))	388	while ((prv = reqq_shift (&req_queue)))
336	ETP_DESTROY (prv);	389	ETP_DESTROY (prv);
337		390
338	while (prv = reqq_shift (&res_queue))	391	while ((prv = reqq_shift (&res_queue)))
339	ETP_DESTROY (prv);	392	ETP_DESTROY (prv);
340		393
341	while (wrk_first.next != &wrk_first)	394	while (wrk_first.next != &wrk_first)
342	{	395	{
343	etp_worker *wrk = wrk_first.next;	396	etp_worker *wrk = wrk_first.next;
…		…
371		424
372	pthread_once (&doinit, etp_once_init);	425	pthread_once (&doinit, etp_once_init);
373		426
374	want_poll_cb = want_poll;	427	want_poll_cb = want_poll;
375	done_poll_cb = done_poll;	428	done_poll_cb = done_poll;
		429
		430	return 0;
376	}	431	}
377		432
378	X_THREAD_PROC (etp_proc);	433	X_THREAD_PROC (etp_proc);
379		434
380	static void etp_start_thread (void)	435	static void etp_start_thread (void)
…		…
400	X_UNLOCK (wrklock);	455	X_UNLOCK (wrklock);
401	}	456	}
402		457
403	static void etp_maybe_start_thread (void)	458	static void etp_maybe_start_thread (void)
404	{	459	{
405	if (etp_nthreads () >= wanted)	460	if (expect_true (etp_nthreads () >= wanted))
406	return;	461	return;
407		462
408	/* todo: maybe use idle here, but might be less exact */	463	/* todo: maybe use idle here, but might be less exact */
409	if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())	464	if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
410	return;	465	return;
411		466
412	etp_start_thread ();	467	etp_start_thread ();
413	}	468	}
414		469
…		…
467		522
468	X_LOCK (reqlock);	523	X_LOCK (reqlock);
469	--nreqs;	524	--nreqs;
470	X_UNLOCK (reqlock);	525	X_UNLOCK (reqlock);
471		526
472	if (req->type == EIO_GROUP && req->size)	527	if (expect_false (req->type == EIO_GROUP && req->size))
473	{	528	{
474	req->int1 = 1; /* mark request as delayed */	529	req->int1 = 1; /* mark request as delayed */
475	continue;	530	continue;
476	}	531	}
477	else	532	else
478	{	533	{
479	int res = ETP_FINISH (req);	534	int res = ETP_FINISH (req);
480	if (res)	535	if (expect_false (res))
481	return res;	536	return res;
482	}	537	}
483		538
484	if (maxreqs && !--maxreqs)	539	if (expect_false (maxreqs && !--maxreqs))
485	break;	540	break;
486		541
487	if (maxtime)	542	if (maxtime)
488	{	543	{
489	gettimeofday (&tv_now, 0);	544	gettimeofday (&tv_now, 0);
…		…
508		563
509	static void etp_submit (ETP_REQ *req)	564	static void etp_submit (ETP_REQ *req)
510	{	565	{
511	req->pri -= ETP_PRI_MIN;	566	req->pri -= ETP_PRI_MIN;
512		567
513	if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;	568	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;	569	if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
515		570
		571	if (expect_false (req->type == EIO_GROUP))
		572	{
		573	/* I hope this is worth it :/ */
516	X_LOCK (reqlock);	574	X_LOCK (reqlock);
517	++nreqs;	575	++nreqs;
		576	X_UNLOCK (reqlock);
		577
		578	X_LOCK (reslock);
		579
		580	++npending;
		581
		582	if (!reqq_push (&res_queue, req) && want_poll_cb)
		583	want_poll_cb ();
		584
		585	X_UNLOCK (reslock);
		586	}
		587	else
		588	{
		589	X_LOCK (reqlock);
		590	++nreqs;
518	++nready;	591	++nready;
519	reqq_push (&req_queue, req);	592	reqq_push (&req_queue, req);
520	X_COND_SIGNAL (reqwait);	593	X_COND_SIGNAL (reqwait);
521	X_UNLOCK (reqlock);	594	X_UNLOCK (reqlock);
522		595
523	etp_maybe_start_thread ();	596	etp_maybe_start_thread ();
		597	}
524	}	598	}
525		599
526	static void etp_set_max_poll_time (double nseconds)	600	static void etp_set_max_poll_time (double nseconds)
527	{	601	{
528	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	602	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
…		…
563		637
564	static void grp_try_feed (eio_req *grp)	638	static void grp_try_feed (eio_req *grp)
565	{	639	{
566	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	640	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
567	{	641	{
568	int old_len = grp->size;	642	grp->flags &= ~EIO_FLAG_GROUPADD;
569		643
570	EIO_FEED (grp);	644	EIO_FEED (grp);
571		645
572	/* stop if no progress has been made */	646	/* stop if no progress has been made */
573	if (old_len == grp->size)	647	if (!(grp->flags & EIO_FLAG_GROUPADD))
574	{	648	{
575	grp->feed = 0;	649	grp->feed = 0;
576	break;	650	break;
577	}	651	}
578	}	652	}
…		…
695		769
696	/*****************************************************************************/	770	/*****************************************************************************/
697	/* work around various missing functions */	771	/* work around various missing functions */
698		772
699	#if !HAVE_PREADWRITE	773	#if !HAVE_PREADWRITE
		774	# undef pread
		775	# undef pwrite
700	# define pread eio__pread	776	# define pread eio__pread
701	# define pwrite eio__pwrite	777	# 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		778
710	static ssize_t	779	static ssize_t
711	eio__pread (int fd, void *buf, size_t count, off_t offset)	780	eio__pread (int fd, void *buf, size_t count, off_t offset)
712	{	781	{
713	ssize_t res;	782	ssize_t res;
…		…
731		800
732	X_LOCK (preadwritelock);	801	X_LOCK (preadwritelock);
733	ooffset = lseek (fd, 0, SEEK_CUR);	802	ooffset = lseek (fd, 0, SEEK_CUR);
734	lseek (fd, offset, SEEK_SET);	803	lseek (fd, offset, SEEK_SET);
735	res = write (fd, buf, count);	804	res = write (fd, buf, count);
736	lseek (fd, offset, SEEK_SET);	805	lseek (fd, ooffset, SEEK_SET);
737	X_UNLOCK (preadwritelock);	806	X_UNLOCK (preadwritelock);
738		807
739	return res;	808	return res;
740	}	809	}
741	#endif	810	#endif
742		811
743	#ifndef HAVE_FUTIMES	812	#ifndef HAVE_FUTIMES
744		813
		814	# undef utimes
		815	# undef futimes
745	# define utimes(path,times) eio__utimes (path, times)	816	# define utimes(path,times) eio__utimes (path, times)
746	# define futimes(fd,times) eio__futimes (fd, times)	817	# define futimes(fd,times) eio__futimes (fd, times)
747		818
748	static int	819	static int
749	eio__utimes (const char *filename, const struct timeval times[2])	820	eio__utimes (const char *filename, const struct timeval times[2])
…		…
768	}	839	}
769		840
770	#endif	841	#endif
771		842
772	#if !HAVE_FDATASYNC	843	#if !HAVE_FDATASYNC
		844	# undef fdatasync
773	# define fdatasync fsync	845	# define fdatasync(fd) fsync (fd)
774	#endif	846	#endif
		847
		848	/* sync_file_range always needs emulation */
		849	int
		850	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		851	{
		852	#if HAVE_SYNC_FILE_RANGE
		853	int res;
		854
		855	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		856	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		857	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		858	{
		859	flags = 0
		860	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		861	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		862	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		863	}
		864
		865	res = sync_file_range (fd, offset, nbytes, flags);
		866
		867	if (!res \|\| errno != ENOSYS)
		868	return res;
		869	#endif
		870
		871	/* even though we could play tricks with the flags, it's better to always
		872	* call fdatasync, as thta matches the expectation of it's users best */
		873	return fdatasync (fd);
		874	}
775		875
776	#if !HAVE_READAHEAD	876	#if !HAVE_READAHEAD
		877	# undef readahead
777	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	878	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
778		879
779	static ssize_t	880	static ssize_t
780	eio__readahead (int fd, off_t offset, size_t count, worker *self)	881	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
781	{	882	{
782	size_t todo = count;	883	size_t todo = count;
783	dBUF;	884	dBUF;
784		885
785	while (todo > 0)	886	while (todo > 0)
…		…
889	}	990	}
890		991
891	return res;	992	return res;
892	}	993	}
893		994
		995	static signed char
		996	eio_dent_cmp (const eio_dirent a, const eio_dirent b)
		997	{
		998	return b->score - a->score ? b->score - a->score /* works because our signed char is always 0..100 */
		999	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0;
		1000	}
		1001
		1002	#define EIO_DENT_CMP(i,op,j) eio_dent_cmp (&i, &j) op 0
		1003
		1004	#define EIO_QSORT_CUTOFF 30 /* quite high, but performs well on many filesystems */
		1005	#define EIO_QSORT_SKIP 60 /* when to skip qsort completely */
		1006
		1007	static void
		1008	eio_dent_sort (eio_dirent *dents, int size)
		1009	{
		1010	int i, j;
		1011
		1012	if (size <= 1)
		1013	return; /* our insertion sort relies on size > 0 */
		1014
		1015	if (size > EIO_QSORT_SKIP) /* skip quicksort for small directories */
		1016	{
		1017	/* first, use quicksort */
		1018	/* should be good for 2*31 entries /
		1019	struct rng { int l, r; } rng [32];
		1020
		1021	i = 0;
		1022	rng[0].l = 0;
		1023	rng[0].r = size;
		1024
		1025	while (expect_true (i >= 0))
		1026	{
		1027	int L = rng [i].l;
		1028	int R = rng [i].r - 1;
		1029
		1030	if (expect_false (L + EIO_QSORT_CUTOFF < R))
		1031	{
		1032	eio_dirent piv = dents [L];
		1033
		1034	while (L < R)
		1035	{
		1036	while (EIO_DENT_CMP (dents [R], >=, piv) && L < R)
		1037	--R;
		1038
		1039	if (L < R)
		1040	dents [L++] = dents [R];
		1041
		1042	while (EIO_DENT_CMP (dents [L], <=, piv) && L < R)
		1043	++L;
		1044
		1045	if (L < R)
		1046	dents [R--] = dents [L];
		1047	}
		1048
		1049	dents [L] = piv;
		1050
		1051	++i;
		1052	rng [i].l = L + 1;
		1053	rng [i].r = rng [i - 1].r;
		1054	rng [i - 1].r = L;
		1055
		1056	if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l)
		1057	{
		1058	struct rng t;
		1059
		1060	t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
		1061	}
		1062	}
		1063	else
		1064	--i;
		1065	}
		1066	}
		1067
		1068	/* use an insertion sort after qsort, or for small arrays */
		1069	/* first move the smallest element to the front, to act as a sentinel */
		1070	{
		1071	int min = 0;
		1072
		1073	for (i = size > EIO_QSORT_SKIP ? EIO_QSORT_CUTOFF + 1 : size; --i; )
		1074	if (EIO_DENT_CMP (dents [i], <, dents [min]))
		1075	min = i;
		1076
		1077	/* swap elements 0 and j (minimum) */
		1078	{
		1079	eio_dirent tmp = dents [0]; dents [0] = dents [min]; dents [min] = tmp;
		1080	}
		1081	}
		1082
		1083	/* then do standard insertion sort */
		1084	for (i = 1; i < size; ++i)
		1085	{
		1086	eio_dirent value = dents [i];
		1087
		1088	for (j = i - 1; EIO_DENT_CMP (dents [j], >, value); --j)
		1089	{
		1090	assert (j >= 0);
		1091	dents [j + 1] = dents [j];
		1092	}
		1093
		1094	dents [j + 1] = value;
		1095	}
		1096	}
		1097
894	/* read a full directory */	1098	/* read a full directory */
895	static void	1099	static void
896	eio__scandir (eio_req req, etp_worker self)	1100	eio__scandir (eio_req req, etp_worker self)
897	{	1101	{
898	DIR *dirp;	1102	DIR *dirp;
899	EIO_STRUCT_DIRENT *entp;	1103	EIO_STRUCT_DIRENT *entp;
900	char name, names;	1104	char name, names;
901	int memlen = 4096;	1105	int namesalloc = 4096;
902	int memofs = 0;	1106	int namesoffs = 0;
		1107	int flags = req->int1;
		1108	eio_dirent *dents = 0;
		1109	int dentalloc = 128;
903	int res = 0;	1110	int dentoffs = 0;
		1111
		1112	req->result = -1;
		1113
		1114	if (!(flags & EIO_READDIR_DENTS))
		1115	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
904		1116
905	X_LOCK (wrklock);	1117	X_LOCK (wrklock);
		1118	/* the corresponding closedir is in ETP_WORKER_CLEAR */
906	self->dirp = dirp = opendir (req->ptr1);	1119	self->dirp = dirp = opendir (req->ptr1);
907	req->flags \|= EIO_FLAG_PTR2_FREE;	1120	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
908	req->ptr2 = names = malloc (memlen);	1121	req->ptr1 = names = malloc (namesalloc);
		1122	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
909	X_UNLOCK (wrklock);	1123	X_UNLOCK (wrklock);
910		1124
911	if (dirp && names)	1125	if (dirp && names && (!flags \|\| dents))
912	for (;;)	1126	for (;;)
913	{	1127	{
914	errno = 0;	1128	errno = 0;
915	entp = readdir (dirp);	1129	entp = readdir (dirp);
916		1130
917	if (!entp)	1131	if (!entp)
		1132	{
		1133	if (errno)
		1134	break;
		1135
		1136	/* sort etc. */
		1137	req->int1 = flags;
		1138	req->result = dentoffs;
		1139
		1140	if (dents)
		1141	{
		1142	eio_dirent *ent = dents + dentoffs;
		1143
		1144	while (ent > dents)
		1145	(--ent)->name = names + (size_t)ent->name;
		1146	}
		1147
		1148	if (flags & EIO_READDIR_STAT_ORDER
		1149	\|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN)))
		1150	eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */
		1151	else if (flags & EIO_READDIR_DIRS_FIRST)
		1152	{
		1153	/* in this case, all is known, and we just put dirs first and sort them */
		1154	eio_dirent *ent = dents + dentoffs;
		1155	eio_dirent *dir = dents;
		1156
		1157	/* now move dirs to the front, and non-dirs to the back */
		1158	/* by walking from both sides and swapping if necessary */
		1159	while (ent > dir)
		1160	{
		1161	if (dir->type == DT_DIR)
		1162	++dir;
		1163	else
		1164	{
		1165	--ent;
		1166
		1167	if (ent->type == DT_DIR)
		1168	{
		1169	eio_dirent tmp = *dir;
		1170	dir = ent;
		1171	*ent = tmp;
		1172
		1173	++dir;
		1174	}
		1175	}
		1176	}
		1177
		1178	/* now sort the dirs only */
		1179	eio_dent_sort (dents, dir - dents);
		1180	}
		1181
		1182	/* only provide the names array unless DENTS is specified */
		1183	if (!(flags & EIO_READDIR_DENTS))
		1184	{
		1185	X_LOCK (wrklock);
		1186	assert (!dents);
		1187	req->ptr1 = 0;
		1188	req->ptr2 = names;
		1189	X_UNLOCK (wrklock);
		1190	}
		1191
918	break;	1192	break;
		1193	}
919		1194
		1195	/* now add the entry to our list(s) */
920	name = entp->d_name;	1196	name = entp->d_name;
921		1197
		1198	/* skip . and .. entries */
922	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1199	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
923	{	1200	{
924	int len = strlen (name) + 1;	1201	int len = D_NAMLEN (entp) + 1;
925		1202
926	res++;	1203	while (expect_false (namesoffs + len > namesalloc))
927
928	while (memofs + len > memlen)
929	{	1204	{
930	memlen *= 2;	1205	namesalloc *= 2;
931	X_LOCK (wrklock);	1206	X_LOCK (wrklock);
932	req->ptr2 = names = realloc (names, memlen);	1207	req->ptr1 = names = realloc (names, namesalloc);
933	X_UNLOCK (wrklock);	1208	X_UNLOCK (wrklock);
934		1209
935	if (!names)	1210	if (!names)
936	break;	1211	break;
937	}	1212	}
938		1213
939	memcpy (names + memofs, name, len);	1214	memcpy (names + namesoffs, name, len);
		1215
		1216	if (dents)
		1217	{
		1218	struct eio_dirent *ent;
		1219
		1220	if (expect_false (dentoffs == dentalloc))
		1221	{
		1222	dentalloc *= 2;
		1223	X_LOCK (wrklock);
		1224	req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1225	X_UNLOCK (wrklock);
		1226
		1227	if (!dents)
		1228	break;
		1229	}
		1230
		1231	ent = dents + dentoffs;
		1232
		1233	ent->name = (char )(size_t)namesoffs; / rather dirtily we store the offset in the pointer */
		1234	ent->namelen = len - 1;
		1235	ent->inode = D_INO (entp);
		1236
		1237	switch (D_TYPE (entp))
		1238	{
		1239	default:
		1240	ent->type = EIO_DT_UNKNOWN;
		1241	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1242	break;
		1243
		1244	#ifdef DT_FIFO
		1245	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1246	#endif
		1247	#ifdef DT_CHR
		1248	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1249	#endif
		1250	#ifdef DT_MPC
		1251	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1252	#endif
		1253	#ifdef DT_DIR
		1254	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1255	#endif
		1256	#ifdef DT_NAM
		1257	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1258	#endif
		1259	#ifdef DT_BLK
		1260	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1261	#endif
		1262	#ifdef DT_MPB
		1263	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1264	#endif
		1265	#ifdef DT_REG
		1266	case DT_REG: ent->type = EIO_DT_REG; break;
		1267	#endif
		1268	#ifdef DT_NWK
		1269	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1270	#endif
		1271	#ifdef DT_CMP
		1272	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1273	#endif
		1274	#ifdef DT_LNK
		1275	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1276	#endif
		1277	#ifdef DT_SOCK
		1278	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1279	#endif
		1280	#ifdef DT_DOOR
		1281	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1282	#endif
		1283	#ifdef DT_WHT
		1284	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1285	#endif
		1286	}
		1287
		1288	ent->score = 0;
		1289
		1290	if (flags & EIO_READDIR_DIRS_FIRST)
		1291	{
		1292	if (ent->type == EIO_DT_UNKNOWN)
		1293	{
		1294	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1295	ent->score = 98;
		1296	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1297	ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */
		1298	}
		1299	else if (ent->type == EIO_DT_DIR)
		1300	ent->score = 100;
		1301	}
		1302	}
		1303
940	memofs += len;	1304	namesoffs += len;
		1305	++dentoffs;
		1306	}
		1307
		1308	if (EIO_CANCELLED (req))
		1309	{
		1310	errno = ECANCELED;
		1311	break;
941	}	1312	}
942	}	1313	}
		1314	}
943		1315
944	if (errno)	1316	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
945	res = -1;	1317	# undef msync
946		1318	# define msync(a,b,c) ((errno = ENOSYS), -1)
947	req->result = res;	1319	#endif
		1320
		1321	int
		1322	eio__mtouch (void *mem, size_t len, int flags)
		1323	{
		1324	intptr_t addr = (intptr_t)mem;
		1325	intptr_t end = addr + len;
		1326	#ifdef PAGESIZE
		1327	const intptr_t page = PAGESIZE;
		1328	#else
		1329	static intptr_t page;
		1330
		1331	if (!page)
		1332	page = sysconf (_SC_PAGESIZE);
		1333	#endif
		1334
		1335	addr &= ~(page - 1); /* assume page size is always a power of two */
		1336
		1337	if (addr < end)
		1338	if (flags) /* modify */
		1339	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
		1340	else
		1341	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1342
		1343	return 0;
948	}	1344	}
949		1345
950	/*****************************************************************************/	1346	/*****************************************************************************/
951		1347
952	#define ALLOC(len) \	1348	#define ALLOC(len) \
…		…
1039		1435
1040	/*****************************************************************************/	1436	/*****************************************************************************/
1041		1437
1042	int eio_init (void (want_poll)(void), void (done_poll)(void))	1438	int eio_init (void (want_poll)(void), void (done_poll)(void))
1043	{	1439	{
1044	etp_init (want_poll, done_poll);	1440	return etp_init (want_poll, done_poll);
1045	}	1441	}
1046		1442
1047	static void eio_api_destroy (eio_req *req)	1443	static void eio_api_destroy (eio_req *req)
1048	{	1444	{
1049	free (req);	1445	free (req);
…		…
1111	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;	1507	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1112	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;	1508	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1113	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;	1509	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1114	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;	1510	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1115	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;	1511	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;	1512	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1117		1513
1118	case EIO_READLINK: ALLOC (NAME_MAX);	1514	case EIO_READLINK: ALLOC (NAME_MAX);
1119	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	1515	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1120		1516
1121	case EIO_SYNC: req->result = 0; sync (); break;	1517	case EIO_SYNC: req->result = 0; sync (); break;
1122	case EIO_FSYNC: req->result = fsync (req->int1); break;	1518	case EIO_FSYNC: req->result = fsync (req->int1); break;
1123	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1519	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1520	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
		1521	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1522	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1124		1523
1125	case EIO_READDIR: eio__scandir (req, self); break;	1524	case EIO_READDIR: eio__scandir (req, self); break;
1126		1525
1127	case EIO_BUSY:	1526	case EIO_BUSY:
1128	#ifdef _WIN32	1527	#ifdef _WIN32
…		…
1160		1559
1161	req->result = req->type == EIO_FUTIME	1560	req->result = req->type == EIO_FUTIME
1162	? futimes (req->int1, times)	1561	? futimes (req->int1, times)
1163	: utimes (req->ptr1, times);	1562	: utimes (req->ptr1, times);
1164	}	1563	}
		1564	break;
1165		1565
1166	case EIO_GROUP:	1566	case EIO_GROUP:
		1567	abort (); /* handled in eio_request */
		1568
1167	case EIO_NOP:	1569	case EIO_NOP:
1168	req->result = 0;	1570	req->result = 0;
1169	break;	1571	break;
1170		1572
1171	case EIO_CUSTOM:	1573	case EIO_CUSTOM:
1172	req->feed (req);	1574	((void ()(eio_req ))req->feed) (req);
1173	break;	1575	break;
1174		1576
1175	default:	1577	default:
1176	req->result = -1;	1578	req->result = -1;
1177	break;	1579	break;
…		…
1200	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)	1602	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
1201	{	1603	{
1202	REQ (EIO_FSYNC); req->int1 = fd; SEND;	1604	REQ (EIO_FSYNC); req->int1 = fd; SEND;
1203	}	1605	}
1204		1606
		1607	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1608	{
		1609	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1610	}
		1611
		1612	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1613	{
		1614	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1615	}
		1616
		1617	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1618	{
		1619	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1620	}
		1621
1205	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1622	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1206	{	1623	{
1207	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1624	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1208	}	1625	}
1209		1626
…		…
1321	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1738	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1322	{	1739	{
1323	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1740	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1324	}	1741	}
1325		1742
1326	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1743	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1327	{	1744	{
1328	return eio__1path (EIO_READDIR, path, pri, cb, data);	1745	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1329	}	1746	}
1330		1747
1331	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1748	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1332	{	1749	{
1333	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND;	1750	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1334	}	1751	}
1335		1752
1336	static eio_req *	1753	static eio_req *
1337	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	1754	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1338	{	1755	{
…		…
1364	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	1781	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1365	}	1782	}
1366		1783
1367	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)	1784	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)
1368	{	1785	{
1369	REQ (EIO_CUSTOM); req->feed = execute; SEND;	1786	REQ (EIO_CUSTOM); req->feed = (void ()(eio_req ))execute; SEND;
1370	}	1787	}
1371		1788
1372	#endif	1789	#endif
1373		1790
1374	eio_req eio_grp (eio_cb cb, void data)	1791	eio_req eio_grp (eio_cb cb, void data)
…		…
1402		1819
1403	void eio_grp_add (eio_req grp, eio_req req)	1820	void eio_grp_add (eio_req grp, eio_req req)
1404	{	1821	{
1405	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	1822	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1406		1823
		1824	grp->flags \|= EIO_FLAG_GROUPADD;
		1825
1407	++grp->size;	1826	++grp->size;
1408	req->grp = grp;	1827	req->grp = grp;
1409		1828
1410	req->grp_prev = 0;	1829	req->grp_prev = 0;
1411	req->grp_next = grp->grp_first;	1830	req->grp_next = grp->grp_first;
…		…
1420	/* misc garbage */	1839	/* misc garbage */
1421		1840
1422	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1841	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1423	{	1842	{
1424	etp_worker wrk;	1843	etp_worker wrk;
		1844	ssize_t ret;
1425		1845
1426	wrk.dbuf = 0;	1846	wrk.dbuf = 0;
1427		1847
1428	eio__sendfile (ofd, ifd, offset, count, &wrk);	1848	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1429		1849
1430	if (wrk.dbuf)	1850	if (wrk.dbuf)
1431	free (wrk.dbuf);	1851	free (wrk.dbuf);
1432	}
1433		1852
		1853	return ret;
		1854	}
		1855

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.16 by root, Fri May 30 04:50:21 2008 UTC vs. Revision 1.40 by root, Sat Jun 13 14:58:33 2009 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.16 by root, Fri May 30 04:50:21 2008 UTC vs.
Revision 1.40 by root, Sat Jun 13 14:58:33 2009 UTC