libsysio-commit

[Libsysio-commit] b_lustre: libsysio/include sysio.h

[Mei <me...@us...>]

Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1:/tmp/cvs-serv5026/include

Modified Files:
      Tag: b_lustre
	sysio.h 
Log Message:
make lustre could hook functions on when enter/leave system calls.



Index: sysio.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -w -b -B -p -r1.7 -r1.7.4.1
--- sysio.h	26 Mar 2003 00:06:04 -0000	1.7
+++ sysio.h	29 Jun 2003 10:15:32 -0000	1.7.4.1
@@ -183,3 +183,25 @@ extern int mount(const char *source, con
 		 unsigned long mountflags,
 		 const void *data);
 extern int umount(const char *target);
+
+/* This allow lustre's function hook into libsysio */
+extern int  __sysio_in_syscall;
+typedef void __sysio_hook_func(void);
+extern __sysio_hook_func *__sysio_hook_sys_enter;
+extern __sysio_hook_func *__sysio_hook_sys_leave;
+
+#define SYSIO_ENTER					\
+	do {						\
+		if (__sysio_hook_sys_enter)		\
+			__sysio_hook_sys_enter();	\
+		if (__sysio_in_syscall++)		\
+			abort();			\
+	} while(0)
+
+#define SYSIO_LEAVE					\
+	do {						\
+		if (--__sysio_in_syscall != 0)		\
+			abort();			\
+		if (__sysio_hook_sys_leave)		\
+			__sysio_hook_sys_leave();	\
+	} while(0)

[Libsysio-commit] b_lustre: libsysio/include sysio.h

[Mei <me...@us...>]

Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1:/tmp/cvs-serv3191/include

Modified Files:
      Tag: b_lustre
	sysio.h 
Log Message:
remove the enter/leave syscalls intercept, now liblustre don't need them.



Index: sysio.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v
retrieving revision 1.7.4.5
retrieving revision 1.7.4.6
diff -u -w -b -B -p -r1.7.4.5 -r1.7.4.6
--- sysio.h	1 Nov 2003 03:08:22 -0000	1.7.4.5
+++ sysio.h	15 Dec 2003 08:22:16 -0000	1.7.4.6
@@ -267,32 +267,3 @@ extern int mount(const char *source, con
 		 unsigned long mountflags,
 		 const void *data);
 extern int umount(const char *target);
-
-/* This allow lustre's function hook into libsysio */
-extern int  __sysio_in_syscall;
-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)		\
-			__sysio_hook_sys_enter();	\
-		if (__sysio_in_syscall++)		\
-			abort();			\
-	} while(0)
-
-#define SYSIO_LEAVE					\
-	do {						\
-		if (__sysio_hook_sys_leave)		\
-			__sysio_hook_sys_leave();	\
-		if (--__sysio_in_syscall != 0)		\
-			abort();			\
-	} while(0)
-#endif

[Libsysio-commit] b_lustre: libsysio/include sysio.h

[Mei <me...@us...>]

Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1:/tmp/cvs-serv29118/include

Modified Files:
      Tag: b_lustre
	sysio.h 
Log Message:
add back the syscall enter/leave tracking which Lee want to keep.



Index: sysio.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v
retrieving revision 1.7.4.6
retrieving revision 1.7.4.7
diff -u -w -b -B -p -r1.7.4.6 -r1.7.4.7
--- sysio.h	15 Dec 2003 08:22:16 -0000	1.7.4.6
+++ sysio.h	16 Dec 2003 07:07:42 -0000	1.7.4.7
@@ -267,3 +267,42 @@ extern int mount(const char *source, con
 		 unsigned long mountflags,
 		 const void *data);
 extern int umount(const char *target);
+
+/* for debugging */
+#if 1
+#define ASSERT(cond)							\
+	if (!(cond)) {							\
+		printf("ASSERTION(" #cond ") failed: " __FILE__ ":"	\
+			__FUNCTION__ ":%d\n", __LINE__);		\
+		abort();						\
+	}
+
+#define ERROR(fmt, a...)						\
+	do {								\
+		printf("ERROR(" __FILE__ ":%d):" fmt, __LINE__, ##a);	\
+	while(0)
+
+#else
+#define ERROR(fmt) 	do{}while(0)
+#define ASSERT		do{}while(0)
+#endif
+
+/* syscall enter/leave hook functions  */
+#if 1
+#define SYSIO_ENTER
+#define SYSIO_LEAVE
+
+#else
+extern void _sysio_sysenter();
+extern void _sysio_sysleave();
+
+#define SYSIO_ENTER							\
+	do {								\
+		_sysio_sysenter();					\
+	} while(0)
+
+#define SYSIO_LEAVE							\
+	do {								\
+		_sysio_sysleave();					\
+	} while(0)
+#endif