From d291d8b244efc66333a228e5013a5afd80c87f6d Mon Sep 17 00:00:00 2001 From: membar Date: Fri, 29 Aug 2003 04:21:01 +0000 Subject: * win32.cc: fixed tab, indentation and whitespace inconsistencies removed jvm.h include added includes java/lang/UnsupportedOperationException.h, java/io/IOException.h, java/net/SocketException.h (WSAEventWrapper): class implementation (_Jv_WinStrError): implemented both overloads (_Jv_ThrowIOException): implemented both overloads (_Jv_ThrowSocketException): implemented both overloads (_Jv_select): implemented * include/win32.h: fixed tab, indentation and whitespace inconsistencies wrapped include with #define WIN32_LEAN_AND_MEAN added jvm.h include (WSAEventWrapper): added class declaration (_Jv_WinStrError): added both overload declarations (_Jv_ThrowIOException): added both overload declarations (_Jv_ThrowSocketException): added both overload declarations removed ENOTCONN, ECONNRESET and ENOPROTOOPT defines (_Jv_select): added declaration (_Jv_socket): removed (_Jv_connect): removed (_Jv_close): removed (_Jv_bind): removed (_Jv_accept): removed (_Jv_listen): removed (_Jv_write): removed (_Jv_read): removed * java/io/natFileDescriptorWin32.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed jvm.h include (testCanUseGetHandleInfo): new function which tests whether Win32 GetHandleInformation() call can be used with console buffer handles (only supported on >=WinNT 5.0) (winerr): removed (superseded by _Jv_WinStrError in include/win32.h) (valid): rewrote implementation using GetHandleInformation() (sync): changed exception throwing to use error string and exception helper methods declared in include/win32.h (open): likewise (write): likewise (setLength): likewise (close): likewise (seek): likewise (getFilePointer): likewise (read): likewise * java/io/natFileWin32.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed jvm.h include (_access): use JV_TEMP_UTF_STRING (_stat): likewise (performMkDir): use JV_TEMP_UTF_STRING (performRenameTo): likewise (performDelete): likewise (performCreate): likewise (performSetReadOnly): likewise (performSetLastModified): likewise * java/lang/natWin32Process.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed includes gcj/cni.h, jvm.h (new_string): removed (startProcess): use JV_TEMP_UTF_STRING, changed exception throwing to use error string and exception helper methods declared in include/win32.h * java/net/natInetAddressWin32.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed jvm.h include removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 (aton): use JV_TEMP_UTF_STRING removed POSIX conditional code not relevant to Win32 (lookup): likewise (getLocalHostName): likewise * java/net/natNetworkInterfaceWin32.cc: fixed tab, indentation and whitespace inconsistencies removed unnecessary windows.h, winsock.h and gcj/cni.h includes removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 (winsock2GetRealNetworkInterfaces): new function to compute network interfaces via Winsock2 API (determineGetRealNetworkInterfacesFN): new function for returning a function pointer to the function used to compute network interfaces. (getRealNetworkInterfaces): implemented * java/net/natPlainDatagramSocketImplWin32.cc: fixed tab, indentation and whitespace inconsistencies removed gcj/cni.h include removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 changed net POSIXisms to Win32isms replaced _Jv socket-related calls with their real Win32 equivalents changed exception throwing to use error string and exception helper methods declared in include/win32.h (peekData): implemented timeout support (receive): likewise * java/net/natPlainSocketImplWin32.cc: fixed tab, indentation and whitespace inconsistencies removed gcj/cni.h and gcj/javaprims.h includes removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 changed net POSIXisms to Win32isms replaced _Jv socket-related calls with their real Win32 equivalents changed exception throwing to use error string and exception helper methods declared in include/win32.h (throwConnectException): helper function for connect() (connect): implemented timeout support (accept): likewise (doRead): new helper function common to both read() method overloads, includes timeout support (read): implemented both overloads in terms of doRead() (available): implemented using ioctlsocket() git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70904 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/include/win32.h | 108 +++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 60 deletions(-) (limited to 'libjava/include') diff --git a/libjava/include/win32.h b/libjava/include/win32.h index 320273aa4e5..6da0eafaa9a 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -11,11 +11,14 @@ details. */ #ifndef __JV_WIN32_H__ #define __JV_WIN32_H__ +#define WIN32_LEAN_AND_MEAN #include +#undef WIN32_LEAN_AND_MEAN #undef STRICT #include #include +#include #include #include @@ -40,21 +43,58 @@ details. */ // with the JNICALL definition in jni.h #define _Jv_platform_ffi_abi FFI_STDCALL -#ifndef DISABLE_JAVA_NET +/* Useful helper classes and methods. */ -// these errors cannot occur on Win32 -#define ENOTCONN 0 -#define ECONNRESET 0 +/* A C++ wrapper around a WSAEVENT which closes the event + in its destructor. If dwSelFlags is non-zero, we also + issue an WSAEventSelect on the socket descriptor with + the given flags; this is undone by a corresponding call + to WSAEventSelect(fd, 0, 0) in our destructor. */ +class WSAEventWrapper +{ +public: + WSAEventWrapper(int fd, DWORD dwSelFlags); + ~WSAEventWrapper(); + + WSAEVENT getEventHandle() + { + return m_hEvent; + } + +private: + WSAEVENT m_hEvent; + int m_fd; + DWORD m_dwSelFlags; +}; + +// Error string text. The int argument is compatible +// with both int WSAGetLastError() and DWORD GetLastError() +// I tried avoiding having to pass the error explicitly, but +// it didn't work this was invoked with say +// throw new SomeException(_Jv_WinStrError()). +extern jstring +_Jv_WinStrError (LPCTSTR lpszPrologue, int nErrorCode); + +extern jstring +_Jv_WinStrError (int nErrorCode); -#ifndef ENOPROTOOPT -#define ENOPROTOOPT 109 -#endif +extern void +_Jv_ThrowIOException (DWORD dwErrorCode); -#endif // DISABLE_JAVA_NET +extern void +_Jv_ThrowIOException (); +extern void +_Jv_ThrowSocketException (DWORD dwErrorCode); + +extern void +_Jv_ThrowSocketException (); + +// Platform implementation extern void _Jv_platform_initialize (void); extern void _Jv_platform_initProperties (java::util::Properties*); extern jlong _Jv_platform_gettimeofday (); +extern int _Jv_select (int n, fd_set *, fd_set *, fd_set *, struct timeval *); inline void _Jv_platform_close_on_exec (jint) @@ -77,58 +117,6 @@ _Jv_platform_usleep (unsigned long usecs) } #endif /* JV_HASH_SYNCHRONIZATION */ -#ifndef DISABLE_JAVA_NET - -static inline int -_Jv_socket (int domain, int type, int protocol) -{ - return ::socket (domain, type, protocol); -} - -inline int -_Jv_connect (jint fd, sockaddr *ptr, int len) -{ - return ::connect (fd, ptr, len); -} - -inline int -_Jv_close (jint fd) -{ - return ::closesocket (fd); -} - -inline int -_Jv_bind (int fd, struct sockaddr *addr, int addrlen) -{ - return ::bind (fd, addr, addrlen); -} - -inline int -_Jv_accept (int fd, struct sockaddr *addr, socklen_t *addrlen) -{ - return ::accept (fd, addr, addrlen); -} - -inline int -_Jv_listen (int fd, int backlog) -{ - return ::listen (fd, backlog); -} - -inline int -_Jv_write(int s, void *buf, int len) -{ - return ::send (s, (char*) buf, len, 0); -} - -inline int -_Jv_read(int s, void *buf, int len) -{ - return ::recv (s, (char*) buf, len, 0); -} - -#endif /* DISABLE_JAVA_NET */ - /* Store up to SIZE return address of the current program state in ARRAY and return the exact number of values stored. */ extern int backtrace (void **__array, int __size); -- cgit v1.2.3