Permalink
Browse files

Merge pull request #7 from martinrehfeld/erlang

Erlang
  • Loading branch information...
2 parents 234172d + 30164da commit 464260d5c506a77cd6dda58577ff333f0b3ab95e @gregwebs gregwebs committed Oct 23, 2012
View
@@ -9,7 +9,7 @@ http://www.yesodweb.com/blog/2011/03/preliminary-warp-cross-language-benchmarks
In our comparison, we tried to find the fastest servers in other languages. For python we used tornado. For Ruby we used Goliath. Here is an overview of [Ruby deployment options](http://blog.gregweber.info/posts/2011-06-16-high-performance-rb-part3). For Java we used winstone, although there may well be a better option.
-In the future we would like to benchmark against Erlang and Nginx.
+In the future we would like to benchmark against Nginx.
## Installation
View
@@ -0,0 +1,11 @@
+#!/bin/bash -x
+DIR="$( cd "$( dirname "$0" )" && pwd )"
+d=$(readlink -f $DIR)
+source lib.sh
+
+./erlang/rel/elli_pong/bin/elli_pong start
+/bin/sleep 600 & # just to give the benchmark function s/th to kill later
+
+benchmark
+
+./erlang/rel/elli_pong/bin/elli_pong stop
View
@@ -0,0 +1,7 @@
+*.dump
+*.beam
+.eunit
+deps
+ebin
+log
+/rel/elli_pong
@@ -0,0 +1,7 @@
+{erl_opts, []}.
+{require_otp_vsn, "R15"}.
+{deps, [
+ {elli, "0.2.0", {git, "git://github.com/knutin/elli.git", {tag,"740ee98e23cd8f921c62c50a0dabae340d508b75"}}}
+]}.
+{clean_files, ["ebin/*.beam"]}.
+{xref_checks, [undefined_function_calls]}.
@@ -0,0 +1,14 @@
+{application, elli_pong,
+ [
+ {description, "Pong benchmark for the Elli webserver"},
+ {vsn, "0.0.1"},
+ {registered, []},
+ {applications, [
+ kernel,
+ stdlib,
+ sasl
+ ]},
+ {mod, {elli_pong, []}},
+ {env, []}
+ ]
+}.
@@ -0,0 +1,16 @@
+-module(elli_pong).
+-behaviour(application).
+
+-export([start/0, start/2, stop/1]).
+
+start() ->
+ application:start(elli_pong).
+
+start(_StartType, _StartArgs) ->
+ case elli_pong_sup:start_link() of
+ {ok, Pid} -> {ok, Pid};
+ Other -> {error, Other}
+ end.
+
+stop(_State) ->
+ ok.
@@ -0,0 +1,10 @@
+-module(elli_pong_callback).
+-behaviour(elli_handler).
+
+-export([handle/2, handle_event/3]).
+
+handle(_Req, _Args) ->
+ {200, [{<<"Content-Type">>, <<"text/plain">>}], <<"PONG">>}.
+
+handle_event(_, _, _) ->
+ ok.
@@ -0,0 +1,33 @@
+-module(elli_pong_sup).
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+%% ===================================================================
+%% API functions
+%% ===================================================================
+
+start_link() ->
+ supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%% ===================================================================
+%% Supervisor callbacks
+%% ===================================================================
+
+init([]) ->
+ {ok, {{one_for_all, 0, 1}, [webserver()]}}.
+
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
+
+webserver() ->
+ {webserver,
+ {elli, start_link, [[{port, 3000},
+ {callback, elli_pong_callback}]]},
+ permanent, 5000, worker, [elli]}.
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+SCRIPTDIR=$(dirname $0)
+cd "$SCRIPTDIR/.."
+
+erl -pa deps/*/ebin apps/*/ebin \
+ -boot start_sasl \
+ -args_file rel/files/vm.args \
+ -s elli_pong \
+ -config rel/files/app
View
Binary file not shown.
View
@@ -0,0 +1,6 @@
+{sub_dirs, [
+ "apps/elli_pong",
+ "rel"
+ ]}.
+{erl_opts, []}.
+{require_otp_vsn, "R15"}.
@@ -0,0 +1,9 @@
+[
+ {sasl, [
+ {sasl_error_logger, {file, "log/sasl-error.log"}},
+ {errlog_type, error},
+ {error_logger_mf_dir, "log/sasl"}, % Log directory
+ {error_logger_mf_maxbytes, 10485760}, % 10 MB max file size
+ {error_logger_mf_maxfiles, 5} % 5 files max
+ ]}
+].
@@ -0,0 +1,156 @@
+#!/bin/bash
+# -*- tab-width:4;indent-tabs-mode:nil -*-
+# ex: ts=4 sw=4 et
+
+RUNNER_SCRIPT_DIR=$(cd ${0%/*} && pwd)
+
+RUNNER_BASE_DIR=${RUNNER_SCRIPT_DIR%/*}
+RUNNER_ETC_DIR=$RUNNER_BASE_DIR/etc
+RUNNER_LOG_DIR=$RUNNER_BASE_DIR/log
+# Note the trailing slash on $PIPE_DIR/
+PIPE_DIR=/tmp/$RUNNER_BASE_DIR/
+RUNNER_USER=
+
+# Make sure this script is running as the appropriate user
+if [ ! -z "$RUNNER_USER" ] && [ `whoami` != "$RUNNER_USER" ]; then
+ exec sudo -u $RUNNER_USER -i $0 $@
+fi
+
+# Make sure CWD is set to runner base dir
+cd $RUNNER_BASE_DIR
+
+# Make sure log directory exists
+mkdir -p $RUNNER_LOG_DIR
+
+# Extract the target node name from node.args
+NAME_ARG=`egrep -e '^-s?name' $RUNNER_ETC_DIR/vm.args`
+if [ -z "$NAME_ARG" ]; then
+ echo "vm.args needs to have either -name or -sname parameter."
+ exit 1
+fi
+
+# Extract the target cookie
+COOKIE_ARG=`grep -e '^-setcookie' $RUNNER_ETC_DIR/vm.args`
+if [ -z "$COOKIE_ARG" ]; then
+ echo "vm.args needs to have a -setcookie parameter."
+ exit 1
+fi
+
+# Identify the script name
+SCRIPT=`basename $0`
+
+# Parse out release and erts info
+START_ERL=`cat $RUNNER_BASE_DIR/releases/start_erl.data`
+ERTS_VSN=${START_ERL% *}
+APP_VSN=${START_ERL#* }
+
+# Add ERTS bin dir to our path
+ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+
+# Setup command to control the node
+NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
+
+# Check the first argument for instructions
+case "$1" in
+ start)
+ # Make sure there is not already a node running
+ RES=`$NODETOOL ping`
+ if [ "$RES" = "pong" ]; then
+ echo "Node is already running!"
+ exit 1
+ fi
+ HEART_COMMAND="$RUNNER_BASE_DIR/bin/$SCRIPT start"
+ export HEART_COMMAND
+ mkdir -p $PIPE_DIR
+ shift # remove $1
+ $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT console $@" 2>&1
+ ;;
+
+ stop)
+ # Wait for the node to completely stop...
+ case `uname -s` in
+ Linux|Darwin|FreeBSD|DragonFly|NetBSD|OpenBSD)
+ # PID COMMAND
+ PID=`ps ax -o pid= -o command=|\
+ grep "$RUNNER_BASE_DIR/.*/[b]eam"|awk '{print $1}'`
+ ;;
+ SunOS)
+ # PID COMMAND
+ PID=`ps -ef -o pid= -o args=|\
+ grep "$RUNNER_BASE_DIR/.*/[b]eam"|awk '{print $1}'`
+ ;;
+ CYGWIN*)
+ # UID PID PPID TTY STIME COMMAND
+ PID=`ps -efW|grep "$RUNNER_BASE_DIR/.*/[b]eam"|awk '{print $2}'`
+ ;;
+ esac
+ $NODETOOL stop
+ while `kill -0 $PID 2>/dev/null`;
+ do
+ sleep 1
+ done
+ ;;
+
+ restart)
+ ## Restart the VM without exiting the process
+ $NODETOOL restart
+ ;;
+
+ reboot)
+ ## Restart the VM completely (uses heart to restart it)
+ $NODETOOL reboot
+ ;;
+
+ ping)
+ ## See if the VM is alive
+ $NODETOOL ping
+ ;;
+
+ attach)
+ # Make sure a node IS running
+ RES=`$NODETOOL ping`
+ if [ "$RES" != "pong" ]; then
+ echo "Node is not running!"
+ exit 1
+ fi
+
+ shift
+ $ERTS_PATH/to_erl $PIPE_DIR
+ ;;
+
+ console|console_clean)
+ # .boot file typically just $SCRIPT (ie, the app name)
+ # however, for debugging, sometimes start_clean.boot is useful:
+ case "$1" in
+ console) BOOTFILE=$SCRIPT ;;
+ console_clean) BOOTFILE=start_clean ;;
+ esac
+ # Setup beam-required vars
+ ROOTDIR=$RUNNER_BASE_DIR
+ BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
+ EMU=beam
+ PROGNAME=`echo $0 | sed 's/.*\\///'`
+ CMD="$BINDIR/erlexec -boot $RUNNER_BASE_DIR/releases/$APP_VSN/$BOOTFILE -mode embedded -config $RUNNER_ETC_DIR/app.config -args_file $RUNNER_ETC_DIR/vm.args -- ${1+"$@"}"
+ export EMU
+ export ROOTDIR
+ export BINDIR
+ export PROGNAME
+
+ # Dump environment info for logging purposes
+ echo "Exec: $CMD"
+ echo "Root: $ROOTDIR"
+
+ # Log the startup
+ logger -t "$SCRIPT[$$]" "Starting up"
+
+ # Start the VM
+ exec $CMD
+ ;;
+
+ *)
+ echo "Usage: $SCRIPT {start|stop|restart|reboot|ping|console|console_clean|attach}"
+ exit 1
+ ;;
+esac
+
+exit 0
View
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+## This script replaces the default "erl" in erts-VSN/bin. This is necessary
+## as escript depends on erl and in turn, erl depends on having access to a
+## bootscript (start.boot). Note that this script is ONLY invoked as a side-effect
+## of running escript -- the embedded node bypasses erl and uses erlexec directly
+## (as it should).
+##
+## Note that this script makes the assumption that there is a start_clean.boot
+## file available in $ROOTDIR/release/VSN.
+
+# Determine the abspath of where this script is executing from.
+ERTS_BIN_DIR=$(cd ${0%/*} && pwd)
+
+# Now determine the root directory -- this script runs from erts-VSN/bin,
+# so we simply need to strip off two dirs from the end of the ERTS_BIN_DIR
+# path.
+ROOTDIR=${ERTS_BIN_DIR%/*/*}
+
+# Parse out release and erts info
+START_ERL=`cat $ROOTDIR/releases/start_erl.data`
+ERTS_VSN=${START_ERL% *}
+APP_VSN=${START_ERL#* }
+
+BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
+EMU=beam
+PROGNAME=`echo $0 | sed 's/.*\\///'`
+CMD="$BINDIR/erlexec"
+export EMU
+export ROOTDIR
+export BINDIR
+export PROGNAME
+
+exec $CMD -boot $ROOTDIR/releases/$APP_VSN/start_clean ${1+"$@"}
Oops, something went wrong.

0 comments on commit 464260d

Please sign in to comment.