Permalink
Browse files

Merge remote-tracking branch 'onlychoice/timeout_opt'

  • Loading branch information...
2 parents 0f47940 + 9d0142c commit 491ea94fefe68b3ef2a0ccd3128a78ced5e0d09e @nniclausse nniclausse committed Mar 31, 2012
Showing with 27 additions and 8 deletions.
  1. +14 −2 doc/user_manual.tex
  2. +2 −1 src/tsung/tsung.app.src.in
  3. +11 −5 src/tsung_controller/ts_config.erl
View
@@ -1069,6 +1069,18 @@ \subsection{Setting options}
<option name="udp_rcv_buffer" value="16384"></option>
\end{Verbatim}
+\paragraph{Timeout for acknowledgments of messages}
+
+This is used to set the idle timeout(used for 'parse' and 'local' ack) and
+global ack timeout(used for 'global' ack). By default, idle timeout will be
+10min(600000) and global ack timeout will be \userinput{infinity}. This value
+can be changed like this:
+
+\begin{Verbatim}
+ <option name="idle_timeout" value="300000"></option>
+ <option name="glocal_ack_timeout" value="6000000"></option>
+\end{Verbatim}
+
\paragraph{Hibernate}
A new option is available in version \strong{1.3.1}: \varname{hibernate}. This
@@ -1077,7 +1089,7 @@ \subsection{Setting options}
higher than 10sec. This value can be changed like this:
\begin{Verbatim}
-<option name="hibernate" value="5"></option>
+ <option name="hibernate" value="5"></option>
\end{Verbatim}
To disable hibernation, you must set the value to \userinput{infinity}.
@@ -1115,7 +1127,7 @@ \subsection{Setting options}
different for every test).
\begin{Verbatim}
-<option name="seed" value="42"/>
+ <option name="seed" value="42"/>
\end{Verbatim}
@@ -21,7 +21,8 @@
{debug_level, 2},
{snd_size, 32768}, % send buffer size
{rcv_size, 32768}, % receive buffer size
- {tcp_timeout, 600000}, % 10min timeout
+ {idle_timeout, 600000}, % 10min timeout
+ {global_ack_timeout, infinity}, % global ack timeout
{connect_timeout, 30000},
{max_warm_delay, 15000},
{dump, full}, % full or light
@@ -706,16 +706,22 @@ parse(Element = #xmlElement{name=option, attributes=Attrs},
NewProto = OldProto#proto_opts{udp_snd_size=Size},
lists:foldl( fun parse/2, Conf#config{proto_opts=NewProto},
Element#xmlElement.content);
- "tcp_timeout" ->
- Size = getAttr(integer,Attrs, value, ?config(tcp_timeout)),
+ "idle_timeout" ->
+ Timeout = getAttr(integer,Attrs, value, ?config(idle_timeout)),
OldProto = Conf#config.proto_opts,
- NewProto = OldProto#proto_opts{idle_timeout=Size},
+ NewProto = OldProto#proto_opts{idle_timeout=Timeout},
+ lists:foldl( fun parse/2, Conf#config{proto_opts=NewProto},
+ Element#xmlElement.content);
+ "global_ack_timeout" ->
+ Timeout = getAttr(integer,Attrs, value, ?config(global_ack_timeout)),
+ OldProto = Conf#config.proto_opts,
+ NewProto = OldProto#proto_opts{global_ack_timeout=Timeout},
lists:foldl( fun parse/2, Conf#config{proto_opts=NewProto},
Element#xmlElement.content);
"retry_timeout" ->
- Size = getAttr(integer,Attrs, value, ?config(client_retry_timeout)),
+ Timeout = getAttr(integer,Attrs, value, ?config(client_retry_timeout)),
OldProto = Conf#config.proto_opts,
- NewProto = OldProto#proto_opts{retry_timeout=Size},
+ NewProto = OldProto#proto_opts{retry_timeout=Timeout},
lists:foldl( fun parse/2, Conf#config{proto_opts=NewProto},
Element#xmlElement.content);
"file_server" ->

0 comments on commit 491ea94

Please sign in to comment.