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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.23 by root, Sun Sep 21 00:23:45 2008 UTC vs.
Revision 1.38 by root, Fri Jun 12 20:01:42 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	/*****************************************************************************/
…		…
411	X_UNLOCK (wrklock);	455	X_UNLOCK (wrklock);
412	}	456	}
413		457
414	static void etp_maybe_start_thread (void)	458	static void etp_maybe_start_thread (void)
415	{	459	{
416	if (etp_nthreads () >= wanted)	460	if (expect_true (etp_nthreads () >= wanted))
417	return;	461	return;
418		462
419	/* todo: maybe use idle here, but might be less exact */	463	/* todo: maybe use idle here, but might be less exact */
420	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 ()))
421	return;	465	return;
422		466
423	etp_start_thread ();	467	etp_start_thread ();
424	}	468	}
425		469
…		…
478		522
479	X_LOCK (reqlock);	523	X_LOCK (reqlock);
480	--nreqs;	524	--nreqs;
481	X_UNLOCK (reqlock);	525	X_UNLOCK (reqlock);
482		526
483	if (req->type == EIO_GROUP && req->size)	527	if (expect_false (req->type == EIO_GROUP && req->size))
484	{	528	{
485	req->int1 = 1; /* mark request as delayed */	529	req->int1 = 1; /* mark request as delayed */
486	continue;	530	continue;
487	}	531	}
488	else	532	else
489	{	533	{
490	int res = ETP_FINISH (req);	534	int res = ETP_FINISH (req);
491	if (res)	535	if (expect_false (res))
492	return res;	536	return res;
493	}	537	}
494		538
495	if (maxreqs && !--maxreqs)	539	if (expect_false (maxreqs && !--maxreqs))
496	break;	540	break;
497		541
498	if (maxtime)	542	if (maxtime)
499	{	543	{
500	gettimeofday (&tv_now, 0);	544	gettimeofday (&tv_now, 0);
…		…
519		563
520	static void etp_submit (ETP_REQ *req)	564	static void etp_submit (ETP_REQ *req)
521	{	565	{
522	req->pri -= ETP_PRI_MIN;	566	req->pri -= ETP_PRI_MIN;
523		567
524	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;
525	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;
526		570
		571	if (expect_false (req->type == EIO_GROUP))
		572	{
		573	/* I hope this is worth it :/ */
527	X_LOCK (reqlock);	574	X_LOCK (reqlock);
528	++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;
529	++nready;	591	++nready;
530	reqq_push (&req_queue, req);	592	reqq_push (&req_queue, req);
531	X_COND_SIGNAL (reqwait);	593	X_COND_SIGNAL (reqwait);
532	X_UNLOCK (reqlock);	594	X_UNLOCK (reqlock);
533		595
534	etp_maybe_start_thread ();	596	etp_maybe_start_thread ();
		597	}
535	}	598	}
536		599
537	static void etp_set_max_poll_time (double nseconds)	600	static void etp_set_max_poll_time (double nseconds)
538	{	601	{
539	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	602	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
…		…
574		637
575	static void grp_try_feed (eio_req *grp)	638	static void grp_try_feed (eio_req *grp)
576	{	639	{
577	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	640	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
578	{	641	{
579	int old_len = grp->size;	642	grp->flags &= ~EIO_FLAG_GROUPADD;
580		643
581	EIO_FEED (grp);	644	EIO_FEED (grp);
582		645
583	/* stop if no progress has been made */	646	/* stop if no progress has been made */
584	if (old_len == grp->size)	647	if (!(grp->flags & EIO_FLAG_GROUPADD))
585	{	648	{
586	grp->feed = 0;	649	grp->feed = 0;
587	break;	650	break;
588	}	651	}
589	}	652	}
…		…
706		769
707	/*****************************************************************************/	770	/*****************************************************************************/
708	/* work around various missing functions */	771	/* work around various missing functions */
709		772
710	#if !HAVE_PREADWRITE	773	#if !HAVE_PREADWRITE
		774	# undef pread
		775	# undef pwrite
711	# define pread eio__pread	776	# define pread eio__pread
712	# define pwrite eio__pwrite	777	# define pwrite eio__pwrite
713		778
714	static ssize_t	779	static ssize_t
715	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)
…		…
735		800
736	X_LOCK (preadwritelock);	801	X_LOCK (preadwritelock);
737	ooffset = lseek (fd, 0, SEEK_CUR);	802	ooffset = lseek (fd, 0, SEEK_CUR);
738	lseek (fd, offset, SEEK_SET);	803	lseek (fd, offset, SEEK_SET);
739	res = write (fd, buf, count);	804	res = write (fd, buf, count);
740	lseek (fd, offset, SEEK_SET);	805	lseek (fd, ooffset, SEEK_SET);
741	X_UNLOCK (preadwritelock);	806	X_UNLOCK (preadwritelock);
742		807
743	return res;	808	return res;
744	}	809	}
745	#endif	810	#endif
746		811
747	#ifndef HAVE_FUTIMES	812	#ifndef HAVE_FUTIMES
748		813
		814	# undef utimes
		815	# undef futimes
749	# define utimes(path,times) eio__utimes (path, times)	816	# define utimes(path,times) eio__utimes (path, times)
750	# define futimes(fd,times) eio__futimes (fd, times)	817	# define futimes(fd,times) eio__futimes (fd, times)
751		818
752	static int	819	static int
753	eio__utimes (const char *filename, const struct timeval times[2])	820	eio__utimes (const char *filename, const struct timeval times[2])
…		…
772	}	839	}
773		840
774	#endif	841	#endif
775		842
776	#if !HAVE_FDATASYNC	843	#if !HAVE_FDATASYNC
		844	# undef fdatasync
777	# define fdatasync fsync	845	# define fdatasync(fd) fsync (fd)
778	#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	}
779		875
780	#if !HAVE_READAHEAD	876	#if !HAVE_READAHEAD
		877	# undef readahead
781	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	878	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
782		879
783	static ssize_t	880	static ssize_t
784	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	881	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
785	{	882	{
…		…
893	}	990	}
894		991
895	return res;	992	return res;
896	}	993	}
897		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_QSORT_CUTOFF 20 /* quite high, but performs well on many filesystems */
		1003
		1004	static void
		1005	eio_dent_sort (eio_dirent *dents, int size)
		1006	{
		1007	int i, j;
		1008
		1009	if (size > EIO_QSORT_CUTOFF * 3) /* skip quicksort for small directories */
		1010	{
		1011	/* first, use quicksort */
		1012	/* should be good for 2*31 entries /
		1013	struct rng { int l, r; } rng [32];
		1014
		1015	i = 0;
		1016	rng[0].l = 0;
		1017	rng[0].r = size;
		1018
		1019	while (expect_true (i >= 0))
		1020	{
		1021	int L = rng [i].l;
		1022	int R = rng [i].r - 1;
		1023
		1024	if (expect_false (L + EIO_QSORT_CUTOFF < R))
		1025	{
		1026	eio_dirent piv = dents [L];
		1027
		1028	while (L < R)
		1029	{
		1030	while (eio_dent_cmp (&dents [R], &piv) >= 0 && L < R)
		1031	--R;
		1032
		1033	if (L < R)
		1034	dents [L++] = dents [R];
		1035
		1036	while (eio_dent_cmp (&dents [L], &piv) <= 0 && L < R)
		1037	++L;
		1038
		1039	if (L < R)
		1040	dents [R--] = dents [L];
		1041	}
		1042
		1043	dents [L] = piv;
		1044
		1045	++i;
		1046	rng [i].l = L + 1;
		1047	rng [i].r = rng [i - 1].r;
		1048	rng [i - 1].r = L;
		1049
		1050	if (rng [i].r - rng [i].l > rng [i - 1].r - rng [i - 1].l)
		1051	{
		1052	struct rng t;
		1053
		1054	t = rng [i]; rng [i] = rng [i - 1]; rng [i - 1] = t;
		1055	}
		1056	}
		1057	else
		1058	--i;
		1059	}
		1060	}
		1061
		1062	/* use a simple insertion sort at the end */
		1063	for (i = 1; i < size; ++i)
		1064	{
		1065	eio_dirent value = dents [i];
		1066
		1067	for (j = i - 1; j >= 0 && eio_dent_cmp (&dents [j], &value) > 0; --j)
		1068	dents [j + 1] = dents [j];
		1069
		1070	dents [j + 1] = value;
		1071	}
		1072	}
		1073
898	/* read a full directory */	1074	/* read a full directory */
899	static void	1075	static void
900	eio__scandir (eio_req req, etp_worker self)	1076	eio__scandir (eio_req req, etp_worker self)
901	{	1077	{
902	DIR *dirp;	1078	DIR *dirp;
903	EIO_STRUCT_DIRENT *entp;	1079	EIO_STRUCT_DIRENT *entp;
904	char name, names;	1080	char name, names;
905	int memlen = 4096;	1081	int namesalloc = 4096;
906	int memofs = 0;	1082	int namesoffs = 0;
		1083	int flags = req->int1;
		1084	eio_dirent *dents = 0;
		1085	int dentalloc = 128;
907	int res = 0;	1086	int dentoffs = 0;
		1087
		1088	req->result = -1;
		1089
		1090	if (!(flags & EIO_READDIR_DENTS))
		1091	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
908		1092
909	X_LOCK (wrklock);	1093	X_LOCK (wrklock);
910	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1094	/* the corresponding closedir is in ETP_WORKER_CLEAR */
911	self->dirp = dirp = opendir (req->ptr1);	1095	self->dirp = dirp = opendir (req->ptr1);
912	req->flags \|= EIO_FLAG_PTR2_FREE;	1096	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
913	req->ptr2 = names = malloc (memlen);	1097	req->ptr1 = names = malloc (namesalloc);
		1098	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
914	X_UNLOCK (wrklock);	1099	X_UNLOCK (wrklock);
915		1100
916	if (dirp && names)	1101	if (dirp && names && (!flags \|\| dents))
917	for (;;)	1102	for (;;)
918	{	1103	{
919	errno = 0;	1104	errno = 0;
920	entp = readdir (dirp);	1105	entp = readdir (dirp);
921		1106
922	if (!entp)	1107	if (!entp)
		1108	{
		1109	if (errno)
		1110	break;
		1111
		1112	/* sort etc. */
		1113	req->int1 = flags;
		1114	req->result = dentoffs;
		1115
		1116	if (dents)
		1117	{
		1118	eio_dirent *ent = dents + dentoffs;
		1119
		1120	while (ent > dents)
		1121	(--ent)->name = names + (size_t)ent->name;
		1122	}
		1123
		1124	if (flags & EIO_READDIR_STAT_ORDER
		1125	\|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN)))
		1126	eio_dent_sort (dents, dentoffs); /* score depends of DIRS_FIRST */
		1127	else if (flags & EIO_READDIR_DIRS_FIRST)
		1128	{
		1129	/* in this case, all is known, and we just put dirs first and sort them */
		1130	eio_dirent *ent = dents + dentoffs;
		1131	eio_dirent *dir = dents;
		1132
		1133	/* now move dirs to the front, and non-dirs to the back */
		1134	/* by walking from both sides and swapping if necessary */
		1135	while (ent > dir)
		1136	{
		1137	if (dir->type == DT_DIR)
		1138	++dir;
		1139	else
		1140	{
		1141	--ent;
		1142
		1143	if (ent->type == DT_DIR)
		1144	{
		1145	eio_dirent tmp = *dir;
		1146	dir = ent;
		1147	*ent = tmp;
		1148
		1149	++dir;
		1150	}
		1151	}
		1152	}
		1153
		1154	/* now sort the dirs only */
		1155	eio_dent_sort (dents, dir - dents);
		1156	}
		1157
		1158	/* only provide the names array unless DENTS is specified */
		1159	if (!(flags & EIO_READDIR_DENTS))
		1160	{
		1161	X_LOCK (wrklock);
		1162	assert (!dents);
		1163	req->ptr1 = 0;
		1164	req->ptr2 = names;
		1165	X_UNLOCK (wrklock);
		1166	}
		1167
923	break;	1168	break;
		1169	}
924		1170
		1171	/* now add the entry to our list(s) */
925	name = entp->d_name;	1172	name = entp->d_name;
926		1173
		1174	/* skip . and .. entries */
927	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1175	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
928	{	1176	{
929	int len = strlen (name) + 1;	1177	int len = D_NAMLEN (entp) + 1;
930		1178
931	res++;	1179	while (expect_false (namesoffs + len > namesalloc))
932
933	while (memofs + len > memlen)
934	{	1180	{
935	memlen *= 2;	1181	namesalloc *= 2;
936	X_LOCK (wrklock);	1182	X_LOCK (wrklock);
937	req->ptr2 = names = realloc (names, memlen);	1183	req->ptr1 = names = realloc (names, namesalloc);
938	X_UNLOCK (wrklock);	1184	X_UNLOCK (wrklock);
939		1185
940	if (!names)	1186	if (!names)
941	break;	1187	break;
942	}	1188	}
943		1189
944	memcpy (names + memofs, name, len);	1190	memcpy (names + namesoffs, name, len);
		1191
		1192	if (dents)
		1193	{
		1194	struct eio_dirent *ent;
		1195
		1196	if (expect_false (dentoffs == dentalloc))
		1197	{
		1198	dentalloc *= 2;
		1199	X_LOCK (wrklock);
		1200	req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1201	X_UNLOCK (wrklock);
		1202
		1203	if (!dents)
		1204	break;
		1205	}
		1206
		1207	ent = dents + dentoffs;
		1208
		1209	ent->name = (char )(size_t)namesoffs; / rather dirtily we store the offset in the pointer */
		1210	ent->namelen = len - 1;
		1211	ent->inode = D_INO (entp);
		1212
		1213	switch (D_TYPE (entp))
		1214	{
		1215	default:
		1216	ent->type = EIO_DT_UNKNOWN;
		1217	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1218	break;
		1219
		1220	#ifdef DT_FIFO
		1221	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1222	#endif
		1223	#ifdef DT_CHR
		1224	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1225	#endif
		1226	#ifdef DT_MPC
		1227	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1228	#endif
		1229	#ifdef DT_DIR
		1230	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1231	#endif
		1232	#ifdef DT_NAM
		1233	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1234	#endif
		1235	#ifdef DT_BLK
		1236	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1237	#endif
		1238	#ifdef DT_MPB
		1239	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1240	#endif
		1241	#ifdef DT_REG
		1242	case DT_REG: ent->type = EIO_DT_REG; break;
		1243	#endif
		1244	#ifdef DT_NWK
		1245	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1246	#endif
		1247	#ifdef DT_CMP
		1248	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1249	#endif
		1250	#ifdef DT_LNK
		1251	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1252	#endif
		1253	#ifdef DT_SOCK
		1254	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1255	#endif
		1256	#ifdef DT_DOOR
		1257	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1258	#endif
		1259	#ifdef DT_WHT
		1260	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1261	#endif
		1262	}
		1263
		1264	ent->score = 0;
		1265
		1266	if (flags & EIO_READDIR_DIRS_FIRST)
		1267	{
		1268	if (ent->type == EIO_DT_UNKNOWN)
		1269	{
		1270	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1271	ent->score = 98;
		1272	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1273	ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */
		1274	}
		1275	else if (ent->type == EIO_DT_DIR)
		1276	ent->score = 100;
		1277	}
		1278	}
		1279
945	memofs += len;	1280	namesoffs += len;
		1281	++dentoffs;
		1282	}
		1283
		1284	if (EIO_CANCELLED (req))
		1285	{
		1286	errno = ECANCELED;
		1287	break;
946	}	1288	}
947	}	1289	}
948
949	if (errno)
950	res = -1;
951
952	req->result = res;
953	}	1290	}
954		1291
955	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)	1292	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1293	# undef msync
956	# define msync(a,b,c) ENOSYS	1294	# define msync(a,b,c) ((errno = ENOSYS), -1)
957	#endif	1295	#endif
958		1296
959	int	1297	int
960	eio__mtouch (void *mem, size_t len, int flags)	1298	eio__mtouch (void *mem, size_t len, int flags)
961	{	1299	{
…		…
1155	case EIO_SYNC: req->result = 0; sync (); break;	1493	case EIO_SYNC: req->result = 0; sync (); break;
1156	case EIO_FSYNC: req->result = fsync (req->int1); break;	1494	case EIO_FSYNC: req->result = fsync (req->int1); break;
1157	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1495	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1158	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;	1496	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
1159	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;	1497	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1498	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1160		1499
1161	case EIO_READDIR: eio__scandir (req, self); break;	1500	case EIO_READDIR: eio__scandir (req, self); break;
1162		1501
1163	case EIO_BUSY:	1502	case EIO_BUSY:
1164	#ifdef _WIN32	1503	#ifdef _WIN32
…		…
1196		1535
1197	req->result = req->type == EIO_FUTIME	1536	req->result = req->type == EIO_FUTIME
1198	? futimes (req->int1, times)	1537	? futimes (req->int1, times)
1199	: utimes (req->ptr1, times);	1538	: utimes (req->ptr1, times);
1200	}	1539	}
		1540	break;
1201		1541
1202	case EIO_GROUP:	1542	case EIO_GROUP:
		1543	abort (); /* handled in eio_request */
		1544
1203	case EIO_NOP:	1545	case EIO_NOP:
1204	req->result = 0;	1546	req->result = 0;
1205	break;	1547	break;
1206		1548
1207	case EIO_CUSTOM:	1549	case EIO_CUSTOM:
…		…
1246	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)	1588	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
1247	{	1589	{
1248	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;	1590	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
1249	}	1591	}
1250		1592
		1593	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1594	{
		1595	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1596	}
		1597
1251	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1598	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1252	{	1599	{
1253	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1600	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1254	}	1601	}
1255		1602
…		…
1367	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1714	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1368	{	1715	{
1369	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1716	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1370	}	1717	}
1371		1718
1372	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1719	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1373	{	1720	{
1374	return eio__1path (EIO_READDIR, path, pri, cb, data);	1721	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1375	}	1722	}
1376		1723
1377	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1724	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1378	{	1725	{
1379	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	1726	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
…		…
1448		1795
1449	void eio_grp_add (eio_req grp, eio_req req)	1796	void eio_grp_add (eio_req grp, eio_req req)
1450	{	1797	{
1451	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	1798	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1452		1799
		1800	grp->flags \|= EIO_FLAG_GROUPADD;
		1801
1453	++grp->size;	1802	++grp->size;
1454	req->grp = grp;	1803	req->grp = grp;
1455		1804
1456	req->grp_prev = 0;	1805	req->grp_prev = 0;
1457	req->grp_next = grp->grp_first;	1806	req->grp_next = grp->grp_first;
…		…
1466	/* misc garbage */	1815	/* misc garbage */
1467		1816
1468	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)	1817	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
1469	{	1818	{
1470	etp_worker wrk;	1819	etp_worker wrk;
		1820	ssize_t ret;
1471		1821
1472	wrk.dbuf = 0;	1822	wrk.dbuf = 0;
1473		1823
1474	eio__sendfile (ofd, ifd, offset, count, &wrk);	1824	ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
1475		1825
1476	if (wrk.dbuf)	1826	if (wrk.dbuf)
1477	free (wrk.dbuf);	1827	free (wrk.dbuf);
1478	}
1479		1828
		1829	return ret;
		1830	}
		1831

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.23 by root, Sun Sep 21 00:23:45 2008 UTC vs. Revision 1.38 by root, Fri Jun 12 20:01:42 2009 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.23 by root, Sun Sep 21 00:23:45 2008 UTC vs.
Revision 1.38 by root, Fri Jun 12 20:01:42 2009 UTC