[kaffe] CVS kaffe (robilad): Resynced with GNU classpath: further trampoline fixes
Kaffe CVS
cvs-commits at kaffe.org
Wed Nov 10 03:21:20 PST 2004
PatchSet 5429
Date: 2004/11/10 11:17:20
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU classpath: further trampoline fixes
2004-11-10 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/classpath/ServiceFactory.java,
libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java,
libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java,
libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java,
libraries/javalib/gnu/java/security/PolicyFile.java:
Resynced with GNU classpath.
2004-11-06 Tom Tromey <tromey at redhat.com>
* gnu/java/rmi/server/UnicastConnectionManager.java (clients): Now
package-private.
(connections): Likewise.
(scavenger): Likewise.
* gnu/java/rmi/server/ConnectionRunnerPool.java (freelist): Now
package-private.
* gnu/java/rmi/server/UnicastRemoteCall.java (vec): Now
package-private.
(ptr): Likewise.
* gnu/java/security/PolicyFile.java (debug): Now package-private.
* gnu/classpath/ServiceFactory.java (log): Now package-private.
Members:
ChangeLog:1.2978->1.2979
libraries/javalib/gnu/classpath/ServiceFactory.java:1.1->1.2
libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java:1.1->1.2
libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.7->1.8
libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.7->1.8
libraries/javalib/gnu/java/security/PolicyFile.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2978 kaffe/ChangeLog:1.2979
--- kaffe/ChangeLog:1.2978 Wed Nov 10 11:12:29 2004
+++ kaffe/ChangeLog Wed Nov 10 11:17:20 2004
@@ -7,6 +7,29 @@
2004-11-10 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/gnu/classpath/ServiceFactory.java,
+ libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java,
+ libraries/javalib/gnu/java/security/PolicyFile.java:
+ Resynced with GNU classpath.
+
+ 2004-11-06 Tom Tromey <tromey at redhat.com>
+
+ * gnu/java/rmi/server/UnicastConnectionManager.java (clients): Now
+ package-private.
+ (connections): Likewise.
+ (scavenger): Likewise.
+ * gnu/java/rmi/server/ConnectionRunnerPool.java (freelist): Now
+ package-private.
+ * gnu/java/rmi/server/UnicastRemoteCall.java (vec): Now
+ package-private.
+ (ptr): Likewise.
+ * gnu/java/security/PolicyFile.java (debug): Now package-private.
+ * gnu/classpath/ServiceFactory.java (log): Now package-private.
+
+2004-11-10 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/imageio/spi/ServiceRegistry.java,
libraries/javalib/javax/naming/directory/BasicAttributes.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/gnu/classpath/ServiceFactory.java
diff -u kaffe/libraries/javalib/gnu/classpath/ServiceFactory.java:1.1 kaffe/libraries/javalib/gnu/classpath/ServiceFactory.java:1.2
--- kaffe/libraries/javalib/gnu/classpath/ServiceFactory.java:1.1 Tue May 18 20:23:01 2004
+++ kaffe/libraries/javalib/gnu/classpath/ServiceFactory.java Wed Nov 10 11:17:22 2004
@@ -521,6 +521,7 @@
}
+ // Package-private to avoid a trampoline.
/**
* Passes a log message to the <code>java.util.logging</code>
* framework. This call returns very quickly if no log message will
@@ -542,7 +543,7 @@
* <code>null</code> if the log message is not associated with a
* Throwable.
*/
- private static void log(Level level, String msg, Object param, Throwable t)
+ static void log(Level level, String msg, Object param, Throwable t)
{
LogRecord rec;
Index: kaffe/libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java:1.1 kaffe/libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java:1.2
--- kaffe/libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java:1.1 Mon Aug 18 17:40:33 2003
+++ kaffe/libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java Wed Nov 10 11:17:22 2004
@@ -1,5 +1,5 @@
/* gnu.java.rmi.server.ConnectionRunnerPool
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -95,7 +95,8 @@
private static int size = 5;
private static int max_size = 10;
- private static ArrayList freelist;
+ // Package-private to avoid a trampoline.
+ static ArrayList freelist;
private static ThreadGroup group = new ThreadGroup("pool");
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.7 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.8
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.7 Fri Oct 15 10:41:45 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java Wed Nov 10 11:17:22 2004
@@ -65,8 +65,9 @@
private static String localhost;
// use different maps for server/client type UnicastConnectionManager
private static Hashtable servers = new Hashtable();
-private static Hashtable clients = new Hashtable();
-private ArrayList connections; //client connection pool
+// Package-private to avoid trampolines.
+static Hashtable clients = new Hashtable();
+ArrayList connections; //client connection pool
// make serverThread volatile for poll
private volatile Thread serverThread;
@@ -74,7 +75,8 @@
String serverName;
int serverPort;
-static private Thread scavenger;
+// Package-private to avoid a trampoline.
+static Thread scavenger;
// If client and server are in the same VM, serverobj represents server
Object serverobj;
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.7 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.8
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.7 Fri Oct 15 10:41:45 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java Wed Nov 10 11:17:22 2004
@@ -61,8 +61,9 @@
private Object object;
private int opnum;
private long hash;
- private Vector vec;
- private int ptr;
+ // These are package-private due to inner class access.
+ Vector vec;
+ int ptr;
private ObjID objid;
private ObjectOutput oout;
Index: kaffe/libraries/javalib/gnu/java/security/PolicyFile.java
diff -u kaffe/libraries/javalib/gnu/java/security/PolicyFile.java:1.4 kaffe/libraries/javalib/gnu/java/security/PolicyFile.java:1.5
--- kaffe/libraries/javalib/gnu/java/security/PolicyFile.java:1.4 Thu Jun 3 21:07:26 2004
+++ kaffe/libraries/javalib/gnu/java/security/PolicyFile.java Wed Nov 10 11:17:23 2004
@@ -143,7 +143,8 @@
// -------------------------------------------------------------------------
private static final boolean DEBUG = true;
- private static void debug(String msg)
+ // Package-private to avoid a trampoline.
+ static void debug(String msg)
{
System.err.print(">> PolicyFile: ");
System.err.println(msg);
More information about the kaffe
mailing list