Commit efce5bcf authored by Vít Kabele's avatar Vít Kabele

shvm extracted from shvm-server

parent 2916ed9f
Pipeline #4616 passed with stages
in 4 minutes and 3 seconds
......@@ -24,7 +24,6 @@
<classpathentry kind="src" path="disl/src/src-annotation"/>
<classpathentry kind="src" path="disl/src/src-context"/>
<classpathentry kind="src" path="disl/src-test"/>
<classpathentry kind="src" path="shvm/src/src-dislreserver"/>
<classpathentry kind="src" path="shvm/src/src-msg-analyze"/>
<classpathentry kind="src" path="shvm/src/src-msg-instr"/>
<classpathentry kind="src" path="shvm/src/src-msg-analyze-mtdispatch"/>
......@@ -34,7 +33,7 @@
<classpathentry kind="src" path="shvm/src/src-util"/>
<classpathentry kind="src" path="shvm/src/src-server-api"/>
<classpathentry kind="src" path="shvm/src-test"/>
<classpathentry kind="src" path="shvm/src/src-proto"/>
<classpathentry kind="src" path="shvm-server/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="output/lib/disl-bypass.jar"/>
<classpathentry kind="lib" path="lib/disl/log4j.jar" sourcepath="lib/devel/log4j-source.jar"/>
......
......@@ -273,6 +273,10 @@
<pathelement location="${src.disl-server.prefix}/${build.disl-server}"/>
</path>
<path id="shvm-server.classpath">
<pathelement location="${src.shvm-server.prefix}/${build.shvm-server}"/>
</path>
<path id="disl.bypass.classpath">
<pathelement location="${build.disl.bypass}/dynamic"/>
</path>
......@@ -638,8 +642,8 @@
<target name="build-shvm" depends="compile-shvm,build-shvm-dispatch">
<ant antfile="${src.shvm.prefix}/build.xml" target="build" usenativebasedir="true"/>
<copy file="${src.shvm.prefix}/${out.lib}/${shvm.lib}" tofile="${out.lib}/${shvm.lib}" />
<ant antfile="${src.shvm-server.prefix}/build.xml" target="build" usenativebasedir="true"/>
<copy file="${src.shvm-server.prefix}/${out.lib}/${shvm-server.lib}" tofile="${out.lib}/${shvm-server.lib}" />
</target>
<!-- Shadow VM agent -->
......@@ -663,6 +667,7 @@
<path refid="disl.classpath"/>
<path refid="disl-server.classpath"/>
<path refid="shvm.classpath"/>
<path refid="shvm-server.classpath"/>
<path refid="junit.classpath"/>
<path refid="asm.classpath"/>
</path>
......@@ -824,6 +829,7 @@
<pathelement location="${build.test}"/>
<pathelement location="${build.util}"/>
<pathelement location="${src.disl-server.prefix}/${build.disl-server}" />
<pathelement location="${src.shvm-server.prefix}/${build.shvm-server}" />
<pathelement location="${src.disl.prefix}/${build.disl}"/>
<pathelement location="${src.shvm.prefix}/${build.shvm}" />
</classpath>
......
......@@ -19,9 +19,10 @@ src.bin=bin
src.disl.prefix=disl
src.disl-server.prefix=disl-server
src.shvm.prefix=shvm
src.shvm-server.prefix=shvm-server
disl.lib=disl-server.jar
shvm.lib=dislre-server.jar
shvm-server.lib=dislre-server.jar
# Base output directory
out.dir=output
......@@ -42,7 +43,9 @@ build.disl=${build.dir}/disl
build.disl-server=${build.dir}/disl-server
build.disl.thread=${build.disl}-thread
build.disl.bypass=${build.disl}-bypass
build.shvm=${build.dir}/shvm
build.shvm-server=${build.dir}/shvm-server
build.shvm.dispatch=${build.shvm}-dispatch
build.test=${build.dir}/test
build.doc.intro=${build.dir}/intro
......
<project name="shvm-server" default="build" basedir=".">
<!--
Import required property files.
-->
<property file="../common.properties"/>
<property file="build.properties" />
<property file="../disl.version.properties" />
<!--
Initialize the build directory
-->
<target name="init">
<mkdir dir="${build.shvm-server}" />
</target>
<!--
Dependency class paths
-->
<path id="asm.classpath">
<fileset dir="../${lib.disl.dir}" includes="asm*.jar" id="asm.fileset"/>
</path>
<path id="util.classpath">
<pathelement location="../${build.util}"/>
</path>
<path id="protobuf.classpath">
<fileset dir="../${lib.disl.dir}" includes="protobuf*.jar"/>
</path>
<!--
Refer to the parent targets
-->
<target name="compile-util">
<ant antfile="../build.xml" target="compile-util" usenativebasedir="true" />
</target>
<target name="compile-shvm-dispatch">
<ant antfile="../build.xml" target="compile-shvm-dispatch" usenativebasedir="true" />
</target>
<target name="build-shvm-dispatch">
<ant antfile="../build.xml" target="build-shvm-dispatch" usenativebasedir="true" />
</target>
<target name="compile-shvm">
<ant antfile="../build.xml" target="compile-shvm" usenativebasedir="true" />
</target>
<!-- SHVM Server -->
<target name="compile" depends="compile-shvm,compile-util,compile-shvm-dispatch,init">
<javac destdir="${build.shvm-server}" debug="true" srcdir="src/">
<classpath>
<path path="../${src.shvm.prefix}/${build.shvm}" />
<path refid="util.classpath"/>
<path refid="asm.classpath" />
<path refid="protobuf.classpath"/>
</classpath>
</javac>
</target>
<!-- Get ASM libs from ASM class path. -->
<pathconvert pathsep=" " property="asm.libs" refid="asm.classpath">
<mapper type="flatten"/>
</pathconvert>
<!-- Get ProtoBuf Java libs from ProtoBuf class path. -->
<pathconvert pathsep=" " property="protobuf.libs" refid="protobuf.classpath">
<mapper type="flatten"/>
</pathconvert>
<target name="build" depends="compile, build-shvm-dispatch">
<jar destfile="${out.lib}/${shvm-server.lib}">
<manifest>
<attribute name="Class-Path" value="${asm.libs} ${protobuf.libs}"/>
<attribute name="Main-Class" value="ch.usi.dag.dislreserver.DiSLREServer"/>
<attribute name="DiSL-Version" value="${disl.version}"/>
</manifest>
<fileset dir="${build.shvm-server}" />
<fileset dir="../${src.shvm.prefix}/${build.shvm}" />
<fileset dir="../${build.util}"/>
</jar>
</target>
<!--
Clean the build directory
-->
<target name="clean">
<delete dir="${out.dir}" />
</target>
</project>
<project name="disl-server" default="build" basedir=".">
<project name="shvm" default="compile" basedir=".">
<!--
Import required property files.
......@@ -7,14 +7,6 @@
<property file="build.properties" />
<property file="../disl.version.properties" />
<!--
Initialize the build directory
-->
<target name="init">
<mkdir dir="${build.shvm}" />
<mkdir dir="${build.shvm.test}" />
</target>
<!--
Dependency class paths
-->
......@@ -29,9 +21,13 @@
<fileset dir="../${lib.test.dir}" includes="*.jar"/>
</path>
<path id="protobuf.classpath">
<fileset dir="../${lib.disl.dir}" includes="protobuf*.jar"/>
</path>
<!--
Initialize the build directory
-->
<target name="init">
<mkdir dir="${build.shvm}" />
<mkdir dir="${build.shvm.test}" />
</target>
<!--
Refer to the parent targets
......@@ -44,18 +40,12 @@
<ant antfile="../build.xml" target="compile-shvm-dispatch" usenativebasedir="true" />
</target>
<target name="build-shvm-dispatch">
<ant antfile="../build.xml" target="build-shvm-dispatch" usenativebasedir="true" />
</target>
<!-- SHVM Server -->
<!-- SHVM Object Model -->
<target name="compile" depends="compile-util,compile-shvm-dispatch,init">
<javac destdir="${build.shvm}" debug="true">
<src path="src/src-dislreserver" />
<src path="src/src-msg-analyze" />
<src path="src/src-msg-analyze-mtdispatch" />
<src path="src/src-proto" />
<src path="src/src-remoteanalysis" />
<src path="src/src-reqdispatch" />
<src path="src/src-server-api" />
......@@ -66,37 +56,10 @@
<path path="../${src.shvm.prefix}/${build.shvm}" />
<path refid="util.classpath"/>
<path refid="asm.classpath" />
<path refid="protobuf.classpath"/>
</classpath>
</javac>
</target>
<!-- Get ASM libs from ASM class path. -->
<pathconvert pathsep=" " property="asm.libs" refid="asm.classpath">
<mapper type="flatten"/>
</pathconvert>
<!-- Get ProtoBuf Java libs from ProtoBuf class path. -->
<pathconvert pathsep=" " property="protobuf.libs" refid="protobuf.classpath">
<mapper type="flatten"/>
</pathconvert>
<target name="build" depends="compile, build-shvm-dispatch">
<jar destfile="${out.lib}/${shvm.lib}">
<manifest>
<attribute name="Class-Path" value="${asm.libs} ${protobuf.libs}"/>
<attribute name="Main-Class" value="ch.usi.dag.dislreserver.DiSLREServer"/>
<attribute name="DiSL-Version" value="${disl.version}"/>
</manifest>
<service type="javax.annotation.processing.Processor" provider="ch.usi.dag.disl.DislClassFinder"/>
<fileset dir="${build.shvm}" />
<fileset dir="../${build.util}"/>
</jar>
</target>
<target name="compile-tests" depends="compile">
<javac destdir="${build.shvm.test}" debug="true" srcdir="${src.shvm.test}" includeantruntime="false">
<classpath>
......@@ -134,7 +97,7 @@
Clean the build directory
-->
<target name="clean">
<delete dir="output" />
<delete dir="${out.dir}" />
</target>
</project>
package ch.usi.dag.dislreserver;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.LinkedList;
......@@ -9,7 +8,6 @@ import java.util.List;
import ch.usi.dag.dislreserver.AnalysisResolver.AnalysisMethodHolder;
import ch.usi.dag.dislreserver.shadow.ShadowObject;
import ch.usi.dag.dislreserver.shadow.ShadowObjectTable;
import ch.usi.dag.util.logging.Logger;
......
......@@ -116,11 +116,11 @@ final class AnalysisResolver {
}
catch (ClassNotFoundException e) {
throw new DiSLREServerException(e);
throw new DiSLREServerException (e);
} catch (InstantiationException e) {
throw new DiSLREServerException(e);
throw new DiSLREServerException (e);
} catch (IllegalAccessException e) {
throw new DiSLREServerException(e);
throw new DiSLREServerException (e);
}
}
......
......@@ -3,7 +3,6 @@ package ch.usi.dag.dislreserver;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import ch.usi.dag.dislreserver.DiSLREServerException;
public interface RequestHandler {
......
......@@ -15,7 +15,7 @@ public final class Logging {
* Package name of the framework entry class.
*/
private static final String
__OLD_PREFIX__ = DiSLREServer.class.getPackage ().getName ();
__OLD_PREFIX__ = SHVM.class.getPackage ().getName ();
/**
* Default prefix for top-level logs.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment