Changeset 320 for trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

Timestamp:

Feb 16, 2012, 3:07:55 PM (9 years ago)

Author:

dmik

Message:

Port Windows-specific b24 changes to OS/2.

File:

• trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp (modified) (11 diffs)

trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

@@ -26 +26 @@
 // Must be at least Windows 2000 or XP to use VectoredExceptions
 #define _WIN32_WINNT 0x500
+#endif
+
+#ifdef __WIN32OS2__
+#include <os2wrap2.h>
 #endif
 
@@ -104 +108 @@
 #include <vdmdbg.h>
 
+#ifdef __EMX__
+
 #ifdef __WIN32OS2__
 #include <mmsystem.h>
 #include <wincon.h>
 #include <basetsd.h>
+#include <winsock.h>
 #define _M_IX86
+#endif
+
+#define _stati64 stat
+#define _fstati64 fstat
 #define _lseeki64 lseek
-#endif
+
+#endif /* EMX */
 
 // for timer info max values which include all bits
@@ -4033 +4045 @@
   #ifdef DEBUG
     jio_fprintf(stderr, "sysNativePath: %s\n", path);
-  #endif DEBUG
+  #endif
   return path;
 }
@@ -4041 +4053 @@
 
 int os::ftruncate(int fd, jlong length) {
-  HANDLE h = (HANDLE)::_get_osfhandle(fd);
-  long high = (long)(length >> 32);
-  DWORD ret;
-
-  if (h == (HANDLE)(-1)) {
-    return -1;
-  }
-
-  ret = ::SetFilePointer(h, (long)(length), &high, FILE_BEGIN);
-  if ((ret == 0xFFFFFFFF) && (::GetLastError() != NO_ERROR)) {
+#ifdef __EMX__
+    return ftruncate(fd, length);
+#else /* __EMX__ */
+    HANDLE h = (HANDLE)::_get_osfhandle(fd);
+    long high = (long)(length >> 32);
+    DWORD ret;
+
+    if (h == (HANDLE)(-1)) {
       return -1;
-  }
-
-  if (::SetEndOfFile(h) == FALSE) {
-    return -1;
-  }
-
-  return 0;
+    }
+
+    ret = ::SetFilePointer(h, (long)(length), &high, FILE_BEGIN);
+    if ((ret == 0xFFFFFFFF) && (::GetLastError() != NO_ERROR)) {
+        return -1;
+    }
+
+    if (::SetEndOfFile(h) == FALSE) {
+      return -1;
+    }
+
+    return 0;
+#endif /* __EMX__ */
 }
 
@@ -4067 +4083 @@
 
 int os::fsync(int fd) {
+#ifdef __EMX__
+    return fsync(fd);
+#else /* __EMX__ */
   HANDLE handle = (HANDLE)::_get_osfhandle(fd);
 
@@ -4075 +4094 @@
   }
   return 0;
+#endif /* __EMX__ */
 }
 
@@ -4080 +4100 @@
 static int stdinAvailable(int, long *);
 
+#ifndef S_ISCHR
 #define S_ISCHR(mode)   (((mode) & _S_IFCHR) == _S_IFCHR)
+#endif
+#ifndef S_ISFIFO
 #define S_ISFIFO(mode)  (((mode) & _S_IFIFO) == _S_IFIFO)
+#endif
 
 // This code is a copy of JDK's sysAvailable
@@ -4127 +4151 @@
     *
     */
+#ifdef __WIN32OS2__
+    os2_AVAILDATA avail = { 0, 0 };
+    os2_ULONG pipeState;
+    os2_APIRET arc = DosPeekNPipe(0, NULL, 0, NULL, &avail, &pipeState);
+    // note that even if ERROR_INVALID_PARAMETER, it seems to return the
+    // correct values in avail and state (undocumented)
+    if (arc != NO_ERROR && arc != ERROR_INVALID_PARAMETER) {
+        *pbytes = avail.cbpipe;
+        return TRUE;
+    }
+
+    return FALSE;
+#else
   HANDLE han;
 
@@ -4146 +4183 @@
   }
   return TRUE;
+#endif
 }
 
@@ -4763 +4801 @@
 
 static void initSockFnTable() {
-  int (PASCAL FAR* WSAStartupPtr)(WORD, LPWSADATA);
+  int (FAR PASCAL * WSAStartupPtr)(WORD, LPWSADATA);
   WSADATA wsadata;
 
@@ -4782 +4820 @@
 
     /* If we loaded a DLL, then we might as well initialize it.  */
-    WSAStartupPtr = (int (PASCAL FAR *)(WORD, LPWSADATA))
+    WSAStartupPtr = (int (FAR PASCAL *)(WORD, LPWSADATA))
     ::GetProcAddress(hWinsock, "WSAStartup");