# HG changeset patch # User Doug Simon # Date 1431953732 -7200 # Node ID 082417ac43e45c4fcf08978ff97b9902825e588e # Parent 84b3d688ea832b792f823fd79511f8bd6547d798 removed com.oracle.graal.hotspot.server and uses of Serializable it depended upon (JBS:GRAAL-53) diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodeFrame.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodeFrame.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodeFrame.java Mon May 18 14:55:32 2015 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.api.code; -import java.io.*; import java.util.*; import com.oracle.graal.api.meta.*; @@ -32,9 +31,7 @@ * where to find the local variables, operand stack values and locked objects of the bytecode * frame(s). */ -public class BytecodeFrame extends BytecodePosition implements Serializable { - - private static final long serialVersionUID = -345025397165977565L; +public class BytecodeFrame extends BytecodePosition { /** * An array of values representing how to reconstruct the state of the Java frame. This is array diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodePosition.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodePosition.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodePosition.java Mon May 18 14:55:32 2015 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.api.code; -import java.io.*; import java.util.*; import com.oracle.graal.api.meta.*; @@ -33,9 +32,7 @@ * system to reconstruct a source-level stack trace for exceptions and to create * {@linkplain BytecodeFrame frames} for deoptimization. */ -public class BytecodePosition implements Serializable { - - private static final long serialVersionUID = 8633885274526033515L; +public class BytecodePosition { private final BytecodePosition caller; private final ResolvedJavaMethod method; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Mon May 18 14:55:32 2015 +0200 @@ -25,27 +25,23 @@ import static com.oracle.graal.api.meta.MetaUtil.*; import static java.util.Collections.*; -import java.io.*; import java.util.*; +import com.oracle.graal.api.code.CodeUtil.RefMapFormatter; import com.oracle.graal.api.meta.Assumptions.Assumption; -import com.oracle.graal.api.code.CodeUtil.RefMapFormatter; import com.oracle.graal.api.meta.*; /** * Represents the output from compiling a method, including the compiled machine code, associated * data and references, relocation information, deoptimization information, etc. */ -public class CompilationResult implements Serializable { - - private static final long serialVersionUID = -1319947729753702434L; +public class CompilationResult { /** * Represents a code position with associated additional information. */ - public abstract static class Site implements Serializable { + public abstract static class Site { - private static final long serialVersionUID = -8214214947651979102L; /** * The position (or offset) of this site with respect to the start of the target method. */ @@ -74,7 +70,6 @@ */ public static class Infopoint extends Site implements Comparable { - private static final long serialVersionUID = 2479806696381720162L; public final DebugInfo debugInfo; public final InfopointReason reason; @@ -124,8 +119,6 @@ */ public static final class Call extends Infopoint { - private static final long serialVersionUID = 1440741241631046954L; - /** * The target of the call. */ @@ -183,9 +176,7 @@ /** * Represents some external data that is referenced by the code. */ - public abstract static class Reference implements Serializable { - - private static final long serialVersionUID = 4841246083028477946L; + public abstract static class Reference { @Override public abstract int hashCode(); @@ -196,8 +187,6 @@ public static final class ConstantReference extends Reference { - private static final long serialVersionUID = 5841121930949053612L; - private final VMConstant constant; public ConstantReference(VMConstant constant) { @@ -233,8 +222,6 @@ public static final class DataSectionReference extends Reference { - private static final long serialVersionUID = 9011681879878139182L; - private boolean initialized; private int offset; @@ -281,7 +268,6 @@ */ public static final class DataPatch extends Site { - private static final long serialVersionUID = 5771730331604867476L; public Reference reference; public DataPatch(int pcOffset, Reference reference) { @@ -314,9 +300,8 @@ * {@link CompilationResult#getTargetCode()}. This is optional information that can be used to * enhance a disassembly of the code. */ - public abstract static class CodeAnnotation implements Serializable { + public abstract static class CodeAnnotation { - private static final long serialVersionUID = -7903959680749520748L; public final int position; public CodeAnnotation(int position) { @@ -342,10 +327,6 @@ */ public static final class CodeComment extends CodeAnnotation { - /** - * - */ - private static final long serialVersionUID = 6802287188701961401L; public final String value; public CodeComment(int position, String comment) { @@ -384,8 +365,6 @@ */ public static final class JumpTable extends CodeAnnotation { - private static final long serialVersionUID = 2222194398353801831L; - /** * The low value in the key range (inclusive). */ @@ -434,7 +413,6 @@ */ public static final class ExceptionHandler extends Site { - private static final long serialVersionUID = 4897339464722665281L; public final int handlerPos; ExceptionHandler(int pcOffset, int handlerPos) { @@ -468,7 +446,6 @@ */ public static final class Mark extends Site { - private static final long serialVersionUID = 3612943150662354844L; public final Object id; public Mark(int pcOffset, Object id) { diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/DataSection.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/DataSection.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/DataSection.java Mon May 18 14:55:32 2015 +0200 @@ -24,7 +24,6 @@ import static com.oracle.graal.api.meta.MetaUtil.*; -import java.io.*; import java.nio.*; import java.util.*; import java.util.function.*; @@ -34,9 +33,7 @@ import com.oracle.graal.api.code.DataSection.Data; import com.oracle.graal.api.meta.*; -public final class DataSection implements Serializable, Iterable { - - private static final long serialVersionUID = -1375715553825731716L; +public final class DataSection implements Iterable { @FunctionalInterface public interface DataBuilder { @@ -77,9 +74,7 @@ } } - public static final class Data implements Serializable { - - private static final long serialVersionUID = -719932751800916080L; + public static final class Data { private int alignment; private final int size; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterValue.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterValue.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterValue.java Mon May 18 14:55:32 2015 +0200 @@ -32,8 +32,6 @@ */ public final class RegisterValue extends AllocatableValue { - private static final long serialVersionUID = 7999341472196897163L; - private final Register reg; /** diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackLockValue.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackLockValue.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackLockValue.java Mon May 18 14:55:32 2015 +0200 @@ -31,8 +31,6 @@ */ public final class StackLockValue extends AbstractValue implements JavaValue { - private static final long serialVersionUID = 8241681800464483691L; - private Value owner; private StackSlotValue slot; private final boolean eliminated; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackSlot.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackSlot.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackSlot.java Mon May 18 14:55:32 2015 +0200 @@ -30,8 +30,6 @@ */ public final class StackSlot extends StackSlotValue { - private static final long serialVersionUID = -7725071921307318433L; - private final int offset; private final boolean addFrameSize; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackSlotValue.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackSlotValue.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/StackSlotValue.java Mon May 18 14:55:32 2015 +0200 @@ -30,8 +30,6 @@ */ public abstract class StackSlotValue extends AllocatableValue { - private static final long serialVersionUID = 5106407801795483337L; - public StackSlotValue(LIRKind lirKind) { super(lirKind); } diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/VirtualObject.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/VirtualObject.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/VirtualObject.java Mon May 18 14:55:32 2015 +0200 @@ -33,8 +33,6 @@ */ public final class VirtualObject extends AbstractValue implements JavaValue { - private static final long serialVersionUID = -2907197776426346021L; - private final ResolvedJavaType type; private Value[] values; private final int id; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/VirtualStackSlot.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/VirtualStackSlot.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/VirtualStackSlot.java Mon May 18 14:55:32 2015 +0200 @@ -30,7 +30,6 @@ */ public abstract class VirtualStackSlot extends StackSlotValue { - private static final long serialVersionUID = 2823688688873398219L; private final int id; public VirtualStackSlot(int id, LIRKind lirKind) { diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractJavaProfile.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractJavaProfile.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractJavaProfile.java Mon May 18 14:55:32 2015 +0200 @@ -22,8 +22,6 @@ */ package com.oracle.graal.api.meta; -import java.io.*; - /** * This object holds probability information for a set of items that were profiled at a specific * BCI. The precision of the supplied values may vary, but a runtime that provides this information @@ -34,9 +32,7 @@ * @param the class of the items that are profiled at the specific BCI and for which * probabilities are stored. E.g., a ResolvedJavaType or a ResolvedJavaMethod. */ -public abstract class AbstractJavaProfile, U> implements Serializable { - - private static final long serialVersionUID = 5493379044459116749L; +public abstract class AbstractJavaProfile, U> { private final double notRecordedProbability; private final T[] pitems; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractProfiledItem.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractProfiledItem.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractProfiledItem.java Mon May 18 14:55:32 2015 +0200 @@ -22,15 +22,11 @@ */ package com.oracle.graal.api.meta; -import java.io.*; - /** * A profiled type that has a probability. Profiled types are naturally sorted in descending order * of their probabilities. */ -public abstract class AbstractProfiledItem implements Comparable>, Serializable { - - private static final long serialVersionUID = 7838575753661305744L; +public abstract class AbstractProfiledItem implements Comparable> { protected final T item; protected final double probability; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractValue.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractValue.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AbstractValue.java Mon May 18 14:55:32 2015 +0200 @@ -22,14 +22,10 @@ */ package com.oracle.graal.api.meta; -import java.io.*; - /** * Abstract base class for values. */ -public abstract class AbstractValue implements Serializable, Value, KindProvider { - - private static final long serialVersionUID = -6909397188697766469L; +public abstract class AbstractValue implements Value, KindProvider { public static final AllocatableValue ILLEGAL = Value.ILLEGAL; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AllocatableValue.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AllocatableValue.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/AllocatableValue.java Mon May 18 14:55:32 2015 +0200 @@ -28,8 +28,6 @@ */ public abstract class AllocatableValue extends AbstractValue implements JavaValue, KindProvider { - private static final long serialVersionUID = 153019506717492133L; - public static final AllocatableValue[] NONE = {}; public AllocatableValue(LIRKind lirKind) { diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Assumptions.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Assumptions.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Assumptions.java Mon May 18 14:55:32 2015 +0200 @@ -22,25 +22,20 @@ */ package com.oracle.graal.api.meta; -import java.io.*; import java.lang.invoke.*; import java.util.*; /** * Class for recording assumptions made during compilation. */ -public final class Assumptions implements Serializable, Iterable { - - private static final long serialVersionUID = 5152062717588239131L; +public final class Assumptions implements Iterable { /** * Abstract base class for assumptions. An assumption assumes a property of the runtime that may * be invalidated by subsequent execution (e.g., that a class has no subclasses implementing * {@link NoFinalizableSubclass Object.finalize()}). */ - public abstract static class Assumption implements Serializable { - - private static final long serialVersionUID = -1936652569665112915L; + public abstract static class Assumption { } /** @@ -84,8 +79,6 @@ */ public static final class NoFinalizableSubclass extends Assumption { - private static final long serialVersionUID = 6451169735564055081L; - private ResolvedJavaType receiverType; public NoFinalizableSubclass(ResolvedJavaType receiverType) { @@ -119,8 +112,6 @@ */ public static final class ConcreteSubtype extends Assumption { - private static final long serialVersionUID = -1457173265437676252L; - /** * Type the assumption is made about. */ @@ -168,8 +159,6 @@ */ public static final class LeafType extends Assumption { - private static final long serialVersionUID = -1457173265437676252L; - /** * Type the assumption is made about. */ @@ -207,8 +196,6 @@ */ public static final class ConcreteMethod extends Assumption { - private static final long serialVersionUID = -7636746737947390059L; - /** * A virtual (or interface) method whose unique implementation for the receiver type in * {@link #context} is {@link #impl}. @@ -261,8 +248,6 @@ */ public static final class CallSiteTargetValue extends Assumption { - private static final long serialVersionUID = 1732459941784550371L; - public final CallSite callSite; public final MethodHandle methodHandle; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethodProfile.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethodProfile.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethodProfile.java Mon May 18 14:55:32 2015 +0200 @@ -31,8 +31,6 @@ */ public final class JavaMethodProfile extends AbstractJavaProfile { - private static final long serialVersionUID = -1440572119913692689L; - public JavaMethodProfile(double notRecordedProbability, ProfiledMethod[] pitems) { super(notRecordedProbability, pitems); } @@ -43,8 +41,6 @@ public static class ProfiledMethod extends AbstractProfiledItem { - private static final long serialVersionUID = 5418813647187024693L; - public ProfiledMethod(ResolvedJavaMethod method, double probability) { super(method, probability); } diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaTypeProfile.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaTypeProfile.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaTypeProfile.java Mon May 18 14:55:32 2015 +0200 @@ -33,7 +33,6 @@ */ public final class JavaTypeProfile extends AbstractJavaProfile { - private static final long serialVersionUID = -6877016333706838441L; private static final ProfiledType[] EMPTY_ARRAY = new ProfiledType[0]; private final TriState nullSeen; @@ -145,8 +144,6 @@ public static class ProfiledType extends AbstractProfiledItem { - private static final long serialVersionUID = 1481773321889860837L; - public ProfiledType(ResolvedJavaType type, double probability) { super(type, probability); assert type.isArray() || type.isConcrete() : type; diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java Mon May 18 14:55:32 2015 +0200 @@ -27,8 +27,6 @@ */ final class NullConstant extends AbstractValue implements JavaConstant { - private static final long serialVersionUID = 8906209595800783961L; - protected NullConstant() { super(LIRKind.reference(Kind.Object)); } diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/PrimitiveConstant.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/PrimitiveConstant.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/PrimitiveConstant.java Mon May 18 14:55:32 2015 +0200 @@ -30,8 +30,6 @@ */ public class PrimitiveConstant extends AbstractValue implements JavaConstant, SerializableConstant { - private static final long serialVersionUID = 8787949721295655376L; - /** * The boxed primitive value as a {@code long}. For {@code float} and {@code double} values, * this value is the result of {@link Float#floatToRawIntBits(float)} and diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RawConstant.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RawConstant.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RawConstant.java Mon May 18 14:55:32 2015 +0200 @@ -23,7 +23,6 @@ package com.oracle.graal.api.meta; public class RawConstant extends PrimitiveConstant { - private static final long serialVersionUID = -242269518888560348L; public RawConstant(long rawValue) { super(Kind.Int, rawValue); diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java --- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java Mon May 18 14:55:32 2015 +0200 @@ -28,7 +28,7 @@ */ public interface Value extends KindProvider, TrustedInterface { - @SuppressWarnings("serial") AllocatableValue ILLEGAL = new AllocatableValue(LIRKind.Illegal) { + AllocatableValue ILLEGAL = new AllocatableValue(LIRKind.Illegal) { @Override public String toString() { diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Mon May 18 13:47:45 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Mon May 18 14:55:32 2015 +0200 @@ -31,13 +31,12 @@ * usually occur here. */ public class ComplexMatchValue extends AbstractValue { - private static final long serialVersionUID = -4734670273590368770L; /** * This is the Value of a node which was matched as part of a complex match. The value isn't * actually useable but this marks it as having been evaluated. */ - @SuppressWarnings("serial") public static final Value INTERIOR_MATCH = new AbstractValue(LIRKind.Illegal) { + public static final Value INTERIOR_MATCH = new AbstractValue(LIRKind.Illegal) { @Override public String toString() { diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.hotspot.server/overview.html --- a/graal/com.oracle.graal.hotspot.server/overview.html Mon May 18 13:47:45 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ - - - - - - - - -Documentation for the com.oracle.graal.hotspot.server project. - - - diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/CompilationServer.java --- a/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/CompilationServer.java Mon May 18 13:47:45 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.hotspot.server; - -import java.io.*; -import java.net.*; -import java.util.*; - -import javax.net.*; - -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.bridge.*; -import com.oracle.graal.hotspot.logging.*; - -/** - * Server side of the client/server compilation model. The server listens for connections on the - * hardcoded port 1199. - */ -public class CompilationServer implements Runnable { - - public static void main(String[] args) throws Exception { - new CompilationServer(false).run(); - } - - public interface ConnectionObserver { - - void connectionStarted(HotSpotGraalRuntimeProvider compiler); - - void connectionFinished(HotSpotGraalRuntimeProvider compiler); - } - - private final boolean multiple; - private final ArrayList observers = new ArrayList<>(); - - /** - * Creates a new Compilation server. The server is activated by calling {@link #run()} directly - * or via a new {@link Thread}. - * - * @param multiple true if the server should server should serve an infinite amount of - * consecutive connections, false if it should terminate after the first connection - * ends. - */ - public CompilationServer(boolean multiple) { - this.multiple = multiple; - } - - public void addConnectionObserver(ConnectionObserver observer) { - observers.add(observer); - } - - public void removeConnectionObserver(ConnectionObserver observer) { - observers.remove(observer); - } - - public void run() { - final ServerSocket serverSocket; - try { - serverSocket = ServerSocketFactory.getDefault().createServerSocket(1199); - } catch (IOException e) { - throw new RuntimeException("Couldn't create compilation server", e); - } - do { - Socket socket = null; - try { - Logger.log("Compilation server ready, waiting for client to connect..."); - socket = serverSocket.accept(); - Logger.log("Connected to " + socket.getRemoteSocketAddress()); - - ReplacingStreams streams = new ReplacingStreams(socket.getOutputStream(), socket.getInputStream()); - - // get the CompilerToVM proxy from the client - CompilerToVM toVM = (CompilerToVM) streams.getInvocation().waitForResult(false); - - // return the initialized compiler to the client - HotSpotGraalRuntimeProvider compiler = initializeServer(toVM); - streams.getInvocation().sendResult(compiler); - - for (ConnectionObserver observer : observers) { - observer.connectionStarted(compiler); - } - - streams.getInvocation().waitForResult(true); - - for (ConnectionObserver observer : observers) { - observer.connectionFinished(compiler); - } - } catch (IOException e) { - e.printStackTrace(); - } catch (ClassNotFoundException e) { - throw new RuntimeException(e); - } finally { - if (socket != null) { - try { - socket.close(); - } catch (IOException e) { - } - } - } - } while (multiple); - } - - @SuppressWarnings("unused") - private static HotSpotGraalRuntimeProvider initializeServer(CompilerToVM toVM) { - // TODO(thomaswue): Fix creation of compiler instances on server side. - return null; - } -} diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/InvocationSocket.java --- a/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/InvocationSocket.java Mon May 18 13:47:45 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,284 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.hotspot.server; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.hotspot.logging.*; - -/** - * A collection of java.lang.reflect proxies that communicate over a socket connection. - * - * Calling a method sends the method name and the parameters through the socket. Afterwards this - * class waits for a result. While waiting for a result three types of objects can arrive through - * the socket: a method invocation, a method result or an exception. Method invocation can thus be - * recursive. - */ -public class InvocationSocket { - - private static final boolean DEBUG = false; - private static final boolean COUNT_CALLS = false; - - private static final HashSet cachedMethodNames = new HashSet<>(); - private static final HashSet forbiddenMethodNames = new HashSet<>(); - - static { - cachedMethodNames.add("name"); - cachedMethodNames.add("kind"); - cachedMethodNames.add("isResolved"); - cachedMethodNames.add("getCompilerToVM"); - cachedMethodNames.add("exactType"); - cachedMethodNames.add("isInitialized"); - forbiddenMethodNames.add("javaClass"); - } - - private final ObjectOutputStream output; - private final ObjectInputStream input; - - private final Map counts = new HashMap<>(); - - public InvocationSocket(ObjectOutputStream output, ObjectInputStream input) { - this.output = output; - this.input = input; - - if (COUNT_CALLS) { - Runtime.getRuntime().addShutdownHook(new Thread() { - - @Override - public void run() { - SortedMap sorted = new TreeMap<>(); - for (Map.Entry entry : counts.entrySet()) { - sorted.put(entry.getValue(), entry.getKey()); - } - for (Map.Entry entry : sorted.entrySet()) { - TTY.println(entry.getKey() + ": " + entry.getValue()); - } - } - }); - } - } - - /** - * Represents one invocation of a method that is transferred via the socket connection. - * - */ - private static class Invocation implements Serializable { - - private static final long serialVersionUID = -799162779226626066L; - - public Object receiver; - public String methodName; - public Object[] args; - - public Invocation(Object receiver, String methodName, Object[] args) { - this.receiver = receiver; - this.methodName = methodName; - this.args = args; - } - } - - /** - * Represents the result of an invocation that is transferred via the socket connection. - * - */ - private static class Result implements Serializable { - - private static final long serialVersionUID = -7496058356272415814L; - - public Object result; - - public Result(Object result) { - this.result = result; - } - } - - private void incCount(String name, Object[] args) { - if (COUNT_CALLS) { - String nameAndArgCount = name + (args == null ? 0 : args.length); - if (counts.get(nameAndArgCount) != null) { - counts.put(nameAndArgCount, counts.get(nameAndArgCount) + 1); - } else { - counts.put(nameAndArgCount, 1); - } - } - } - - /** - * Each instance of this class handles remote invocations for one instance of a Remote class. It - * will forward all interface methods to the other end of the socket and cache the results of - * calls to certain methods. - * - */ - public class Handler implements InvocationHandler { - - private final Object receiver; - private final HashMap cache = new HashMap<>(); - - public Handler(Object receiver) { - this.receiver = receiver; - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - // only interface methods can be transferred, java.lang.Object methods - if (method.getDeclaringClass() == Object.class) { - return method.invoke(receiver, args); - } - String methodName = method.getName(); - // check if the result of this zero-arg method was cached - if (args == null || args.length == 0) { - if (cache.containsKey(methodName)) { - return cache.get(methodName); - } - } - if (forbiddenMethodNames.contains(methodName)) { - throw new IllegalAccessException(methodName + " not allowed"); - } - Object result = null; - try { - if (DEBUG) { - Logger.startScope("invoking remote " + methodName); - } - incCount(methodName, args); - - output.writeObject(new Invocation(receiver, methodName, args)); - output.flush(); - result = waitForResult(false); - - // result caching for selected methods - if ((args == null || args.length == 0) && cachedMethodNames.contains(methodName)) { - cache.put(methodName, result); - } - return result; - } catch (Throwable t) { - t.printStackTrace(); - throw t; - } finally { - if (DEBUG) { - Logger.endScope(" = " + result); - } - } - } - } - - /** - * Waits for the result of a remote method invocation. Invocations that should be executed in - * this VM might arrive while waiting for the result, and these invocations will be executed - * before again waiting fort he result. - */ - @SuppressWarnings("unused") - public Object waitForResult(boolean eofExpected) throws IOException, ClassNotFoundException { - while (true) { - Object in; - try { - in = input.readObject(); - } catch (EOFException e) { - if (eofExpected) { - return null; - } - throw e; - } - if (in instanceof Result) { - return ((Result) in).result; - } else if (in instanceof RuntimeException) { - throw (RuntimeException) in; - } else if (in instanceof Throwable) { - throw new RuntimeException((Throwable) in); - } - - Invocation invoke = (Invocation) in; - Method method = null; - for (Class clazz = invoke.receiver.getClass(); clazz != null; clazz = clazz.getSuperclass()) { - for (Method m : clazz.getDeclaredMethods()) { - if (invoke.methodName.equals(m.getName())) { - method = m; - break; - } - } - } - if (method == null) { - Exception e = new UnsupportedOperationException("unknown method " + invoke.methodName); - e.printStackTrace(); - output.writeObject(e); - output.flush(); - } else { - Object result = null; - try { - if (invoke.args == null) { - if (DEBUG) { - Logger.startScope("invoking local " + invoke.methodName); - } - result = method.invoke(invoke.receiver); - } else { - if (Logger.ENABLED && DEBUG) { - StringBuilder str = new StringBuilder(); - str.append("invoking local " + invoke.methodName + "("); - for (int i = 0; i < invoke.args.length; i++) { - str.append(i == 0 ? "" : ", "); - str.append(Logger.pretty(invoke.args[i])); - } - str.append(")"); - Logger.startScope(str.toString()); - } - result = method.invoke(invoke.receiver, invoke.args); - } - result = new Result(result); - } catch (IllegalArgumentException e) { - TTY.println("error while invoking " + invoke.methodName); - e.getCause().printStackTrace(); - result = e.getCause(); - } catch (InvocationTargetException e) { - TTY.println("error while invoking " + invoke.methodName); - e.getCause().printStackTrace(); - result = e.getCause(); - } catch (IllegalAccessException e) { - TTY.println("error while invoking " + invoke.methodName); - e.getCause().printStackTrace(); - result = e.getCause(); - } finally { - if (DEBUG) { - if (result instanceof Result) { - Logger.endScope(" = " + ((Result) result).result); - } else { - Logger.endScope(" = " + result); - } - } - } - output.writeObject(result); - output.flush(); - } - } - } - - /** - * Sends a result without invoking a method, used by CompilationServer startup code. - */ - public void sendResult(Object obj) throws IOException { - output.writeObject(new Result(obj)); - output.flush(); - } - // CheckStyle: resume system..print check -} diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/Remote.java --- a/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/Remote.java Mon May 18 13:47:45 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.hotspot.server; - -public interface Remote { - -} diff -r 84b3d688ea83 -r 082417ac43e4 graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/ReplacingStreams.java --- a/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/ReplacingStreams.java Mon May 18 13:47:45 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,185 +0,0 @@ -/* - * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.hotspot.server; - -import static com.oracle.graal.graph.util.CollectionsAccess.*; - -import java.io.*; -import java.lang.reflect.*; -import java.util.*; - -import com.oracle.graal.api.meta.*; -import com.oracle.graal.hotspot.logging.*; - -public class ReplacingStreams { - - private Map objectMap = newIdentityMap(); - private ArrayList