diff --git a/.travis.yml b/.travis.yml index 608ad011cf2..70e7aea78be 100755 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,6 @@ env: - "TESTDIR=Erlang/cowboy" - "TESTDIR=Erlang/elli" - "TESTDIR=Erlang/mochiweb" - - "TESTDIR=Erlang/misultin" - "TESTDIR=Go/beego" - "TESTDIR=Go/falcore" - "TESTDIR=Go/fasthttp" diff --git a/frameworks/Erlang/misultin/.gitignore b/frameworks/Erlang/misultin/.gitignore deleted file mode 100644 index 62bed6ad9fe..00000000000 --- a/frameworks/Erlang/misultin/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.eunit -deps -ebin -*.o -*.beam -*.plt -erl_crash.dump -/.rebar/ diff --git a/frameworks/Erlang/misultin/Makefile b/frameworks/Erlang/misultin/Makefile deleted file mode 100644 index e16a7b62a5a..00000000000 --- a/frameworks/Erlang/misultin/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -REBAR=./rebar - -all: - @$(REBAR) -r get-deps compile - -clean: - @$(REBAR) clean - -run: - @./start.sh - -stop: - @killall beam.smp diff --git a/frameworks/Erlang/misultin/benchmark_config.json b/frameworks/Erlang/misultin/benchmark_config.json deleted file mode 100644 index 8630a2d3b5b..00000000000 --- a/frameworks/Erlang/misultin/benchmark_config.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "framework": "misultin", - "tests": [{ - "default": { - "setup_file": "setup", - "json_url": "/json", - "plaintext_url": "/plaintext", - "port": 8080, - "approach": "Realistic", - "classification": "Platform", - "database": "MySQL", - "framework": "Misultin", - "language": "Erlang", - "orm": "Raw", - "platform": "Erlang", - "webserver": "None", - "os": "Linux", - "database_os": "Linux", - "display_name": "misultin", - "notes": "", - "versus": "" - }}] -} diff --git a/frameworks/Erlang/misultin/priv/app.config b/frameworks/Erlang/misultin/priv/app.config deleted file mode 100644 index ad1219705ac..00000000000 --- a/frameworks/Erlang/misultin/priv/app.config +++ /dev/null @@ -1,9 +0,0 @@ -%% -*- erlang -*- -[{misultin_bench, [{http_port, 8080}]}, - - {erl_bench, [{db_pool, 256}, - {db_user, "benchmarkdbuser"}, - {db_password, "benchmarkdbpass"}, - {db_host, "localhost"}, - {db_port, 3306}, - {db_name, "hello_world"}]}]. diff --git a/frameworks/Erlang/misultin/rebar.config b/frameworks/Erlang/misultin/rebar.config deleted file mode 100644 index e0670b6b049..00000000000 --- a/frameworks/Erlang/misultin/rebar.config +++ /dev/null @@ -1,5 +0,0 @@ -%% -*- erlang -*- -{deps, [ - {erl_bench, ".*", {git, "git://github.com/utkarshkukreti/erl_bench.git", "cb70233d7de1e800893cf1460f181a706aa08a38"}}, - {misultin, "0.9", {git, "git://github.com/ostinelli/misultin.git", {tag, "misultin-0.9"}}} -]}. diff --git a/frameworks/Erlang/misultin/setup.sh b/frameworks/Erlang/misultin/setup.sh deleted file mode 100644 index 0ff0ec7ea25..00000000000 --- a/frameworks/Erlang/misultin/setup.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/misultin_bench_sup.erl - -fw_depends erlang - -rm -rf deps/* ebin/* -rebar get-deps -rebar compile - -erl +K true +sbwt very_long +swt very_low -pa ebin deps/*/ebin -boot start_sasl -config priv/app.config -s misultin_bench_app -noshell -detached diff --git a/frameworks/Erlang/misultin/src/misultin_bench.app.src b/frameworks/Erlang/misultin/src/misultin_bench.app.src deleted file mode 100644 index 4dbeaa200d4..00000000000 --- a/frameworks/Erlang/misultin/src/misultin_bench.app.src +++ /dev/null @@ -1,9 +0,0 @@ -%% -*- erlang -*- -{application, misultin_bench, - [{description, ""}, - {vsn, "0.1"}, - {modules, []}, - {registered, []}, - {mod, {misultin_bench_app, []}}, - {env, []}, - {applications, [kernel, stdlib, crypto, erl_bench]}]}. diff --git a/frameworks/Erlang/misultin/src/misultin_bench_app.erl b/frameworks/Erlang/misultin/src/misultin_bench_app.erl deleted file mode 100644 index da1056074fe..00000000000 --- a/frameworks/Erlang/misultin/src/misultin_bench_app.erl +++ /dev/null @@ -1,16 +0,0 @@ --module(misultin_bench_app). --behaviour(application). --export([start/0]). --export([start/2, stop/1]). - -start() -> - application:ensure_all_started(misultin_bench). - -start(_Type, _StartArgs) -> - {ok, Port} = application:get_env(misultin_bench, http_port), - Options = [{loop, fun(Req) -> web_handler:dispatch(Req) end}, - {port, Port}], - misultin_bench_sup:start_link(Options). - -stop(_State) -> - ok. diff --git a/frameworks/Erlang/misultin/src/misultin_bench_sup.erl b/frameworks/Erlang/misultin/src/misultin_bench_sup.erl deleted file mode 100644 index a360c948b6b..00000000000 --- a/frameworks/Erlang/misultin/src/misultin_bench_sup.erl +++ /dev/null @@ -1,18 +0,0 @@ --module(misultin_bench_sup). --behaviour(supervisor). --export([start_link/1]). --export([init/1]). - -start_link(Options) -> - supervisor:start_link(?MODULE, [Options]). - -init([Options]) -> - Misultin = supervisor(misultin, Options), - Processes = [Misultin], - Strategy = {one_for_one, 5, 30}, - {ok, {Strategy, Processes}}. - -supervisor(Mod, Options) -> - {Mod, - {Mod, start_link, [Options]}, - permanent, infinity, supervisor, [Mod]}. diff --git a/frameworks/Erlang/misultin/src/web_handler.erl b/frameworks/Erlang/misultin/src/web_handler.erl deleted file mode 100644 index d44c56f212c..00000000000 --- a/frameworks/Erlang/misultin/src/web_handler.erl +++ /dev/null @@ -1,53 +0,0 @@ --module(web_handler). --export([dispatch/1]). - -dispatch(Req) -> - Method = Req:get(method), - {_UriType, Uri} = Req:get(uri), - Path = string:tokens(Uri, "/"), - handle(Method, Path, Req). - -%% handle - -handle('GET', ["json"], Req) -> - json(Req, erl_bench:hello_json()); - -handle('GET', ["plaintext"], Req) -> - plain(Req, erl_bench:hello_plain()); - -handle('GET', ["db"], Req) -> - json(Req, erl_bench:random_json()); - -handle('GET', ["queries"], Req) -> - Queries = queries(Req), - json(Req, erl_bench:randoms_json(Queries)); - -handle('GET', ["updates"], Req) -> - Queries = queries(Req), - json(Req, erl_bench:update_randoms_json(Queries)); - -handle('GET', ["fortunes"], Req) -> - html(Req, erl_bench:fortunes_html()); - -handle(_Method, _Path, Req) -> - Req:respond(404, [{"Content-Type", "text/plain"}], "Not Found"). - -%% private - -json(Req, Json) -> - Req:ok([{"Content-Type", "application/json"}], Json). - -plain(Req, Text) -> - Req:ok([{"Content-Type", "text/plain"}], Text). - -html(Req, Html) -> - Req:ok([{"Content-Type", "text/html"}], Html). - -queries(Req) -> - Params = Req:parse_qs(), - Queries = (catch list_to_integer(proplists:get_value("queries", Params, "1"))), - case {is_number(Queries), Queries > 500} of - {true, true} -> 500; - {false, _} -> 1; - _ -> Queries - end. diff --git a/frameworks/Erlang/misultin/start-dev.sh b/frameworks/Erlang/misultin/start-dev.sh deleted file mode 100644 index a427d2e17d4..00000000000 --- a/frameworks/Erlang/misultin/start-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -exec erl \ - +K true +sbwt very_long +swt very_low \ - -pa ebin deps/*/ebin \ - -boot start_sasl \ - -config priv/app.config \ - -s misultin_bench_app