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

Comparing libeio/eio.c (file contents):
Revision 1.15 by root, Sat May 17 12:26:57 2008 UTC vs.
Revision 1.31 by root, Sat Jun 6 17:25:13 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>
75	# include <unistd.h>	78	# include <unistd.h>
76	# include <utime.h>	79	# include <utime.h>
77	# include <signal.h>	80	# include <signal.h>
78	# include <dirent.h>	81	# include <dirent.h>
		82
		83	/* POSIX_SOURCE is useless on bsd's, and XOPEN_SOURCE is unreliable there, too */
		84	# if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		85	# define D_INO(de) (de)->d_fileno
		86	# define _DIRENT_HAVE_D_TYPE /* sigh */
		87	# elif defined(__linux) \|\| defined(d_ino) \|\| _XOPEN_SOURCE >= 600
		88	# define D_INO(de) (de)->d_ino
		89	# endif
		90
		91	# ifdef _DIRENT_HAVE_D_TYPE
		92	# define D_TYPE(de) (de)->d_type
		93	# endif
79		94
80	# ifndef EIO_STRUCT_DIRENT	95	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent	96	# define EIO_STRUCT_DIRENT struct dirent
82	# endif	97	# endif
83		98
…		…
96	# else	111	# else
97	# error sendfile support requested but not available	112	# error sendfile support requested but not available
98	# endif	113	# endif
99	#endif	114	#endif
100		115
		116	#ifndef D_TYPE
		117	# define D_TYPE(de) 0
		118	#endif
		119
		120	#ifndef D_INO
		121	# define D_INO(de) 0
		122	#endif
		123
101	/* number of seconds after which an idle threads exit */	124	/* number of seconds after which an idle threads exit */
102	#define IDLE_TIMEOUT 10	125	#define IDLE_TIMEOUT 10
103		126
104	/* used for struct dirent, AIX doesn't provide it */	127	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	128	#ifndef NAME_MAX
…		…
117	errno = ENOMEM; \	140	errno = ENOMEM; \
118	if (!eio_buf) \	141	if (!eio_buf) \
119	return -1;	142	return -1;
120		143
121	#define EIO_TICKS ((1000000 + 1023) >> 10)	144	#define EIO_TICKS ((1000000 + 1023) >> 10)
		145
		146	/*****************************************************************************/
		147
		148	#if __GNUC__ >= 3
		149	# define expect(expr,value) __builtin_expect ((expr),(value))
		150	#else
		151	# define expect(expr,value) (expr)
		152	#endif
		153
		154	#define expect_false(expr) expect ((expr) != 0, 0)
		155	#define expect_true(expr) expect ((expr) != 0, 1)
122		156
123	/*****************************************************************************/	157	/*****************************************************************************/
124		158
125	#define ETP_PRI_MIN EIO_PRI_MIN	159	#define ETP_PRI_MIN EIO_PRI_MIN
126	#define ETP_PRI_MAX EIO_PRI_MAX	160	#define ETP_PRI_MAX EIO_PRI_MAX
…		…
177	static mutex_t wrklock = X_MUTEX_INIT;	211	static mutex_t wrklock = X_MUTEX_INIT;
178	static mutex_t reslock = X_MUTEX_INIT;	212	static mutex_t reslock = X_MUTEX_INIT;
179	static mutex_t reqlock = X_MUTEX_INIT;	213	static mutex_t reqlock = X_MUTEX_INIT;
180	static cond_t reqwait = X_COND_INIT;	214	static cond_t reqwait = X_COND_INIT;
181		215
		216	#if !HAVE_PREADWRITE
		217	/*
		218	* make our pread/pwrite emulation safe against themselves, but not against
		219	* normal read/write by using a mutex. slows down execution a lot,
		220	* but that's your problem, not mine.
		221	*/
		222	static mutex_t preadwritelock = X_MUTEX_INIT;
		223	#endif
		224
182	typedef struct etp_worker	225	typedef struct etp_worker
183	{	226	{
184	/* locked by wrklock */	227	/* locked by wrklock */
185	struct etp_worker prev, next;	228	struct etp_worker prev, next;
186		229
…		…
314	X_LOCK (reqlock);	357	X_LOCK (reqlock);
315	X_LOCK (reslock);	358	X_LOCK (reslock);
316	#if !HAVE_PREADWRITE	359	#if !HAVE_PREADWRITE
317	X_LOCK (preadwritelock);	360	X_LOCK (preadwritelock);
318	#endif	361	#endif
319	#if !HAVE_READDIR_R
320	X_LOCK (readdirlock);
321	#endif
322	}	362	}
323		363
324	static void etp_atfork_parent (void)	364	static void etp_atfork_parent (void)
325	{	365	{
326	#if !HAVE_READDIR_R
327	X_UNLOCK (readdirlock);
328	#endif
329	#if !HAVE_PREADWRITE	366	#if !HAVE_PREADWRITE
330	X_UNLOCK (preadwritelock);	367	X_UNLOCK (preadwritelock);
331	#endif	368	#endif
332	X_UNLOCK (reslock);	369	X_UNLOCK (reslock);
333	X_UNLOCK (reqlock);	370	X_UNLOCK (reqlock);
…		…
336		373
337	static void etp_atfork_child (void)	374	static void etp_atfork_child (void)
338	{	375	{
339	ETP_REQ *prv;	376	ETP_REQ *prv;
340		377
341	while (prv = reqq_shift (&req_queue))	378	while ((prv = reqq_shift (&req_queue)))
342	ETP_DESTROY (prv);	379	ETP_DESTROY (prv);
343		380
344	while (prv = reqq_shift (&res_queue))	381	while ((prv = reqq_shift (&res_queue)))
345	ETP_DESTROY (prv);	382	ETP_DESTROY (prv);
346		383
347	while (wrk_first.next != &wrk_first)	384	while (wrk_first.next != &wrk_first)
348	{	385	{
349	etp_worker *wrk = wrk_first.next;	386	etp_worker *wrk = wrk_first.next;
…		…
377		414
378	pthread_once (&doinit, etp_once_init);	415	pthread_once (&doinit, etp_once_init);
379		416
380	want_poll_cb = want_poll;	417	want_poll_cb = want_poll;
381	done_poll_cb = done_poll;	418	done_poll_cb = done_poll;
		419
		420	return 0;
382	}	421	}
383		422
384	X_THREAD_PROC (etp_proc);	423	X_THREAD_PROC (etp_proc);
385		424
386	static void etp_start_thread (void)	425	static void etp_start_thread (void)
…		…
406	X_UNLOCK (wrklock);	445	X_UNLOCK (wrklock);
407	}	446	}
408		447
409	static void etp_maybe_start_thread (void)	448	static void etp_maybe_start_thread (void)
410	{	449	{
411	if (etp_nthreads () >= wanted)	450	if (expect_true (etp_nthreads () >= wanted))
412	return;	451	return;
413		452
414	/* todo: maybe use idle here, but might be less exact */	453	/* todo: maybe use idle here, but might be less exact */
415	if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())	454	if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
416	return;	455	return;
417		456
418	etp_start_thread ();	457	etp_start_thread ();
419	}	458	}
420		459
…		…
473		512
474	X_LOCK (reqlock);	513	X_LOCK (reqlock);
475	--nreqs;	514	--nreqs;
476	X_UNLOCK (reqlock);	515	X_UNLOCK (reqlock);
477		516
478	if (req->type == EIO_GROUP && req->size)	517	if (expect_false (req->type == EIO_GROUP && req->size))
479	{	518	{
480	req->int1 = 1; /* mark request as delayed */	519	req->int1 = 1; /* mark request as delayed */
481	continue;	520	continue;
482	}	521	}
483	else	522	else
484	{	523	{
485	int res = ETP_FINISH (req);	524	int res = ETP_FINISH (req);
486	if (res)	525	if (expect_false (res))
487	return res;	526	return res;
488	}	527	}
489		528
490	if (maxreqs && !--maxreqs)	529	if (expect_false (maxreqs && !--maxreqs))
491	break;	530	break;
492		531
493	if (maxtime)	532	if (maxtime)
494	{	533	{
495	gettimeofday (&tv_now, 0);	534	gettimeofday (&tv_now, 0);
…		…
514		553
515	static void etp_submit (ETP_REQ *req)	554	static void etp_submit (ETP_REQ *req)
516	{	555	{
517	req->pri -= ETP_PRI_MIN;	556	req->pri -= ETP_PRI_MIN;
518		557
519	if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;	558	if (expect_false (req->pri < ETP_PRI_MIN - ETP_PRI_MIN)) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;
520	if (req->pri > ETP_PRI_MAX - ETP_PRI_MIN) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;	559	if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
521		560
		561	if (expect_false (req->type == EIO_GROUP))
		562	{
		563	/* I hope this is worth it :/ */
522	X_LOCK (reqlock);	564	X_LOCK (reqlock);
523	++nreqs;	565	++nreqs;
		566	X_UNLOCK (reqlock);
		567
		568	X_LOCK (reslock);
		569
		570	++npending;
		571
		572	if (!reqq_push (&res_queue, req) && want_poll_cb)
		573	want_poll_cb ();
		574
		575	X_UNLOCK (reslock);
		576	}
		577	else
		578	{
		579	X_LOCK (reqlock);
		580	++nreqs;
524	++nready;	581	++nready;
525	reqq_push (&req_queue, req);	582	reqq_push (&req_queue, req);
526	X_COND_SIGNAL (reqwait);	583	X_COND_SIGNAL (reqwait);
527	X_UNLOCK (reqlock);	584	X_UNLOCK (reqlock);
528		585
529	etp_maybe_start_thread ();	586	etp_maybe_start_thread ();
		587	}
530	}	588	}
531		589
532	static void etp_set_max_poll_time (double nseconds)	590	static void etp_set_max_poll_time (double nseconds)
533	{	591	{
534	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	592	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
…		…
569		627
570	static void grp_try_feed (eio_req *grp)	628	static void grp_try_feed (eio_req *grp)
571	{	629	{
572	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	630	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
573	{	631	{
574	int old_len = grp->size;	632	grp->flags &= ~EIO_FLAG_GROUPADD;
575		633
576	EIO_FEED (grp);	634	EIO_FEED (grp);
577		635
578	/* stop if no progress has been made */	636	/* stop if no progress has been made */
579	if (old_len == grp->size)	637	if (!(grp->flags & EIO_FLAG_GROUPADD))
580	{	638	{
581	grp->feed = 0;	639	grp->feed = 0;
582	break;	640	break;
583	}	641	}
584	}	642	}
…		…
701		759
702	/*****************************************************************************/	760	/*****************************************************************************/
703	/* work around various missing functions */	761	/* work around various missing functions */
704		762
705	#if !HAVE_PREADWRITE	763	#if !HAVE_PREADWRITE
		764	# undef pread
		765	# undef pwrite
706	# define pread eio__pread	766	# define pread eio__pread
707	# define pwrite eio__pwrite	767	# define pwrite eio__pwrite
708
709	/*
710	* make our pread/pwrite safe against themselves, but not against
711	* normal read/write by using a mutex. slows down execution a lot,
712	* but that's your problem, not mine.
713	*/
714	static mutex_t preadwritelock = X_MUTEX_INIT;
715		768
716	static ssize_t	769	static ssize_t
717	eio__pread (int fd, void *buf, size_t count, off_t offset)	770	eio__pread (int fd, void *buf, size_t count, off_t offset)
718	{	771	{
719	ssize_t res;	772	ssize_t res;
…		…
737		790
738	X_LOCK (preadwritelock);	791	X_LOCK (preadwritelock);
739	ooffset = lseek (fd, 0, SEEK_CUR);	792	ooffset = lseek (fd, 0, SEEK_CUR);
740	lseek (fd, offset, SEEK_SET);	793	lseek (fd, offset, SEEK_SET);
741	res = write (fd, buf, count);	794	res = write (fd, buf, count);
742	lseek (fd, offset, SEEK_SET);	795	lseek (fd, ooffset, SEEK_SET);
743	X_UNLOCK (preadwritelock);	796	X_UNLOCK (preadwritelock);
744		797
745	return res;	798	return res;
746	}	799	}
747	#endif	800	#endif
748		801
749	#ifndef HAVE_FUTIMES	802	#ifndef HAVE_FUTIMES
750		803
		804	# undef utimes
		805	# undef futimes
751	# define utimes(path,times) eio__utimes (path, times)	806	# define utimes(path,times) eio__utimes (path, times)
752	# define futimes(fd,times) eio__futimes (fd, times)	807	# define futimes(fd,times) eio__futimes (fd, times)
753		808
754	static int	809	static int
755	eio__utimes (const char *filename, const struct timeval times[2])	810	eio__utimes (const char *filename, const struct timeval times[2])
…		…
774	}	829	}
775		830
776	#endif	831	#endif
777		832
778	#if !HAVE_FDATASYNC	833	#if !HAVE_FDATASYNC
		834	# undef fdatasync
779	# define fdatasync fsync	835	# define fdatasync(fd) fsync (fd)
780	#endif	836	#endif
		837
		838	/* sync_file_range always needs emulation */
		839	int
		840	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		841	{
		842	#if HAVE_SYNC_FILE_RANGE
		843	int res;
		844
		845	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		846	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		847	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		848	{
		849	flags = 0
		850	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		851	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		852	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		853	}
		854
		855	res = sync_file_range (fd, offset, nbytes, flags);
		856
		857	if (!res \|\| errno != ENOSYS)
		858	return res;
		859	#endif
		860
		861	/* even though we could play tricks with the flags, it's better to always
		862	* call fdatasync, as thta matches the expectation of it's users best */
		863	return fdatasync (fd);
		864	}
781		865
782	#if !HAVE_READAHEAD	866	#if !HAVE_READAHEAD
		867	# undef readahead
783	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	868	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
784		869
785	static ssize_t	870	static ssize_t
786	eio__readahead (int fd, off_t offset, size_t count, worker *self)	871	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
787	{	872	{
788	size_t todo = count;	873	size_t todo = count;
789	dBUF;	874	dBUF;
790		875
791	while (todo > 0)	876	while (todo > 0)
…		…
799		884
800	errno = 0;	885	errno = 0;
801	return count;	886	return count;
802	}	887	}
803		888
804	#endif
805
806	#if !HAVE_READDIR_R
807	# define readdir_r eio__readdir_r
808
809	static mutex_t readdirlock = X_MUTEX_INIT;
810
811	static int
812	eio__readdir_r (DIR dirp, EIO_STRUCT_DIRENT ent, EIO_STRUCT_DIRENT **res)
813	{
814	EIO_STRUCT_DIRENT *e;
815	int errorno;
816
817	X_LOCK (readdirlock);
818
819	e = readdir (dirp);
820	errorno = errno;
821
822	if (e)
823	{
824	*res = ent;
825	strcpy (ent->d_name, e->d_name);
826	}
827	else
828	*res = 0;
829
830	X_UNLOCK (readdirlock);
831
832	errno = errorno;
833	return e ? 0 : -1;
834	}
835	#endif	889	#endif
836		890
837	/* sendfile always needs emulation */	891	/* sendfile always needs emulation */
838	static ssize_t	892	static ssize_t
839	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)	893	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
…		…
926	}	980	}
927		981
928	return res;	982	return res;
929	}	983	}
930		984
		985	static int
		986	eio_dent_cmp (const void a_, const void b_)
		987	{
		988	const eio_dirent a = (const eio_dirent )a_;
		989	const eio_dirent b = (const eio_dirent )b_;
		990
		991	return (int)b->score - (int)a->score ? (int)b->score - (int)a->score
		992	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */
		993	}
		994
931	/* read a full directory */	995	/* read a full directory */
932	static void	996	static void
933	eio__scandir (eio_req req, etp_worker self)	997	eio__scandir (eio_req req, etp_worker self)
934	{	998	{
935	DIR *dirp;	999	DIR *dirp;
936	union
937	{
938	EIO_STRUCT_DIRENT d;
939	char b [offsetof (EIO_STRUCT_DIRENT, d_name) + NAME_MAX + 1];
940	} *u;
941	EIO_STRUCT_DIRENT *entp;	1000	EIO_STRUCT_DIRENT *entp;
942	char name, names;	1001	unsigned char name, names;
943	int memlen = 4096;	1002	int namesalloc = 4096;
944	int memofs = 0;	1003	int namesoffs = 0;
		1004	int flags = req->int1;
		1005	eio_dirent *dents = 0;
		1006	int dentalloc = 128;
945	int res = 0;	1007	int dentoffs = 0;
		1008
		1009	req->result = -1;
		1010
		1011	if (!(flags & EIO_READDIR_DENTS))
		1012	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
946		1013
947	X_LOCK (wrklock);	1014	X_LOCK (wrklock);
		1015
		1016	/* the corresponding closedir is in ETP_WORKER_CLEAR */
948	self->dirp = dirp = opendir (req->ptr1);	1017	self->dirp = dirp = opendir (req->ptr1);
949	self->dbuf = u = malloc (sizeof (*u));
950	req->flags \|= EIO_FLAG_PTR2_FREE;	1018	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
951	req->ptr2 = names = malloc (memlen);	1019	req->ptr1 = names = malloc (namesalloc);
		1020	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
		1021
952	X_UNLOCK (wrklock);	1022	X_UNLOCK (wrklock);
953		1023
954	if (dirp && u && names)	1024	if (dirp && names && (!flags \|\| dents))
955	for (;;)	1025	for (;;)
956	{	1026	{
957	errno = 0;	1027	errno = 0;
958	readdir_r (dirp, &u->d, &entp);	1028	entp = readdir (dirp);
959		1029
960	if (!entp)	1030	if (!entp)
		1031	{
		1032	if (errno)
		1033	break;
		1034
		1035	/* sort etc. */
		1036	req->int1 = flags;
		1037	req->result = dentoffs;
		1038
		1039	if (flags & EIO_READDIR_STAT_ORDER \|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN))
		1040	{
		1041	/* pray your qsort doesn't use quicksort */
		1042	qsort (dents, dentoffs, sizeof (dents), eio_dent_cmp); / score depends of DIRS_FIRST */
		1043	}
		1044	else if (flags & EIO_READDIR_DIRS_FIRST && !(flags & EIO_READDIR_FOUND_UNKNOWN))
		1045	{
		1046	/* in this case, all is known, and we just put dirs first and sort them */
		1047	eio_dirent *ent = dents + dentoffs;
		1048	eio_dirent *dir = dents;
		1049
		1050	while (ent > dir)
		1051	{
		1052	if (dir->type == DT_DIR)
		1053	++dir;
		1054	else
		1055	{
		1056	--ent;
		1057
		1058	if (ent->type == DT_DIR)
		1059	{
		1060	eio_dirent tmp = *dir;
		1061	dir = ent;
		1062	*ent = tmp;
		1063
		1064	++dir;
		1065	}
		1066	}
		1067	}
		1068
		1069	/* now sort the dirs only */
		1070	qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);
		1071	}
		1072
		1073	{int i; for(i=0;i<dentoffs;++i){eio_dirent *e=dents+i; printf ("%9ld %3d %s\n", e->inode,e->score,e->name);}}//D
		1074
961	break;	1075	break;
		1076	}
962		1077
963	name = entp->d_name;	1078	name = entp->d_name;
964		1079
965	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1080	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
966	{	1081	{
967	int len = strlen (name) + 1;	1082	int len = strlen (name) + 1;
968		1083
969	res++;	1084	while (expect_false (namesoffs + len > namesalloc))
970
971	while (memofs + len > memlen)
972	{	1085	{
973	memlen *= 2;	1086	namesalloc *= 2;
974	X_LOCK (wrklock);	1087	X_LOCK (wrklock);
975	req->ptr2 = names = realloc (names, memlen);	1088	req->ptr1 = names = realloc (names, namesalloc);
976	X_UNLOCK (wrklock);	1089	X_UNLOCK (wrklock);
977		1090
978	if (!names)	1091	if (!names)
979	break;	1092	break;
980	}	1093	}
981		1094
982	memcpy (names + memofs, name, len);	1095	memcpy (names + namesoffs, name, len);
		1096
		1097	if (dents)
		1098	{
		1099	struct eio_dirent *ent;
		1100
		1101	if (expect_false (dentoffs == dentalloc))
		1102	{
		1103	dentalloc *= 2;
		1104	X_LOCK (wrklock);
		1105	req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1106	X_UNLOCK (wrklock);
		1107
		1108	if (!dents)
		1109	break;
		1110	}
		1111
		1112	ent = dents + dentoffs;
		1113
		1114	ent->name = names + namesoffs;
		1115	ent->namelen = len - 1;
		1116	ent->inode = D_INO (entp);
		1117
		1118	switch (D_TYPE (entp))
		1119	{
		1120	default:
		1121	ent->type = EIO_DT_UNKNOWN;
		1122	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1123	break;
		1124
		1125	#ifdef DT_FIFO
		1126	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1127	#endif
		1128	#ifdef DT_CHR
		1129	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1130	#endif
		1131	#ifdef DT_DIR
		1132	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1133	#endif
		1134	#ifdef DT_BLK
		1135	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1136	#endif
		1137	#ifdef DT_REG
		1138	case DT_REG: ent->type = EIO_DT_REG; break;
		1139	#endif
		1140	#ifdef DT_LNK
		1141	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1142	#endif
		1143	#ifdef DT_SOCK
		1144	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1145	#endif
		1146	#ifdef DT_WHT
		1147	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1148	#endif
		1149	}
		1150
		1151	ent->score = 0;
		1152
		1153	if (flags & EIO_READDIR_DIRS_FIRST)
		1154	{
		1155	if (ent->type == EIO_DT_UNKNOWN)
		1156	{
		1157	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1158	ent->score = 98;
		1159	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1160	ent->score = len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */
		1161	}
		1162	else if (ent->type == DT_DIR)
		1163	ent->score = 100;
		1164	}
		1165	}
		1166
983	memofs += len;	1167	namesoffs += len;
		1168	++dentoffs;
984	}	1169	}
985	}	1170	}
986		1171	else
987	if (errno)
988	res = -1;
989
990	req->result = res;	1172	req->result = -1;
		1173
		1174	/* if user doesn't want the dents, do not provide it */
		1175	if (!(flags & EIO_READDIR_DENTS))
		1176	{
		1177	X_LOCK (wrklock);
		1178	free (dents);
		1179	req->ptr2 = req->ptr1;
		1180	req->ptr1 = 0;
		1181	X_UNLOCK (wrklock);
		1182	}
		1183	}
		1184
		1185	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1186	# undef msync
		1187	# define msync(a,b,c) ((errno = ENOSYS), -1)
		1188	#endif
		1189
		1190	int
		1191	eio__mtouch (void *mem, size_t len, int flags)
		1192	{
		1193	intptr_t addr = (intptr_t)mem;
		1194	intptr_t end = addr + len;
		1195	#ifdef PAGESIZE
		1196	const intptr_t page = PAGESIZE;
		1197	#else
		1198	static intptr_t page;
		1199
		1200	if (!page)
		1201	page = sysconf (_SC_PAGESIZE);
		1202	#endif
		1203
		1204	addr &= ~(page - 1); /* assume page size is always a power of two */
		1205
		1206	if (addr < end)
		1207	if (flags) /* modify */
		1208	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
		1209	else
		1210	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1211
		1212	return 0;
991	}	1213	}
992		1214
993	/*****************************************************************************/	1215	/*****************************************************************************/
994		1216
995	#define ALLOC(len) \	1217	#define ALLOC(len) \
…		…
1082		1304
1083	/*****************************************************************************/	1305	/*****************************************************************************/
1084		1306
1085	int eio_init (void (want_poll)(void), void (done_poll)(void))	1307	int eio_init (void (want_poll)(void), void (done_poll)(void))
1086	{	1308	{
1087	etp_init (want_poll, done_poll);	1309	return etp_init (want_poll, done_poll);
1088	}	1310	}
1089		1311
1090	static void eio_api_destroy (eio_req *req)	1312	static void eio_api_destroy (eio_req *req)
1091	{	1313	{
1092	free (req);	1314	free (req);
…		…
1154	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;	1376	case EIO_RMDIR: req->result = rmdir (req->ptr1); break;
1155	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;	1377	case EIO_MKDIR: req->result = mkdir (req->ptr1, (mode_t)req->int2); break;
1156	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;	1378	case EIO_RENAME: req->result = rename (req->ptr1, req->ptr2); break;
1157	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;	1379	case EIO_LINK: req->result = link (req->ptr1, req->ptr2); break;
1158	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;	1380	case EIO_SYMLINK: req->result = symlink (req->ptr1, req->ptr2); break;
1159	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;	1381	case EIO_MKNOD: req->result = mknod (req->ptr1, (mode_t)req->int2, (dev_t)req->int3); break;
1160		1382
1161	case EIO_READLINK: ALLOC (NAME_MAX);	1383	case EIO_READLINK: ALLOC (NAME_MAX);
1162	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	1384	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1163		1385
1164	case EIO_SYNC: req->result = 0; sync (); break;	1386	case EIO_SYNC: req->result = 0; sync (); break;
1165	case EIO_FSYNC: req->result = fsync (req->int1); break;	1387	case EIO_FSYNC: req->result = fsync (req->int1); break;
1166	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1388	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1389	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
		1390	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1391	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1167		1392
1168	case EIO_READDIR: eio__scandir (req, self); break;	1393	case EIO_READDIR: eio__scandir (req, self); break;
1169		1394
1170	case EIO_BUSY:	1395	case EIO_BUSY:
1171	#ifdef _WIN32	1396	#ifdef _WIN32
…		…
1203		1428
1204	req->result = req->type == EIO_FUTIME	1429	req->result = req->type == EIO_FUTIME
1205	? futimes (req->int1, times)	1430	? futimes (req->int1, times)
1206	: utimes (req->ptr1, times);	1431	: utimes (req->ptr1, times);
1207	}	1432	}
		1433	break;
1208		1434
1209	case EIO_GROUP:	1435	case EIO_GROUP:
		1436	abort (); /* handled in eio_request */
		1437
1210	case EIO_NOP:	1438	case EIO_NOP:
1211	req->result = 0;	1439	req->result = 0;
1212	break;	1440	break;
1213		1441
1214	case EIO_CUSTOM:	1442	case EIO_CUSTOM:
1215	req->feed (req);	1443	((void ()(eio_req ))req->feed) (req);
1216	break;	1444	break;
1217		1445
1218	default:	1446	default:
1219	req->result = -1;	1447	req->result = -1;
1220	break;	1448	break;
…		…
1243	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)	1471	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
1244	{	1472	{
1245	REQ (EIO_FSYNC); req->int1 = fd; SEND;	1473	REQ (EIO_FSYNC); req->int1 = fd; SEND;
1246	}	1474	}
1247		1475
		1476	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1477	{
		1478	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1479	}
		1480
		1481	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1482	{
		1483	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1484	}
		1485
		1486	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1487	{
		1488	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1489	}
		1490
1248	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1491	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1249	{	1492	{
1250	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1493	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1251	}	1494	}
1252		1495
…		…
1364	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1607	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1365	{	1608	{
1366	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1609	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1367	}	1610	}
1368		1611
1369	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1612	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1370	{	1613	{
1371	return eio__1path (EIO_READDIR, path, pri, cb, data);	1614	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1372	}	1615	}
1373		1616
1374	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1617	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1375	{	1618	{
1376	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND;	1619	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
1377	}	1620	}
1378		1621
1379	static eio_req *	1622	static eio_req *
1380	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)	1623	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1381	{	1624	{
…		…
1407	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	1650	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1408	}	1651	}
1409		1652
1410	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)	1653	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)
1411	{	1654	{
1412	REQ (EIO_CUSTOM); req->feed = execute; SEND;	1655	REQ (EIO_CUSTOM); req->feed = (void ()(eio_req ))execute; SEND;
1413	}	1656	}
1414		1657
1415	#endif	1658	#endif
1416		1659
1417	eio_req eio_grp (eio_cb cb, void data)	1660	eio_req eio_grp (eio_cb cb, void data)
…		…
1445		1688
1446	void eio_grp_add (eio_req grp, eio_req req)	1689	void eio_grp_add (eio_req grp, eio_req req)
1447	{	1690	{
1448	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	1691	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1449		1692
		1693	grp->flags \|= EIO_FLAG_GROUPADD;
		1694
1450	++grp->size;	1695	++grp->size;
1451	req->grp = grp;	1696	req->grp = grp;
1452		1697
1453	req->grp_prev = 0;	1698	req->grp_prev = 0;
1454	req->grp_next = grp->grp_first;	1699	req->grp_next = grp->grp_first;

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.15 by root, Sat May 17 12:26:57 2008 UTC vs. Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.15 by root, Sat May 17 12:26:57 2008 UTC vs.
Revision 1.31 by root, Sat Jun 6 17:25:13 2009 UTC