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

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.22 by root, Fri Jul 11 10:54:50 2008 UTC vs.
Revision 1.35 by root, Sat Jun 6 20:13:46 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 _DIRENT_HAVE_D_TYPE /* sigh */
		86	# define D_INO(de) (de)->d_fileno
		87	# define D_NAMLEN(de) (de)->d_namlen
		88	# elif defined(__linux) \|\| defined(d_ino) \|\| _XOPEN_SOURCE >= 600
		89	# define D_INO(de) (de)->d_ino
		90	# endif
		91
		92	#ifdef _D_EXACT_NAMLEN
		93	# undef D_NAMLEN
		94	# define D_NAMLEN(de) _D_EXACT_NAMLEN (de)
		95	#endif
		96
		97	# ifdef _DIRENT_HAVE_D_TYPE
		98	# define D_TYPE(de) (de)->d_type
		99	# endif
79		100
80	# ifndef EIO_STRUCT_DIRENT	101	# ifndef EIO_STRUCT_DIRENT
81	# define EIO_STRUCT_DIRENT struct dirent	102	# define EIO_STRUCT_DIRENT struct dirent
82	# endif	103	# endif
83		104
…		…
96	# else	117	# else
97	# error sendfile support requested but not available	118	# error sendfile support requested but not available
98	# endif	119	# endif
99	#endif	120	#endif
100		121
		122	#ifndef D_TYPE
		123	# define D_TYPE(de) 0
		124	#endif
		125	#ifndef D_INO
		126	# define D_INO(de) 0
		127	#endif
		128	#ifndef D_NAMLEN
		129	# define D_NAMLEN(de) strlen ((de)->d_name)
		130	#endif
		131
101	/* number of seconds after which an idle threads exit */	132	/* number of seconds after which an idle threads exit */
102	#define IDLE_TIMEOUT 10	133	#define IDLE_TIMEOUT 10
103		134
104	/* used for struct dirent, AIX doesn't provide it */	135	/* used for struct dirent, AIX doesn't provide it */
105	#ifndef NAME_MAX	136	#ifndef NAME_MAX
…		…
117	errno = ENOMEM; \	148	errno = ENOMEM; \
118	if (!eio_buf) \	149	if (!eio_buf) \
119	return -1;	150	return -1;
120		151
121	#define EIO_TICKS ((1000000 + 1023) >> 10)	152	#define EIO_TICKS ((1000000 + 1023) >> 10)
		153
		154	/*****************************************************************************/
		155
		156	#if __GNUC__ >= 3
		157	# define expect(expr,value) __builtin_expect ((expr),(value))
		158	#else
		159	# define expect(expr,value) (expr)
		160	#endif
		161
		162	#define expect_false(expr) expect ((expr) != 0, 0)
		163	#define expect_true(expr) expect ((expr) != 0, 1)
122		164
123	/*****************************************************************************/	165	/*****************************************************************************/
124		166
125	#define ETP_PRI_MIN EIO_PRI_MIN	167	#define ETP_PRI_MIN EIO_PRI_MIN
126	#define ETP_PRI_MAX EIO_PRI_MAX	168	#define ETP_PRI_MAX EIO_PRI_MAX
…		…
144	if (wrk->dirp) \	186	if (wrk->dirp) \
145	{ \	187	{ \
146	closedir (wrk->dirp); \	188	closedir (wrk->dirp); \
147	wrk->dirp = 0; \	189	wrk->dirp = 0; \
148	}	190	}
		191
149	#define ETP_WORKER_COMMON \	192	#define ETP_WORKER_COMMON \
150	void *dbuf; \	193	void *dbuf; \
151	DIR *dirp;	194	DIR *dirp;
152		195
153	/*****************************************************************************/	196	/*****************************************************************************/
…		…
411	X_UNLOCK (wrklock);	454	X_UNLOCK (wrklock);
412	}	455	}
413		456
414	static void etp_maybe_start_thread (void)	457	static void etp_maybe_start_thread (void)
415	{	458	{
416	if (etp_nthreads () >= wanted)	459	if (expect_true (etp_nthreads () >= wanted))
417	return;	460	return;
418		461
419	/* todo: maybe use idle here, but might be less exact */	462	/* todo: maybe use idle here, but might be less exact */
420	if (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())	463	if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ()))
421	return;	464	return;
422		465
423	etp_start_thread ();	466	etp_start_thread ();
424	}	467	}
425		468
…		…
478		521
479	X_LOCK (reqlock);	522	X_LOCK (reqlock);
480	--nreqs;	523	--nreqs;
481	X_UNLOCK (reqlock);	524	X_UNLOCK (reqlock);
482		525
483	if (req->type == EIO_GROUP && req->size)	526	if (expect_false (req->type == EIO_GROUP && req->size))
484	{	527	{
485	req->int1 = 1; /* mark request as delayed */	528	req->int1 = 1; /* mark request as delayed */
486	continue;	529	continue;
487	}	530	}
488	else	531	else
489	{	532	{
490	int res = ETP_FINISH (req);	533	int res = ETP_FINISH (req);
491	if (res)	534	if (expect_false (res))
492	return res;	535	return res;
493	}	536	}
494		537
495	if (maxreqs && !--maxreqs)	538	if (expect_false (maxreqs && !--maxreqs))
496	break;	539	break;
497		540
498	if (maxtime)	541	if (maxtime)
499	{	542	{
500	gettimeofday (&tv_now, 0);	543	gettimeofday (&tv_now, 0);
…		…
519		562
520	static void etp_submit (ETP_REQ *req)	563	static void etp_submit (ETP_REQ *req)
521	{	564	{
522	req->pri -= ETP_PRI_MIN;	565	req->pri -= ETP_PRI_MIN;
523		566
524	if (req->pri < ETP_PRI_MIN - ETP_PRI_MIN) req->pri = ETP_PRI_MIN - ETP_PRI_MIN;	567	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;	568	if (expect_false (req->pri > ETP_PRI_MAX - ETP_PRI_MIN)) req->pri = ETP_PRI_MAX - ETP_PRI_MIN;
526		569
		570	if (expect_false (req->type == EIO_GROUP))
		571	{
		572	/* I hope this is worth it :/ */
527	X_LOCK (reqlock);	573	X_LOCK (reqlock);
528	++nreqs;	574	++nreqs;
		575	X_UNLOCK (reqlock);
		576
		577	X_LOCK (reslock);
		578
		579	++npending;
		580
		581	if (!reqq_push (&res_queue, req) && want_poll_cb)
		582	want_poll_cb ();
		583
		584	X_UNLOCK (reslock);
		585	}
		586	else
		587	{
		588	X_LOCK (reqlock);
		589	++nreqs;
529	++nready;	590	++nready;
530	reqq_push (&req_queue, req);	591	reqq_push (&req_queue, req);
531	X_COND_SIGNAL (reqwait);	592	X_COND_SIGNAL (reqwait);
532	X_UNLOCK (reqlock);	593	X_UNLOCK (reqlock);
533		594
534	etp_maybe_start_thread ();	595	etp_maybe_start_thread ();
		596	}
535	}	597	}
536		598
537	static void etp_set_max_poll_time (double nseconds)	599	static void etp_set_max_poll_time (double nseconds)
538	{	600	{
539	if (WORDACCESS_UNSAFE) X_LOCK (reslock);	601	if (WORDACCESS_UNSAFE) X_LOCK (reslock);
…		…
574		636
575	static void grp_try_feed (eio_req *grp)	637	static void grp_try_feed (eio_req *grp)
576	{	638	{
577	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))	639	while (grp->size < grp->int2 && !EIO_CANCELLED (grp))
578	{	640	{
579	int old_len = grp->size;	641	grp->flags &= ~EIO_FLAG_GROUPADD;
580		642
581	EIO_FEED (grp);	643	EIO_FEED (grp);
582		644
583	/* stop if no progress has been made */	645	/* stop if no progress has been made */
584	if (old_len == grp->size)	646	if (!(grp->flags & EIO_FLAG_GROUPADD))
585	{	647	{
586	grp->feed = 0;	648	grp->feed = 0;
587	break;	649	break;
588	}	650	}
589	}	651	}
…		…
706		768
707	/*****************************************************************************/	769	/*****************************************************************************/
708	/* work around various missing functions */	770	/* work around various missing functions */
709		771
710	#if !HAVE_PREADWRITE	772	#if !HAVE_PREADWRITE
		773	# undef pread
		774	# undef pwrite
711	# define pread eio__pread	775	# define pread eio__pread
712	# define pwrite eio__pwrite	776	# define pwrite eio__pwrite
713		777
714	static ssize_t	778	static ssize_t
715	eio__pread (int fd, void *buf, size_t count, off_t offset)	779	eio__pread (int fd, void *buf, size_t count, off_t offset)
…		…
735		799
736	X_LOCK (preadwritelock);	800	X_LOCK (preadwritelock);
737	ooffset = lseek (fd, 0, SEEK_CUR);	801	ooffset = lseek (fd, 0, SEEK_CUR);
738	lseek (fd, offset, SEEK_SET);	802	lseek (fd, offset, SEEK_SET);
739	res = write (fd, buf, count);	803	res = write (fd, buf, count);
740	lseek (fd, offset, SEEK_SET);	804	lseek (fd, ooffset, SEEK_SET);
741	X_UNLOCK (preadwritelock);	805	X_UNLOCK (preadwritelock);
742		806
743	return res;	807	return res;
744	}	808	}
745	#endif	809	#endif
746		810
747	#ifndef HAVE_FUTIMES	811	#ifndef HAVE_FUTIMES
748		812
		813	# undef utimes
		814	# undef futimes
749	# define utimes(path,times) eio__utimes (path, times)	815	# define utimes(path,times) eio__utimes (path, times)
750	# define futimes(fd,times) eio__futimes (fd, times)	816	# define futimes(fd,times) eio__futimes (fd, times)
751		817
752	static int	818	static int
753	eio__utimes (const char *filename, const struct timeval times[2])	819	eio__utimes (const char *filename, const struct timeval times[2])
…		…
772	}	838	}
773		839
774	#endif	840	#endif
775		841
776	#if !HAVE_FDATASYNC	842	#if !HAVE_FDATASYNC
		843	# undef fdatasync
777	# define fdatasync fsync	844	# define fdatasync(fd) fsync (fd)
778	#endif	845	#endif
		846
		847	/* sync_file_range always needs emulation */
		848	int
		849	eio__sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags)
		850	{
		851	#if HAVE_SYNC_FILE_RANGE
		852	int res;
		853
		854	if (EIO_SYNC_FILE_RANGE_WAIT_BEFORE != SYNC_FILE_RANGE_WAIT_BEFORE
		855	\|\| EIO_SYNC_FILE_RANGE_WRITE != SYNC_FILE_RANGE_WRITE
		856	\|\| EIO_SYNC_FILE_RANGE_WAIT_AFTER != SYNC_FILE_RANGE_WAIT_AFTER)
		857	{
		858	flags = 0
		859	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_BEFORE ? SYNC_FILE_RANGE_WAIT_BEFORE : 0)
		860	\| (flags & EIO_SYNC_FILE_RANGE_WRITE ? SYNC_FILE_RANGE_WRITE : 0)
		861	\| (flags & EIO_SYNC_FILE_RANGE_WAIT_AFTER ? SYNC_FILE_RANGE_WAIT_AFTER : 0);
		862	}
		863
		864	res = sync_file_range (fd, offset, nbytes, flags);
		865
		866	if (!res \|\| errno != ENOSYS)
		867	return res;
		868	#endif
		869
		870	/* even though we could play tricks with the flags, it's better to always
		871	* call fdatasync, as thta matches the expectation of it's users best */
		872	return fdatasync (fd);
		873	}
779		874
780	#if !HAVE_READAHEAD	875	#if !HAVE_READAHEAD
		876	# undef readahead
781	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)	877	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
782		878
783	static ssize_t	879	static ssize_t
784	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)	880	eio__readahead (int fd, off_t offset, size_t count, etp_worker *self)
785	{	881	{
…		…
893	}	989	}
894		990
895	return res;	991	return res;
896	}	992	}
897		993
		994	static int
		995	eio_dent_cmp (const void a_, const void b_)
		996	{
		997	const eio_dirent a = (const eio_dirent )a_;
		998	const eio_dirent b = (const eio_dirent )b_;
		999
		1000	return (int)b->score - (int)a->score ? (int)b->score - (int)a->score
		1001	: a->inode < b->inode ? -1 : a->inode > b->inode ? 1 : 0; /* int might be < ino_t */
		1002	}
		1003
898	/* read a full directory */	1004	/* read a full directory */
899	static void	1005	static void
900	eio__scandir (eio_req req, etp_worker self)	1006	eio__scandir (eio_req req, etp_worker self)
901	{	1007	{
902	DIR *dirp;	1008	DIR *dirp;
903	EIO_STRUCT_DIRENT *entp;	1009	EIO_STRUCT_DIRENT *entp;
904	char name, names;	1010	unsigned char name, names;
905	int memlen = 4096;	1011	int namesalloc = 4096;
906	int memofs = 0;	1012	int namesoffs = 0;
		1013	int flags = req->int1;
		1014	eio_dirent *dents = 0;
		1015	int dentalloc = 128;
907	int res = 0;	1016	int dentoffs = 0;
		1017
		1018	req->result = -1;
		1019
		1020	if (!(flags & EIO_READDIR_DENTS))
		1021	flags &= ~(EIO_READDIR_DIRS_FIRST \| EIO_READDIR_STAT_ORDER);
908		1022
909	X_LOCK (wrklock);	1023	X_LOCK (wrklock);
910	/* the corresponding closedir is in ETP_WORKER_CLEAR */	1024	/* the corresponding closedir is in ETP_WORKER_CLEAR */
911	self->dirp = dirp = opendir (req->ptr1);	1025	self->dirp = dirp = opendir (req->ptr1);
912	req->flags \|= EIO_FLAG_PTR2_FREE;	1026	req->flags \|= EIO_FLAG_PTR1_FREE \| EIO_FLAG_PTR2_FREE;
913	req->ptr2 = names = malloc (memlen);	1027	req->ptr1 = names = malloc (namesalloc);
		1028	req->ptr2 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
914	X_UNLOCK (wrklock);	1029	X_UNLOCK (wrklock);
915		1030
916	if (dirp && names)	1031	if (dirp && names && (!flags \|\| dents))
917	for (;;)	1032	for (;;)
918	{	1033	{
919	errno = 0;	1034	errno = 0;
920	entp = readdir (dirp);	1035	entp = readdir (dirp);
921		1036
922	if (!entp)	1037	if (!entp)
		1038	{
		1039	if (errno)
		1040	break;
		1041
		1042	/* sort etc. */
		1043	req->int1 = flags;
		1044	req->result = dentoffs;
		1045
		1046	if (dents)
		1047	{
		1048	eio_dirent *ent = dents + dentoffs;
		1049
		1050	while (ent > dents)
		1051	(--ent)->name = names + (size_t)ent->name;
		1052	}
		1053
		1054	if (flags & EIO_READDIR_STAT_ORDER
		1055	\|\| !(~flags & (EIO_READDIR_DIRS_FIRST \| EIO_READDIR_FOUND_UNKNOWN)))
		1056	{
		1057	/* pray your qsort doesn't use quicksort */
		1058	qsort (dents, dentoffs, sizeof (dents), eio_dent_cmp); / score depends of DIRS_FIRST */
		1059	}
		1060	else if (flags & EIO_READDIR_DIRS_FIRST)
		1061	{
		1062	/* in this case, all is known, and we just put dirs first and sort them */
		1063	eio_dirent *ent = dents + dentoffs;
		1064	eio_dirent *dir = dents;
		1065
		1066	/* now move dirs to the front, and non-dirs to the back */
		1067	/* by walkign from both sides and swapping if necessary */
		1068	while (ent > dir)
		1069	{
		1070	if (dir->type == DT_DIR)
		1071	++dir;
		1072	else
		1073	{
		1074	--ent;
		1075
		1076	if (ent->type == DT_DIR)
		1077	{
		1078	eio_dirent tmp = *dir;
		1079	dir = ent;
		1080	*ent = tmp;
		1081
		1082	++dir;
		1083	}
		1084	}
		1085	}
		1086
		1087	/* now sort the dirs only */
		1088	qsort (dents, dir - dents, sizeof (*dents), eio_dent_cmp);
		1089	}
		1090
		1091	/* only provide the names array unless DENTS is specified */
		1092	if (!(flags & EIO_READDIR_DENTS))
		1093	{
		1094	X_LOCK (wrklock);
		1095	assert (!dents);
		1096	req->ptr1 = 0;
		1097	req->ptr2 = names;
		1098	X_UNLOCK (wrklock);
		1099	}
		1100
923	break;	1101	break;
		1102	}
924		1103
		1104	/* now add the entry to our list(s) */
925	name = entp->d_name;	1105	name = entp->d_name;
926		1106
		1107	/* skip . and .. entries */
927	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))	1108	if (name [0] != '.' \|\| (name [1] && (name [1] != '.' \|\| name [2])))
928	{	1109	{
929	int len = strlen (name) + 1;	1110	int len = D_NAMLEN (entp) + 1;
930		1111
931	res++;	1112	while (expect_false (namesoffs + len > namesalloc))
932
933	while (memofs + len > memlen)
934	{	1113	{
935	memlen *= 2;	1114	namesalloc *= 2;
936	X_LOCK (wrklock);	1115	X_LOCK (wrklock);
937	req->ptr2 = names = realloc (names, memlen);	1116	req->ptr1 = names = realloc (names, namesalloc);
938	X_UNLOCK (wrklock);	1117	X_UNLOCK (wrklock);
939		1118
940	if (!names)	1119	if (!names)
941	break;	1120	break;
942	}	1121	}
943		1122
944	memcpy (names + memofs, name, len);	1123	memcpy (names + namesoffs, name, len);
		1124
		1125	if (dents)
		1126	{
		1127	struct eio_dirent *ent;
		1128
		1129	if (expect_false (dentoffs == dentalloc))
		1130	{
		1131	dentalloc *= 2;
		1132	X_LOCK (wrklock);
		1133	req->ptr2 = dents = realloc (dents, dentalloc * sizeof (eio_dirent));
		1134	X_UNLOCK (wrklock);
		1135
		1136	if (!dents)
		1137	break;
		1138	}
		1139
		1140	ent = dents + dentoffs;
		1141
		1142	ent->name = (char )(size_t)namesoffs; / rather dirtily we store the offset in the pointer */
		1143	ent->namelen = len - 1;
		1144	ent->inode = D_INO (entp);
		1145
		1146	switch (D_TYPE (entp))
		1147	{
		1148	default:
		1149	ent->type = EIO_DT_UNKNOWN;
		1150	flags \|= EIO_READDIR_FOUND_UNKNOWN;
		1151	break;
		1152
		1153	#ifdef DT_FIFO
		1154	case DT_FIFO: ent->type = EIO_DT_FIFO; break;
		1155	#endif
		1156	#ifdef DT_CHR
		1157	case DT_CHR: ent->type = EIO_DT_CHR; break;
		1158	#endif
		1159	#ifdef DT_MPC
		1160	case DT_MPC: ent->type = EIO_DT_MPC; break;
		1161	#endif
		1162	#ifdef DT_DIR
		1163	case DT_DIR: ent->type = EIO_DT_DIR; break;
		1164	#endif
		1165	#ifdef DT_NAM
		1166	case DT_NAM: ent->type = EIO_DT_NAM; break;
		1167	#endif
		1168	#ifdef DT_BLK
		1169	case DT_BLK: ent->type = EIO_DT_BLK; break;
		1170	#endif
		1171	#ifdef DT_MPB
		1172	case DT_MPB: ent->type = EIO_DT_MPB; break;
		1173	#endif
		1174	#ifdef DT_REG
		1175	case DT_REG: ent->type = EIO_DT_REG; break;
		1176	#endif
		1177	#ifdef DT_NWK
		1178	case DT_NWK: ent->type = EIO_DT_NWK; break;
		1179	#endif
		1180	#ifdef DT_CMP
		1181	case DT_CMP: ent->type = EIO_DT_CMP; break;
		1182	#endif
		1183	#ifdef DT_LNK
		1184	case DT_LNK: ent->type = EIO_DT_LNK; break;
		1185	#endif
		1186	#ifdef DT_SOCK
		1187	case DT_SOCK: ent->type = EIO_DT_SOCK; break;
		1188	#endif
		1189	#ifdef DT_DOOR
		1190	case DT_DOOR: ent->type = EIO_DT_DOOR; break;
		1191	#endif
		1192	#ifdef DT_WHT
		1193	case DT_WHT: ent->type = EIO_DT_WHT; break;
		1194	#endif
		1195	}
		1196
		1197	ent->score = 0;
		1198
		1199	if (flags & EIO_READDIR_DIRS_FIRST)
		1200	{
		1201	if (ent->type == EIO_DT_UNKNOWN)
		1202	{
		1203	if (name == '.') / leading dots are likely directories, and, in any case, rare */
		1204	ent->score = 98;
		1205	else if (!strchr (name, '.')) /* absense of dots indicate likely dirs */
		1206	ent->score = len <= 2 ? len + 6 : len <= 4 ? 5 : len <= 7 ? 4 : 1; /* shorter == more likely dir, but avoid too many classes */
		1207	}
		1208	else if (ent->type == EIO_DT_DIR)
		1209	ent->score = 100;
		1210	}
		1211	}
		1212
945	memofs += len;	1213	namesoffs += len;
		1214	++dentoffs;
946	}	1215	}
947	}	1216	}
948		1217	else
949	if (errno)
950	res = -1;
951
952	req->result = res;	1218	req->result = -1;
		1219	}
		1220
		1221	#if !(_POSIX_MAPPED_FILES && _POSIX_SYNCHRONIZED_IO)
		1222	# undef msync
		1223	# define msync(a,b,c) ((errno = ENOSYS), -1)
		1224	#endif
		1225
		1226	int
		1227	eio__mtouch (void *mem, size_t len, int flags)
		1228	{
		1229	intptr_t addr = (intptr_t)mem;
		1230	intptr_t end = addr + len;
		1231	#ifdef PAGESIZE
		1232	const intptr_t page = PAGESIZE;
		1233	#else
		1234	static intptr_t page;
		1235
		1236	if (!page)
		1237	page = sysconf (_SC_PAGESIZE);
		1238	#endif
		1239
		1240	addr &= ~(page - 1); /* assume page size is always a power of two */
		1241
		1242	if (addr < end)
		1243	if (flags) /* modify */
		1244	do { ((volatile sig_atomic_t )addr) \|= 0; } while ((addr += page) < len);
		1245	else
		1246	do { ((volatile sig_atomic_t )addr) ; } while ((addr += page) < len);
		1247
		1248	return 0;
953	}	1249	}
954		1250
955	/*****************************************************************************/	1251	/*****************************************************************************/
956		1252
957	#define ALLOC(len) \	1253	#define ALLOC(len) \
…		…
1124	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;	1420	req->result = readlink (req->ptr1, req->ptr2, NAME_MAX); break;
1125		1421
1126	case EIO_SYNC: req->result = 0; sync (); break;	1422	case EIO_SYNC: req->result = 0; sync (); break;
1127	case EIO_FSYNC: req->result = fsync (req->int1); break;	1423	case EIO_FSYNC: req->result = fsync (req->int1); break;
1128	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	1424	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
		1425	case EIO_MSYNC: req->result = msync (req->ptr2, req->size, req->int1); break;
		1426	case EIO_MTOUCH: req->result = eio__mtouch (req->ptr2, req->size, req->int1); break;
		1427	case EIO_SYNC_FILE_RANGE: req->result = eio__sync_file_range (req->int1, req->offs, req->size, req->int2); break;
1129		1428
1130	case EIO_READDIR: eio__scandir (req, self); break;	1429	case EIO_READDIR: eio__scandir (req, self); break;
1131		1430
1132	case EIO_BUSY:	1431	case EIO_BUSY:
1133	#ifdef _WIN32	1432	#ifdef _WIN32
…		…
1165		1464
1166	req->result = req->type == EIO_FUTIME	1465	req->result = req->type == EIO_FUTIME
1167	? futimes (req->int1, times)	1466	? futimes (req->int1, times)
1168	: utimes (req->ptr1, times);	1467	: utimes (req->ptr1, times);
1169	}	1468	}
		1469	break;
1170		1470
1171	case EIO_GROUP:	1471	case EIO_GROUP:
		1472	abort (); /* handled in eio_request */
		1473
1172	case EIO_NOP:	1474	case EIO_NOP:
1173	req->result = 0;	1475	req->result = 0;
1174	break;	1476	break;
1175		1477
1176	case EIO_CUSTOM:	1478	case EIO_CUSTOM:
1177	req->feed (req);	1479	((void ()(eio_req ))req->feed) (req);
1178	break;	1480	break;
1179		1481
1180	default:	1482	default:
1181	req->result = -1;	1483	req->result = -1;
1182	break;	1484	break;
…		…
1205	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)	1507	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
1206	{	1508	{
1207	REQ (EIO_FSYNC); req->int1 = fd; SEND;	1509	REQ (EIO_FSYNC); req->int1 = fd; SEND;
1208	}	1510	}
1209		1511
		1512	eio_req eio_msync (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1513	{
		1514	REQ (EIO_MSYNC); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1515	}
		1516
		1517	eio_req eio_mtouch (void addr, size_t length, int flags, int pri, eio_cb cb, void *data)
		1518	{
		1519	REQ (EIO_MTOUCH); req->ptr2 = addr; req->size = length; req->int1 = flags; SEND;
		1520	}
		1521
		1522	eio_req eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void data)
		1523	{
		1524	REQ (EIO_SYNC_FILE_RANGE); req->int1 = fd; req->offs = offset; req->size = nbytes; req->int2 = flags; SEND;
		1525	}
		1526
1210	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)	1527	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1211	{	1528	{
1212	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;	1529	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1213	}	1530	}
1214		1531
…		…
1326	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)	1643	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
1327	{	1644	{
1328	return eio__1path (EIO_RMDIR, path, pri, cb, data);	1645	return eio__1path (EIO_RMDIR, path, pri, cb, data);
1329	}	1646	}
1330		1647
1331	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)	1648	eio_req eio_readdir (const char path, int flags, int pri, eio_cb cb, void *data)
1332	{	1649	{
1333	return eio__1path (EIO_READDIR, path, pri, cb, data);	1650	REQ (EIO_READDIR); PATH; req->int1 = flags; SEND;
1334	}	1651	}
1335		1652
1336	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)	1653	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1337	{	1654	{
1338	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;	1655	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int3 = (long)dev; SEND;
…		…
1369	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);	1686	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
1370	}	1687	}
1371		1688
1372	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)	1689	eio_req eio_custom (eio_cb execute, int pri, eio_cb cb, void data)
1373	{	1690	{
1374	REQ (EIO_CUSTOM); req->feed = execute; SEND;	1691	REQ (EIO_CUSTOM); req->feed = (void ()(eio_req ))execute; SEND;
1375	}	1692	}
1376		1693
1377	#endif	1694	#endif
1378		1695
1379	eio_req eio_grp (eio_cb cb, void data)	1696	eio_req eio_grp (eio_cb cb, void data)
…		…
1407		1724
1408	void eio_grp_add (eio_req grp, eio_req req)	1725	void eio_grp_add (eio_req grp, eio_req req)
1409	{	1726	{
1410	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));	1727	assert (("cannot add requests to IO::AIO::GRP after the group finished", grp->int1 != 2));
1411		1728
		1729	grp->flags \|= EIO_FLAG_GROUPADD;
		1730
1412	++grp->size;	1731	++grp->size;
1413	req->grp = grp;	1732	req->grp = grp;
1414		1733
1415	req->grp_prev = 0;	1734	req->grp_prev = 0;
1416	req->grp_next = grp->grp_first;	1735	req->grp_next = grp->grp_first;

Diff Legend

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

Comparing cvsroot/libeio/eio.c (file contents): Revision 1.22 by root, Fri Jul 11 10:54:50 2008 UTC vs. Revision 1.35 by root, Sat Jun 6 20:13:46 2009 UTC

Diff Legend

Comparing cvsroot/libeio/eio.c (file contents):
Revision 1.22 by root, Fri Jul 11 10:54:50 2008 UTC vs.
Revision 1.35 by root, Sat Jun 6 20:13:46 2009 UTC