Changeset 516 for Tests


Ignore:
Timestamp:
03/29/12 11:04:08 (10 years ago)
Author:
BegemoT
Message:
 
Location:
Tests/JAVA/test
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • Tests/JAVA/test/test.iws

    r513 r516  
    4141  <component name="ChangeListManager"> 
    4242    <list default="true" readonly="true" id="6898b49f-ea82-4df2-ad6c-da63a3fe4f9a" name="Default" comment=""> 
    43       <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDQueueUnrolled.java" afterPath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDUnrolledQueue.java" /> 
    44       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/QueuesVsDisruptorUnstressedBenchmark.java" afterPath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/QueuesVsDisruptorUnstressedBenchmark.java" /> 
    45       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java" afterPath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java" /> 
    46       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedUnrolledQueue.java" afterPath="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedUnrolledQueue.java" /> 
     43      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/unstressed_task_benchmark_statistics.sh" /> 
    4744      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.iws" afterPath="$PROJECT_DIR$/test.iws" /> 
    4845    </list> 
     
    193190  <component name="FileEditorManager"> 
    194191    <leaf> 
    195       <file leaf-file-name="config.properties.template" pinned="false" current="false" current-in-tab="false"> 
    196         <entry file="file://$PROJECT_DIR$/config.properties.template"> 
     192      <file leaf-file-name="CABSESDLazySetPaddedUnrolledQueue.java" pinned="false" current="false" current-in-tab="false"> 
     193        <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedUnrolledQueue.java"> 
    197194          <provider selected="true" editor-type-id="text-editor"> 
    198             <state line="9" column="34" selection-start="216" selection-end="250" vertical-scroll-proportion="0.0"> 
     195            <state line="86" column="81" selection-start="3477" selection-end="3477" vertical-scroll-proportion="0.0"> 
    199196              <folding /> 
    200197            </state> 
     
    202199        </entry> 
    203200      </file> 
    204       <file leaf-file-name="config.properties" pinned="false" current="false" current-in-tab="false"> 
    205         <entry file="file://$PROJECT_DIR$/config.properties"> 
     201      <file leaf-file-name="CABSESDUnrolledQueue.java" pinned="false" current="false" current-in-tab="false"> 
     202        <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDUnrolledQueue.java"> 
    206203          <provider selected="true" editor-type-id="text-editor"> 
    207             <state line="12" column="34" selection-start="324" selection-end="324" vertical-scroll-proportion="0.0"> 
     204            <state line="144" column="0" selection-start="4520" selection-end="4520" vertical-scroll-proportion="0.0"> 
    208205              <folding /> 
    209206            </state> 
     
    211208        </entry> 
    212209      </file> 
    213       <file leaf-file-name="CABSESDUnrolledQueue.java" pinned="false" current="true" current-in-tab="true"> 
    214         <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDUnrolledQueue.java"> 
     210      <file leaf-file-name="CABSESDLazySetUnrolledQueue.java" pinned="false" current="false" current-in-tab="false"> 
     211        <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetUnrolledQueue.java"> 
    215212          <provider selected="true" editor-type-id="text-editor"> 
    216             <state line="14" column="43" selection-start="442" selection-end="442" vertical-scroll-proportion="0.2027027"> 
     213            <state line="147" column="44" selection-start="5075" selection-end="5075" vertical-scroll-proportion="0.0"> 
     214              <folding /> 
     215            </state> 
     216          </provider> 
     217        </entry> 
     218      </file> 
     219      <file leaf-file-name="unstressed_task_benchmark.sh" pinned="false" current="false" current-in-tab="false"> 
     220        <entry file="file://$PROJECT_DIR$/unstressed_task_benchmark.sh"> 
     221          <provider selected="true" editor-type-id="text-editor"> 
     222            <state line="8" column="24" selection-start="232" selection-end="232" vertical-scroll-proportion="0.0"> 
     223              <folding /> 
     224            </state> 
     225          </provider> 
     226        </entry> 
     227      </file> 
     228      <file leaf-file-name="unstressed_task_benchmark_statistics.sh" pinned="false" current="true" current-in-tab="true"> 
     229        <entry file="file://$PROJECT_DIR$/unstressed_task_benchmark_statistics.sh"> 
     230          <provider selected="true" editor-type-id="text-editor"> 
     231            <state line="16" column="0" selection-start="373" selection-end="373" vertical-scroll-proportion="0.37986705"> 
     232              <folding /> 
     233            </state> 
     234          </provider> 
     235        </entry> 
     236      </file> 
     237      <file leaf-file-name="CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java" pinned="false" current="false" current-in-tab="false"> 
     238        <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java"> 
     239          <provider selected="true" editor-type-id="text-editor"> 
     240            <state line="35" column="28" selection-start="1581" selection-end="1581" vertical-scroll-proportion="0.0"> 
    217241              <folding /> 
    218242            </state> 
     
    234258    <option name="changedFiles"> 
    235259      <list> 
    236         <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/stressed/ABQxNTask.java" /> 
    237         <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/stressed/AbstractTask.java" /> 
    238260        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/ABQBusyWaitQueue.java" /> 
    239261        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/ABQConditionFreeQueue.java" /> 
     
    246268        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/AbstractSESDSequencer.java" /> 
    247269        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/SESDSequencerUnrolled.java" /> 
     270        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDQueueUnrolled.java" /> 
     271        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDUnrolledQueue.java" /> 
    248272        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedUnrolledQueue.java" /> 
    249273        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java" /> 
    250         <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDQueueUnrolled.java" /> 
    251         <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDUnrolledQueue.java" /> 
     274        <option value="$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetUnrolledQueue.java" /> 
     275        <option value="$PROJECT_DIR$/unstressed_task_benchmark_statistics.sh" /> 
    252276      </list> 
    253277    </option> 
     
    10391063    </key> 
    10401064  </component> 
    1041   <component name="RunManager" selected="Application.unstressed.TaskBenchmark[CABSESDUnrolled]"> 
     1065  <component name="RunManager" selected="Application.unstressed.TaskBenchmark[SESDLazySetPaddedUnrolled]"> 
    10421066    <configuration default="false" name="CABSESDQueueTest" type="JUnit" factoryName="JUnit" temporary="true"> 
    10431067      <module name="test" /> 
     
    18151839      <method /> 
    18161840    </configuration> 
     1841    <configuration default="false" name="unstressed.TaskBenchmark[SESDLazySetPaddedUnrolled]" type="Application" factoryName="Application"> 
     1842      <option name="MAIN_CLASS_NAME" value="test.threads.queue.stressed.TaskBenchmark" /> 
     1843      <option name="VM_PARAMETERS" value="-ea -server -Xmx128m -XX:+PrintCommandLineFlags " /> 
     1844      <option name="PROGRAM_PARAMETERS" value="-task=test.threads.queue.unstressed.QueueTask --payload=none -Dtask.queue-factory=test.threads.queue.unstressed.impl.CABSESDLazySetPaddedUnrolledQueue" /> 
     1845      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> 
     1846      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> 
     1847      <option name="ALTERNATIVE_JRE_PATH" value="$PROJECT_DIR$/../../../../1.7.0.jdk/Contents/Home" /> 
     1848      <option name="ENABLE_SWING_INSPECTOR" value="false" /> 
     1849      <option name="ENV_VARIABLES" /> 
     1850      <option name="PASS_PARENT_ENVS" value="true" /> 
     1851      <module name="test" /> 
     1852      <envs /> 
     1853      <RunnerSettings RunnerId="Profile "> 
     1854        <option name="myExternalizedOptions" value="&#10;snapshots-dir=&#10;additional-options2=onexit\=snapshot&#10;" /> 
     1855      </RunnerSettings> 
     1856      <RunnerSettings RunnerId="Run" /> 
     1857      <ConfigurationWrapper RunnerId="Run" /> 
     1858      <method /> 
     1859    </configuration> 
    18171860    <configuration default="false" name="MultithreadedBitSetPerformanceTest.testScalePerformance" type="JUnit" factoryName="JUnit"> 
    18181861      <module name="test" /> 
     
    18371880      <method /> 
    18381881    </configuration> 
    1839     <list size="31"> 
     1882    <list size="32"> 
    18401883      <item index="0" class="java.lang.String" itemvalue="Application.Increment2" /> 
    18411884      <item index="1" class="java.lang.String" itemvalue="Application.QueueBenchmark[ABQ]" /> 
     
    18631906      <item index="23" class="java.lang.String" itemvalue="Application.unstressed.TaskBenchmark[LongQueue]" /> 
    18641907      <item index="24" class="java.lang.String" itemvalue="Application.unstressed.TaskBenchmark[ABQConditionFree]" /> 
    1865       <item index="25" class="java.lang.String" itemvalue="JUnit.CABSESDQueueTest" /> 
    1866       <item index="26" class="java.lang.String" itemvalue="JUnit.test.threads.queue in test" /> 
    1867       <item index="27" class="java.lang.String" itemvalue="JUnit.test.threads.queue.unstressed.impl in test" /> 
    1868       <item index="28" class="java.lang.String" itemvalue="JUnit.MultithreadedBitSetPerformanceTest.testScalePerformance" /> 
    1869       <item index="29" class="java.lang.String" itemvalue="JUnit.ABQBusyWaitQueueTest" /> 
    1870       <item index="30" class="java.lang.String" itemvalue="JUnit.CABConcurrentQueueTest" /> 
     1908      <item index="25" class="java.lang.String" itemvalue="Application.unstressed.TaskBenchmark[SESDLazySetPaddedUnrolled]" /> 
     1909      <item index="26" class="java.lang.String" itemvalue="JUnit.CABSESDQueueTest" /> 
     1910      <item index="27" class="java.lang.String" itemvalue="JUnit.test.threads.queue in test" /> 
     1911      <item index="28" class="java.lang.String" itemvalue="JUnit.test.threads.queue.unstressed.impl in test" /> 
     1912      <item index="29" class="java.lang.String" itemvalue="JUnit.MultithreadedBitSetPerformanceTest.testScalePerformance" /> 
     1913      <item index="30" class="java.lang.String" itemvalue="JUnit.ABQBusyWaitQueueTest" /> 
     1914      <item index="31" class="java.lang.String" itemvalue="JUnit.CABConcurrentQueueTest" /> 
    18711915    </list> 
    18721916    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false"> 
     
    19481992  </component> 
    19491993  <component name="ToolWindowManager"> 
    1950     <frame x="0" y="22" width="1440" height="874" extended-state="6" /> 
    1951     <editor active="false" /> 
     1994    <frame x="0" y="22" width="1600" height="1174" extended-state="6" /> 
     1995    <editor active="true" /> 
    19521996    <layout> 
    19531997      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32986766" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" /> 
     
    19612005      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 
    19622006      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3994253" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 
    1963       <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23132184" sideWeight="0.67774934" order="0" side_tool="false" content_ui="tabs" /> 
     2007      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16817011" sideWeight="0.67774934" order="0" side_tool="false" content_ui="tabs" /> 
    19642008      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> 
    1965       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52865064" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 
     2009      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.528133" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 
    19662010      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32993513" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 
    19672011      <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> 
     
    20552099  </component> 
    20562100  <component name="editorHistoryManager"> 
    2057     <entry file="jar:///Library/Java/JavaVirtualMachines/1.6.0_26-b03-377.jdk/Contents/Home/src.jar!/src/java/util/concurrent/locks/Condition.java"> 
    2058       <provider selected="true" editor-type-id="text-editor"> 
    2059         <state line="202" column="0" selection-start="9198" selection-end="9198" vertical-scroll-proportion="0.46777546" /> 
    2060       </provider> 
    2061     </entry> 
    2062     <entry file="jar:///Library/Java/JavaVirtualMachines/1.6.0_26-b03-377.jdk/Contents/Home/src.jar!/src/java/util/concurrent/ArrayBlockingQueue.java"> 
    2063       <provider selected="true" editor-type-id="text-editor"> 
    2064         <state line="74" column="22" selection-start="2832" selection-end="2832" vertical-scroll-proportion="0.6756757" /> 
    2065       </provider> 
    2066     </entry> 
    20672101    <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/ABQBusyWaitQueue.java"> 
    20682102      <provider selected="true" editor-type-id="text-editor"> 
     
    20852119      </provider> 
    20862120    </entry> 
    2087     <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetUnrolledQueue.java"> 
    2088       <provider selected="true" editor-type-id="text-editor"> 
    2089         <state line="15" column="19" selection-start="418" selection-end="418" vertical-scroll-proportion="0.0" /> 
    2090       </provider> 
    2091     </entry> 
    20922121    <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDQueue.java"> 
    20932122      <provider selected="true" editor-type-id="text-editor"> 
     
    20982127      <provider selected="true" editor-type-id="text-editor"> 
    20992128        <state line="108" column="8" selection-start="4028" selection-end="4062" vertical-scroll-proportion="0.23076923" /> 
    2100       </provider> 
    2101     </entry> 
    2102     <entry file="file://$PROJECT_DIR$/config.properties.template"> 
    2103       <provider selected="true" editor-type-id="text-editor"> 
    2104         <state line="9" column="34" selection-start="216" selection-end="250" vertical-scroll-proportion="0.0"> 
    2105           <folding /> 
    2106         </state> 
    2107       </provider> 
    2108     </entry> 
    2109     <entry file="file://$PROJECT_DIR$/config.properties"> 
    2110       <provider selected="true" editor-type-id="text-editor"> 
    2111         <state line="12" column="34" selection-start="324" selection-end="324" vertical-scroll-proportion="0.0" /> 
    2112       </provider> 
    2113     </entry> 
    2114     <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java"> 
    2115       <provider selected="true" editor-type-id="text-editor"> 
    2116         <state line="152" column="63" selection-start="5503" selection-end="5503" vertical-scroll-proportion="0.6621622"> 
    2117           <folding /> 
    2118         </state> 
    2119       </provider> 
    2120     </entry> 
    2121     <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedUnrolledQueue.java"> 
    2122       <provider selected="true" editor-type-id="text-editor"> 
    2123         <state line="146" column="50" selection-start="5109" selection-end="5109" vertical-scroll-proportion="0.6621622"> 
    2124           <folding /> 
    2125         </state> 
    21262129      </provider> 
    21272130    </entry> 
     
    21402143      </provider> 
    21412144    </entry> 
     2145    <entry file="file://$PROJECT_DIR$/config.properties"> 
     2146      <provider selected="true" editor-type-id="text-editor"> 
     2147        <state line="12" column="34" selection-start="324" selection-end="324" vertical-scroll-proportion="0.4054054"> 
     2148          <folding /> 
     2149        </state> 
     2150      </provider> 
     2151    </entry> 
     2152    <entry file="file://$PROJECT_DIR$/config.properties.template"> 
     2153      <provider selected="true" editor-type-id="text-editor"> 
     2154        <state line="9" column="34" selection-start="216" selection-end="250" vertical-scroll-proportion="0.30405405"> 
     2155          <folding /> 
     2156        </state> 
     2157      </provider> 
     2158    </entry> 
     2159    <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java"> 
     2160      <provider selected="true" editor-type-id="text-editor"> 
     2161        <state line="35" column="28" selection-start="1581" selection-end="1581" vertical-scroll-proportion="0.0"> 
     2162          <folding /> 
     2163        </state> 
     2164      </provider> 
     2165    </entry> 
     2166    <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedUnrolledQueue.java"> 
     2167      <provider selected="true" editor-type-id="text-editor"> 
     2168        <state line="86" column="81" selection-start="3477" selection-end="3477" vertical-scroll-proportion="0.0"> 
     2169          <folding /> 
     2170        </state> 
     2171      </provider> 
     2172    </entry> 
    21422173    <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDUnrolledQueue.java"> 
    21432174      <provider selected="true" editor-type-id="text-editor"> 
    2144         <state line="14" column="43" selection-start="442" selection-end="442" vertical-scroll-proportion="0.2027027"> 
     2175        <state line="144" column="0" selection-start="4520" selection-end="4520" vertical-scroll-proportion="0.0"> 
     2176          <folding /> 
     2177        </state> 
     2178      </provider> 
     2179    </entry> 
     2180    <entry file="file://$PROJECT_DIR$/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetUnrolledQueue.java"> 
     2181      <provider selected="true" editor-type-id="text-editor"> 
     2182        <state line="147" column="44" selection-start="5075" selection-end="5075" vertical-scroll-proportion="0.0"> 
     2183          <folding /> 
     2184        </state> 
     2185      </provider> 
     2186    </entry> 
     2187    <entry file="file://$PROJECT_DIR$/unstressed_task_benchmark.sh"> 
     2188      <provider selected="true" editor-type-id="text-editor"> 
     2189        <state line="8" column="24" selection-start="232" selection-end="232" vertical-scroll-proportion="0.0"> 
     2190          <folding /> 
     2191        </state> 
     2192      </provider> 
     2193    </entry> 
     2194    <entry file="file://$PROJECT_DIR$/unstressed_task_benchmark_statistics.sh"> 
     2195      <provider selected="true" editor-type-id="text-editor"> 
     2196        <state line="16" column="0" selection-start="373" selection-end="373" vertical-scroll-proportion="0.37986705"> 
    21452197          <folding /> 
    21462198        </state> 
  • Tests/JAVA/test/unstressed_task_benchmark_statistics.sh

    r485 r516  
    1212rm result.data 
    1313 
    14 for FACTORY in "ABQWrapperQueue" "ABQBusyWaitQueue" "CABSESDQueue" "CABSESDMaskedQueue" "CABSESDMaskedQueueUnrolled" 
     14for I in 1 2 3 4 5 6 7 8 9 
    1515do 
    1616    mvn exec:java -Dexec.mainClass="test.threads.queue.stressed.TaskBenchmark" \ 
    17         -Dexec.args="--task=test.threads.queue.unstressed.QueueTask --payload=none -Dtask.queue-factory=test.threads.queue.unstressed.impl.$FACTORY" -e 
     17        -Dexec.args="--task=test.threads.queue.unstressed.QueueTask --payload=none" -e 
    1818done 
    19  
    20  
    21 for TASK in "DisruptorTask" "SequencerTask" "LongQueueTask" 
    22 do 
    23     mvn exec:java -Dexec.mainClass="test.threads.queue.stressed.TaskBenchmark" \ 
    24         -Dexec.args="--task=test.threads.queue.unstressed.$TASK --payload=none" -e 
    25 done 
Note: See TracChangeset for help on using the changeset viewer.