X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fwhenexpr.ml;h=c2ffa334be9c77404579d21d23a15f4192c6ce66;hb=d0eb02dfe7ab7db2f9e67c4313a1cad3b0ce4d93;hp=2cb686346532c0420f479082fff8aa02e45210ee;hpb=0c9faf57f9239b0fe1c0b46353d222bb4cf5cd74;p=whenjobs.git

diff --git a/lib/whenexpr.ml b/lib/whenexpr.ml
index 2cb6863..c2ffa33 100644
--- a/lib/whenexpr.ml
+++ b/lib/whenexpr.ml
@@ -83,23 +83,6 @@ type shell_script = {
   sh_script : string;
 }
 
-type preinfo = {
-  pi_job_name : string;
-  pi_serial : Big_int.big_int;
-}
-
-type result = {
-  res_job_name : string;
-  res_serial : Big_int.big_int;
-  res_code : int;
-  res_tmpdir : string;
-  res_output : string;
-  res_start_time : float;
-}
-
-type pre = preinfo -> bool
-type post = result -> unit
-
 type variable =
   | T_unit
   | T_bool of bool
@@ -123,6 +106,31 @@ let rpc_of_variable = function
 
 type variables = variable StringMap.t
 
+type preinfo = {
+  pi_job_name : string;
+  pi_serial : Big_int.big_int;
+  pi_variables : (string * variable) list;
+  pi_running : preinfo_running_job list;
+}
+and preinfo_running_job = {
+  pirun_job_name : string;
+  pirun_serial : Big_int.big_int;
+  pirun_start_time : float;
+  pirun_pid : int;
+}
+
+type result = {
+  res_job_name : string;
+  res_serial : Big_int.big_int;
+  res_code : int;
+  res_tmpdir : string;
+  res_output : string;
+  res_start_time : float;
+}
+
+type pre = preinfo -> bool
+type post = result -> unit
+
 type job_cond =
   | When_job of whenexpr
   | Every_job of periodexpr