Mercurial > hg > truffle

diff src/os/linux/vm/os_linux.inline.hpp @ 2033:03e1b9fce89d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7003707: need to remove (some) system include files from the HotSpot header files Summary: move socket_available into os_linux.cpp to avoid inclusion of ioctl.h in os_linux.inline.hpp Reviewed-by: coleenp, stefank, ikrylov
author dholmes
date Thu, 16 Dec 2010 20:57:03 -0500
parents 828eafbd85cc
children b92c45f2bc75
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.inline.hpp	Thu Dec 16 12:56:51 2010 -0800
+++ b/src/os/linux/vm/os_linux.inline.hpp	Thu Dec 16 20:57:03 2010 -0500
@@ -45,7 +45,6 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/poll.h>
-#include <sys/ioctl.h>
 #include <netdb.h>
 
 inline void* os::thread_local_storage_at(int index) {
@@ -268,16 +267,6 @@
   RESTARTABLE_RETURN_INT(::sendto(fd, buf, len, (unsigned int) flags, to, tolen));
 }
 
-inline int os::socket_available(int fd, jint *pbytes) {
-  // Linux doc says EINTR not returned, unlike Solaris
-  int ret = ::ioctl(fd, FIONREAD, pbytes);
-
-  //%% note ioctl can return 0 when successful, JVM_SocketAvailable
-  // is expected to return 0 on failure and 1 on success to the jdk.
-  return (ret < 0) ? 0 : 1;
-}
-
-
 inline int os::socket_shutdown(int fd, int howto){
   return ::shutdown(fd, howto);
 }