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

Comparing libeio/eio.c (file contents):
Revision 1.8 by root, Sun May 11 20:08:37 2008 UTC vs.
Revision 1.11 by root, Tue May 13 18:50:27 2008 UTC

…		…
41	# ifndef EIO_STRUCT_DIRENT	41	# ifndef EIO_STRUCT_DIRENT
42	# define EIO_STRUCT_DIRENT struct dirent	42	# define EIO_STRUCT_DIRENT struct dirent
43	# endif	43	# endif
44		44
45	#endif	45	#endif
46
47	# ifndef EIO_STRUCT_STAT
48	# define EIO_STRUCT_STAT struct stat
49	# endif
50		46
51	#if HAVE_SENDFILE	47	#if HAVE_SENDFILE
52	# if __linux	48	# if __linux
53	# include <sys/sendfile.h>	49	# include <sys/sendfile.h>
54	# elif __freebsd	50	# elif __freebsd
…		…
77	#define dBUF \	73	#define dBUF \
78	char *eio_buf; \	74	char *eio_buf; \
79	X_LOCK (wrklock); \	75	X_LOCK (wrklock); \
80	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \	76	self->dbuf = eio_buf = malloc (EIO_BUFSIZE); \
81	X_UNLOCK (wrklock); \	77	X_UNLOCK (wrklock); \
		78	errno = ENOMEM; \
82	if (!eio_buf) \	79	if (!eio_buf) \
83	return -1;	80	return -1;
84		81
85	#define EIO_TICKS ((1000000 + 1023) >> 10)	82	#define EIO_TICKS ((1000000 + 1023) >> 10)
86		83
…		…
95	{	92	{
96	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS	93	return (tv2->tv_sec - tv1->tv_sec ) * EIO_TICKS
97	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);	94	+ ((tv2->tv_usec - tv1->tv_usec) >> 10);
98	}	95	}
99		96
100	static unsigned int started, idle, wanted;	97	static unsigned int started, idle, wanted = 4;
101		98
102	/* worker threads management */	99	/* worker threads management */
103	static mutex_t wrklock = X_MUTEX_INIT;	100	static mutex_t wrklock = X_MUTEX_INIT;
104		101
105	typedef struct worker {	102	typedef struct worker
		103	{
106	/* locked by wrklock */	104	/* locked by wrklock */
107	struct worker prev, next;	105	struct worker prev, next;
108		106
109	thread_t tid;	107	thread_t tid;
110		108
…		…
326	static void start_thread (void)	324	static void start_thread (void)
327	{	325	{
328	worker *wrk = calloc (1, sizeof (worker));	326	worker *wrk = calloc (1, sizeof (worker));
329		327
330	/TODO/	328	/TODO/
331	assert (("unable to allocate worker thread data", !wrk));	329	assert (("unable to allocate worker thread data", wrk));
332		330
333	X_LOCK (wrklock);	331	X_LOCK (wrklock);
334		332
335	if (thread_create (&wrk->tid, eio_proc, (void *)wrk))	333	if (thread_create (&wrk->tid, eio_proc, (void *)wrk))
336	{	334	{
…		…
358	start_thread ();	356	start_thread ();
359	}	357	}
360		358
361	void eio_submit (eio_req *req)	359	void eio_submit (eio_req *req)
362	{	360	{
		361	req->pri += EIO_PRI_BIAS;
		362
		363	if (req->pri < EIO_PRI_MIN + EIO_PRI_BIAS) req->pri = EIO_PRI_MIN + EIO_PRI_BIAS;
		364	if (req->pri > EIO_PRI_MAX + EIO_PRI_BIAS) req->pri = EIO_PRI_MAX + EIO_PRI_BIAS;
		365
363	++nreqs;	366	++nreqs;
364		367
365	X_LOCK (reqlock);	368	X_LOCK (reqlock);
366	++nready;	369	++nready;
367	reqq_push (&req_queue, req);	370	reqq_push (&req_queue, req);
…		…
485		488
486	/*****************************************************************************/	489	/*****************************************************************************/
487	/* work around various missing functions */	490	/* work around various missing functions */
488		491
489	#if !HAVE_PREADWRITE	492	#if !HAVE_PREADWRITE
490	# define pread aio_pread	493	# define pread eio__pread
491	# define pwrite aio_pwrite	494	# define pwrite eio__pwrite
492		495
493	/*	496	/*
494	* make our pread/pwrite safe against themselves, but not against	497	* make our pread/pwrite safe against themselves, but not against
495	* normal read/write by using a mutex. slows down execution a lot,	498	* normal read/write by using a mutex. slows down execution a lot,
496	* but that's your problem, not mine.	499	* but that's your problem, not mine.
497	*/	500	*/
498	static mutex_t preadwritelock = X_MUTEX_INIT;	501	static mutex_t preadwritelock = X_MUTEX_INIT;
499		502
500	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)	503	static ssize_t
		504	eio__pread (int fd, void *buf, size_t count, off_t offset)
501	{	505	{
502	ssize_t res;	506	ssize_t res;
503	off_t ooffset;	507	off_t ooffset;
504		508
505	X_LOCK (preadwritelock);	509	X_LOCK (preadwritelock);
…		…
510	X_UNLOCK (preadwritelock);	514	X_UNLOCK (preadwritelock);
511		515
512	return res;	516	return res;
513	}	517	}
514		518
515	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)	519	static ssize_t
		520	eio__pwrite (int fd, void *buf, size_t count, off_t offset)
516	{	521	{
517	ssize_t res;	522	ssize_t res;
518	off_t ooffset;	523	off_t ooffset;
519		524
520	X_LOCK (preadwritelock);	525	X_LOCK (preadwritelock);
…		…
528	}	533	}
529	#endif	534	#endif
530		535
531	#ifndef HAVE_FUTIMES	536	#ifndef HAVE_FUTIMES
532		537
533	# define utimes(path,times) aio_utimes (path, times)	538	# define utimes(path,times) eio__utimes (path, times)
534	# define futimes(fd,times) aio_futimes (fd, times)	539	# define futimes(fd,times) eio__futimes (fd, times)
535		540
		541	static int
536	static int aio_utimes (const char *filename, const struct timeval times[2])	542	eio__utimes (const char *filename, const struct timeval times[2])
537	{	543	{
538	if (times)	544	if (times)
539	{	545	{
540	struct utimbuf buf;	546	struct utimbuf buf;
541		547
…		…
546	}	552	}
547	else	553	else
548	return utime (filename, 0);	554	return utime (filename, 0);
549	}	555	}
550		556
551	static int aio_futimes (int fd, const struct timeval tv[2])	557	static int eio__futimes (int fd, const struct timeval tv[2])
552	{	558	{
553	errno = ENOSYS;	559	errno = ENOSYS;
554	return -1;	560	return -1;
555	}	561	}
556		562
…		…
559	#if !HAVE_FDATASYNC	565	#if !HAVE_FDATASYNC
560	# define fdatasync fsync	566	# define fdatasync fsync
561	#endif	567	#endif
562		568
563	#if !HAVE_READAHEAD	569	#if !HAVE_READAHEAD
564	# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)	570	# define readahead(fd,offset,count) eio__readahead (fd, offset, count, self)
565		571
		572	static ssize_t
566	static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)	573	eio__readahead (int fd, off_t offset, size_t count, worker *self)
567	{	574	{
568	size_t todo = count;	575	size_t todo = count;
569	dBUF;	576	dBUF;
570		577
571	while (todo > 0)	578	while (todo > 0)
…		…
582	}	589	}
583		590
584	#endif	591	#endif
585		592
586	#if !HAVE_READDIR_R	593	#if !HAVE_READDIR_R
587	# define readdir_r aio_readdir_r	594	# define readdir_r eio__readdir_r
588		595
589	static mutex_t readdirlock = X_MUTEX_INIT;	596	static mutex_t readdirlock = X_MUTEX_INIT;
590		597
		598	static int
591	static int readdir_r (DIR dirp, EIO_STRUCT_DIRENT ent, EIO_STRUCT_DIRENT **res)	599	eio__readdir_r (DIR dirp, EIO_STRUCT_DIRENT ent, EIO_STRUCT_DIRENT **res)
592	{	600	{
593	EIO_STRUCT_DIRENT *e;	601	EIO_STRUCT_DIRENT *e;
594	int errorno;	602	int errorno;
595		603
596	X_LOCK (readdirlock);	604	X_LOCK (readdirlock);
…		…
612	return e ? 0 : -1;	620	return e ? 0 : -1;
613	}	621	}
614	#endif	622	#endif
615		623
616	/* sendfile always needs emulation */	624	/* sendfile always needs emulation */
		625	static ssize_t
617	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)	626	eio__sendfile (int ofd, int ifd, off_t offset, size_t count, worker *self)
618	{	627	{
619	ssize_t res;	628	ssize_t res;
620		629
621	if (!count)	630	if (!count)
622	return 0;	631	return 0;
…		…
705		714
706	return res;	715	return res;
707	}	716	}
708		717
709	/* read a full directory */	718	/* read a full directory */
		719	static void
710	static void scandir_ (eio_req req, worker self)	720	eio__scandir (eio_req req, worker self)
711	{	721	{
712	DIR *dirp;	722	DIR *dirp;
713	union	723	union
714	{	724	{
715	EIO_STRUCT_DIRENT d;	725	EIO_STRUCT_DIRENT d;
…		…
843	: read (req->int1, req->ptr2, req->size); break;	853	: read (req->int1, req->ptr2, req->size); break;
844	case EIO_WRITE: req->result = req->offs >= 0	854	case EIO_WRITE: req->result = req->offs >= 0
845	? pwrite (req->int1, req->ptr2, req->size, req->offs)	855	? pwrite (req->int1, req->ptr2, req->size, req->offs)
846	: write (req->int1, req->ptr2, req->size); break;	856	: write (req->int1, req->ptr2, req->size); break;
847		857
848	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;	858	case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
849	case EIO_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;	859	case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
850		860
851	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));	861	case EIO_STAT: ALLOC (sizeof (EIO_STRUCT_STAT));
852	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	862	req->result = stat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
853	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));	863	case EIO_LSTAT: ALLOC (sizeof (EIO_STRUCT_STAT));
854	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;	864	req->result = lstat (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
…		…
878		888
879	case EIO_SYNC: req->result = 0; sync (); break;	889	case EIO_SYNC: req->result = 0; sync (); break;
880	case EIO_FSYNC: req->result = fsync (req->int1); break;	890	case EIO_FSYNC: req->result = fsync (req->int1); break;
881	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;	891	case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
882		892
883	case EIO_READDIR: scandir_ (req, self); break;	893	case EIO_READDIR: eio__scandir (req, self); break;
884		894
885	case EIO_BUSY:	895	case EIO_BUSY:
886	#ifdef _WIN32	896	#ifdef _WIN32
887	Sleep (req->nv1 * 1000.);	897	Sleep (req->nv1 * 1000.);
888	#else	898	#else
…		…
921	: utimes (req->ptr1, times);	931	: utimes (req->ptr1, times);
922	}	932	}
923		933
924	case EIO_GROUP:	934	case EIO_GROUP:
925	case EIO_NOP:	935	case EIO_NOP:
		936	req->result = 0;
926	break;	937	break;
927		938
928	case EIO_QUIT:	939	case EIO_QUIT:
929	goto quit;	940	goto quit;
930		941
…		…
1043	\	1054	\
1044	req = (eio_req )calloc (1, sizeof req); \	1055	req = (eio_req )calloc (1, sizeof req); \
1045	if (!req) \	1056	if (!req) \
1046	return 0; \	1057	return 0; \
1047	\	1058	\
1048	req->type = EIO_ ## rtype; \	1059	req->type = rtype; \
1049	req->pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \	1060	req->pri = pri; \
1050	req->finish = cb; \	1061	req->finish = cb; \
		1062	req->data = data; \
1051	req->destroy = eio_api_destroy;	1063	req->destroy = eio_api_destroy;
1052		1064
1053	#define SEND eio_submit (req); return req	1065	#define SEND eio_submit (req); return req
1054		1066
1055	#define PATH (void)0	1067	#define PATH \
		1068	req->flags \|= EIO_FLAG_PTR1_FREE; \
		1069	req->ptr1 = strdup (path); \
		1070	if (!req->ptr1) \
		1071	{ \
		1072	eio_api_destroy (req); \
		1073	return 0; \
		1074	}
1056		1075
		1076	eio_req eio_nop (int pri, eio_cb cb, void data)
		1077	{
		1078	REQ (EIO_NOP); SEND;
		1079	}
		1080
		1081	eio_req eio_busy (double delay, int pri, eio_cb cb, void data)
		1082	{
		1083	REQ (EIO_BUSY); req->nv1 = delay; SEND;
		1084	}
		1085
1057	eio_req *eio_fsync (int fd, eio_cb cb)	1086	eio_req eio_sync (int pri, eio_cb cb, void data)
1058	{	1087	{
		1088	REQ (EIO_SYNC); SEND;
		1089	}
		1090
		1091	eio_req eio_fsync (int fd, int pri, eio_cb cb, void data)
		1092	{
1059	REQ (FSYNC); req->int1 = fd; SEND;	1093	REQ (EIO_FSYNC); req->int1 = fd; SEND;
1060	}	1094	}
1061		1095
1062	eio_req *eio_fdatasync (int fd, eio_cb cb)	1096	eio_req eio_fdatasync (int fd, int pri, eio_cb cb, void data)
1063	{	1097	{
1064	REQ (FDATASYNC); req->int1 = fd; SEND;	1098	REQ (EIO_FDATASYNC); req->int1 = fd; SEND;
1065	}	1099	}
1066		1100
		1101	eio_req eio_close (int fd, int pri, eio_cb cb, void data)
		1102	{
		1103	REQ (EIO_CLOSE); req->int1 = fd; SEND;
		1104	}
		1105
1067	eio_req *eio_readahead (int fd, off_t offset, size_t length, eio_cb cb)	1106	eio_req eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void data)
1068	{	1107	{
1069	REQ (READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;	1108	REQ (EIO_READAHEAD); req->int1 = fd; req->offs = offset; req->size = length; SEND;
1070	}	1109	}
1071		1110
1072	eio_req eio_read (int fd, off_t offset, size_t length, void data, eio_cb cb)	1111	eio_req eio_read (int fd, void buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1073	{	1112	{
1074	REQ (READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = data; SEND;	1113	REQ (EIO_READ); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1075	}	1114	}
1076		1115
1077	eio_req eio_write (int fd, off_t offset, size_t length, void data, eio_cb cb)	1116	eio_req eio_write (int fd, void buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
1078	{	1117	{
1079	REQ (WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = data; SEND;	1118	REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
1080	}	1119	}
1081		1120
1082	eio_req *eio_fstat (int fd, eio_cb cb)	1121	eio_req eio_fstat (int fd, int pri, eio_cb cb, void data)
1083	{	1122	{
1084	REQ (FSTAT); req->int1 = fd; SEND;	1123	REQ (EIO_FSTAT); req->int1 = fd; SEND;
1085	}	1124	}
1086		1125
1087	eio_req *eio_futime (int fd, double atime, double mtime, eio_cb cb)	1126	eio_req eio_futime (int fd, double atime, double mtime, int pri, eio_cb cb, void data)
1088	{	1127	{
1089	REQ (FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;	1128	REQ (EIO_FUTIME); req->int1 = fd; req->nv1 = atime; req->nv2 = mtime; SEND;
1090	}	1129	}
1091		1130
1092	eio_req *eio_ftruncate (int fd, off_t offset, eio_cb cb)	1131	eio_req eio_ftruncate (int fd, off_t offset, int pri, eio_cb cb, void data)
1093	{	1132	{
1094	REQ (FTRUNCATE); req->int1 = fd; req->offs = offset; SEND;	1133	REQ (EIO_FTRUNCATE); req->int1 = fd; req->offs = offset; SEND;
1095	}	1134	}
1096		1135
1097	eio_req *eio_fchmod (int fd, mode_t mode, eio_cb cb)	1136	eio_req eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void data)
1098	{	1137	{
1099	REQ (FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;	1138	REQ (EIO_FCHMOD); req->int1 = fd; req->int2 = (long)mode; SEND;
1100	}	1139	}
1101		1140
1102	eio_req *eio_fchown (int fd, uid_t uid, gid_t gid, eio_cb cb)	1141	eio_req eio_fchown (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void data)
1103	{	1142	{
1104	REQ (FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	1143	REQ (EIO_FCHOWN); req->int1 = fd; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1105	}	1144	}
1106		1145
1107	eio_req *eio_dup2 (int fd, int fd2, eio_cb cb)	1146	eio_req eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void data)
1108	{	1147	{
1109	REQ (DUP2); req->int1 = fd; req->int2 = fd2; SEND;	1148	REQ (EIO_DUP2); req->int1 = fd; req->int2 = fd2; SEND;
1110	}	1149	}
1111		1150
1112	eio_req *eio_sendfile (int out_fd, int in_fd, off_t in_offset, size_t length, eio_cb cb)	1151	eio_req eio_sendfile (int out_fd, int in_fd, off_t in_offset, size_t length, int pri, eio_cb cb, void data)
1113	{	1152	{
1114	REQ (SENDFILE); req->int1 = out_fd; req->int2 = in_fd; req->offs = in_offset; req->size = length; SEND;	1153	REQ (EIO_SENDFILE); req->int1 = out_fd; req->int2 = in_fd; req->offs = in_offset; req->size = length; SEND;
1115	}	1154	}
1116		1155
1117	eio_req eio_open (const char path, int flags, mode_t mode, eio_cb cb)	1156	eio_req eio_open (const char path, int flags, mode_t mode, int pri, eio_cb cb, void *data)
1118	{	1157	{
1119	REQ (OPEN); PATH; req->int1 = flags; req->int2 = (long)mode; SEND;	1158	REQ (EIO_OPEN); PATH; req->int1 = flags; req->int2 = (long)mode; SEND;
1120	}	1159	}
1121		1160
1122	eio_req eio_readlink (const char path, eio_cb cb)
1123	{
1124	REQ (READLINK); PATH; SEND;
1125	}
1126
1127	eio_req eio_stat (const char path, eio_cb cb)
1128	{
1129	REQ (STAT); PATH; SEND;
1130	}
1131
1132	eio_req eio_lstat (const char path, eio_cb cb)
1133	{
1134	REQ (LSTAT); PATH; SEND;
1135	}
1136
1137	eio_req eio_utime (const char path, double atime, double mtime, eio_cb cb)	1161	eio_req eio_utime (const char path, double atime, double mtime, int pri, eio_cb cb, void *data)
1138	{	1162	{
1139	REQ (UTIME); PATH; req->nv1 = atime; req->nv2 = mtime; SEND;	1163	REQ (EIO_UTIME); PATH; req->nv1 = atime; req->nv2 = mtime; SEND;
1140	}	1164	}
1141		1165
1142	eio_req eio_truncate (const char path, off_t offset, eio_cb cb)	1166	eio_req eio_truncate (const char path, off_t offset, int pri, eio_cb cb, void *data)
1143	{	1167	{
1144	REQ (TRUNCATE); PATH; req->offs = offset; SEND;	1168	REQ (EIO_TRUNCATE); PATH; req->offs = offset; SEND;
1145	}	1169	}
1146		1170
1147	eio_req eio_chown (const char path, uid_t uid, gid_t gid, eio_cb cb)	1171	eio_req eio_chown (const char path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data)
1148	{	1172	{
1149	REQ (CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;	1173	REQ (EIO_CHOWN); PATH; req->int2 = (long)uid; req->int3 = (long)gid; SEND;
1150	}	1174	}
1151		1175
1152	eio_req eio_chmod (const char path, mode_t mode, eio_cb cb)	1176	eio_req eio_chmod (const char path, mode_t mode, int pri, eio_cb cb, void *data)
1153	{	1177	{
1154	REQ (CHMOD); PATH; req->int2 = (long)mode; SEND;	1178	REQ (EIO_CHMOD); PATH; req->int2 = (long)mode; SEND;
1155	}	1179	}
1156		1180
1157	eio_req eio_mkdir (const char path, mode_t mode, eio_cb cb)	1181	eio_req eio_mkdir (const char path, mode_t mode, int pri, eio_cb cb, void *data)
1158	{	1182	{
1159	REQ (MKDIR); PATH; req->int2 = (long)mode; SEND;	1183	REQ (EIO_MKDIR); PATH; req->int2 = (long)mode; SEND;
1160	}	1184	}
1161		1185
1162	eio_req eio_unlink (const char path, eio_cb cb)	1186	static eio_req *
		1187	eio__1path (int type, const char path, int pri, eio_cb cb, void data)
1163	{	1188	{
1164	REQ (UNLINK); PATH; SEND;
1165	}
1166
1167	eio_req eio_rmdir (const char path, eio_cb cb)
1168	{
1169	REQ (RMDIR); PATH; SEND;	1189	REQ (type); PATH; SEND;
1170	}	1190	}
1171		1191
		1192	eio_req eio_readlink (const char path, int pri, eio_cb cb, void *data)
		1193	{
		1194	return eio__1path (EIO_READLINK, path, pri, cb, data);
		1195	}
		1196
		1197	eio_req eio_stat (const char path, int pri, eio_cb cb, void *data)
		1198	{
		1199	return eio__1path (EIO_STAT, path, pri, cb, data);
		1200	}
		1201
		1202	eio_req eio_lstat (const char path, int pri, eio_cb cb, void *data)
		1203	{
		1204	return eio__1path (EIO_LSTAT, path, pri, cb, data);
		1205	}
		1206
		1207	eio_req eio_unlink (const char path, int pri, eio_cb cb, void *data)
		1208	{
		1209	return eio__1path (EIO_UNLINK, path, pri, cb, data);
		1210	}
		1211
		1212	eio_req eio_rmdir (const char path, int pri, eio_cb cb, void *data)
		1213	{
		1214	return eio__1path (EIO_RMDIR, path, pri, cb, data);
		1215	}
		1216
1172	eio_req eio_readdir (const char path, eio_cb cb)	1217	eio_req eio_readdir (const char path, int pri, eio_cb cb, void *data)
1173	{	1218	{
1174	REQ (READDIR); PATH; SEND;	1219	return eio__1path (EIO_READDIR, path, pri, cb, data);
1175	}	1220	}
1176		1221
1177	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, eio_cb cb)	1222	eio_req eio_mknod (const char path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data)
1178	{	1223	{
1179	REQ (MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND;	1224	REQ (EIO_MKNOD); PATH; req->int2 = (long)mode; req->int2 = (long)dev; SEND;
1180	}	1225	}
1181		1226
1182	eio_req *eio_busy (double delay, eio_cb cb)	1227	static eio_req *
		1228	eio__2path (int type, const char path, const char new_path, int pri, eio_cb cb, void *data)
1183	{	1229	{
1184	REQ (BUSY); req->nv1 = delay; SEND;	1230	REQ (type); PATH;
1185	}
1186		1231
		1232	req->flags \|= EIO_FLAG_PTR2_FREE;
		1233	req->ptr2 = strdup (new_path);
		1234	if (!req->ptr2)
		1235	{
		1236	eio_api_destroy (req);
		1237	return 0;
		1238	}
		1239
		1240	SEND;
		1241	}
		1242
		1243	eio_req eio_link (const char path, const char new_path, int pri, eio_cb cb, void data)
		1244	{
		1245	return eio__2path (EIO_LINK, path, new_path, pri, cb, data);
		1246	}
		1247
		1248	eio_req eio_symlink (const char path, const char new_path, int pri, eio_cb cb, void data)
		1249	{
		1250	return eio__2path (EIO_SYMLINK, path, new_path, pri, cb, data);
		1251	}
		1252
		1253	eio_req eio_rename (const char path, const char new_path, int pri, eio_cb cb, void data)
		1254	{
		1255	return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
		1256	}
		1257
1187	eio_req *eio_nop (eio_cb cb)	1258	eio_req eio_grp (eio_cb cb, void data)
1188	{	1259	{
		1260	const int pri = EIO_PRI_MAX;
		1261
1189	REQ (NOP); SEND;	1262	REQ (EIO_GROUP); SEND;
1190	}	1263	}
1191		1264
1192	#undef REQ	1265	#undef REQ
1193	#undef PATH	1266	#undef PATH
1194	#undef SEND	1267	#undef SEND
1195		1268
1196	#if 0	1269	/*****************************************************************************/
1197		1270	/* grp functions */
1198	void
1199	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)
1200	PROTOTYPE: $$$;$
1201	PPCODE:
1202	{
1203	dREQ;
1204
1205	req->type = EIO_OPEN;
1206	req->sv1 = newSVsv (pathname);
1207	req->ptr1 = SvPVbyte_nolen (req->sv1);
1208	req->int1 = flags;
1209	req->int2 = mode;
1210
1211	EIO_SEND;
1212	}
1213
1214	void
1215	aio_fsync (SV fh, SV callback=&PL_sv_undef)
1216	PROTOTYPE: $;$
1217	ALIAS:
1218	aio_fsync = EIO_FSYNC
1219	aio_fdatasync = EIO_FDATASYNC
1220	PPCODE:
1221	{
1222	dREQ;
1223
1224	req->type = ix;
1225	req->sv1 = newSVsv (fh);
1226	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1227
1228	EIO_SEND (req);
1229	}
1230
1231	void
1232	aio_close (SV fh, SV callback=&PL_sv_undef)
1233	PROTOTYPE: $;$
1234	PPCODE:
1235	{
1236	dREQ;
1237
1238	req->type = EIO_CLOSE;
1239	req->sv1 = newSVsv (fh);
1240	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1241
1242	EIO_SEND (req);
1243	}
1244
1245	void
1246	aio_read (SV fh, SV offset, SV length, SV8 data, IV dataoffset, SV *callback=&PL_sv_undef)
1247	ALIAS:
1248	aio_read = EIO_READ
1249	aio_write = EIO_WRITE
1250	PROTOTYPE: $$$$$;$
1251	PPCODE:
1252	{
1253	STRLEN svlen;
1254	char *svptr = SvPVbyte (data, svlen);
1255	UV len = SvUV (length);
1256
1257	SvUPGRADE (data, SVt_PV);
1258	SvPOK_on (data);
1259
1260	if (dataoffset < 0)
1261	dataoffset += svlen;
1262
1263	if (dataoffset < 0 \|\| dataoffset > svlen)
1264	croak ("dataoffset outside of data scalar");
1265
1266	if (ix == EIO_WRITE)
1267	{
1268	/* write: check length and adjust. */
1269	if (!SvOK (length) \|\| len + dataoffset > svlen)
1270	len = svlen - dataoffset;
1271	}
1272	else
1273	{
1274	/* read: grow scalar as necessary */
1275	svptr = SvGROW (data, len + dataoffset + 1);
1276	}
1277
1278	if (len < 0)
1279	croak ("length must not be negative");
1280
1281	{
1282	dREQ;
1283
1284	req->type = ix;
1285	req->sv1 = newSVsv (fh);
1286	req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
1287	: IoOFP (sv_2io (fh)));
1288	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1289	req->size = len;
1290	req->sv2 = SvREFCNT_inc (data);
1291	req->ptr2 = (char *)svptr + dataoffset;
1292	req->stroffset = dataoffset;
1293
1294	if (!SvREADONLY (data))
1295	{
1296	SvREADONLY_on (data);
1297	req->flags \|= FLAG_SV2_RO_OFF;
1298	}
1299
1300	EIO_SEND;
1301	}
1302	}
1303
1304	void
1305	aio_readlink (SV8 path, SV callback=&PL_sv_undef)
1306	PROTOTYPE: $$;$
1307	PPCODE:
1308	{
1309	SV *data;
1310	dREQ;
1311
1312	data = newSV (NAME_MAX);
1313	SvPOK_on (data);
1314
1315	req->type = EIO_READLINK;
1316	req->sv1 = newSVsv (path);
1317	req->ptr1 = SvPVbyte_nolen (req->sv1);
1318	req->sv2 = data;
1319	req->ptr2 = SvPVbyte_nolen (data);
1320
1321	EIO_SEND;
1322	}
1323
1324	void
1325	aio_sendfile (SV out_fh, SV in_fh, SV in_offset, UV length, SV callback=&PL_sv_undef)
1326	PROTOTYPE: $$$$;$
1327	PPCODE:
1328	{
1329	dREQ;
1330
1331	req->type = EIO_SENDFILE;
1332	req->sv1 = newSVsv (out_fh);
1333	req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1334	req->sv2 = newSVsv (in_fh);
1335	req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1336	req->offs = SvVAL64 (in_offset);
1337	req->size = length;
1338
1339	EIO_SEND;
1340	}
1341
1342	void
1343	aio_readahead (SV fh, SV offset, IV length, SV *callback=&PL_sv_undef)
1344	PROTOTYPE: $$$;$
1345	PPCODE:
1346	{
1347	dREQ;
1348
1349	req->type = EIO_READAHEAD;
1350	req->sv1 = newSVsv (fh);
1351	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1352	req->offs = SvVAL64 (offset);
1353	req->size = length;
1354
1355	EIO_SEND;
1356	}
1357
1358	void
1359	aio_stat (SV8 fh_or_path, SV callback=&PL_sv_undef)
1360	ALIAS:
1361	aio_stat = EIO_STAT
1362	aio_lstat = EIO_LSTAT
1363	PPCODE:
1364	{
1365	dREQ;
1366
1367	req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
1368	if (!req->ptr2)
1369	{
1370	req_destroy (req);
1371	croak ("out of memory during aio_stat statdata allocation");
1372	}
1373
1374	req->flags \|= FLAG_PTR2_FREE;
1375	req->sv1 = newSVsv (fh_or_path);
1376
1377	if (SvPOK (fh_or_path))
1378	{
1379	req->type = ix;
1380	req->ptr1 = SvPVbyte_nolen (req->sv1);
1381	}
1382	else
1383	{
1384	req->type = EIO_FSTAT;
1385	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1386	}
1387
1388	EIO_SEND;
1389	}
1390
1391	void
1392	aio_utime (SV8 fh_or_path, SV atime, SV mtime, SV callback=&PL_sv_undef)
1393	PPCODE:
1394	{
1395	dREQ;
1396
1397	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1398	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1399	req->sv1 = newSVsv (fh_or_path);
1400
1401	if (SvPOK (fh_or_path))
1402	{
1403	req->type = EIO_UTIME;
1404	req->ptr1 = SvPVbyte_nolen (req->sv1);
1405	}
1406	else
1407	{
1408	req->type = EIO_FUTIME;
1409	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1410	}
1411
1412	EIO_SEND;
1413	}
1414
1415	void
1416	aio_truncate (SV8 fh_or_path, SV offset, SV *callback=&PL_sv_undef)
1417	PPCODE:
1418	{
1419	dREQ;
1420
1421	req->sv1 = newSVsv (fh_or_path);
1422	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1423
1424	if (SvPOK (fh_or_path))
1425	{
1426	req->type = EIO_TRUNCATE;
1427	req->ptr1 = SvPVbyte_nolen (req->sv1);
1428	}
1429	else
1430	{
1431	req->type = EIO_FTRUNCATE;
1432	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1433	}
1434
1435	EIO_SEND;
1436	}
1437
1438	void
1439	aio_chmod (SV8 fh_or_path, int mode, SV callback=&PL_sv_undef)
1440	ALIAS:
1441	aio_chmod = EIO_CHMOD
1442	aio_fchmod = EIO_FCHMOD
1443	aio_mkdir = EIO_MKDIR
1444	PPCODE:
1445	{
1446	dREQ;
1447
1448	req->type = type;
1449	req->int2 = mode;
1450	req->sv1 = newSVsv (fh_or_path);
1451
1452	if (ix == EIO_FCHMOD)
1453	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1454	else
1455	req->ptr1 = SvPVbyte_nolen (req->sv1);
1456
1457	EIO_SEND;
1458	}
1459
1460	void
1461	aio_chown (SV8 fh_or_path, SV uid, SV gid, SV callback=&PL_sv_undef)
1462	PPCODE:
1463	{
1464	dREQ;
1465
1466	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1467	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1468	req->sv1 = newSVsv (fh_or_path);
1469
1470	if (SvPOK (fh_or_path))
1471	{
1472	req->type = EIO_CHOWN;
1473	req->ptr1 = SvPVbyte_nolen (req->sv1);
1474	}
1475	else
1476	{
1477	req->type = EIO_FCHOWN;
1478	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1479	}
1480
1481	EIO_SEND;
1482	}
1483
1484	void
1485	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
1486	ALIAS:
1487	aio_unlink = EIO_UNLINK
1488	aio_rmdir = EIO_RMDIR
1489	aio_readdir = EIO_READDIR
1490	PPCODE:
1491	{
1492	dREQ;
1493
1494	req->type = ix;
1495	req->sv1 = newSVsv (pathname);
1496	req->ptr1 = SvPVbyte_nolen (req->sv1);
1497
1498	EIO_SEND;
1499	}
1500
1501	void
1502	aio_link (SV8 oldpath, SV8 newpath, SV *callback=&PL_sv_undef)
1503	ALIAS:
1504	aio_link = EIO_LINK
1505	aio_symlink = EIO_SYMLINK
1506	aio_rename = EIO_RENAME
1507	PPCODE:
1508	{
1509	dREQ;
1510
1511	req->type = ix;
1512	req->sv1 = newSVsv (oldpath);
1513	req->ptr1 = SvPVbyte_nolen (req->sv1);
1514	req->sv2 = newSVsv (newpath);
1515	req->ptr2 = SvPVbyte_nolen (req->sv2);
1516
1517	EIO_SEND;
1518	}
1519
1520	void
1521	aio_mknod (SV8 pathname, int mode, UV dev, SV callback=&PL_sv_undef)
1522	PPCODE:
1523	{
1524	dREQ;
1525
1526	req->type = EIO_MKNOD;
1527	req->sv1 = newSVsv (pathname);
1528	req->ptr1 = SvPVbyte_nolen (req->sv1);
1529	req->int2 = (mode_t)mode;
1530	req->offs = dev;
1531
1532	EIO_SEND;
1533	}
1534
1535	void
1536	aio_busy (double delay, SV *callback=&PL_sv_undef)
1537	PPCODE:
1538	{
1539	dREQ;
1540
1541	req->type = EIO_BUSY;
1542	req->nv1 = delay < 0. ? 0. : delay;
1543
1544	EIO_SEND;
1545	}
1546
1547	void
1548	aio_group (SV *callback=&PL_sv_undef)
1549	PROTOTYPE: ;$
1550	PPCODE:
1551	{
1552	dREQ;
1553
1554	req->type = EIO_GROUP;
1555
1556	req_send (req);
1557	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1558	}
1559
1560	void
1561	aio_nop (SV *callback=&PL_sv_undef)
1562	ALIAS:
1563	aio_nop = EIO_NOP
1564	aio_sync = EIO_SYNC
1565	PPCODE:
1566	{
1567	dREQ;
1568
1569	#endif
1570		1271
1571	void eio_grp_feed (eio_req grp, void (feed)(eio_req *req), int limit)	1272	void eio_grp_feed (eio_req grp, void (feed)(eio_req *req), int limit)
1572	{	1273	{
1573	grp->int2 = limit;	1274	grp->int2 = limit;
1574	grp->feed = feed;	1275	grp->feed = feed;
…		…
1597	grp->grp_first->grp_prev = req;	1298	grp->grp_first->grp_prev = req;
1598		1299
1599	grp->grp_first = req;	1300	grp->grp_first = req;
1600	}	1301	}
1601		1302
		1303	/*****************************************************************************/
		1304	/* misc garbage */
1602		1305
		1306	ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
		1307	{
		1308	worker wrk;
		1309
		1310	wrk.dbuf = 0;
		1311
		1312	eio__sendfile (ofd, ifd, offset, count, &wrk);
		1313
		1314	if (wrk.dbuf)
		1315	free (wrk.dbuf);
		1316	}
		1317

Diff Legend

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

Comparing libeio/eio.c (file contents): Revision 1.8 by root, Sun May 11 20:08:37 2008 UTC vs. Revision 1.11 by root, Tue May 13 18:50:27 2008 UTC

Diff Legend

Comparing libeio/eio.c (file contents):
Revision 1.8 by root, Sun May 11 20:08:37 2008 UTC vs.
Revision 1.11 by root, Tue May 13 18:50:27 2008 UTC