Fixed setting of socket.timeout in httpd (was not currently set before).
Adopted the nanoseconds timeout precision - in config file added support for ns, us, ms, s timeout precision (without indication, it uses `seconds` precision).
This commit is contained in:
+11
-4
@@ -23,6 +23,8 @@ deferred class
|
||||
inherit
|
||||
WEB_SOCKET_CONSTANTS
|
||||
|
||||
WSF_TIMEOUT_UTILITIES
|
||||
|
||||
REFACTORING_HELPER
|
||||
|
||||
feature -- Web Socket Interface
|
||||
@@ -90,13 +92,18 @@ feature -- Websocket events
|
||||
|
||||
feature {WEB_SOCKET} -- Timeout.
|
||||
|
||||
timer_delay: INTEGER
|
||||
-- Maximal duration in seconds between two `on_timeout` event.
|
||||
timer_delay_ns: NATURAL_64
|
||||
-- Maximal duration in nanoseconds between two `on_timeout` event.
|
||||
-- Disable timeout event, by setting it to `0` (default).
|
||||
|
||||
set_timer_delay_ns (nb_nanosecs: NATURAL_64)
|
||||
do
|
||||
timer_delay_ns := nb_nanosecs
|
||||
end
|
||||
|
||||
set_timer_delay (nb_secs: INTEGER)
|
||||
do
|
||||
timer_delay := nb_secs
|
||||
timer_delay_ns := seconds_to_nanoseconds (nb_secs)
|
||||
end
|
||||
|
||||
on_timer (ws: WEB_SOCKET)
|
||||
@@ -143,7 +150,7 @@ feature -- Websocket events: implemented
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
copyright: "2011-2018, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -42,7 +42,7 @@ feature {NONE} -- Initialization
|
||||
end
|
||||
end
|
||||
|
||||
feature {NONE} -- Access
|
||||
feature {WEB_SOCKET_EVENT_I} -- Access
|
||||
|
||||
request: WSF_REQUEST
|
||||
-- Associated request.
|
||||
@@ -209,29 +209,30 @@ feature {WEB_SOCKET_HANDLER} -- Networking
|
||||
|
||||
wait_for_input (cb: detachable WEB_SOCKET_EVENT_I)
|
||||
local
|
||||
l_timeout, nb: INTEGER
|
||||
l_cb_timeout: INTEGER
|
||||
nb,
|
||||
l_timeout_ns,
|
||||
l_cb_timeout_ns: NATURAL_64
|
||||
do
|
||||
has_input := False
|
||||
if cb = Void then
|
||||
has_input := socket.ready_for_reading
|
||||
else
|
||||
l_cb_timeout := cb.timer_delay
|
||||
l_timeout := socket.timeout
|
||||
if l_cb_timeout = 0 then
|
||||
l_cb_timeout_ns := cb.timer_delay_ns
|
||||
l_timeout_ns := socket.timeout_ns
|
||||
if l_cb_timeout_ns = 0 then
|
||||
-- timeout event not enabled.
|
||||
has_input := socket.ready_for_reading
|
||||
else
|
||||
cb.on_timer (Current)
|
||||
if l_cb_timeout > l_timeout then
|
||||
if l_cb_timeout_ns > l_timeout_ns then
|
||||
-- event timeout duration is bigger than socket timeout
|
||||
-- thus, no on_timeout before next frame waiting
|
||||
has_input := socket.ready_for_reading
|
||||
else
|
||||
from
|
||||
l_timeout := socket.timeout
|
||||
nb := l_timeout
|
||||
socket.set_timeout (l_cb_timeout) -- FIXME: for now 1 sec is the smaller timeout we can use.
|
||||
l_timeout_ns := socket.timeout_ns
|
||||
nb := l_timeout_ns
|
||||
socket.set_timeout_ns (l_cb_timeout_ns)
|
||||
until
|
||||
has_input or nb <= 0
|
||||
loop
|
||||
@@ -239,13 +240,13 @@ feature {WEB_SOCKET_HANDLER} -- Networking
|
||||
if not has_input then
|
||||
-- Call on_timeout only if there is no input,
|
||||
-- otherwise it was called once before the initial wait.
|
||||
socket.set_timeout (l_timeout)
|
||||
socket.set_timeout_ns (l_timeout_ns)
|
||||
cb.on_timer (Current)
|
||||
socket.set_timeout (l_cb_timeout)
|
||||
socket.set_timeout_ns (l_cb_timeout_ns)
|
||||
end
|
||||
nb := nb - l_cb_timeout
|
||||
nb := nb - l_cb_timeout_ns
|
||||
end
|
||||
socket.set_timeout (l_timeout)
|
||||
socket.set_timeout_ns (l_timeout_ns)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -772,7 +773,7 @@ feature {NONE} -- Debug
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
copyright: "2011-2018, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
Reference in New Issue
Block a user