Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1:/tmp/cvs-serv21121/include
Modified Files:
Tag: b_lustre
bypass.h sysio.h
Log Message:
- make possible return real fd number when allocation file structure
- make socket driver use above
- temporarily disable entry/leave checkpoint because of re-entranc
problem, which introduced by socket driver. later reorganize it.
- disable bypass read/write, but keep bypass_fcntl
- related fixes in read/write
Index: bypass.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/Attic/bypass.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -b -B -p -r1.1.2.1 -r1.1.2.2
--- bypass.h 19 Jun 2003 12:18:28 -0000 1.1.2.1
+++ bypass.h 8 Sep 2003 03:58:16 -0000 1.1.2.2
@@ -20,10 +20,12 @@
#define DEBUG(fmt, arg...) do{}while(0)
#endif /* __LIBSYSIO_DEBUG__ */
+#if 0
ioid_t __bypass_ireadv(int fd, const struct iovec *iov, int count);
ioid_t __bypass_preadv(int fd, const struct iovec *iov, int count, off_t offset);
ioid_t __bypass_iwritev(int fd, const struct iovec *iov, int count);
ioid_t __bypass_pwritev(int fd, const struct iovec *iov, int count, off_t offset);
+#endif
int __bypass_fcntl(int fd, int cmd, va_list ap);
#endif /* __LIBSYSIO_BYPASS_H_ */
Index: sysio.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v
retrieving revision 1.7.4.3
retrieving revision 1.7.4.4
diff -u -w -b -B -p -r1.7.4.3 -r1.7.4.4
--- sysio.h 18 Aug 2003 13:56:04 -0000 1.7.4.3
+++ sysio.h 8 Sep 2003 03:58:17 -0000 1.7.4.4
@@ -197,6 +197,12 @@ typedef void __sysio_hook_func(void);
extern __sysio_hook_func *__sysio_hook_sys_enter;
extern __sysio_hook_func *__sysio_hook_sys_leave;
+#if 1
+/* XXX temprarily disabled for the re-entrance problem */
+#define SYSIO_ENTER
+#define SYSIO_LEAVE
+
+#else
#define SYSIO_ENTER \
do { \
if (__sysio_hook_sys_enter) \
@@ -207,8 +213,9 @@ extern __sysio_hook_func *__sysio_hook_s
#define SYSIO_LEAVE \
do { \
- if (--__sysio_in_syscall != 0) \
- abort(); \
if (__sysio_hook_sys_leave) \
__sysio_hook_sys_leave(); \
+ if (--__sysio_in_syscall != 0) \
+ abort(); \
} while(0)
+#endif
|
