Skip to content
Browse files

remove single example file, add several for each protocol in examples…

… dir.

SVN Revision: 564
  • Loading branch information...
1 parent bf07bec commit bc55eac0c7530712086ac4b6b6ed2fe7c9d44d52 @nniclausse nniclausse committed Nov 8, 2005
Showing with 84 additions and 72 deletions.
  1. +2 −2 Makefile.in
  2. +3 −3 configure
  3. +1 −1 configure.in
  4. +18 −66 idx-tsunami.xml.in → examples/http_distributed.xml.in
  5. +60 −0 examples/jabber.xml.in
View
4 Makefile.in
@@ -76,8 +76,8 @@ INC_FILES = $(wildcard $(INC)/*.hrl)
SRC = $(wildcard $(ESRC)/$(APPLICATION)/*.erl)
CONTROLLER_SRC = $(wildcard $(ESRC)/$(CONTROLLER_APPLICATION)/*.erl)
RECORDER_SRC = $(wildcard $(ESRC)/$(RECORDER_APPLICATION)/*.erl)
-CONFFILE = idx-tsunami.xml
-CONFFILE_SRC = idx-tsunami.xml.in
+CONFFILE_SRC = $(wildcard examples/*.xml.in)
+CONFFILE = $(basename $(CONFFILE_SRC))
USERMANUAL = doc/user_manual.html doc/IDXDOC.css
USERMANUAL_IMG = $(wildcard doc/images/*.png)
USERMANUAL_SRC = doc/user_manual.tex
View
6 configure
@@ -1569,7 +1569,7 @@ echo "$as_me: error: erlang program was not properly executed, (conftest.out was
not produced)" >&2;}
{ (exit 1); exit 1; }; }
fi
-ERLANG_XMERL_DIR=`cat conftest.out|head -1`
+ERLANG_XMERL_DIR=`head -1 < conftest.out`
if test -f "$ERLANG_XMERL_DIR/inc/xmerl.hrl"; then
ERLANG_XMERL_DIR="$ERLANG_XMERL_DIR/inc/"
echo "$as_me:$LINENO: result: $ERLANG_XMERL_DIR" >&5
@@ -1752,7 +1752,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- ac_config_files="$ac_config_files Makefile idx-tsunami.spec idx-tsunami.sh idx-tsunami.xml src/analyse_msg.pl src/log2tsunami.pl"
+ ac_config_files="$ac_config_files Makefile idx-tsunami.spec idx-tsunami.sh examples/*.xml src/analyse_msg.pl src/log2tsunami.pl"
cat >confcache <<\_ACEOF
@@ -2309,7 +2309,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"idx-tsunami.spec" ) CONFIG_FILES="$CONFIG_FILES idx-tsunami.spec" ;;
"idx-tsunami.sh" ) CONFIG_FILES="$CONFIG_FILES idx-tsunami.sh" ;;
- "idx-tsunami.xml" ) CONFIG_FILES="$CONFIG_FILES idx-tsunami.xml" ;;
+ "examples/*.xml" ) CONFIG_FILES="$CONFIG_FILES examples/*.xml" ;;
"src/analyse_msg.pl" ) CONFIG_FILES="$CONFIG_FILES src/analyse_msg.pl" ;;
"src/log2tsunami.pl" ) CONFIG_FILES="$CONFIG_FILES src/log2tsunami.pl" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
View
2 configure.in
@@ -98,6 +98,6 @@ AC_SUBST(TEMPLATES_SUBDIR,[idx-tsunami/templates])
AC_PROG_MAKE_SET
AC_PROG_INSTALL
-AC_CONFIG_FILES([Makefile idx-tsunami.spec idx-tsunami.sh idx-tsunami.xml src/analyse_msg.pl src/log2tsunami.pl])
+AC_CONFIG_FILES([Makefile idx-tsunami.spec idx-tsunami.sh examples/*.xml src/analyse_msg.pl src/log2tsunami.pl])
AC_OUTPUT
View
84 idx-tsunami.xml.in → examples/http_distributed.xml.in
@@ -4,27 +4,25 @@
<!-- set loglevel="debug" for maximum verbosity -->
<idx-tsunami loglevel="notice" dumptraffic="false" version="1.0">
-
-
<!-- Client side setup -->
<clients>
<!-- maxusers is the max number of simultaneous clients. Don't set
it too high because you can run out of file descriptors. Remember
that ssl_esock use 2 fds by connection. -->
- <client host="localhost" weight="2" maxusers="500">
+ <client host="myhost" weight="2" maxusers="500">
<!-- Several virtual IP can be used to simulate more
machines. Very useful when a load-balancer use the client's IP to
distribute the traffic amoung a cluster of servers-->
<ip value="192.168.2.223"></ip>
- <ip value="127.0.0.1"></ip>
+ <ip value="192.168.2.224"></ip>
</client>
<!-- a second machine is used, with a higher weight, and 2 cpus
(erlang is not SMP aware, so we starts 2 beams to use all the
CPUs -->
- <client host="speed4" weight="3" maxusers="250" cpu="2">
- <ip value="192.168.2.224"></ip>
+ <client host="myhost2" weight="3" maxusers="250" cpu="2">
+ <ip value="192.168.2.225"></ip>
</client>
<!-- If you have a single machine to do the tests, you may add
@@ -36,13 +34,13 @@
</clients>
<!-- Server side setup -->
- <server host="myserver" port="7" type="tcp"></server>
+ <server host="myserver" port="80" type="tcp"></server>
<!-- to start os monitoring (cpu, network, memory). Use an erlang
agent on the remote machine or SNMP. erlang is the default -->
<monitoring>
<monitor host="myserver" type="snmp"></monitor>
- <monitor host="myserver2" type="erlang"></monitor>
+ <monitor host="myhost" type="erlang"></monitor>
</monitoring>
<!-- several arrival phases can be set: for each phase, you can set
@@ -52,29 +50,24 @@
<arrivalphase phase="1" duration="1" unit="hour">
<users interarrival="2" unit="second"></users>
</arrivalphase>
+ <arrivalphase phase="2" duration="1" unit="hour">
+ <users interarrival="1" unit="second"></users>
+ </arrivalphase>
<!-- default values. -->
<!-- Thinktime value overrides those set in the session
nodes if override=true. -->
- <default name="thinktime" value="3" random="false" override="false"></default>
+ <default name="thinktime" value="3" random="true" override="false"></default>
+
<!-- to set specific ssl_ciphers -->
- <default name="ssl_ciphers" value="EXP1024-RC4-SHA,EDH-RSA-DES-CBC3-SHA"></default>
+ <!-- <default name="ssl_ciphers" value="EXP1024-RC4-SHA,EDH-RSA-DES-CBC3-SHA"></default> -->
<!-- To start ts_file_server. It can be use later in dynamic
substitution using ts_file_server:get_next_line() -->
<default name="file_server" value="/tmp/userlist"></default>
<!-- HTTP parameters -->
- <!-- none yet -->
- <!-- JABBER parameters -->
- <!-- to synchronise users, use a global acknoledgement -->
- <default type="ts_jabber" name="global_number" value="5"></default>
- <default type="ts_jabber" name="userid_max" value="100"></default>
- <default type="ts_jabber" name="domain" value="jabber.org"></default>
- <default type="ts_jabber" name="username" value="glop"></default>
- <default type="ts_jabber" name="passwd" value="glop"></default>
-
<!-- If you want to benchmark a proxy server instead of a reguler web server-->
<!-- <default type="ts_http" name="http_use_server_as_proxy" value="true"/> -->
@@ -132,56 +125,15 @@
</session>
+ <session name="http-example" popularity="30" type="ts_http">
+ <request> <http url="/" method="GET" version="1.1"></http> </request>
+ <request> <http url="/images/icon1.gif" method="GET" version="1.1" if_modified_since="Fri, 14 Nov 2003 02:43:31 GMT"></http> </request>
+ <request> <http url="/images/icon1.gif" method="GET" version="1.1"></http> </request>
- <!-- ********************************************** -->
- <!-- Jabber session example (see 'type' argument) -->
- <!-- ********************************************** -->
-
- <session popularity="70" name="jabber-example" type="ts_jabber">
-
- <request> <jabber type="connect" ack="no_ack"></jabber> </request>
- <thinktime value="2"></thinktime>
- <transaction name="authenticate">
- <request> <jabber type="authenticate" ack="local"></jabber> </request>
- </transaction>
-
- <request> <jabber type="presence" ack="no_ack"/> </request>
- <thinktime value="2"></thinktime>
-
- <request> <jabber type="register" ack="no_ack" id="new"></jabber> </request>
-
- <transaction name="roster">
- <request> <jabber type="iq:roster:set" ack="no_ack" destination="offline"></jabber> </request>
- <request> <jabber type="presence:roster" ack="no_ack" destination="previous"></jabber> </request>
- <request> <jabber type="iq:roster:set" ack="no_ack" destination="online"></jabber> </request>
- <request> <jabber type="iq:roster:get" ack="no_ack"></jabber> </request>
- </transaction>
- <thinktime value="2"></thinktime>
-
- <request> <jabber type="chat" ack="no_ack" size="56"></jabber> </request>
- <thinktime value="30"></thinktime>
-
- <transaction name="global_msg">
- <request> <jabber type="chat" ack="global" size="56" destination="random"></jabber> </request>
- </transaction>
-
- <thinktime value="30"></thinktime>
-
- <transaction name="online">
- <request> <jabber type="chat" ack="no_ack" size="16" destination="online"></jabber> </request>
- </transaction>
- <thinktime value="30"></thinktime>
-
- <transaction name="offline">
- <request> <jabber type="chat" ack="no_ack" size="56" destination="offline"></jabber> </request>
- </transaction>
+ <thinktime value="60" random="true"></thinktime>
- <thinktime value="30"></thinktime>
-
- <transaction name="close">
- <request> <jabber type="close" ack="local"></jabber> </request>
- </transaction>
+ <request> <http url="/" method="GET" version="1.1" if_modified_since="Fri, 14 Nov 2003 02:43:31 GMT"></http> </request>
</session>
</idx-tsunami>
View
60 examples/jabber.xml.in
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE idx-tsunami SYSTEM "/home/nniclausse/share/idx-tsunami/idx-tsunami-1.0.dtd">
+<idx-tsunami loglevel="notice" version="1.0">
+
+ <clients>
+ <client host="localhost" use_controller_vm="true"></client>
+ </clients>
+
+ <!-- Server side setup -->
+ <server host="127.0.0.1" port="5222" type="tcp"></server>
+
+
+ <arrivalphase phase="1" duration="1" unit="minute">
+ <users interarrival="2" unit="second"></users>
+ </arrivalphase>
+
+ <!-- JABBER parameters -->
+ <!-- to synchronise users, use a global acknoledgement -->
+ <default type="ts_jabber" name="global_number" value="100"></default>
+ <default type="ts_jabber" name="userid_max" value="10000"></default>
+ <default type="ts_jabber" name="domain" value="mydomain.org"></default>
+ <default type="ts_jabber" name="username" value="user"></default>
+ <default type="ts_jabber" name="passwd" value="pass"></default>
+
+ <session popularity="100" name="jabber-example" type="ts_jabber">
+
+ <request> <jabber type="connect" ack="no_ack"></jabber> </request>
+ <thinktime value="2"></thinktime>
+ <transaction name="authenticate">
+ <request> <jabber type="authenticate" ack="local"></jabber> </request>
+ </transaction>
+
+ <request> <jabber type="presence" ack="no_ack"/> </request>
+ <thinktime value="2"></thinktime>
+
+ <transaction name="roster">
+ <request> <jabber type="iq:roster:get" ack="local"></jabber></request>
+ </transaction>
+
+ <thinktime value="30"></thinktime>
+
+ <transaction name="online">
+ <request> <jabber type="chat" ack="no_ack" size="16" destination="online"></jabber> </request>
+ </transaction>
+
+ <thinktime value="30"></thinktime>
+
+ <transaction name="offline">
+ <request> <jabber type="chat" ack="no_ack" size="56" destination="offline"></jabber> </request>
+ </transaction>
+
+ <thinktime value="30"></thinktime>
+
+ <transaction name="close">
+ <request> <jabber type="close" ack="no_ack"></jabber> </request>
+ </transaction>
+
+ </session>
+</idx-tsunami>
+

0 comments on commit bc55eac

Please sign in to comment.
Something went wrong with that request. Please try again.