Browse Source

Merge branch 'master' of https://github.com/moxford/FrameworkBenchmarks into moxford-master

Patrick Falls 12 years ago
parent
commit
c37a829345
4 changed files with 5 additions and 8 deletions
  1. 1 2
      cowboy/setup_erlang.py
  2. 2 2
      cowboy/src/hello_world_app.erl
  3. 1 2
      elli/setup_erlang.py
  4. 1 2
      elli/src/elli_bench_sup.erl

+ 1 - 2
cowboy/setup_erlang.py

@@ -1,4 +1,3 @@
-
 import subprocess
 import subprocess
 import sys
 import sys
 import setup_util
 import setup_util
@@ -9,7 +8,7 @@ def start(args):
   try:
   try:
     subprocess.check_call("./rebar get-deps", shell=True, cwd="cowboy")
     subprocess.check_call("./rebar get-deps", shell=True, cwd="cowboy")
     subprocess.check_call("./rebar compile", shell=True, cwd="cowboy")
     subprocess.check_call("./rebar compile", shell=True, cwd="cowboy")
-    subprocess.check_call("erl -pa ebin deps/*/ebin -s hello_world -noshell -detached", shell=True, cwd="cowboy")
+    subprocess.check_call("erl -pa ebin deps/*/ebin +K true +sbwt very_long +swt very_low -s hello_world -noshell -detached", shell=True, cwd="cowboy")
     return 0
     return 0
   except subprocess.CalledProcessError:
   except subprocess.CalledProcessError:
     return 1
     return 1

+ 2 - 2
cowboy/src/hello_world_app.erl

@@ -13,7 +13,7 @@
 start(_Type, _Args) ->
 start(_Type, _Args) ->
         crypto:start(),
         crypto:start(),
         application:start(emysql),
         application:start(emysql),
-        emysql:add_pool(test_pool, 32,
+        emysql:add_pool(test_pool, 5000,
           "benchmarkdbuser", "benchmarkdbpass", "localhost", 3306,
           "benchmarkdbuser", "benchmarkdbpass", "localhost", 3306,
           "hello_world", utf8),
           "hello_world", utf8),
 	emysql:prepare(db_stmt, <<"SELECT * FROM World where id = ?">>),
 	emysql:prepare(db_stmt, <<"SELECT * FROM World where id = ?">>),
@@ -23,7 +23,7 @@ start(_Type, _Args) ->
 			{"/db", db_handler, []}
 			{"/db", db_handler, []}
 		]}
 		]}
 	]),
 	]),
-	{ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [
+	{ok, _} = cowboy:start_http(http, 5000, [{port, 8080}], [
 		{env, [{dispatch, Dispatch}]}
 		{env, [{dispatch, Dispatch}]}
 	]),
 	]),
 	hello_world_sup:start_link().
 	hello_world_sup:start_link().

+ 1 - 2
elli/setup_erlang.py

@@ -1,4 +1,3 @@
-
 import subprocess
 import subprocess
 import sys
 import sys
 import setup_util
 import setup_util
@@ -9,7 +8,7 @@ def start(args):
   try:
   try:
     subprocess.check_call("./rebar get-deps", shell=True, cwd="elli")
     subprocess.check_call("./rebar get-deps", shell=True, cwd="elli")
     subprocess.check_call("./rebar compile", shell=True, cwd="elli")
     subprocess.check_call("./rebar compile", shell=True, cwd="elli")
-    subprocess.check_call("erl -pa ebin deps/*/ebin -s elli_bench -noshell -detached", shell=True, cwd="elli")
+    subprocess.check_call("erl -pa ebin deps/*/ebin +K true +sbwt very_long +swt very_low -s elli_bench -noshell -detached", shell=True, cwd="elli")
     return 0
     return 0
   except subprocess.CalledProcessError:
   except subprocess.CalledProcessError:
     return 1
     return 1

+ 1 - 2
elli/src/elli_bench_sup.erl

@@ -1,4 +1,3 @@
-
 -module(elli_bench_sup).
 -module(elli_bench_sup).
 
 
 -behaviour(supervisor).
 -behaviour(supervisor).
@@ -26,7 +25,7 @@ start_link() ->
 init([]) ->
 init([]) ->
     crypto:start(),
     crypto:start(),
     application:start(emysql),
     application:start(emysql),
-    emysql:add_pool(test_pool, 32,
+    emysql:add_pool(test_pool, 5000,
        "benchmarkdbuser", "benchmarkdbpass", "localhost", 3306,
        "benchmarkdbuser", "benchmarkdbpass", "localhost", 3306,
        "hello_world", utf8),
        "hello_world", utf8),
     emysql:prepare(db_stmt, <<"SELECT * FROM World where id = ?">>),
     emysql:prepare(db_stmt, <<"SELECT * FROM World where id = ?">>),