Skip to content
Snippets Groups Projects
Commit 0b7a65db authored by Pierre Roux's avatar Pierre Roux
Browse files

Put State inside ProcessorState

It was a parameter but that wasn't of any use,
it was just making everything more noisy.
parent 6eb9b908
No related branches found
No related tags found
No related merge requests found
...@@ -78,8 +78,7 @@ Section ValidPreemptionModel. ...@@ -78,8 +78,7 @@ Section ValidPreemptionModel.
Context `{JobPreemptable Job}. Context `{JobPreemptable Job}.
(** Consider any kind of processor state model, ... *) (** Consider any kind of processor state model, ... *)
Context {PState : Type}. Context {PState : ProcessorState Job}.
Context `{ProcessorState Job PState}.
(** ... any job arrival sequence, ... *) (** ... any job arrival sequence, ... *)
Variable arr_seq : arrival_sequence Job. Variable arr_seq : arrival_sequence Job.
...@@ -150,8 +149,7 @@ Section ValidTaskRunToCompletionThreshold. ...@@ -150,8 +149,7 @@ Section ValidTaskRunToCompletionThreshold.
Context `{TaskRunToCompletionThreshold Task}. Context `{TaskRunToCompletionThreshold Task}.
(** Further, consider any kind of processor model, ... *) (** Further, consider any kind of processor model, ... *)
Context {PState : Type}. Context {PState : ProcessorState Job}.
Context `{ProcessorState Job PState}.
(** ... any job arrival sequence, ... *) (** ... any job arrival sequence, ... *)
Variable arr_seq: arrival_sequence Job. Variable arr_seq: arrival_sequence Job.
......
...@@ -17,8 +17,7 @@ Section PropertyOfSequentiality. ...@@ -17,8 +17,7 @@ Section PropertyOfSequentiality.
Context `{JobCost Job}. Context `{JobCost Job}.
(** ... and any kind of processor model. *) (** ... and any kind of processor model. *)
Context {PState : Type}. Context {PState : ProcessorState Job}.
Context `{ProcessorState Job PState}.
(** Consider any arrival sequence ... *) (** Consider any arrival sequence ... *)
Variable arr_seq : arrival_sequence Job. Variable arr_seq : arrival_sequence Job.
...@@ -44,6 +43,5 @@ Section PropertyOfSequentiality. ...@@ -44,6 +43,5 @@ Section PropertyOfSequentiality.
all all
(fun j_tsk => completed_by sched j_tsk t) (fun j_tsk => completed_by sched j_tsk t)
(task_arrivals_before arr_seq (job_task j) (job_arrival j)). (task_arrivals_before arr_seq (job_task j) (job_arrival j)).
End PropertyOfSequentiality. End PropertyOfSequentiality.
...@@ -49,7 +49,7 @@ Section RTAforFPwithBoundedNonpreemptiveSegmentsWithArrivalCurves. ...@@ -49,7 +49,7 @@ Section RTAforFPwithBoundedNonpreemptiveSegmentsWithArrivalCurves.
Variable sched : schedule (ideal.processor_state Job). Variable sched : schedule (ideal.processor_state Job).
(** ... allow for any work-bearing notion of job readiness, ... *) (** ... allow for any work-bearing notion of job readiness, ... *)
Context `{@JobReady Job (ideal.processor_state Job) _ Cost Arrival}. Context `{@JobReady Job (ideal.processor_state Job) Cost Arrival}.
Hypothesis H_job_ready : work_bearing_readiness arr_seq sched. Hypothesis H_job_ready : work_bearing_readiness arr_seq sched.
(** ... and assume that the schedule is valid. *) (** ... and assume that the schedule is valid. *)
......
...@@ -54,7 +54,7 @@ Section AbstractRTAforFPwithArrivalCurves. ...@@ -54,7 +54,7 @@ Section AbstractRTAforFPwithArrivalCurves.
Variable sched : schedule (ideal.processor_state Job). Variable sched : schedule (ideal.processor_state Job).
(** ... allow for any work-bearing notion of job readiness, ... *) (** ... allow for any work-bearing notion of job readiness, ... *)
Context `{@JobReady Job (ideal.processor_state Job) _ Cost Arrival}. Context `{@JobReady Job (ideal.processor_state Job) Cost Arrival}.
Hypothesis H_job_ready : work_bearing_readiness arr_seq sched. Hypothesis H_job_ready : work_bearing_readiness arr_seq sched.
(** ... and assume that the schedule is valid. *) (** ... and assume that the schedule is valid. *)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment