Browse Source

Merge pull request #434 from kppullin/servicestack_updates

Servicestack updates
Brian Hauer 12 years ago
parent
commit
5915084a83

+ 4 - 0
servicestack/.gitignore

@@ -3,6 +3,10 @@
 *.suo
 *.suo
 */bin/
 */bin/
 */obj/
 */obj/
+obj/
+[Bb]in
+[Dd]ebug*/
+[Rr]elease*/
 .nuget/NuGet.exe
 .nuget/NuGet.exe
 packages/
 packages/
 !packages/repositories.config
 !packages/repositories.config

+ 18 - 18
servicestack/benchmark_config

@@ -13,9 +13,9 @@
       "setup_file": "setup_iis",
       "setup_file": "setup_iis",
       "os": "nt",
       "os": "nt",
       "db_url": "/sqlserver/db",
       "db_url": "/sqlserver/db",
-      "query_url": "/sqlserver/queries?queries=",
+      "query_url": "/sqlserver/queries/",
       "fortune_url": "/sqlserver/fortunes",
       "fortune_url": "/sqlserver/fortunes",
-      "update_url": "/sqlserver/update?queries=",
+      "update_url": "/sqlserver/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 156
       "sort": 156
     },
     },
@@ -23,9 +23,9 @@
       "setup_file": "setup_iis",
       "setup_file": "setup_iis",
       "os": "nt",
       "os": "nt",
       "db_url": "/mysql/db",
       "db_url": "/mysql/db",
-      "query_url": "/mysql/queries?queries=",
+      "query_url": "/mysql/queries/",
       "fortune_url": "/mysql/fortunes",
       "fortune_url": "/mysql/fortunes",
-      "update_url": "/mysql/update?queries=",
+      "update_url": "/mysql/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 157
       "sort": 157
     },
     },
@@ -33,9 +33,9 @@
       "setup_file": "setup_iis",
       "setup_file": "setup_iis",
       "os": "nt",
       "os": "nt",
       "db_url": "/postgresql/db",
       "db_url": "/postgresql/db",
-      "query_url": "/postgresql/queries?queries=",
+      "query_url": "/postgresql/queries/",
       "fortune_url": "/postgresql/fortunes",
       "fortune_url": "/postgresql/fortunes",
-      "update_url": "/postgresql/update?queries=",
+      "update_url": "/postgresql/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 158
       "sort": 158
     },
     },
@@ -49,27 +49,27 @@
     "nginx-sqlserver": {
     "nginx-sqlserver": {
       "setup_file": "setup_nginx",
       "setup_file": "setup_nginx",
       "db_url": "/sqlserver/db",
       "db_url": "/sqlserver/db",
-      "query_url": "/sqlserver/queries?queries=",
+      "query_url": "/sqlserver/queries/",
       "fortune_url": "/sqlserver/fortunes",
       "fortune_url": "/sqlserver/fortunes",
-      "update_url": "/sqlserver/update?queries=",
+      "update_url": "/sqlserver/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 159
       "sort": 159
     },
     },
     "nginx-mysql": {
     "nginx-mysql": {
       "setup_file": "setup_nginx",
       "setup_file": "setup_nginx",
       "db_url": "/mysql/db",
       "db_url": "/mysql/db",
-      "query_url": "/mysql/queries?queries=",
+      "query_url": "/mysql/queries/",
       "fortune_url": "/mysql/fortunes",
       "fortune_url": "/mysql/fortunes",
-      "update_url": "/mysql/update?queries=",
+      "update_url": "/mysql/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 160
       "sort": 160
     },
     },
     "nginx-postgresql": {
     "nginx-postgresql": {
       "setup_file": "setup_nginx",
       "setup_file": "setup_nginx",
       "db_url": "/postgresql/db",
       "db_url": "/postgresql/db",
-      "query_url": "/postgresql/queries?queries=",
+      "query_url": "/postgresql/queries/",
       "fortune_url": "/postgresql/fortunes",
       "fortune_url": "/postgresql/fortunes",
-      "update_url": "/postgresql/update?queries=",
+      "update_url": "/postgresql/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 161
       "sort": 161
     },
     },
@@ -83,27 +83,27 @@
     "xsp-sqlserver": {
     "xsp-sqlserver": {
       "setup_file": "setup_xsp",
       "setup_file": "setup_xsp",
       "db_url": "/sqlserver/db",
       "db_url": "/sqlserver/db",
-      "query_url": "/sqlserver/queries?queries=",
+      "query_url": "/sqlserver/queries/",
       "fortune_url": "/sqlserver/fortunes",
       "fortune_url": "/sqlserver/fortunes",
-      "update_url": "/sqlserver/update?queries=",
+      "update_url": "/sqlserver/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 163
       "sort": 163
     },
     },
     "xsp-mysql": {
     "xsp-mysql": {
       "setup_file": "setup_xsp",
       "setup_file": "setup_xsp",
       "db_url": "/mysql/db",
       "db_url": "/mysql/db",
-      "query_url": "/mysql/queries?queries=",
+      "query_url": "/mysql/queries/",
       "fortune_url": "/mysql/fortunes",
       "fortune_url": "/mysql/fortunes",
-      "update_url": "/mysql/update?queries=",
+      "update_url": "/mysql/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 164
       "sort": 164
     },
     },
     "xsp-postgresql": {
     "xsp-postgresql": {
       "setup_file": "setup_xsp",
       "setup_file": "setup_xsp",
       "db_url": "/postgresql/db",
       "db_url": "/postgresql/db",
-      "query_url": "/postgresql/queries?queries=",
+      "query_url": "/postgresql/queries/",
       "fortune_url": "/postgresql/fortunes",
       "fortune_url": "/postgresql/fortunes",
-      "update_url": "/postgresql/update?queries=",
+      "update_url": "/postgresql/updates/",
       "port": 8080,
       "port": 8080,
       "sort": 165
       "sort": 165
     }
     }

+ 5 - 0
servicestack/src/Global.asax.cs

@@ -1,4 +1,5 @@
 using System;
 using System;
+using System.Threading;
 using System.Web;
 using System.Web;
 
 
 namespace ServiceStackBenchmark
 namespace ServiceStackBenchmark
@@ -7,6 +8,10 @@ namespace ServiceStackBenchmark
     {
     {
         protected void Application_Start(object sender, EventArgs e)
         protected void Application_Start(object sender, EventArgs e)
         {
         {
+            var threads = 40 * Environment.ProcessorCount;
+            ThreadPool.SetMaxThreads(threads, threads);
+            ThreadPool.SetMinThreads(threads, threads);
+
             new AppHost().Init();
             new AppHost().Init();
         }
         }
 
 

+ 30 - 0
servicestack/src/Properties/PublishProfiles/IIS.pubxml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <MSDeployServiceURL>localhost</MSDeployServiceURL>
+    <DeployIisAppPath>Benchmarks</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>InProc</MSDeployPublishMethod>
+    <UserName />
+    <_SavePWD>False</_SavePWD>
+    <PublishDatabaseSettings>
+    </PublishDatabaseSettings>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedPlatform>x64</LastUsedPlatform>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
+    <EnableMSDeployBackup>False</EnableMSDeployBackup>
+    <SiteUrlToLaunchAfterPublish>/</SiteUrlToLaunchAfterPublish>
+    <PrecompileBeforePublish>True</PrecompileBeforePublish>
+    <EnableUpdateable>False</EnableUpdateable>
+    <DebugSymbols>False</DebugSymbols>
+    <WDPMergeOption>DonotMerge</WDPMergeOption>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+</Project>

+ 3 - 0
servicestack/src/ServiceStackBenchmark.csproj

@@ -202,6 +202,9 @@
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\PublishProfiles\IIS.pubxml" />
+  </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="AppHostConfigHelper.cs" />
     <Compile Include="AppHostConfigHelper.cs" />
     <Compile Include="Model\Fortune.cs" />
     <Compile Include="Model\Fortune.cs" />

+ 1 - 1
servicestack/src/Web.config

@@ -16,7 +16,7 @@
   </appSettings>
   </appSettings>
   <system.web>
   <system.web>
     <customErrors mode="Off" />
     <customErrors mode="Off" />
-    <compilation debug="true" targetFramework="4.5" />
+    <compilation debug="false" targetFramework="4.5" />
     <httpHandlers>
     <httpHandlers>
       <add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" />
       <add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" />
     </httpHandlers>
     </httpHandlers>