Skip to content

Commit

Permalink
Merge branch 'master' into forstowhiles
Browse files Browse the repository at this point in the history
  • Loading branch information
alcides committed Mar 6, 2012
2 parents 30c36bf + 11a0962 commit 8cc6336
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
!/compiler/
!/runtime/
!/tests/
!/signatures/
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<!-- aeminium.runtime -->
<property name="runtime.dir" value="runtime/src" />
<property name="runtime.jar" value="runtime/AeminiumRuntime.jar" />
<property name="runtime.jar" value="runtime/dist/AeminiumRuntime.jar" />

<!-- aeminium.tests -->
<property name="tests.src.dir" value="tests/src" />
Expand Down Expand Up @@ -66,7 +66,7 @@
</target>

<target name="compile.runtime" depends="">
<ant dir="runtime" target="jar-release"/>
<ant dir="runtime" target="jar"/>
</target>

<target name="translate.tests" depends="compile.compiler,compile.runtime">
Expand Down
2 changes: 1 addition & 1 deletion runtime
Submodule runtime updated 32 files
+0 −2 .classpath
+0 −1 .gitignore
+3 −2 aeminiumrt.config
+75 −73 build.xml
+ lib/api.jar
+ lib/apisrc.jar
+0 −11 src/aeminium/runtime/Profiler.java
+0 −1 src/aeminium/runtime/Task.java
+77 −20 src/aeminium/runtime/examples/SimpleTest.java
+0 −104 src/aeminium/runtime/examples/SimpleTestOriginal.java
+3 −32 src/aeminium/runtime/implementations/implicitworkstealing/ImplicitWorkStealingRuntime.java
+5 −69 src/aeminium/runtime/implementations/implicitworkstealing/graph/ImplicitGraph.java
+1 −5 src/aeminium/runtime/implementations/implicitworkstealing/scheduler/BlockingThreadPool.java
+5 −63 src/aeminium/runtime/implementations/implicitworkstealing/scheduler/BlockingWorkStealingScheduler.java
+0 −79 src/aeminium/runtime/implementations/implicitworkstealing/scheduler/WorkStealingThread.java
+2 −2 src/aeminium/runtime/implementations/implicitworkstealing/task/ImplicitAtomicTask.java
+2 −2 src/aeminium/runtime/implementations/implicitworkstealing/task/ImplicitBlockingTask.java
+2 −2 src/aeminium/runtime/implementations/implicitworkstealing/task/ImplicitNonBlockingTask.java
+37 −115 src/aeminium/runtime/implementations/implicitworkstealing/task/ImplicitTask.java
+0 −1 src/aeminium/runtime/implementations/implicitworkstealing/task/ImplicitTaskState.java
+0 −30 src/aeminium/runtime/profiler/AeminiumProbeProvider.java
+0 −19 src/aeminium/runtime/profiler/AeminiumProfiler.java
+0 −102 src/aeminium/runtime/profiler/CountersProbe.java
+0 −39 src/aeminium/runtime/profiler/DataCollection.java
+0 −150 src/aeminium/runtime/profiler/TaskDetailsProbe.java
+0 −27 src/aeminium/runtime/profiler/TaskInfo.java
+0 −27 src/aeminium/runtime/profiler/TaskInfoSaved.java
+0 −37 src/aeminium/runtime/profiler/interceptorTests/InterceptorLauncher.java
+0 −74 src/aeminium/runtime/profiler/interceptorTests/MethodProbe.java
+0 −18 src/aeminium/runtime/profiler/interceptorTests/TestProbeProvider.java
+0 −103 src/aeminium/runtime/tests/FibonnaciGetless.java
+0 −84 src/aeminium/runtime/tools/benchmark/AeminiumFibonacci.java
47 changes: 47 additions & 0 deletions signatures/signatures
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
9
Ljava/lang/Math;.cos(D)D
2
R P 0
W R

Ljava/lang/Math;.sin(D)D
2
R P 0
W R

Ljava/lang/Math;.hypot(DD)D
2
R P 0
W R

Ljava/lang/Math;.atan2(DD)D
2
R P 0
W R

Ljava/lang/Math;.exp(D)D
2
R P 0
W R

Ljava/lang/Math;.cosh(D)D
2
R P 0
W R

Ljava/lang/Math;.sinh(D)D
2
R P 0
W R

Ljava/util/Random;.nextDouble()D
3
R T
W T
W R

Ljava/io/PrintStream;.println(Ljava/lang/Object;)V
2
R P 0
W T

0 comments on commit 8cc6336

Please sign in to comment.