fix field handling

Sam Pullara · Sam Pullara · commit 5e42940579e4 · 2012-01-17T10:27:48.000-08:00
diff --git a/indy/src/main/java/com/github/mustachejava/indy/IndyWrapper.java b/indy/src/main/java/com/github/mustachejava/indy/IndyWrapper.java
@@ -112,7 +112,11 @@ public static Object lookup(MutableCallSite callSite, IndyWrapper iw, Object sco
     Method method = iw.getMethod();
     if (method == null) {
       Field field = iw.getField();
-      callSite.setTarget(MethodHandles.lookup().unreflectGetter(field));
+      MethodHandle unreflect = MethodHandles.lookup().unreflectGetter(field);
+      unreflect = MethodHandles.dropArguments(unreflect, 0, IndyWrapper.class);
+      unreflect = MethodHandles.explicitCastArguments(unreflect,
+              MethodType.methodType(Object.class, IndyWrapper.class, Object.class));
+      callSite.setTarget(unreflect);
       return field.get(scope);
     } else {
       MethodHandle unreflect = MethodHandles.lookup().unreflect(method);
@@ -122,7 +126,8 @@ public static Object lookup(MutableCallSite callSite, IndyWrapper iw, Object sco
           unreflect = MethodHandles.insertArguments(unreflect, i + 2, iw.getArguments()[i]);
         }
       }
-      unreflect = MethodHandles.explicitCastArguments(unreflect, MethodType.methodType(Object.class, IndyWrapper.class, Object.class));
+      unreflect = MethodHandles.explicitCastArguments(unreflect,
+              MethodType.methodType(Object.class, IndyWrapper.class, Object.class));
       callSite.setTarget(unreflect);
       return method.invoke(scope, iw.getArguments());
     }
diff --git a/indy/src/test/java/com/github/mustachejava/JsonInterpreterTest.java b/indy/src/test/java/com/github/mustachejava/JsonInterpreterTest.java
@@ -0,0 +1,220 @@
+package com.github.mustachejava;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.github.mustachejava.indy.IndyObjectHandler;
+import junit.framework.TestCase;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.MappingJsonFactory;
+
+/**
+ * Tests for the compiler.
+ * <p/>
+ * User: sam
+ * Date: May 3, 2010
+ * Time: 10:23:54 AM
+ */
+public class JsonInterpreterTest extends TestCase {
+  private static final int TIME = 2;
+
+  private File root;
+
+  public Object toObject(final JsonNode node) {
+    if (node.isArray()) {
+      return new ArrayList() {{
+        for (JsonNode jsonNodes : node) {
+          add(toObject(jsonNodes));
+        }
+      }};
+    } else if (node.isObject()) {
+      return new HashMap() {{
+        for (Iterator<Map.Entry<String, JsonNode>> i = node.getFields(); i.hasNext(); ) {
+          Map.Entry<String, JsonNode> next = i.next();
+          Object o = toObject(next.getValue());
+          put(next.getKey(), o);
+        }
+      }};
+    } else if (node.isNull()) {
+      return null;
+    } else {
+      return node.asText();
+    }
+  }
+
+  public void testSingleThreaded() throws MustacheException, IOException, InterruptedException {
+    final Mustache parse = getMustache();
+    final Object parent = getScope();
+
+    singlethreaded(parse, parent);
+  }
+
+  public void testMultithreaded() throws IOException, InterruptedException {
+    final Mustache parse = getMustache();
+    final Object parent = getScope();
+
+    final AtomicInteger runs = new AtomicInteger(0);
+    ExecutorService es = Executors.newCachedThreadPool();
+    int range = (int) Math.round(Runtime.getRuntime().availableProcessors() * 1.5 + 1);
+    for (int threads = 1; threads < range; threads++) {
+      final Semaphore semaphore = new Semaphore(threads);
+      {
+        long start = System.currentTimeMillis();
+        while (true) {
+          semaphore.acquire();
+          es.submit(new Runnable() {
+            @Override
+            public void run() {
+              parse.execute(new NullWriter(), new Object[] { parent });
+              runs.incrementAndGet();
+              semaphore.release();
+            }
+          });
+          if (System.currentTimeMillis() - start > TIME * 1000) {
+            break;
+          }
+        }
+        System.out.println("NullWriter Serial with " + threads + " threads: " + runs.intValue() / TIME + "/s " + " per thread: " + (runs.intValue() / TIME / threads));
+        runs.set(0);
+        Thread.sleep(100);
+      }
+    }
+  }
+
+  private Object getScope() throws IOException {
+    MappingJsonFactory jf = new MappingJsonFactory();
+    InputStream json = getClass().getClassLoader().getResourceAsStream("hogan.json");
+    final Map node = (Map) toObject(jf.createJsonParser(json).readValueAsTree());
+    System.out.println(node);
+    return new Object() {
+      int uid = 0;
+      List tweets = new ArrayList() {{
+        for (int i = 0; i < 50; i++) {
+          add(node);
+        }
+      }};
+    };
+  }
+
+  private Mustache getMustache() {
+    DefaultMustacheFactory mb = new DefaultMustacheFactory(root);
+    mb.setObjectHandler(new IndyObjectHandler());
+    final Mustache parse = mb.compile("timeline.mustache");
+    mb.compile("timeline.mustache");
+    return parse;
+  }
+
+  private void singlethreaded(Mustache parse, Object parent) {
+    long start = System.currentTimeMillis();
+    System.out.println(System.currentTimeMillis() - start);
+    start = System.currentTimeMillis();
+    StringWriter writer = new StringWriter();
+    parse.execute(writer, parent);
+
+    start = System.currentTimeMillis();
+    for (int i = 0; i < 500; i++) {
+      parse.execute(new StringWriter(), parent);
+    }
+    System.out.println((System.currentTimeMillis() - start));
+
+    start = System.currentTimeMillis();
+    for (int i = 0; i < 500; i++) {
+      parse.execute(new StringWriter(), parent);
+    }
+    System.out.println((System.currentTimeMillis() - start));
+
+    start = System.currentTimeMillis();
+    for (int i = 0; i < 500; i++) {
+      parse.execute(new StringWriter(), parent);
+    }
+    System.out.println((System.currentTimeMillis() - start));
+
+    System.out.println("timeline.html evaluations per millisecond:");
+    for (int i = 0; i < 2; i++) {
+      {
+        start = System.currentTimeMillis();
+        int total = 0;
+        while (true) {
+          parse.execute(new NullWriter(), parent);
+          total++;
+          if (System.currentTimeMillis() - start > TIME * 1000) break;
+        }
+        System.out.println("NullWriter Serial: " + total / TIME + "/s");
+      }
+      {
+        start = System.currentTimeMillis();
+        int total = 0;
+        while (true) {
+          parse.execute(new StringWriter(), parent);
+          total++;
+          if (System.currentTimeMillis() - start > TIME * 1000) break;
+        }
+        System.out.println("StringWriter Serial: " + total / TIME + "/s");
+      }
+    }
+  }
+
+  static class NullWriter extends Writer {
+    @Override
+    public void write(int c) throws IOException {
+    }
+
+    @Override
+    public void write(char[] cbuf) throws IOException {
+    }
+
+    @Override
+    public void write(String str) throws IOException {
+    }
+
+    @Override
+    public void write(String str, int off, int len) throws IOException {
+    }
+
+    @Override
+    public Writer append(CharSequence csq) throws IOException {
+      return this;
+    }
+
+    @Override
+    public Writer append(CharSequence csq, int start, int end) throws IOException {
+      return this;
+    }
+
+    @Override
+    public Writer append(char c) throws IOException {
+      return this;
+    }
+
+    @Override
+    public void write(char[] cbuf, int off, int len) throws IOException {
+    }
+
+    @Override
+    public void flush() throws IOException {
+    }
+
+    @Override
+    public void close() throws IOException {
+    }
+  }
+
+  protected void setUp() throws Exception {
+    super.setUp();
+    File file = new File("src/test/resources");
+    root = new File(file, "simple.html").exists() ? file : new File("../src/test/resources");
+  }
+
+}
