# HG changeset patch
# User Will Droste <william.droste@pace.com>
# Date 1415047615 21600
#      Mon Nov 03 14:46:55 2014 -0600
# Branch remove_locks
# Node ID 455923057c52d20a46aa4d8b0119033157d56f28
# Parent  3d2dbae23c5292b7f31ac4c92fa6d1afd8bd8eb2
Added high-scale-lib and then converted to using NonBlockingIdentityHashmap to reduce blocking in high multi-core applications

diff -r 3d2dbae23c52 -r 455923057c52 .hgignore
--- a/.hgignore	Mon Aug 13 13:49:48 2012 -0700
+++ b/.hgignore	Mon Nov 03 14:46:55 2014 -0600
@@ -28,3 +28,4 @@
 cachedir
 dist
 profile.txt
+.idea
diff -r 3d2dbae23c52 -r 455923057c52 build.xml
--- a/build.xml	Mon Aug 13 13:49:48 2012 -0700
+++ b/build.xml	Mon Nov 03 14:46:55 2014 -0600
@@ -186,6 +186,9 @@
             <pathelement path="${extlibs.dir}/stringtemplate-3.2.jar" />
             <pathelement path="${extlibs.dir}/livetribe-jsr223-2.0.5.jar" />
 
+            <!-- Used for PyType Scale -->
+            <pathelement path="${extlibs.dir}/high-scale-lib-1.0.6.jar" />
+
             <pathelement path="${extlibs.dir}/asm-3.1.jar" />
             <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
             <pathelement path="${extlibs.dir}/constantine.jar" />
@@ -656,6 +659,7 @@
             <rule pattern="org.apache.wml.**" result="org.python.apache.wml.@1"/>
             <rule pattern="org.apache.html.**" result="org.python.apache.html.@1"/>
             <zipfileset src="extlibs/jline-0.9.95-SNAPSHOT.jar"/>
+            <zipfileset src="extlibs/high-scale-lib-1.0.6.jar" />
             <!--
             <rule pattern="jline.**" result="org.python.jline.@1"/>
             -->
diff -r 3d2dbae23c52 -r 455923057c52 extlibs/high-scale-lib-1.0.6.jar
Binary file extlibs/high-scale-lib-1.0.6.jar has changed
diff -r 3d2dbae23c52 -r 455923057c52 src/org/python/core/PyType.java
--- a/src/org/python/core/PyType.java	Mon Aug 13 13:49:48 2012 -0700
+++ b/src/org/python/core/PyType.java	Mon Nov 03 14:46:55 2014 -0600
@@ -11,6 +11,8 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
+import org.cliffc.high_scale_lib.NonBlockingHashSet;
+import org.cliffc.high_scale_lib.NonBlockingIdentityHashMap;
 import org.python.expose.ExposeAsSuperclass;
 import org.python.expose.ExposedDelete;
 import org.python.expose.ExposedGet;
@@ -102,7 +104,7 @@
     private static Set<PyType> exposedTypes;
     
     /** Mapping of Java classes to their TypeBuilders. */
-    private static Map<Class<?>, TypeBuilder> classToBuilder;
+    private static Map<Class<?>, TypeBuilder> classToBuilder = new NonBlockingIdentityHashMap<Class<?>, TypeBuilder>();
 
     protected PyType(PyType subtype) {
         super(subtype);
@@ -1271,13 +1273,13 @@
     // are themselves synchronized. However, if we use Google Collections/Guava,
     // MapMaker only uses ConcurrentMap anyway
 
-    public static synchronized PyType fromClass(Class<?> c) {
+    public static PyType fromClass(Class<?> c) {
         return fromClass(c, true);
     }
 
-    public static synchronized PyType fromClass(Class<?> c, boolean hardRef) {
-        if (class_to_type == null) {
-            class_to_type = new MapMaker().weakKeys().weakValues().makeMap();
+    public static PyType fromClass(Class<?> c, boolean hardRef) {
+        if (null == class_to_type) {
+            class_to_type = new NonBlockingIdentityHashMap<Class<?>, PyType>();
             addFromClass(PyType.class, null);
         }
         PyType type = class_to_type.get(c);
@@ -1311,8 +1313,8 @@
             }
         }
         if (hardRef && result != null) {
-            if (exposedTypes == null) {
-                exposedTypes = Generic.set();
+            if (null == exposedTypes) {
+                exposedTypes = new NonBlockingHashSet<PyType>();
             }
             exposedTypes.add(result) ;
         }