Skip to content

Remove useless hack on Eliom_references in Eliom_comet #847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove useless hack on Eliom_references in Eliom_comet #847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions src/lib/eliom_comet.server.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,43 +586,26 @@ end = struct
(* as of now only `Client_process scope are handled: so we only stock scope_hierarchy *)
type handler_ref_table =
( Eliom_common.scope_hierarchy
, handler option Eliom_reference.eref )
, handler option Eliom_reference.Volatile.eref )
Hashtbl.t

let handler_ref_table : handler_ref_table = Hashtbl.create 1

(* this is a hack for the create function not to return 'a Lwt.t
type: This is needed because bus and react create the channel at
wrapping time, where it is impossible to block *)
let get_ref eref =
match Lwt.state (Eliom_reference.get eref) with
| Lwt.Return v -> v
| _ ->
failwith
"Eliom_comet: accessing channel references should not be blocking: this is an eliom bug"

let set_ref eref v =
match Lwt.state (Eliom_reference.set eref v) with
| Lwt.Return () -> ()
| _ ->
failwith
"Eliom_comet: accessing channel references should not be blocking: this is an eliom bug"

let get_handler_eref scope =
let scope_hierarchy =
Eliom_common_base.scope_hierarchy_of_user_scope scope
in
try Hashtbl.find handler_ref_table scope_hierarchy
with Not_found ->
let eref =
Eliom_reference.eref ~scope:(`Client_process scope_hierarchy) None
Eliom_reference.Volatile.eref ~scope:(`Client_process scope_hierarchy) None
in
Hashtbl.add handler_ref_table scope_hierarchy eref;
eref

let get_handler scope =
let eref = get_handler_eref scope in
match get_ref eref with
match Eliom_reference.Volatile.get eref with
| Some t -> t
| None ->
let hd_service =
Expand All @@ -648,7 +631,7 @@ end = struct
; hd_last = "", -1
; hd_activity = Inactive (Unix.gettimeofday ()) }
in
set_ref eref (Some handler);
Eliom_reference.Volatile.set eref (Some handler);
run_handler handler;
handler

Expand Down
Loading