Enable prefixed components

jklmnn · jklmnn · commit c09a11c0678e · 2020-06-10T17:34:50.000+02:00
ref #97
diff --git a/src/core/linux/gneiss-main.adb b/src/core/linux/gneiss-main.adb
@@ -69,8 +69,8 @@ is
          Status := 1;
          return;
       end if;
-      Construct_Sym := Gneiss_Internal.Linker.Symbol (Handle, "component__construct");
-      Destruct_Sym  := Gneiss_Internal.Linker.Symbol (Handle, "component__destruct");
+      Construct_Sym := Gneiss_Internal.Linker.Symbol (Handle, "gneiss_component_construct");
+      Destruct_Sym  := Gneiss_Internal.Linker.Symbol (Handle, "gneiss_component_destruct");
       if
          Construct_Sym = System.Null_Address
          or else Destruct_Sym = System.Null_Address
diff --git a/src/gneiss-component.ads b/src/gneiss-component.ads
@@ -39,15 +39,15 @@ is
    procedure Construct (Cap : Capability) with
       Export,
       Convention => C,
-      External_Name => "componolit_interfaces_component_construct";
+      External_Name => "gneiss_component_construct";
 
    --  Exit method of a component.
    --
    --  This procedure is called once the platform decides to exit the component.
    procedure Destruct with
       Export,
       Convention => C,
-      External_Name => "componolit_interfaces_component_destruct";
+      External_Name => "gneiss_component_destruct";
 
    --  Signal component
    --
diff --git a/test/empty.gpr b/test/empty.gpr
@@ -15,7 +15,7 @@ project Empty extends "gneiss_component" is
             when others =>
                for Library_Kind use "dynamic";
                for Library_Standalone use "encapsulated";
-               for Library_Interface use ("component");
+               for Library_Interface use ("empty");
          end case;
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
diff --git a/test/hello_world.gpr b/test/hello_world.gpr
@@ -11,7 +11,7 @@ project Hello_World extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "hello_world";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Hello_World.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/hello_world/hello_world-component.adb b/test/hello_world/hello_world-component.adb
@@ -2,7 +2,7 @@
 with Gneiss.Log;
 with Gneiss.Log.Client;
 
-package body Component with
+package body Hello_World.Component with
    SPARK_Mode,
    Refined_State => (Platform_State  => Log,
                      Component_State => Cap)
@@ -38,4 +38,4 @@ is
       Log_Client.Finalize (Log);
    end Destruct;
 
-end Component;
+end Hello_World.Component;
diff --git a/test/hello_world/hello_world-component.ads b/test/hello_world/hello_world-component.ads
@@ -3,7 +3,7 @@ with Gneiss;
 with Gneiss.Component;
 with Gneiss_Internal;
 
-package Component with
+package Hello_World.Component with
    SPARK_Mode,
    Abstract_State => (Component_State, Platform_State),
    Initializes => (Platform_State, Main.Platform)
@@ -20,4 +20,4 @@ is
 
    package Main is new Gneiss.Component (Construct, Destruct);
 
-end Component;
+end Hello_World.Component;
diff --git a/test/hello_world/hello_world.ads b/test/hello_world/hello_world.ads
@@ -0,0 +1,4 @@
+
+package Hello_World is
+   
+end Hello_World;
diff --git a/test/linux.sh b/test/linux.sh
@@ -9,16 +9,16 @@ pip3 install -e tool/RecordFlux
 
 set -e
 
-./cement prove test/message_client.gpr . lib test -u component
-./cement prove test/message_server.gpr . lib test -u component
-./cement prove test/hello_world.gpr . lib test -u component
-./cement prove test/log_proxy.gpr . lib test -u component
-./cement prove test/rom.gpr . lib test -u component
-./cement prove test/memory_client.gpr . lib test -u component
-./cement prove test/memory_server.gpr . lib test -u component
-./cement prove test/timer.gpr . lib test -u component
-#./cement prove test/packet_client.gpr . lib test -u component
-#./cement prove test/packet_server.gpr . lib test -u component
+./cement prove test/message_client.gpr . lib test -u message_client-component
+./cement prove test/message_server.gpr . lib test -u message_server-component
+./cement prove test/hello_world.gpr . lib test -u hello_world-component
+./cement prove test/log_proxy.gpr . lib test -u log_proxy-component
+./cement prove test/rom.gpr . lib test -u rom-component
+./cement prove test/memory_client.gpr . lib test -u memory_client-component
+./cement prove test/memory_server.gpr . lib test -u memory_server-component
+./cement prove test/timer.gpr . lib test -u timer-component
+#./cement prove test/packet_client.gpr . lib test -u packet_client-component
+#./cement prove test/packet_server.gpr . lib test -u packet_server-component
 
 ./cement build test/message_client/message_client.xml . lib test
 ./cement build test/hello_world/hello_world.xml . lib test
diff --git a/test/linux_log_server.gpr b/test/linux_log_server.gpr
@@ -10,7 +10,7 @@ project Linux_Log_Server extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "linux_log_server";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Linux_Log_Server.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/linux_log_server/linux_log_server-component.adb b/test/linux_log_server/linux_log_server-component.adb
@@ -3,7 +3,7 @@ with Gneiss.Log;
 with Gneiss.Log.Server;
 with Gneiss.Log.Dispatcher;
 
-package body Component with
+package body Linux_Log_Server.Component with
    SPARK_Mode
 is
 
@@ -145,4 +145,4 @@ is
        then Context (Log.Index (Session).Value).Ready
        else False);
 
-end Component;
+end Linux_Log_Server.Component;
diff --git a/test/linux_log_server/linux_log_server-component.ads b/test/linux_log_server/linux_log_server-component.ads
@@ -2,7 +2,7 @@
 with Gneiss;
 with Gneiss.Component;
 
-package Component with
+package Linux_Log_Server.Component with
    SPARK_Mode
 is
 
@@ -11,4 +11,4 @@ is
 
    package Main is new Gneiss.Component (Construct, Destruct);
 
-end Component;
+end Linux_Log_Server.Component;
diff --git a/test/linux_log_server/linux_log_server.ads b/test/linux_log_server/linux_log_server.ads
@@ -0,0 +1,4 @@
+
+package Linux_Log_Server is
+
+end Linux_Log_Server;
diff --git a/test/log_proxy.gpr b/test/log_proxy.gpr
@@ -13,7 +13,7 @@ project Log_Proxy extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "log_proxy";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Log_Proxy.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/log_proxy/log_proxy-component.adb b/test/log_proxy/log_proxy-component.adb
@@ -4,7 +4,7 @@ with Gneiss.Log.Client;
 with Gneiss.Log.Server;
 with Gneiss.Log.Dispatcher;
 
-package body Component with
+package body Log_Proxy.Component with
    SPARK_Mode,
    Refined_State => (Component_State => Capability,
                      Platform_State  => (Dispatcher,
@@ -294,4 +294,4 @@ is
       S.Flushed := True;
    end Flush;
 
-end Component;
+end Log_Proxy.Component;
diff --git a/test/log_proxy/log_proxy-component.ads b/test/log_proxy/log_proxy-component.ads
@@ -3,7 +3,7 @@ with Gneiss;
 with Gneiss.Component;
 with Gneiss_Internal;
 
-package Component with
+package Log_Proxy.Component with
    SPARK_Mode,
    Abstract_State => (Component_State, Platform_State),
    Initializes    => (Platform_State, Main.Platform)
@@ -21,4 +21,4 @@ is
 
    package Main is new Gneiss.Component (Construct, Destruct);
 
-end Component;
+end Log_Proxy.Component;
diff --git a/test/log_proxy/log_proxy.ads b/test/log_proxy/log_proxy.ads
@@ -0,0 +1,4 @@
+
+package Log_Proxy is
+   
+end Log_Proxy;
diff --git a/test/memory_client.gpr b/test/memory_client.gpr
@@ -11,7 +11,7 @@ project Memory_Client extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "memory_client";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Memory_Client.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/memory_client/memory_client-component.adb b/test/memory_client/memory_client-component.adb
@@ -4,7 +4,7 @@ with Gneiss.Log.Client;
 with Gneiss.Memory;
 with Gneiss.Memory.Client;
 
-package body Component with
+package body Memory_Client.Component with
    SPARK_Mode,
    Refined_State => (Platform_State => (Log, Mem))
 is
@@ -71,4 +71,4 @@ is
       Log_Client.Finalize (Log);
    end Destruct;
 
-end Component;
+end Memory_Client.Component;
diff --git a/test/memory_client/memory_client-component.ads b/test/memory_client/memory_client-component.ads
@@ -3,7 +3,7 @@ with Gneiss_Internal;
 with Gneiss;
 with Gneiss.Component;
 
-package Component with
+package Memory_Client.Component with
    SPARK_Mode,
    Abstract_State => Platform_State,
    Initializes    => (Platform_State, Main.Platform)
@@ -19,4 +19,4 @@ is
 
    package Main is new Gneiss.Component (Construct, Destruct);
 
-end Component;
+end Memory_Client.Component;
diff --git a/test/memory_client/memory_client.ads b/test/memory_client/memory_client.ads
@@ -0,0 +1,4 @@
+
+package Memory_Client is
+
+end Memory_Client;
diff --git a/test/memory_server.gpr b/test/memory_server.gpr
@@ -11,7 +11,7 @@ project Memory_Server extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "memory_server";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Memory_Server.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/memory_server/memory_server-component.adb b/test/memory_server/memory_server-component.adb
@@ -3,7 +3,7 @@ with Gneiss.Memory;
 with Gneiss.Memory.Dispatcher;
 with Gneiss.Memory.Server;
 
-package body Component with
+package body Memory_Server.Component with
    SPARK_Mode,
    Refined_State => (Component_State => Capability,
                      Platform_State  => (Dispatcher,
@@ -163,4 +163,4 @@ is
        then Context (Memory.Index (Session).Value).Ready
        else False);
 
-end Component;
+end Memory_Server.Component;
diff --git a/test/memory_server/memory_server-component.ads b/test/memory_server/memory_server-component.ads
@@ -3,7 +3,7 @@ with Gneiss;
 with Gneiss.Component;
 with Gneiss_Internal;
 
-package Component with
+package Memory_Server.Component with
    SPARK_Mode,
    Abstract_State => (Component_State, Platform_State),
    Initializes    => (Platform_State, Main.Platform)
@@ -20,4 +20,4 @@ is
 
    package Main is new Gneiss.Component (Construct, Destruct);
 
-end Component;
+end Memory_Server.Component;
diff --git a/test/memory_server/memory_server.ads b/test/memory_server/memory_server.ads
@@ -0,0 +1,4 @@
+
+package Memory_Server is
+
+end Memory_Server;
diff --git a/test/message_client.gpr b/test/message_client.gpr
@@ -11,7 +11,7 @@ project Message_Client extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "message_client";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Message_Client.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/message_client/message_client-component.adb b/test/message_client/message_client-component.adb
@@ -4,7 +4,7 @@ with Gneiss.Log.Client;
 with Gneiss.Message;
 with Gneiss.Message.Client;
 
-package body Component with
+package body Message_Client.Component with
    SPARK_Mode,
    Refined_State => (Component_State => Capability,
                      Platform_State  => (Client, Log))
@@ -84,4 +84,4 @@ is
       Message_Client.Finalize (Client);
    end Destruct;
 
-end Component;
+end Message_Client.Component;
diff --git a/test/message_client/message_client-component.ads b/test/message_client/message_client-component.ads
@@ -3,7 +3,7 @@ with Gneiss;
 with Gneiss.Component;
 with Gneiss_Internal;
 
-package Component with
+package Message_Client.Component with
    SPARK_Mode,
    Abstract_State => (Component_State, Platform_State),
    Initializes    => (Platform_State, Main.Platform)
@@ -20,4 +20,4 @@ is
 
    package Main is new Gneiss.Component (Construct, Destruct);
 
-end Component;
+end Message_Client.Component;
diff --git a/test/message_client/message_client.ads b/test/message_client/message_client.ads
@@ -0,0 +1,4 @@
+
+package Message_Client is
+
+end Message_Client;
diff --git a/test/message_server.gpr b/test/message_server.gpr
@@ -12,7 +12,7 @@ project Message_Server extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "message_server";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Message_Server.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/message_server/message_server-component.adb b/test/message_server/message_server-component.adb
@@ -3,7 +3,7 @@ with Gneiss.Message;
 with Gneiss.Message.Dispatcher;
 with Gneiss.Message.Server;
 
-package body Component with
+package body Message_Server.Component with
    SPARK_Mode,
    Refined_State => (Component_State => Capability,
                      Platform_State  => (Dispatcher,
@@ -150,4 +150,4 @@ is
        then Context (Message.Index (Session).Value).Ready
        else False);
 
-end Component;
+end Message_Server.Component;
diff --git a/test/message_server/message_server-component.ads b/test/message_server/message_server-component.ads
@@ -3,7 +3,7 @@ with Gneiss;
 with Gneiss.Component;
 with Gneiss_Internal;
 
-package Component with
+package Message_Server.Component with
    SPARK_Mode,
    Abstract_State => (Component_State, Platform_State),
    Initializes    => (Platform_State, Main.Platform)
@@ -20,4 +20,4 @@ is
 
    package Main is new Gneiss.Component (Construct, Destruct);
 
-end Component;
+end Message_Server.Component;
diff --git a/test/message_server/message_server.ads b/test/message_server/message_server.ads
@@ -0,0 +1,4 @@
+
+package Message_Server is
+
+end Message_Server;
diff --git a/test/packet_client.gpr b/test/packet_client.gpr
@@ -9,7 +9,7 @@ project Packet_Client extends "gneiss_component" is
          for Library_Name use Gneiss_Component_Prefix & "packet_client";
          for Library_Kind use "dynamic";
          for Library_Standalone use "encapsulated";
-         for Library_Interface use ("component");
+         for Library_Interface use ("Packet_Client.Component");
          for Library_Dir use external ("CEMENT_COMPONENT_DIR");
       when others =>
          for Languages use ();
diff --git a/test/packet_client/packet_client-component.adb b/test/packet_client/packet_client-component.adb
@@ -4,7 +4,7 @@ with Gneiss.Log.Client;
 with Gneiss.Packet;
 with Gneiss.Packet.Client;
 
-package body Component with
+package body Packet_Client.Component with
    SPARK_Mode
 is
 
@@ -103,4 +103,4 @@ is
       Packet_Client.Finalize (Client);
    end Destruct;
 
-end Component;
+end Packet_Client.Component;
diff --git a/test/packet_client/packet_client-component.ads b/test/packet_client/packet_client-component.ads
diff --git a/test/packet_client/packet_client.ads b/test/packet_client/packet_client.ads
diff --git a/test/packet_server.gpr b/test/packet_server.gpr
diff --git a/test/packet_server/packet_server-component.adb b/test/packet_server/packet_server-component.adb
diff --git a/test/packet_server/packet_server-component.ads b/test/packet_server/packet_server-component.ads
diff --git a/test/packet_server/packet_server.ads b/test/packet_server/packet_server.ads
diff --git a/test/rom.gpr b/test/rom.gpr
diff --git a/test/rom/rom-component.adb b/test/rom/rom-component.adb
diff --git a/test/rom/rom-component.ads b/test/rom/rom-component.ads
diff --git a/test/rom/rom.ads b/test/rom/rom.ads
diff --git a/test/rom2.gpr b/test/rom2.gpr
diff --git a/test/timer.gpr b/test/timer.gpr
diff --git a/test/timer/timer-component.adb b/test/timer/timer-component.adb
diff --git a/test/timer/timer-component.ads b/test/timer/timer-component.ads
diff --git a/test/timer/timer.ads b/test/timer/timer.ads
