From 1dcea1fae0137f683cdc7e1f0c60a19812df576d Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Thu, 21 Jul 2011 02:18:10 +0000
Subject: [PATCH] large raytracer changes from jin + join hack

---
 .../GC/NON_BAMBOO/RayTracer/RayTracer.java    |  8 +++----
 .../GC/NON_BAMBOO/RayTracer/TestRunner.p      | 21 +++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/RayTracer.java b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/RayTracer.java
index 2cb307e8..73b33092 100644
--- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/RayTracer.java
+++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/RayTracer.java
@@ -109,9 +109,9 @@ public class RayTracer extends Thread {
     /* create spheres */
 
     Primitive p;
-    int nx = 4; // 6
-    int ny = 4; // 6
-    int nz = 4; // 6
+    int nx = 6; // 4
+    int ny = 6; // 4
+    int nz = 6; // 4
     for (int i = 0; i < nx; i++) {
       for (int j = 0; j < ny; j++) {
         for (int k = 0; k < nz; k++) {
@@ -233,7 +233,7 @@ public class RayTracer extends Thread {
         row[x]= alpha | (red << 16) | (green << 8) | (blue);
       } // end for (x)
 
-      image[y-interval.yfrom]=row;
+      image[y]=row;
     } // end for (y)
 
 
diff --git a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.p b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.p
index cad0d920..6224535f 100644
--- a/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.p
+++ b/Robust/src/Benchmarks/Scheduling/GC/NON_BAMBOO/RayTracer/TestRunner.p
@@ -15,12 +15,13 @@ public class TestRunner extends RayTracer {
   public TestRunner(int id, 
       int numCore,
       int size,
+      int image[][],					
       Scene scene) {
     super();
     this.id = id;
     this.numCore = numCore;
     this.size = size;
-
+    this.image=image;
     // create the objects to be rendered
     this.scene = scene; //createScene();
 
@@ -40,7 +41,7 @@ public class TestRunner extends RayTracer {
   }
 
   public void init() {
-    this.image=new int[this.size/this.numCore][];
+
   }
 
   public void JGFvalidate() {
@@ -84,9 +85,17 @@ public class TestRunner extends RayTracer {
     Composer comp = new Composer(threadnum, size);
     RayTracer rt = new RayTracer();
     Scene scene = rt.createScene();
-    for(int i = 0; i < threadnum; ++i) {
-      TestRunner tr = new TestRunner(i, threadnum, size, scene);
+    int image[][]=new int[size][];
+    TestRunner trarray[]=new TestRunner[threadnum];					 
+    for(int i = 1; i < threadnum; ++i) {
+      TestRunner tr = new TestRunner(i, threadnum, size, image, scene);
       tr.start();
-    }
-  }
+				       trarray[i]=tr;
+				       }
+             TestRunner tr0 = new TestRunner(0, threadnum, size, image, scene);
+      tr0.run();
+    for(int i = 1; i < threadnum; ++i) {
+				       trarray[i].join();
+				       }
+}
 }
-- 
2.34.1