Changeset 373 for trunk/openjdk/jdk/src/solaris

Timestamp:

May 31, 2012, 5:49:53 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Make java.io.FileDescriptor work with LIBC file descriptors.

On Windows, this class carries both the windows handle and the libc file
descriptor but only handles were used so far. Now, if the handle is not set,
the descriptor will be used (with a relevant LIBC call).

File:

• trunk/openjdk/jdk/src/solaris/native/java/io/io_util_md.h (modified) (2 diffs)

trunk/openjdk/jdk/src/solaris/native/java/io/io_util_md.h

@@ -48 +48 @@
         -1 : (*env)->GetIntField(env, (*env)->GetObjectField(env, (this), (fid)), IO_fd_fdID)
 
+#define ASSIGN_FD(fd, this, fid) \
+    do { \
+        fd = (*env)->GetObjectField(env, (this), (fid)) == NULL ? \
+            -1 : (*env)->GetIntField(env, (*env)->GetObjectField(env, (this), (fid)), IO_fd_fdID); \
+    } while(0)
+
+#define VALID_FD(fd) (fd != -1)
+
 /*
  * Macros to set/get fd when inside java.io.FileDescriptor
@@ -66 +74 @@
  * On Solaris, the handle field is unused
  */
-#define SET_HANDLE(fd) return (jlong)-1
+#define RETURN_HANDLE(fd) return (jlong)-1
 
 /*