Commit 25ce56bf authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fix generation of pohi interface

parent 364eb12d
...@@ -215,6 +215,7 @@ package body TASTE.Concurrency_View is ...@@ -215,6 +215,7 @@ package body TASTE.Concurrency_View is
Block_Names : Vector_Tag; Block_Names : Vector_Tag;
Block_Languages : Vector_Tag; Block_Languages : Vector_Tag;
Blocks : Unbounded_String; Blocks : Unbounded_String;
Part_Threads : Unbounded_String;
Partition_Assoc : Translate_Set; Partition_Assoc : Translate_Set;
-- Connections between threads: -- Connections between threads:
Thread_Src_Name, Thread_Src_Name,
...@@ -255,6 +256,11 @@ package body TASTE.Concurrency_View is ...@@ -255,6 +256,11 @@ package body TASTE.Concurrency_View is
Output_Port_Thread_Name := Output_Port_Thread_Name :=
Output_Port_Thread_Name & Each.Thread_Name; Output_Port_Thread_Name & Each.Thread_Name;
end loop; end loop;
Put_Info ("Partition: "
& To_String (Partition.Deployment_Partition.Name));
for T of Partition.Threads loop
Put_Info ("Thread: " & To_String (T.Name));
end loop;
for T of Partition.Threads loop for T of Partition.Threads loop
declare declare
...@@ -279,6 +285,7 @@ package body TASTE.Concurrency_View is ...@@ -279,6 +285,7 @@ package body TASTE.Concurrency_View is
else ""); else "");
begin begin
Threads := Threads & Newline & Result; Threads := Threads & Newline & Result;
Part_Threads := Part_Threads & Newline & Result;
Thread_Names := Thread_Names & Name; Thread_Names := Thread_Names & Name;
All_Thread_Names := All_Thread_Names & Name; All_Thread_Names := All_Thread_Names & Name;
for P of T.Output_Ports loop for P of T.Output_Ports loop
...@@ -383,7 +390,7 @@ package body TASTE.Concurrency_View is ...@@ -383,7 +390,7 @@ package body TASTE.Concurrency_View is
-- Association includes Name, Coverage, CPU Info, etc. -- Association includes Name, Coverage, CPU Info, etc.
-- (see taste-deployment_view.ads for the complete list) -- (see taste-deployment_view.ads for the complete list)
Partition_Assoc := Partition.Deployment_Partition.To_Template Partition_Assoc := Partition.Deployment_Partition.To_Template
& Assoc ("Threads", Threads) & Assoc ("Threads", Part_Threads)
& Assoc ("Thread_Names", Thread_Names) & Assoc ("Thread_Names", Thread_Names)
& Assoc ("Node_Name", Node_Name) & Assoc ("Node_Name", Node_Name)
& Assoc ("Blocks", Blocks) & Assoc ("Blocks", Blocks)
......
...@@ -22,8 +22,12 @@ procedure @_CAPITALIZE:Name_@ ...@@ -22,8 +22,12 @@ procedure @_CAPITALIZE:Name_@
@@END_INLINE@@ @@END_INLINE@@
with Import, Convention => C, Link_Name => "@_LOWER:Parent_Function_@_@_LOWER:Name_@"; with Import, Convention => C, Link_Name => "@_LOWER:Parent_Function_@_@_LOWER:Name_@";
begin begin
@@-- Works only for one param: for more than one param, use a table section C_@_CAPITALIZE:Name_@
C_@_CAPITALIZE:Name_@ (@_CAPITALIZE:Param_Names_@, @_CAPITALIZE:Param_Names_@_Size); @@INLINE( \()(,\n )(\);)@@
@@TABLE@@
@_CAPITALIZE:Param_Names_@, @_CAPITALIZE:Param_Names_@_Size
@@END_TABLE@@
@@END_INLINE@@
end @_CAPITALIZE:Name_@; end @_CAPITALIZE:Name_@;
@@ELSE@@ @@ELSE@@
procedure @_CAPITALIZE:Name_@ is procedure @_CAPITALIZE:Name_@ is
......
...@@ -44,8 +44,8 @@ project @_CAPITALIZE:Name_@_AIR is ...@@ -44,8 +44,8 @@ project @_CAPITALIZE:Name_@_AIR is
"-fdiagnostics-show-option", "-fdiagnostics-show-option",
"-Wcast-align", "-Wcast-align",
"-Wswitch", "-Wswitch",
"-ffunction-sections", --"-ffunction-sections",
"-fdata-sections", --"-fdata-sections",
"-Wmissing-prototypes", "-Wmissing-prototypes",
"-Wimplicit-function-declaration", "-Wimplicit-function-declaration",
"-Wstrict-prototypes", "-Wstrict-prototypes",
...@@ -75,7 +75,7 @@ project @_CAPITALIZE:Name_@_AIR is ...@@ -75,7 +75,7 @@ project @_CAPITALIZE:Name_@_AIR is
("@_LOWER:Name_@", ("@_LOWER:Name_@",
"/home/taste/air/air/pmk/core/include", "/home/taste/air/air/pmk/core/include",
"/home/taste/air/air/pmk/arch/sparc/include", "/home/taste/air/air/pmk/arch/sparc/include",
"/home/taste/air/air/libs/imaspex/include", "/home/taste/air/air/install/libs/imaspex/include",
"../deploymentview_final/polyorb-hi-c/src", "../deploymentview_final/polyorb-hi-c/src",
"../deploymentview_final/polyorb-hi-c/include", "../deploymentview_final/polyorb-hi-c/include",
"../../dataview/C", "../../dataview/C",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment