From 89d2e025d3dd6737fb516eee5653a9bd314ff7af Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date: Fri, 21 Feb 2014 10:59:13 +0100
Subject: [PATCH] generator: rename RunningTaskAnalysis
The running task analysis is more a system state dataflow analysis. So
we should name it like that.
Change-Id: I39ea9baaa6c2c1781e2ff270ae403b41f06a15ed
---
app/bcc1/alarm1/verify_a.py | 2 +-
app/bcc1/alarm1/verify_b.py | 2 +-
app/bcc1/alarm1/verify_c.py | 2 +-
app/bcc1/alarm1/verify_d.py | 2 +-
app/bcc1/alarm1/verify_e.py | 2 +-
app/bcc1/complex1/verify_a.py | 2 +-
app/bcc1/complex1/verify_b.py | 2 +-
app/bcc1/complex1/verify_c.py | 2 +-
app/bcc1/isr2/verify_a.py | 2 +-
app/bcc1/isr2/verify_b.py | 2 +-
app/bcc1/isr2/verify_c.py | 2 +-
app/bcc1/isr2/verify_d.py | 2 +-
app/bcc1/resource1/verify_a.py | 2 +-
app/bcc1/resource1/verify_b.py | 2 +-
app/bcc1/resource1/verify_d.py | 2 +-
app/bcc1/resource1/verify_e.py | 2 +-
app/bcc1/resource1/verify_f.py | 2 +-
app/bcc1/resource1/verify_g.py | 2 +-
app/bcc1/resource1/verify_h.py | 2 +-
app/bcc1/resource1/verify_k.py | 2 +-
app/bcc1/resource2/verify_a.py | 2 +-
app/bcc1/resource2/verify_b.py | 2 +-
app/bcc1/sse1/verify_a.py | 2 +-
app/bcc1/sse1/verify_b.py | 2 +-
app/bcc1/sse1/verify_c.py | 2 +-
app/bcc1/task1/verify_a.py | 2 +-
app/bcc1/task1/verify_b.py | 2 +-
app/bcc1/task1/verify_c.py | 2 +-
app/bcc1/task1/verify_d.py | 2 +-
app/bcc1/task1/verify_e.py | 2 +-
app/bcc1/task1/verify_f.py | 2 +-
app/bcc1/task1/verify_g.py | 2 +-
app/bcc1/task2/verify_a.py | 2 +-
app/bcc1/task2/verify_b.py | 2 +-
generator/graph/SymbolicSystemExecution.py | 2 +-
generator/graph/{RunningTask.py => SystemStateFlow.py} | 6 +++---
generator/graph/__init__.py | 2 +-
generator/main.py | 4 ++--
38 files changed, 41 insertions(+), 41 deletions(-)
rename generator/graph/{RunningTask.py => SystemStateFlow.py} (98%)
diff --git a/app/bcc1/alarm1/verify_a.py b/app/bcc1/alarm1/verify_a.py
index 523af7e..e9c7522 100644
--- a/app/bcc1/alarm1/verify_a.py
+++ b/app/bcc1/alarm1/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_b.py b/app/bcc1/alarm1/verify_b.py
index 0716ee7..ff65476 100644
--- a/app/bcc1/alarm1/verify_b.py
+++ b/app/bcc1/alarm1/verify_b.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_c.py b/app/bcc1/alarm1/verify_c.py
index 6f5dc42..4b1493a 100644
--- a/app/bcc1/alarm1/verify_c.py
+++ b/app/bcc1/alarm1/verify_c.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_d.py b/app/bcc1/alarm1/verify_d.py
index ca826c1..b654499 100644
--- a/app/bcc1/alarm1/verify_d.py
+++ b/app/bcc1/alarm1/verify_d.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/alarm1/verify_e.py b/app/bcc1/alarm1/verify_e.py
index d36f624..57c25df 100644
--- a/app/bcc1/alarm1/verify_e.py
+++ b/app/bcc1/alarm1/verify_e.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/complex1/verify_a.py b/app/bcc1/complex1/verify_a.py
index efbfbdb..bdeaa4e 100644
--- a/app/bcc1/complex1/verify_a.py
+++ b/app/bcc1/complex1/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS, ISR1) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/complex1/verify_b.py b/app/bcc1/complex1/verify_b.py
index 60e4e64..3507bb7 100644
--- a/app/bcc1/complex1/verify_b.py
+++ b/app/bcc1/complex1/verify_b.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS, ISR1) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/complex1/verify_c.py b/app/bcc1/complex1/verify_c.py
index a649ad2..303fef0 100644
--- a/app/bcc1/complex1/verify_c.py
+++ b/app/bcc1/complex1/verify_c.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS, ISR1) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/isr2/verify_a.py b/app/bcc1/isr2/verify_a.py
index 517c166..29f0fb8 100644
--- a/app/bcc1/isr2/verify_a.py
+++ b/app/bcc1/isr2/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS, ISR1) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/isr2/verify_b.py b/app/bcc1/isr2/verify_b.py
index 015326d..09bf35e 100644
--- a/app/bcc1/isr2/verify_b.py
+++ b/app/bcc1/isr2/verify_b.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS, ISR1) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS", "ISR1"])
diff --git a/app/bcc1/isr2/verify_c.py b/app/bcc1/isr2/verify_c.py
index c7f0b6d..807f23a 100644
--- a/app/bcc1/isr2/verify_c.py
+++ b/app/bcc1/isr2/verify_c.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "StartOS"])
diff --git a/app/bcc1/isr2/verify_d.py b/app/bcc1/isr2/verify_d.py
index f2b4c9a..0434d8b 100644
--- a/app/bcc1/isr2/verify_d.py
+++ b/app/bcc1/isr2/verify_d.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, Idle, ISR1) = \
get_functions(analysis.system, ["H1", "H2", "H3", "Idle", "ISR1"])
diff --git a/app/bcc1/resource1/verify_a.py b/app/bcc1/resource1/verify_a.py
index 69eaf74..ff299f1 100644
--- a/app/bcc1/resource1/verify_a.py
+++ b/app/bcc1/resource1/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_b.py b/app/bcc1/resource1/verify_b.py
index edd0302..ad84850 100644
--- a/app/bcc1/resource1/verify_b.py
+++ b/app/bcc1/resource1/verify_b.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_d.py b/app/bcc1/resource1/verify_d.py
index c951728..cd5ff89 100644
--- a/app/bcc1/resource1/verify_d.py
+++ b/app/bcc1/resource1/verify_d.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS, bar) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_e.py b/app/bcc1/resource1/verify_e.py
index 38efcac..bf0fefb 100644
--- a/app/bcc1/resource1/verify_e.py
+++ b/app/bcc1/resource1/verify_e.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_f.py b/app/bcc1/resource1/verify_f.py
index 34cabe1..f8c0abb 100644
--- a/app/bcc1/resource1/verify_f.py
+++ b/app/bcc1/resource1/verify_f.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_g.py b/app/bcc1/resource1/verify_g.py
index aeeb052..9c37c4e 100644
--- a/app/bcc1/resource1/verify_g.py
+++ b/app/bcc1/resource1/verify_g.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_h.py b/app/bcc1/resource1/verify_h.py
index 82d4338..38d9ad8 100644
--- a/app/bcc1/resource1/verify_h.py
+++ b/app/bcc1/resource1/verify_h.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource1/verify_k.py b/app/bcc1/resource1/verify_k.py
index ed9e207..45afa40 100644
--- a/app/bcc1/resource1/verify_k.py
+++ b/app/bcc1/resource1/verify_k.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/resource2/verify_a.py b/app/bcc1/resource2/verify_a.py
index b751012..f60b8b8 100644
--- a/app/bcc1/resource2/verify_a.py
+++ b/app/bcc1/resource2/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", "Idle", "StartOS"])
diff --git a/app/bcc1/resource2/verify_b.py b/app/bcc1/resource2/verify_b.py
index c46a8f6..a28d637 100644
--- a/app/bcc1/resource2/verify_b.py
+++ b/app/bcc1/resource2/verify_b.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5", "Idle", "StartOS"])
diff --git a/app/bcc1/sse1/verify_a.py b/app/bcc1/sse1/verify_a.py
index 66def3c..d202d58 100644
--- a/app/bcc1/sse1/verify_a.py
+++ b/app/bcc1/sse1/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/sse1/verify_b.py b/app/bcc1/sse1/verify_b.py
index ce8d0d5..acc3276 100644
--- a/app/bcc1/sse1/verify_b.py
+++ b/app/bcc1/sse1/verify_b.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS, bar) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/sse1/verify_c.py b/app/bcc1/sse1/verify_c.py
index 782f109..9d9ffe8 100644
--- a/app/bcc1/sse1/verify_c.py
+++ b/app/bcc1/sse1/verify_c.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(H1, H2, H3, H4, H5, Idle, StartOS, bar) = \
get_functions(analysis.system, ["H1", "H2", "H3", "H4", "H5",
diff --git a/app/bcc1/task1/verify_a.py b/app/bcc1/task1/verify_a.py
index b745407..a820974 100644
--- a/app/bcc1/task1/verify_a.py
+++ b/app/bcc1/task1/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_b.py b/app/bcc1/task1/verify_b.py
index 181c42e..ac6a1a8 100644
--- a/app/bcc1/task1/verify_b.py
+++ b/app/bcc1/task1/verify_b.py
@@ -17,7 +17,7 @@ def after_MoveFunctionsToTask(analysis):
# But is not yet moved to the Task of Handler11
assert bar in Handler11.task.functions
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, bar, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "bar", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_c.py b/app/bcc1/task1/verify_c.py
index 85763c4..170d9f5 100644
--- a/app/bcc1/task1/verify_c.py
+++ b/app/bcc1/task1/verify_c.py
@@ -17,7 +17,7 @@ def after_MoveFunctionsToTask(analysis):
# But is not yet moved to the Task of Handler11
assert bar in Handler11.task.functions
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, bar, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "bar", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_d.py b/app/bcc1/task1/verify_d.py
index 086b688..9a4e4e1 100644
--- a/app/bcc1/task1/verify_d.py
+++ b/app/bcc1/task1/verify_d.py
@@ -17,7 +17,7 @@ def after_MoveFunctionsToTask(analysis):
# But is not yet moved to the Task of Handler11
assert bar in Handler11.task.functions
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, bar, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "bar", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_e.py b/app/bcc1/task1/verify_e.py
index e7fa842..81487b9 100644
--- a/app/bcc1/task1/verify_e.py
+++ b/app/bcc1/task1/verify_e.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_f.py b/app/bcc1/task1/verify_f.py
index 82521c1..fbeafa9 100644
--- a/app/bcc1/task1/verify_f.py
+++ b/app/bcc1/task1/verify_f.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task1/verify_g.py b/app/bcc1/task1/verify_g.py
index 41dd6bd..17f1e51 100644
--- a/app/bcc1/task1/verify_g.py
+++ b/app/bcc1/task1/verify_g.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, Idle, StartOS, bar) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS", "bar"])
diff --git a/app/bcc1/task2/verify_a.py b/app/bcc1/task2/verify_a.py
index 06a5e97..4fff906 100644
--- a/app/bcc1/task2/verify_a.py
+++ b/app/bcc1/task2/verify_a.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/app/bcc1/task2/verify_b.py b/app/bcc1/task2/verify_b.py
index 686a264..e6859b1 100644
--- a/app/bcc1/task2/verify_b.py
+++ b/app/bcc1/task2/verify_b.py
@@ -1,6 +1,6 @@
from generator.graph.verifier_tools import *
-def after_RunningTaskAnalysis(analysis):
+def after_SystemStateFlow(analysis):
# Find all three systemcall handlers
(Handler11, Handler12, Handler13, Idle, StartOS) = \
get_functions(analysis.system, ["Handler11", "Handler12", "Handler13", "Idle", "StartOS"])
diff --git a/generator/graph/SymbolicSystemExecution.py b/generator/graph/SymbolicSystemExecution.py
index 59fcfce..6f41706 100644
--- a/generator/graph/SymbolicSystemExecution.py
+++ b/generator/graph/SymbolicSystemExecution.py
@@ -157,7 +157,7 @@ class Combine_RunningTask_SSE(Analysis):
def requires(self):
# We require all possible system edges to be contructed
- return ["RunningTaskAnalysis", "SymbolicSystemExecution"]
+ return ["SystemStateFlow", "SymbolicSystemExecution"]
def do(self):
self.removed_edges = []
diff --git a/generator/graph/RunningTask.py b/generator/graph/SystemStateFlow.py
similarity index 98%
rename from generator/graph/RunningTask.py
rename to generator/graph/SystemStateFlow.py
index 7247c64..eda2f93 100644
--- a/generator/graph/RunningTask.py
+++ b/generator/graph/SystemStateFlow.py
@@ -8,7 +8,7 @@ from generator.graph.AtomicBasicBlock import E
from generator.tools import panic
-class RunningTaskAnalysis(Analysis):
+class SystemStateFlow(Analysis):
def __init__(self):
Analysis.__init__(self)
self.sporadic_events = []
@@ -35,7 +35,7 @@ class RunningTaskAnalysis(Analysis):
@staticmethod
def update_before_state(edge_states, before_state_dict, block, edge_type):
- before = RunningTaskAnalysis.merge_inputs(edge_states, block, edge_type)
+ before = SystemStateFlow.merge_inputs(edge_states, block, edge_type)
changed = False
if not block in before_state_dict:
before_state_dict[block] = before
@@ -231,7 +231,7 @@ class RunningTask_ISR(SporadicEvent):
self.before_abb_states[block] = before
else:
self.changed_current_block, before = \
- RunningTaskAnalysis.update_before_state(self.edge_states,
+ SystemStateFlow.update_before_state(self.edge_states,
self.before_abb_states,
block,
edge_type = E.irq_level)
diff --git a/generator/graph/__init__.py b/generator/graph/__init__.py
index 2482804..a4999fe 100644
--- a/generator/graph/__init__.py
+++ b/generator/graph/__init__.py
@@ -8,7 +8,7 @@ from generator.graph.Subtask import Subtask
from generator.graph.AtomicBasicBlock import AtomicBasicBlock
from generator.graph.Function import Function
from generator.graph.Analysis import *
-from generator.graph.RunningTask import *
+from generator.graph.SystemStateFlow import *
from generator.graph.common import GraphObject
from generator.graph.Sporadic import Alarm
from generator.graph.Resource import Resource
diff --git a/generator/main.py b/generator/main.py
index e61ea83..0c14bb3 100755
--- a/generator/main.py
+++ b/generator/main.py
@@ -95,7 +95,7 @@ if __name__ == "__main__":
pass_manager.register_and_enqueue_analysis(DynamicPriorityAnalysis())
# System-Level: Analysis
- pass_manager.register_analysis(RunningTaskAnalysis())
+ pass_manager.register_analysis(SystemStateFlow())
pass_manager.register_analysis(SymbolicSystemExecution())
pass_manager.register_analysis(Combine_RunningTask_SSE())
@@ -118,7 +118,7 @@ if __name__ == "__main__":
# Only when we want to specialize the system calls, run the
# System-Level analysises
pass_manager.enqueue_analysis("Combine_RunningTask_SSE")
- global_abb_information = pass_manager.get_pass("RunningTaskAnalysis")
+ global_abb_information = pass_manager.get_pass("SystemStateFlow")
syscall_rules = SpecializedSystemCalls(global_abb_information)
else:
syscall_rules = FullSystemCalls()
--
GitLab