Changeset 104

Timestamp:

Aug 17, 2010, 1:54:15 AM (15 years ago)

Author:

dmik

Message:

jdk: Adopted nio.dll for OS/2.

Location:

trunk/openjdk/jdk

Files:

• make/java/nio/Makefile (modified) (1 diff)
• src/windows/native/java/nio/MappedByteBuffer.c (modified) (1 diff)
• src/windows/native/sun/nio/ch/DatagramChannelImpl.c (modified) (7 diffs)
• src/windows/native/sun/nio/ch/FileChannelImpl.c (modified) (1 diff)
• src/windows/native/sun/nio/ch/IOUtil.c (modified) (3 diffs)
• src/windows/native/sun/nio/ch/Net.c (modified) (3 diffs)

trunk/openjdk/jdk/make/java/nio/Makefile

@@ -135 +135 @@
 endif
 ifeq ($(PLATFORM),os2)
-  OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
-     -L$(LIBDIR) java.lib \
-     $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \
+  OTHER_LDLIBS += $(JVMLIB) -lws2_32.lib \
+     -L$(LIBDIR) -ljava.lib \
+     -l$(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \
      $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \
      $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj

trunk/openjdk/jdk/src/windows/native/java/nio/MappedByteBuffer.c

@@ -30 +30 @@
 #include "java_nio_MappedByteBuffer.h"
 #include <stdlib.h>
+#ifdef __WIN32OS2__
+#include <winerror.h>
+#endif
 
 JNIEXPORT jboolean JNICALL

trunk/openjdk/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c

@@ -28 +28 @@
 #include "jvm.h"
 #include "jlong.h"
+#ifndef __WIN32OS2__
 #include <io.h>
+#endif
 #include "sun_nio_ch_DatagramChannelImpl.h"
 #include "nio.h"
@@ -34 +36 @@
 #include "net_util.h"
 #include <winsock2.h>
+#ifdef __EMX__
+#include <string.h>
+#endif
 
 static jfieldID isa_addrID;     /* address in java.net.InetSocketAddress */
@@ -40 +45 @@
 static jfieldID dci_senderAddrID; /* sender InetAddress in sun.nio.ch.DatagramChannelImpl */
 static jfieldID dci_senderPortID; /* sender port in sun.nio.ch.DatagramChannelImpl */
-static jfieldID ia_addrID;
-static jfieldID ia_famID;
+static jfieldID i4a_addrID;
+static jfieldID i4a_famID;
 static jclass isa_class;        /* java.net.InetSocketAddress */
-static jclass ia_class;
+static jclass i4a_class;
 static jmethodID isa_ctorID;    /*   .InetSocketAddress(InetAddress, int) */
-static jmethodID ia_ctorID;
+static jmethodID i4a_ctorID;
 
 /*
@@ -67 +72 @@
     }
     if ((jint)ntohl(sa->sin_addr.s_addr) !=
-        (*env)->GetIntField(env, senderAddr, ia_addrID)) {
+        (*env)->GetIntField(env, senderAddr, i4a_addrID)) {
         return JNI_FALSE;
     }
@@ -101 +106 @@
                                           "cachedSenderPort", "I");
     clazz = (*env)->FindClass(env, "java/net/Inet4Address");
-    ia_class = (*env)->NewGlobalRef(env, clazz);
-    ia_addrID = (*env)->GetFieldID(env, clazz, "address", "I");
-    ia_famID = (*env)->GetFieldID(env, clazz, "family", "I");
-    ia_ctorID = (*env)->GetMethodID(env, clazz, "<init>", "()V");
+    i4a_class = (*env)->NewGlobalRef(env, clazz);
+    i4a_addrID = (*env)->GetFieldID(env, clazz, "address", "I");
+    i4a_famID = (*env)->GetFieldID(env, clazz, "family", "I");
+    i4a_ctorID = (*env)->GetMethodID(env, clazz, "<init>", "()V");
 }
 
@@ -236 +241 @@
     if (!isSenderCached(env, this, &psa)) {
         int port = ntohs(psa.sin_port);
-        jobject ia = (*env)->NewObject(env, ia_class, ia_ctorID);
+        jobject ia = (*env)->NewObject(env, i4a_class, i4a_ctorID);
         jobject isa = NULL;
 
@@ -246 +251 @@
         if (ia != NULL) {
             // populate InetAddress (assumes AF_INET)
-            (*env)->SetIntField(env, ia, ia_addrID, ntohl(psa.sin_addr.s_addr));
+            (*env)->SetIntField(env, ia, i4a_addrID, ntohl(psa.sin_addr.s_addr));
 
             // create InetSocketAddress

trunk/openjdk/jdk/src/windows/native/sun/nio/ch/FileChannelImpl.c

@@ -28 +28 @@
 #include "jvm.h"
 #include "jlong.h"
+#ifndef __WIN32OS2__
 #include <io.h>
+#endif
 #include "nio.h"
 #include "nio_util.h"
 #include "sun_nio_ch_FileChannelImpl.h"
+#ifdef __WIN32OS2__
+#include <winerror.h>
+#endif
 
 static jfieldID chan_fd; /* id for jobject 'fd' in java.io.FileChannel */

trunk/openjdk/jdk/src/windows/native/sun/nio/ch/IOUtil.c

@@ -26 +26 @@
 #include <windows.h>
 #include <winsock2.h>
+#ifndef __WIN32OS2__
 #include <io.h>
+#endif
 #include "jni.h"
 #include "jni_util.h"
@@ -157 +159 @@
 Java_sun_nio_ch_IOUtil_drain(JNIEnv *env, jclass cl, jint fd)
 {
+#ifndef __WIN32OS2__
     DWORD read = 0;
     int totalRead = 0;
@@ -190 +193 @@
     }
     return (totalRead > 0) ? JNI_TRUE : JNI_FALSE;
+#else /* __WIN32OS2__ */
+    JNU_ThrowIOExceptionWithLastError(env, "Drain");
+    return JNI_FALSE;
+#endif /* __WIN32OS2__ */
 }
 

trunk/openjdk/jdk/src/windows/native/sun/nio/ch/Net.c

@@ -38 +38 @@
 
 
-static jfieldID ia_addrID;
-static jclass ia_class;
-static jmethodID ia_ctorID;
-static jfieldID ia_famID;
+static jfieldID i4a_addrID;
+static jclass i4a_class;
+static jmethodID i4a_ctorID;
+static jfieldID i4a_famID;
 
 /**************************************************************
@@ -51 +51 @@
 {
     clazz = (*env)->FindClass(env, "java/net/Inet4Address");
-    ia_class = (*env)->NewGlobalRef(env, clazz);
-    ia_addrID = (*env)->GetFieldID(env, clazz, "address", "I");
-    ia_famID = (*env)->GetFieldID(env, clazz, "family", "I");
-    ia_ctorID = (*env)->GetMethodID(env, clazz, "<init>", "()V");
+    i4a_class = (*env)->NewGlobalRef(env, clazz);
+    i4a_addrID = (*env)->GetFieldID(env, clazz, "address", "I");
+    i4a_famID = (*env)->GetFieldID(env, clazz, "family", "I");
+    i4a_ctorID = (*env)->GetMethodID(env, clazz, "<init>", "()V");
 }
 
@@ -143 +143 @@
     }
 
-    iao = (*env)->NewObject(env, ia_class, ia_ctorID);
+    iao = (*env)->NewObject(env, i4a_class, i4a_ctorID);
     if (iao == NULL) {
         JNU_ThrowOutOfMemoryError(env, "heap allocation failure");
     } else {
-        (*env)->SetIntField(env, iao, ia_addrID, ntohl(sa.sin_addr.s_addr));
+        (*env)->SetIntField(env, iao, i4a_addrID, ntohl(sa.sin_addr.s_addr));
     }