libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
This commit is contained in:
Matthias Klose
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
|
@ -46,23 +46,22 @@ exception statement from your version. */
|
|||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#if defined(HAVE_SYS_IOCTL_H)
|
||||
#define BSD_COMP /* Get FIONREAD on Solaris2 */
|
||||
#include <sys/ioctl.h>
|
||||
#endif
|
||||
#if defined(HAVE_SYS_FILIO_H) /* Get FIONREAD on Solaris 2.5 */
|
||||
#include <sys/filio.h>
|
||||
#endif
|
||||
|
||||
#include "cpnet.h"
|
||||
|
||||
#define SOCKET_DEFAULT_TIMEOUT -1 /* milliseconds */
|
||||
|
||||
#if defined (HAVE_MSG_NOSIGNAL)
|
||||
#define SOCKET_NOSIGNAL MSG_NOSIGNAL
|
||||
#elif defined (HAVE_SO_NOSIGPIPE)
|
||||
#define SOCKET_NOSIGNAL SO_NOSIGPIPE
|
||||
#else
|
||||
#error "No suitable flag found to ommit a SIGPIPE on signal errors with send()."
|
||||
#endif
|
||||
|
||||
static int socketTimeouts[FD_SETSIZE];
|
||||
|
||||
static jint waitForWritable(jint fd)
|
||||
|
|
@ -249,6 +248,15 @@ jint cpnet_setBroadcast(JNIEnv *env UNUSED, jint fd, jint flag)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if defined (HAVE_MSG_NOSIGNAL)
|
||||
#elif defined (HAVE_SO_NOSIGPIPE)
|
||||
static int setsockopt_NOSIGPIPE (int fd)
|
||||
{
|
||||
int setToTrue = 1;
|
||||
return setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &setToTrue, sizeof(setToTrue));
|
||||
}
|
||||
#endif
|
||||
|
||||
jint cpnet_send (JNIEnv *env UNUSED, jint fd, jbyte *data, jint len, jint *bytes_sent)
|
||||
{
|
||||
ssize_t ret;
|
||||
|
|
@ -256,7 +264,17 @@ jint cpnet_send (JNIEnv *env UNUSED, jint fd, jbyte *data, jint len, jint *bytes
|
|||
if (waitForWritable(fd) < 0)
|
||||
return ETIMEDOUT;
|
||||
|
||||
ret = send(fd, data, len, SOCKET_NOSIGNAL);
|
||||
#if defined (HAVE_MSG_NOSIGNAL)
|
||||
ret = send(fd, data, len, MSG_NOSIGNAL);
|
||||
#elif defined (HAVE_SO_NOSIGPIPE)
|
||||
ret = setsockopt_NOSIGPIPE(fd);
|
||||
if (ret == 0) ret = send(fd, data, len, 0);
|
||||
#else
|
||||
/* We want SIGPIPE to be omitted. But this configuration does not have an
|
||||
* option for that.
|
||||
*/
|
||||
ret = send(fd, data, len, 0);
|
||||
#endif
|
||||
if (ret < 0)
|
||||
return errno;
|
||||
|
||||
|
|
@ -272,8 +290,24 @@ jint cpnet_sendTo (JNIEnv *env UNUSED, jint fd, jbyte *data, jint len, cpnet_add
|
|||
if (waitForWritable(fd) < 0)
|
||||
return ETIMEDOUT;
|
||||
|
||||
ret = sendto(fd, data, len, SOCKET_NOSIGNAL, (struct sockaddr *)addr->data,
|
||||
#if defined (HAVE_MSG_NOSIGNAL)
|
||||
ret = sendto(fd, data, len, MSG_NOSIGNAL, (struct sockaddr *)addr->data,
|
||||
addr->len);
|
||||
#elif defined (HAVE_SO_NOSIGPIPE)
|
||||
ret = setsockopt_NOSIGPIPE(fd);
|
||||
if (ret == 0)
|
||||
{
|
||||
ret = sendto(fd, data, len, 0, (struct sockaddr *)addr->data,
|
||||
addr->len);
|
||||
}
|
||||
#else
|
||||
/* We want SIGPIPE to be omitted. But this configuration does not have an
|
||||
* option for that.
|
||||
*/
|
||||
ret = sendto(fd, data, len, 0, (struct sockaddr *)addr->data,
|
||||
addr->len);
|
||||
#endif
|
||||
|
||||
if (ret < 0)
|
||||
return errno;
|
||||
|
||||
|
|
@ -608,8 +642,17 @@ jint cpnet_getHostByName (JNIEnv *env, const char *hostname, cpnet_address ***ad
|
|||
do
|
||||
{
|
||||
buf = (char *)JCL_malloc(env, buflen);
|
||||
|
||||
#ifdef HAVE_GETHOSTBYNAME_R
|
||||
# if defined(HAVE_FUNC_GETHOSTBYNAME_R_6)
|
||||
ret = gethostbyname_r (hostname, &hret, buf, buflen, &result, &herr);
|
||||
# elif defined(HAVE_FUNC_GETHOSTBYNAME_R_5)
|
||||
result = gethostbyname_r(hostname, &hret, buf, buflen, &herr);
|
||||
# elif defined(HAVE_FUNC_GETHOSTBYNAME_R_3)
|
||||
# error IMPLEMENT ME!
|
||||
# else
|
||||
# error unknown number of arguments for gethostbyname_r
|
||||
# endif
|
||||
#else
|
||||
hret.h_addr_list = NULL;
|
||||
hret.h_addrtype = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue