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

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).

Location:

trunk/openjdk/jdk/src/windows/native/java/io

Files:

• FileDescriptor_md.c (modified) (1 diff)
• FileOutputStream_md.c (modified) (2 diffs)
• io_util_md.c (modified) (2 diffs)
• io_util_md.h (modified) (4 diffs)

trunk/openjdk/jdk/src/windows/native/java/io/FileDescriptor_md.c

@@ -55 +55 @@
 JNIEXPORT jlong JNICALL
 Java_java_io_FileDescriptor_set(JNIEnv *env, jclass fdClass, jint fd) {
-    SET_HANDLE(fd);
+    RETURN_HANDLE(fd);
 }
 

trunk/openjdk/jdk/src/windows/native/java/io/FileOutputStream_md.c

@@ -71 +71 @@
     jboolean append = (*env)->GetBooleanField(env, this, fos_append);
     FD fd = GET_FD(this, fos_fd);
-    if (fd == -1) {
+    if (!VALID_FD(fd)) {
         JNU_ThrowIOException(env, "Stream Closed");
         return;
@@ -88 +88 @@
     jboolean append = (*env)->GetBooleanField(env, this, fos_append);
     FD fd = GET_FD(this, fos_fd);
-    if (fd == -1) {
+    if (!VALID_FD(fd)) {
         JNU_ThrowIOException(env, "Stream Closed");
         return;

trunk/openjdk/jdk/src/windows/native/java/io/io_util_md.c

@@ -533 +533 @@
 {
     FD fd = GET_FD(this, fid);
-    HANDLE h = (HANDLE)fd;
+    HANDLE h = (HANDLE)fd.handle;
 
     if (h == INVALID_HANDLE_VALUE) {
@@ -548 +548 @@
 
     if (CloseHandle(h) == 0) { /* Returns zero on failure */
-        SET_FD(this, fd, fid); // restore fd
+        SET_FD(this, fd.handle, fid); // restore fd
         JNU_ThrowIOExceptionWithLastError(env, "close failed");
     }

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

@@ -54 +54 @@
  * Macros to use the right data type for file descriptors
  */
-#define FD jlong
+typedef struct __FD
+{
+    jint fd;
+    jlong handle;
+} _FD;
+
+#define FD _FD
 
 /*
@@ -61 +67 @@
  * will simply return -1 to avoid crashing VM.
  */
+
 #define SET_FD(this, fd, fid) \
     if ((*env)->GetObjectField(env, (this), (fid)) != NULL) \
@@ -66 +73 @@
 
 #define GET_FD(this, fid) \
-    ((*env)->GetObjectField(env, (this), (fid)) == NULL) ? \
-      -1 : (*env)->GetLongField(env, (*env)->GetObjectField(env, (this), (fid)), IO_handle_fdID)
+    { ((*env)->GetObjectField(env, (this), (fid)) == NULL ? \
+      -1 : (*env)->GetIntField(env, (*env)->GetObjectField(env, (this), (fid)), IO_fd_fdID)), \
+      ((*env)->GetObjectField(env, (this), (fid)) == NULL ? \
+        -1 : (*env)->GetLongField(env, (*env)->GetObjectField(env, (this), (fid)), IO_handle_fdID)) }
+
+#define ASSIGN_FD(fd, this, fid) \
+    do { \
+        fd.fd = ((*env)->GetObjectField(env, (this), (fid)) == NULL ? \
+            -1 : (*env)->GetIntField(env, (*env)->GetObjectField(env, (this), (fid)), IO_fd_fdID)); \
+        fd.handle = ((*env)->GetObjectField(env, (this), (fid)) == NULL ? \
+            -1 : (*env)->GetLongField(env, (*env)->GetObjectField(env, (this), (fid)), IO_handle_fdID)); \
+    } while(0)
+
+#define VALID_FD(fd) (fd.handle != -1 || fd.fd != -1)
 
 /*
  * Macros to set/get fd when inside java.io.FileDescriptor
  */
-#define THIS_FD(obj) (*env)->GetLongField(env, obj, IO_handle_fdID)
+#define THIS_FD(obj) { (*env)->GetLongField(env, obj, IO_fd_fdID), (*env)->GetLongField(env, obj, IO_handle_fdID) }
 
 /*
  * Route the routines away from HPI layer
  */
-#define IO_Write handleWrite
-#define IO_Sync handleSync
-#define IO_Read handleRead
-#define IO_Lseek handleLseek
-#define IO_Available handleAvailable
-#define IO_SetLength handleSetLength
+#define IO_Write(fd,buf,len) (fd.handle != -1 ? handleWrite(fd.handle, buf, len) : JVM_Write(fd.fd, buf, len))
+#define IO_Sync(fd) (fd.handle != -1 ? handleSync(fd.handle) : JVM_Sync(fd.fd))
+#define IO_Read(fd,buf,len) (fd.handle != -1 ? handleRead(fd.handle, buf, len) : JVM_Read(fd.fd, buf, len))
+#define IO_Lseek(fd,offset,whence) (fd.handle != -1 ? handleLseek(fd.handle, offset, whence) : JVM_Lseek(fd.fd, offset, whence))
+#define IO_Available(fd,pbytes) (fd.handle != -1 ? handleAvailable(fd.handle, pbytes) : JVM_Available(fd.fd, pbytes))
+#define IO_SetLength(fd, length) (fd.handle != -1 ? handleSetLength(fd.handle, length) : JVM_SetLength(fd.fd, length))
 
 /*
@@ -88 +107 @@
  * standard handles stdIn, stdOut, stdErr
  */
-#define SET_HANDLE(fd) \
+#define RETURN_HANDLE(fd) \
 if (fd == 0) { \
     return (jlong)GetStdHandle(STD_INPUT_HANDLE); \