Remove Fake_preempt

Author: vasilisp

configure

@@ -107,7 +107,7 @@ full_pwd=`pwd`
 
 ## Which options exist? eoptions for enable/disable, woptions for with/without:
 eoptions="debug annot natdynlink"
-woptions="pgsql sqlite dbm camlzip preempt"
+woptions="pgsql sqlite dbm camlzip"
 
 print_options () {
 	for opt in $eoptions; do

src/baselib/Makefile

@@ -58,12 +58,6 @@ else
   NATIVECODE_RUNTIME_DETECT=false
 endif
 
-ifeq "$(PREEMPTIVE)" "YES"
-  PREEMTIMPLEM=Lwt_preemptive
-else
-  PREEMTIMPLEM=Fake_preempt
-endif
-
 VERSION := $(shell head -n 1 ../../VERSION)
 
 ocsigen_config.ml: ocsigen_config.ml.in ../../Makefile.config ../../Makefile.options ../../VERSION
@@ -81,7 +75,6 @@ ocsigen_config.ml: ocsigen_config.ml.in ../../Makefile.config ../../Makefile.opt
 	| sed s%_PROJECTNAME_%$(PROJECTNAME)%g \
 	| sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
 	| sed s%_CONFIGDIR_%$(CONFIGDIR)% \
-	| sed s%_PREEMTIMPLEM_%$(PREEMTIMPLEM)% \
 	| sed s%_ISNATIVE_%$(NATIVECODE_RUNTIME_DETECT)%g \
 	| sed "s%_DEPS_%$(INITPACKAGE)%g" \
 	> ocsigen_config.ml

src/baselib/ocsigen_config.ml.in

@@ -38,13 +38,6 @@ let native_ext = if is_native then ".opt" else ""
 let builtin_packages =
   List.fold_left (fun a s -> String.Set.add s a) String.Set.empty [_DEPS_]
 
-module Fake_preempt =
-struct
-  let set_max_number_of_threads_queued : int -> unit = fun _ -> ()
-  let get_max_number_of_threads_queued : unit -> int = fun () -> 0
-  let init : int -> int -> (string -> unit) -> unit = fun _ _ _ -> ()
-end
-
 (* Server config: *)
 let (uploaddir : string option ref) = ref None
 let logdir = ref (Some ("_LOGDIR_"))
@@ -97,7 +90,7 @@ let set_veryverbose () =
 let set_minthreads i = minthreads := i
 let set_maxthreads i = maxthreads := i
 let set_max_number_of_threads_queued =
-  _PREEMTIMPLEM_.set_max_number_of_threads_queued
+  Lwt_preemptive.set_max_number_of_threads_queued
 let set_max_number_of_connections i = max_number_of_connections := i
 let set_client_timeout i = silent_client_timeout := i
 let set_server_timeout i = silent_server_timeout := i
@@ -143,7 +136,7 @@ let get_default_group () = !default_group
 let get_minthreads () = !minthreads
 let get_maxthreads () = !maxthreads
 let get_max_number_of_threads_queued =
-  _PREEMTIMPLEM_.get_max_number_of_threads_queued
+  Lwt_preemptive.get_max_number_of_threads_queued
 let get_max_number_of_connections () = !max_number_of_connections
 let get_client_timeout () = !silent_client_timeout
 let get_server_timeout () = !silent_server_timeout
@@ -175,5 +168,4 @@ let display_version () =
   print_newline ();
   exit 0
 
-let init_preempt =
-  _PREEMTIMPLEM_.init
+let init_preempt = Lwt_preemptive.init