Skip to content

Commit 9429c68

Browse files
committed
Remove usage of 'Lwt_preemptive'
`Lwt_preemptive` is not used in any Ocsigen projects and will make less sense with other concurrency libraries. This removes the call to `Lwt_preemptive.init` and the `maxdetachedcomputationsqueued` config option.
1 parent 6bfe3a2 commit 9429c68

File tree

5 files changed

+0
-20
lines changed

5 files changed

+0
-20
lines changed

src/server/ocsigen_config.ml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ let set_debug () =
108108

109109
let set_minthreads i = minthreads := i
110110
let set_maxthreads i = maxthreads := i
111-
112-
let set_max_number_of_threads_queued =
113-
Lwt_preemptive.set_max_number_of_threads_queued
114-
115111
let set_max_number_of_connections i = max_number_of_connections := i
116112
let set_client_timeout i = silent_client_timeout := i
117113
let set_server_timeout i = silent_server_timeout := i
@@ -154,10 +150,6 @@ let get_veryverbose () = !veryverbose
154150
let get_debug () = !debug
155151
let get_minthreads () = !minthreads
156152
let get_maxthreads () = !maxthreads
157-
158-
let get_max_number_of_threads_queued =
159-
Lwt_preemptive.get_max_number_of_threads_queued
160-
161153
let get_max_number_of_connections () = !max_number_of_connections
162154
let get_client_timeout () = !silent_client_timeout
163155
let get_server_timeout () = !silent_server_timeout

src/server/ocsigen_config.mli

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ val set_veryverbose : unit -> unit
5656
val set_debug : unit -> unit
5757
val set_minthreads : int -> unit
5858
val set_maxthreads : int -> unit
59-
val set_max_number_of_threads_queued : int -> unit
6059
val set_max_number_of_connections : int -> unit
6160
val set_client_timeout : int -> unit
6261
val set_server_timeout : int -> unit
@@ -92,7 +91,6 @@ val get_veryverbose : unit -> bool
9291
val get_debug : unit -> bool
9392
val get_minthreads : unit -> int
9493
val get_maxthreads : unit -> int
95-
val get_max_number_of_threads_queued : unit -> int
9694
val get_max_number_of_connections : unit -> int
9795
val get_client_timeout : unit -> int
9896
val get_server_timeout : unit -> int

src/server/ocsigen_parseconfig.ml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,6 @@ and later_pass = function
445445
later_pass ll
446446
| Element ("minthreads", [], _p) :: ll -> later_pass ll
447447
| Element ("maxthreads", [], _p) :: ll -> later_pass ll
448-
| Element (("maxdetachedcomputationsqueued" as st), [], p) :: ll ->
449-
set_max_number_of_threads_queued
450-
(int_of_string st (parse_string_tag st p));
451-
later_pass ll
452448
| Element (("maxconnected" as st), [], p) :: ll ->
453449
set_max_number_of_connections (int_of_string st (parse_string_tag st p));
454450
later_pass ll

src/server/ocsigen_server.ml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,6 @@ let main config =
278278
raise
279279
(Ocsigen_config.Config_file_error
280280
"maxthreads should be greater than minthreads");
281-
Lwt_preemptive.init minthreads maxthreads (fun s ->
282-
Logs.err ~src:section (fun fmt -> fmt "%s" s));
283281
(Lwt.async_exception_hook :=
284282
fun e ->
285283
(* replace the default "exit 2" behaviour *)
@@ -447,7 +445,6 @@ let start
447445
?debugmode
448446
?minthreads
449447
?maxthreads
450-
?max_number_of_threads_queued
451448
?max_number_of_connections
452449
?client_timeout
453450
?server_timeout
@@ -480,8 +477,6 @@ let start
480477
Option.iter Ocsigen_config.set_debug debug;
481478
Option.iter Ocsigen_config.set_minthreads minthreads;
482479
Option.iter Ocsigen_config.set_maxthreads maxthreads;
483-
Option.iter Ocsigen_config.set_max_number_of_threads_queued
484-
max_number_of_threads_queued;
485480
Option.iter Ocsigen_config.set_max_number_of_connections
486481
max_number_of_connections;
487482
Option.iter Ocsigen_config.set_client_timeout client_timeout;

src/server/ocsigen_server.mli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ val start :
5050
-> ?debugmode:bool
5151
-> ?minthreads:int
5252
-> ?maxthreads:int
53-
-> ?max_number_of_threads_queued:int
5453
-> ?max_number_of_connections:int
5554
-> ?client_timeout:int
5655
-> ?server_timeout:int

0 commit comments

Comments
 (0)