Added comment to performance test.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@23 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/guice.ipr b/guice.ipr
index 0bed8d0..b7a3645 100644
--- a/guice.ipr
+++ b/guice.ipr
@@ -6,11 +6,11 @@
<component name="Build editor project-level loader">
<settings>
<class-settings class="com.google.devtools.intellig.configcheck.ProjectPathChecker" />
+ <class-settings class="com.google.devtools.intellig.configcheck.PythonSdkChecker" />
<class-settings class="com.google.devtools.intellig.configcheck.ProjectJdkChecker">
<setting name="getProjectJdk" value="/usr/local/buildtools/java/jdk1.5.0_06" />
<setting name="getModuleJdks" value="rO0ABXNyABFqYXZhLnV0aWwuSGFzaFNldLpEhZWWuLc0AwAAeHB3DAAAABA/QAAAAAAAAHg=" />
</class-settings>
- <class-settings class="com.google.devtools.intellig.configcheck.PythonSdkChecker" />
<class-settings class="com.google.devtools.intellig.configcheck.ClearOutputChecker" />
</settings>
</component>
diff --git a/guice.iws b/guice.iws
index 408c554..db5ef13 100644
--- a/guice.iws
+++ b/guice.iws
@@ -18,11 +18,9 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java" afterPath="$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.ipr" afterPath="$PROJECT_DIR$/guice.ipr" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.iml" afterPath="$PROJECT_DIR$/guice.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/guice.iws" afterPath="$PROJECT_DIR$/guice.iws" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java" afterPath="$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -195,7 +193,7 @@
<file leaf-file-name="ContainerImpl.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="483" column="19" selection-start="16109" selection-end="16109" vertical-scroll-proportion="0.8813097">
+ <state line="483" column="19" selection-start="16109" selection-end="16109" vertical-scroll-proportion="0.016236868">
<folding />
</state>
</provider>
@@ -204,7 +202,7 @@
<file leaf-file-name="FastClass.class" pinned="false" current="false" current-in-tab="false">
<entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastClass.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="47" selection-start="386" selection-end="386" vertical-scroll-proportion="0.26044568">
+ <state line="12" column="47" selection-start="386" selection-end="386" vertical-scroll-proportion="0.016472869">
<folding />
</state>
</provider>
@@ -213,7 +211,7 @@
<file leaf-file-name="AllTests.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/com/google/inject/AllTests.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="3" selection-start="950" selection-end="950" vertical-scroll-proportion="0.18553889">
+ <state line="28" column="3" selection-start="950" selection-end="950" vertical-scroll-proportion="0.12989494">
<folding />
</state>
</provider>
@@ -222,7 +220,7 @@
<file leaf-file-name="SpringPerformanceComparison.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="109" column="15" selection-start="3779" selection-end="3779" vertical-scroll-proportion="0.44065484">
+ <state line="33" column="36" selection-start="1297" selection-end="1297" vertical-scroll-proportion="0.1461318">
<folding />
</state>
</provider>
@@ -231,7 +229,7 @@
<file leaf-file-name="Scoped.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/google/inject/Scoped.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.32469305">
+ <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.22731614">
<folding />
</state>
</provider>
@@ -240,7 +238,7 @@
<file leaf-file-name="FastMethod.class" pinned="false" current="false" current-in-tab="false">
<entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastMethod.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="158" selection-end="158" vertical-scroll-proportion="0.09470752">
+ <state line="5" column="13" selection-start="158" selection-end="158" vertical-scroll-proportion="0.065891474">
<folding />
</state>
</provider>
@@ -441,14 +439,14 @@
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
+ <navigator currentView="PackagesPane" proportions="0.16666667" version="1" splitterProportion="0.5">
<flattenPackages PackagesPane="true" />
<showMembers />
<showModules PackagesPane="false" />
<showLibraryContents PackagesPane="false" />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -523,12 +521,18 @@
<option name="Make" value="true" />
</method>
</tempConfiguration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="" />
+ <method>
+ <option name="Make" value="true" />
+ </method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
@@ -561,18 +565,12 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
- <method>
- <option name="Make" value="true" />
- </method>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
</configuration>
<configuration default="false" name="SpringPerformanceComparison" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" value="com.google.inject.SpringPerformanceComparison" />
@@ -674,14 +672,14 @@
</component>
<component name="ToolWindowManager">
<frame x="4" y="44" width="1916" height="1156" extended-state="0" />
- <editor active="false" />
+ <editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3336904" order="3" />
<window_info id="Mach" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32919848" order="9" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15854311" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15854311" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29517502" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16236559" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27909178" order="10" />
@@ -692,7 +690,7 @@
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.14623655" order="1" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3282876" order="8" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29044464" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29044464" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39978448" order="0" />
@@ -854,44 +852,44 @@
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastMethod.class">
+ <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="158" selection-end="158" vertical-scroll-proportion="0.09470752">
+ <state line="483" column="19" selection-start="16109" selection-end="16109" vertical-scroll-proportion="0.016236868">
<folding />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastClass.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="47" selection-start="386" selection-end="386" vertical-scroll-proportion="0.26044568">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/com/google/inject/ContainerImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="483" column="19" selection-start="16109" selection-end="16109" vertical-scroll-proportion="0.8813097">
+ <state line="12" column="47" selection-start="386" selection-end="386" vertical-scroll-proportion="0.016472869">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/com/google/inject/AllTests.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="3" selection-start="950" selection-end="950" vertical-scroll-proportion="0.18553889">
+ <state line="28" column="3" selection-start="950" selection-end="950" vertical-scroll-proportion="0.12989494">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/google/inject/Scoped.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.32469305">
+ <state line="31" column="18" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.22731614">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/net/sf/cglib/reflect/FastMethod.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="5" column="13" selection-start="158" selection-end="158" vertical-scroll-proportion="0.065891474">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/com/google/inject/SpringPerformanceComparison.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="109" column="15" selection-start="3779" selection-end="3779" vertical-scroll-proportion="0.44065484">
+ <state line="33" column="36" selection-start="1297" selection-end="1297" vertical-scroll-proportion="0.1461318">
<folding />
</state>
</provider>
diff --git a/test/com/google/inject/SpringPerformanceComparison.java b/test/com/google/inject/SpringPerformanceComparison.java
index 2fb1a77..05f81d1 100644
--- a/test/com/google/inject/SpringPerformanceComparison.java
+++ b/test/com/google/inject/SpringPerformanceComparison.java
@@ -29,7 +29,10 @@
import java.util.concurrent.Callable;
/**
- * Performance test.
+ * A semi-useless microbenchmark. Spring and Guice constuct the same object
+ * graph a bunch of times, and we see who can construct the most per second.
+ * As of this writing Guice is more than 50X faster. Also useful for comparing
+ * pure Java configuration options.
*
* @author crazybob@google.com (Bob Lee)
*/
