X-Git-Url: http://git.annexia.org/?p=whenjobs.git;a=blobdiff_plain;f=daemon%2Fdaemon.ml;h=542c7a48b40ffb255708c766928ca430616aab82;hp=af2668fa408f3b1d4c3777e90898d609c40ea82e;hb=600c8000490fa8279b23ce866e9ecc2a90e5f79a;hpb=76e68068f22a67c788f14a7c9404db7f7514da49 diff --git a/daemon/daemon.ml b/daemon/daemon.ml index af2668f..542c7a4 100644 --- a/daemon/daemon.ml +++ b/daemon/daemon.ml @@ -26,24 +26,12 @@ open Printf (* See [exit.c]. *) external _exit : int -> 'a = "whenjobs__exit" -(* All jobs that are loaded. Maps name -> [job] structure. *) -let jobs = ref StringMap.empty - -(* Map variable names to jobs which depend on that variable. This - * gives us a quick way to tell which jobs might need to be reevaluated - * when a variable is set. - *) -let dependencies = ref StringMap.empty - -(* Current values of variables. Using the referentially transparent - * type Map is very useful here because it lets us cheaply keep - * previous values of variables. - *) -let variables : variables ref = ref StringMap.empty - (* $HOME/.whenjobs *) let jobsdir = ref "" +(* The state. *) +let state = ref Whenstate.empty + (* Jobs that are running; map of PID -> (job, other data). Note that * the job may no longer exist *OR* it may have been renamed, * eg. if the jobs file was reloaded. @@ -76,6 +64,7 @@ let rec init j d = let addr = sprintf "%s/socket" !jobsdir in (try unlink addr with Unix_error _ -> ()); + (* Create the Unix domain socket server. *) server := Some ( Whenproto_srv.When.V1.create_server ~proc_reload_file @@ -92,10 +81,8 @@ let rec init j d = (* Handle SIGCHLD to clean up jobs. *) Sys.set_signal Sys.sigchld (Sys.Signal_handle handle_sigchld); - (* Initialize the variables. XXX Eventually this will be saved - * and loaded from a persistent store. - *) - variables := StringMap.add "JOBSERIAL" (T_int zero_big_int) !variables + (* Initialize the variables. *) + state := Whenstate.set_variable !state "JOBSERIAL" (T_int zero_big_int) and proc_reload_file () = if !debug then Syslog.notice "remote call: reload_file"; @@ -107,30 +94,14 @@ and proc_set_variable (name, value) = if !debug then Syslog.notice "remote call: set_variable %s" name; try - (* Don't permit certain names. *) - if name = "JOBSERIAL" then - failwith "JOBSERIAL variable cannot be set"; - - let len = String.length name in - if len = 0 then - failwith "variable name is an empty string"; - if name.[0] <> '_' && not (isalpha name.[0]) then - failwith "variable name must start with alphabetic character or underscore"; - - let rec loop i = - if i >= len then () - else if name.[i] <> '_' && not (isalnum name.[i]) then - failwith "variable name contains non-alphanumeric non-underscore character" - else loop (i+1) - in - loop 1; + check_valid_variable_name name; let value = variable_of_rpc value in - variables := StringMap.add name value !variables; + state := Whenstate.set_variable !state name value; (* Which jobs need to be re-evaluated? *) - let jobnames = try StringMap.find name !dependencies with Not_found -> [] in - reevaluate_whenjobs jobnames; + let jobs = Whenstate.get_dependencies !state name in + reevaluate_whenjobs jobs; `ok with @@ -139,17 +110,14 @@ and proc_set_variable (name, value) = and proc_get_variable name = if !debug then Syslog.notice "remote call: get_variable %s" name; - try rpc_of_variable (StringMap.find name !variables) - with (* all non-existent variables are empty strings *) - Not_found -> `string_t "" + rpc_of_variable (Whenstate.get_variable !state name) and proc_get_variable_names () = if !debug then Syslog.notice "remote call: get_variable_names"; - (* Only return variables that are non-empty. *) - let vars = StringMap.fold ( - fun name value xs -> if value <> T_string "" then name :: xs else xs - ) !variables [] in + let vars = Whenstate.get_variable_names !state in + + (* Return variable names as a sorted array. *) let vars = Array.of_list vars in Array.sort compare vars; vars @@ -168,14 +136,20 @@ and proc_exit_daemon () = (* Reload the jobs file. *) and reload_file () = let file = sprintf "%s/jobs.cmo" !jobsdir in - Whenfile.init (); - let js = + (* As we are reloading the file, we want to create a new state + * that has no jobs, but has all the variables from the previous + * state. + *) + let s = Whenstate.copy_variables !state Whenstate.empty in + Whenfile.init s; + + let s = try Dynlink.loadfile file; - let jobs = Whenfile.get_jobs () in - Syslog.notice "loaded %d job(s) from %s" (List.length jobs) file; - jobs + let s = Whenfile.get_state () in + Syslog.notice "loaded %d job(s) from %s" (Whenstate.nr_jobs s) file; + s with | Dynlink.Error err -> let err = Dynlink.error_message err in @@ -184,73 +158,49 @@ and reload_file () = | exn -> failwith (Printexc.to_string exn) in - (* Set 'jobs' and related global variables. *) - let () = - let map = List.fold_left ( - fun map j -> - let name = j.job_name in - StringMap.add name j map - ) StringMap.empty js in - jobs := map in - - let () = - let map = List.fold_left ( - fun map j -> - let deps = dependencies_of_job j in - let name = j.job_name in - List.fold_left ( - fun map d -> - let names = try StringMap.find d map with Not_found -> [] in - StringMap.add d (name :: names) map - ) map deps - ) StringMap.empty js in - dependencies := map in + state := s; (* Re-evaluate all when jobs. *) - reevaluate_whenjobs ~onload:true (StringMap.keys !jobs); + reevaluate_whenjobs ~onload:true (Whenstate.get_whenjobs !state); (* Schedule the next every job to run. *) schedule_next_everyjob () -(* Re-evaluate each named when-statement job, in a loop until we reach - * a fixpoint. Run those that need to be run. every-statement jobs - * are ignored here. +(* Re-evaluate each when-statement job, in a loop until we reach + * a fixpoint. Run those that need to be run. *) -and reevaluate_whenjobs ?(onload=false) jobnames = - let rec loop set jobnames = +and reevaluate_whenjobs ?onload jobs = + let rec loop set jobs = let set' = List.fold_left ( - fun set jobname -> - let job = - try StringMap.find jobname !jobs - with Not_found -> assert false in - assert (jobname = job.job_name); - - let r, job' = - try job_evaluate job !variables onload + fun set job -> + let r, state' = + try Whenstate.evaluate_whenjob ?onload !state job with Invalid_argument err | Failure err -> Syslog.error "error evaluating job %s (at %s): %s" - jobname (Camlp4.PreCast.Ast.Loc.to_string job.job_loc) err; - false, job in + job.job_name (Camlp4.PreCast.Ast.Loc.to_string job.job_loc) err; + false, !state in - jobs := StringMap.add jobname job' !jobs; + state := state'; if !debug then - Syslog.notice "evaluate %s -> %b\n" jobname r; + Syslog.notice "evaluate %s -> %b\n" job.job_name r; - if r then StringSet.add jobname set else set - ) set jobnames in + if r then StringSet.add job.job_name set else set + ) set jobs in if StringSet.compare set set' <> 0 then - loop set' jobnames + loop set' jobs else set' in - let set = loop StringSet.empty jobnames in + let set = loop StringSet.empty jobs in let jobnames = StringSet.elements set in + (* Ensure the jobs always run in predictable (name) order. *) let jobnames = List.sort compare_jobnames jobnames in - List.iter run_job - (List.map (fun jobname -> StringMap.find jobname !jobs) jobnames) + + (* Run the jobs. *) + List.iter run_job (List.map (Whenstate.get_job !state) jobnames) (* Schedule the next every-statement job to run, if there is one. We * look at the every jobs, work out the time that each must run at, @@ -262,11 +212,11 @@ and schedule_next_everyjob () = let t = time () in (* Get only everyjobs. *) - let jobs = StringMap.values !jobs in - let jobs = filter_map ( + let jobs = Whenstate.get_everyjobs !state in + let jobs = List.map ( function - | { job_cond = Every_job period } as job -> Some (job, period) - | { job_cond = When_job _ } -> None + | { job_cond = Every_job period } as job -> (job, period) + | { job_cond = When_job _ } -> assert false ) jobs in (* Map everyjob to next time it must run. *) @@ -345,10 +295,10 @@ and run_job job = let () = (* Increment JOBSERIAL. *) let serial = - match StringMap.find "JOBSERIAL" !variables with + match Whenstate.get_variable !state "JOBSERIAL" with | T_int serial -> let serial = succ_big_int serial in - variables := StringMap.add "JOBSERIAL" (T_int serial) !variables; + state := Whenstate.set_variable !state "JOBSERIAL" (T_int serial); serial | _ -> assert false in @@ -366,8 +316,9 @@ and run_job job = chdir dir; (* Set environment variables corresponding to each variable. *) - StringMap.iter - (fun name value -> putenv name (string_of_variable value)) !variables; + List.iter + (fun (name, value) -> putenv name (string_of_variable value)) + (Whenstate.get_variables !state); (* Set the $JOBNAME environment variable. *) putenv "JOBNAME" job.job_name;