2006-09-20 Casey Marshall <csm@gnu.org>

	* configure.ac (AC_CHECK_HEADERS): check for `sys/epoll.h.'
	(AC_CHECK_FUNCS): check for `epoll_create.'
	* gnu/java/nio/EpollSelectionKeyImpl.java: new file.
	* gnu/java/nio/EpollSelectorImpl.java: new file.
	* gnu/java/nio/SelectorProviderImpl.java (epoll_failed): new class
	field.
	(openSelector): return epoll selector if requested and available.
	* include/Makefile.am (H_FILES): add gnu_java_nio_EpollSelectorImpl.h.
	(gnu_java_nio_EpollSelectorImpl.h): new target.
	* include/gnu_java_nio_EpollSelectorImpl.h: new file.
	* native/jni/java-nio/Makefile.am (libjavanio_la_SOURCES): add
	gnu_java_nio_EpollSelectorImpl.c.
	* native/jni/java-nio/gnu_java_nio_EpollSelectorImpl.c: new file.

2 files changed, 99 insertions, 0 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 1d38ae51e..baa6fc0bd 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -128,6 +128,7 @@ $(GCONF_PREFS_FILES) \
 $(top_srcdir)/include/gnu_java_net_VMPlainDatagramSocketImpl.h \
 $(top_srcdir)/include/gnu_java_net_VMPlainSocketImpl.h \
 $(top_srcdir)/include/gnu_java_net_local_LocalSocketImpl.h \
+$(top_srcdir)/include/gnu_java_nio_EpollSelectorImpl.h \
 $(top_srcdir)/include/gnu_java_nio_FileChannelImpl.h \
 $(top_srcdir)/include/gnu_java_nio_KqueueSelectorImpl.h \
 $(top_srcdir)/include/gnu_java_nio_VMChannel.h \
@@ -227,6 +228,9 @@ $(top_srcdir)/include/gnu_java_nio_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio
 $(top_srcdir)/include/gnu_java_nio_KqueueSelectorImpl.h: $(top_srcdir)/gnu/java/nio/KqueueSelectorImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.KqueueSelectorImpl
 
+$(top_srcdir)/include/gnu_java_nio_EpollSelectorImpl.h: $(top_srcdir)/gnu/java/nio/EpollSelectorImpl.java
+	$(JAVAH) -o $@ gnu.java.nio.EpollSelectorImpl
+
 $(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvDecoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvDecoder.java
 	$(JAVAH) -o $@ gnu.java.nio.charset.iconv.IconvDecoder
 $(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvEncoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvEncoder.java
diff --git a/include/gnu_java_nio_EpollSelectorImpl.h b/include/gnu_java_nio_EpollSelectorImpl.h
new file mode 100644
index 000000000..188cdf9d5
--- /dev/null
+++ b/include/gnu_java_nio_EpollSelectorImpl.h
@@ -0,0 +1,95 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class gnu_java_nio_EpollSelectorImpl */
+
+#ifndef _Included_gnu_java_nio_EpollSelectorImpl
+#define _Included_gnu_java_nio_EpollSelectorImpl
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef gnu_java_nio_EpollSelectorImpl_DEFAULT_EPOLL_SIZE
+#define gnu_java_nio_EpollSelectorImpl_DEFAULT_EPOLL_SIZE 128L
+#undef gnu_java_nio_EpollSelectorImpl_OP_ACCEPT
+#define gnu_java_nio_EpollSelectorImpl_OP_ACCEPT 16L
+#undef gnu_java_nio_EpollSelectorImpl_OP_CONNECT
+#define gnu_java_nio_EpollSelectorImpl_OP_CONNECT 8L
+#undef gnu_java_nio_EpollSelectorImpl_OP_READ
+#define gnu_java_nio_EpollSelectorImpl_OP_READ 1L
+#undef gnu_java_nio_EpollSelectorImpl_OP_WRITE
+#define gnu_java_nio_EpollSelectorImpl_OP_WRITE 4L
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_supported
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1supported
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    sizeof_struct
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_sizeof_1struct
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_create
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1create
+  (JNIEnv *, jclass, jint);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_add
+ * Signature: (III)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1add
+  (JNIEnv *, jclass, jint, jint, jint);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_modify
+ * Signature: (III)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1modify
+  (JNIEnv *, jclass, jint, jint, jint);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_delete
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1delete
+  (JNIEnv *, jclass, jint, jint);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    epoll_wait
+ * Signature: (ILjava/nio/ByteBuffer;II)I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1wait
+  (JNIEnv *, jclass, jint, jobject, jint, jint);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    selected_fd
+ * Signature: (Ljava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_selected_1fd
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     gnu_java_nio_EpollSelectorImpl
+ * Method:    selected_ops
+ * Signature: (Ljava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_selected_1ops
+  (JNIEnv *, jclass, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif