Clean main and init files from different architectures

src/CMakeLists.txt

@@ -209,10 +209,12 @@ FOREACH(STARTUP_HOOK_FUNCTION ${STARTUP_HOOK_FUNCTIONS_LIST})
   SET(FORTE_STARTUP_HOOKS_CALLS  "${FORTE_STARTUP_HOOKS_CALLS}  ${STARTUP_HOOK_FUNCTION}(argc, arg);\n")
 ENDFOREACH()
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/arch/startuphook.cpp.in ${CMAKE_BINARY_DIR}/src_gen/startuphook_new.cpp)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/startuphook.cpp.in ${CMAKE_BINARY_DIR}/src_gen/startuphook_new.cpp)
 forte_replacefile_if_changed(${CMAKE_BINARY_DIR}/src_gen/startuphook_new.cpp ${CMAKE_BINARY_DIR}/src_gen/startuphook.cpp)
 file(REMOVE ${CMAKE_BINARY_DIR}/src_gen/startuphook_new.cpp)
 
+forte_add_sourcefile_with_path_cpp(${CMAKE_BINARY_DIR}/src_gen/startuphook.cpp)
+
 #############################################################################
 # Load FORTE Extension Files
 #############################################################################
@@ -337,6 +339,7 @@ if(FORTE_BUILD_SHARED_LIBRARY)
   TARGET_LINK_LIBRARIES (forte-shared ${LINK_LIBRARY})
   ADD_DEPENDENCIES (forte-shared FORTE_LITE)
   install(TARGETS forte-shared ARCHIVE DESTINATION bin LIBRARY DESTINATION bin)
+  target_compile_options(FORTE_LITE PRIVATE "-fPIC")
   message("Building shared library")
 endif(FORTE_BUILD_SHARED_LIBRARY)
 

src/arch/CMakeLists.txt

@@ -30,7 +30,9 @@ add_subdirectory(zephyr)
 
 add_subdirectory(utils)
 
-forte_add_sourcefile_hcpp(timerha devlog)
+forte_add_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common)  
+
+forte_add_sourcefile_hcpp(timerha devlog forte)
 
 SET(FORTE_LOGGER_BUFFER_SIZE "300" CACHE STRING "Buffer's length of the logger")
 mark_as_advanced(FORTE_LOGGER_BUFFER_SIZE)

src/arch/win32/forte_instance.h → src/arch/common/forte_specific_architecture.cpp

@@ -1,27 +1,21 @@
 /*******************************************************************************
- * Copyright (c) 2017 fortiss GmbH
+ * Copyright (c) 2024 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
  *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
- *  Jose Cabral, Alois Zoitl - initial API and implementation and/or initial documentation
+ *  Jose Cabral - initial API and implementation and/or initial documentation
  *******************************************************************************/
 
-#ifndef FORTE_INSTANCE_H_
-#define FORTE_INSTANCE_H_
+#include "forte_specific_architecture.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void startupFORTE();
-void shutdownFORTE();
-
-#ifdef __cplusplus
+int CForteSpecificArchitecture::initialize(int , char** ){
+  return 0;
 }
-#endif
 
-#endif
+int CForteSpecificArchitecture::deinitialize() {
+  return 0;
+}

src/arch/common/forte_specific_architecture.h

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2024 
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Jose Cabral - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#ifndef SRC_ARCH_COMMON_FORTE_SPECIFIC_ARCHITECTURE_H_
+#define SRC_ARCH_COMMON_FORTE_SPECIFIC_ARCHITECTURE_H_
+
+#include "forte_specific_architecture.h"
+
+class CForteSpecificArchitecture{
+  public:
+
+    static int initialize(int argc , char* argv[]);
+
+    static int deinitialize();
+};
+
+#endif /* SRC_ARCH_COMMON_FORTE_SPECIFIC_ARCHITECTURE_H_ */

src/arch/ecos/ecoscppinit.cpp

@@ -19,3 +19,13 @@ extern "C" void
 __cxa_pure_virtual(void) {
   //TODO maybe add some exception handling reporting here
 }
+
+extern "C" void abort(int ) { while(1) ; }
+
+void *__dso_handle = 0;
+
+extern "C" int _getpid(void) {
+  return 1;
+}
+
+extern "C" void _kill(int ) { while(1) ; }

src/arch/ecos/nios2/CMakeLists.txt

@@ -34,7 +34,7 @@ if("${FORTE_ARCHITECTURE}" STREQUAL "Nios2")
   endif(FORTE_FAKE_TIME)
   forte_add_sourcefile_cpp(../../posix/forte_architecture_time.cpp ../../forte_standard_time.cpp)
 
-  forte_add_sourcefile_cpp(../ecoscppinit.cpp ../../genforte_printer.cpp ../forte_architecture.cpp)
+  forte_add_sourcefile_cpp(../ecoscppinit.cpp ../../genforte_printer.cpp ../../common/forte_specific_architecture.cpp)
   forte_add_sourcefile_h(../../forte_architecture_time.h)
   forte_add_sourcefile_cpp(../../genforte_realFunctions.cpp)
 

src/arch/ecos/phycoreat91/CMakeLists.txt

@@ -25,7 +25,7 @@ if("${FORTE_ARCHITECTURE}" STREQUAL "Phycore AT91")
   else(FORTE_FAKE_TIME)
     forte_add_sourcefile_hcpp(../ecostiha)
   endif(FORTE_FAKE_TIME)
-  forte_add_sourcefile_cpp(../../posix/forte_architecture_time.cpp ../../forte_standard_time.cpp)
+  forte_add_sourcefile_cpp(../ecoscppinit.cpp ../../posix/forte_architecture_time.cpp ../../forte_standard_time.cpp ../../common/forte_specific_architecture.cpp)
 
   forte_add_sourcefile_cpp(../../genforte_printer.cpp)
   forte_add_sourcefile_h(../../forte_architecture_time.h)

src/arch/ecos/forte_instance.cpp → src/arch/forte.cpp

@@ -11,42 +11,42 @@
  *  Tarik Terzimehic - make OPC UA server port setable from the command line
  *******************************************************************************/
 
-#include "forte_instance.h"
-#include "forteinstance.h"
-#include <forte_printer.h>
-
-#include "fortenew.h"
-#include "forte_architecture.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "../../stdfblib/ita/RMT_DEV.h"
+#include "forte.h"
 
 #include "../utils/mainparam_utils.h"
+#include "forte_architecture.h"
+#include "forte_printer.h"
+#include "forteinstance.h"
 
-unsigned const int cgForteDefaultPort = 61499;
+static const unsigned int scForteDefaultPort = 61499;
+static const unsigned int scMaxPortValue = 65535;
 
 /*!\brief Check if the correct endianess has been configured.
  *
  * If the right endianess is not set this function will end FORTE.
  */
 bool checkEndianess();
 
-void forteGlobalInitialize(){
-  CForteArchitecture::initialize();
+int forteGlobalInitialize(int argc, char *argv[]){
+  if(auto result = CForteArchitecture::initialize(argc, argv); result != 0){
+    return result;
+  }
+  return 0;
 }
 
-void forteGlobalDeinitialize(){
-  CForteArchitecture::deinitialize();
+int forteGlobalDeinitialize(){
+  return CForteArchitecture::deinitialize();
 }
 
-int forteStartInstance(unsigned int paPort, TForteInstance* paResultInstance){
+FORTE_STATUS forteStartInstance(unsigned int paPort, TForteInstance* paResultInstance){
 
-  if(65535 < paPort){
+  if(scMaxPortValue < paPort){
+    DEVLOG_ERROR("Provided port %d not valid\n", paPort);
     return FORTE_WRONG_PARAMETERS;
   }
 
   if(0 == paPort){
-    paPort = cgForteDefaultPort;
+    paPort = scForteDefaultPort;
   }
 
   char progName[] = "forte";
@@ -60,50 +60,58 @@ int forteStartInstance(unsigned int paPort, TForteInstance* paResultInstance){
   return forteStartInstanceGeneric(3, arguments, paResultInstance);
 }
 
-int forteStartInstanceGeneric(int argc, char *arg[], TForteInstance* paResultInstance){
-
-  if(!CForteArchitecture::isInitialized()){
-    return FORTE_ARCHITECTURE_NOT_READY;
-  }
+FORTE_STATUS forteStartInstanceGeneric(int argc, char *argv[], TForteInstance* paResultInstance){
 
-  if(0 == paResultDevice){
+  if(nullptr == paResultInstance){
+    DEVLOG_ERROR("Provided result instance parameter not valid\n");
     return FORTE_WRONG_PARAMETERS;
   }
 
-  if(0 != *paResultDevice){
+  if(nullptr != *paResultInstance){
+    DEVLOG_ERROR("Provided result instance already started\n");
     return FORTE_DEVICE_ALREADY_STARTED;
   }
 
   if(!checkEndianess()){
+    // logged already in the function
     return FORTE_WRONG_ENDIANESS;
   }
 
-  const char *pIpPort = parseCommandLineArguments(argc, arg);
-  if((0 != strlen(pIpPort)) && (nullptr != strchr(pIpPort, ':'))){
-    C4diacFORTEInstance *instance = new C4diacFORTEInstance();
-    if(!instance->startupNewDevice(ipPort)) {
-      delete instance;
-      return FORTE_COULD_NOT_CREATE_DEVICE;
-    }
-    *paResultInstance = instance;
-    DEVLOG_INFO("FORTE is up and running\n");
+  if(!CForteArchitecture::isInitialized()){
+    DEVLOG_ERROR("The low level platform should be initialized before starting a forte instance\n");
+    return FORTE_ARCHITECTURE_NOT_READY;
   }
-  else{ //! If needed call listHelp() to list the help for FORTE
+
+  const auto ipPort = parseCommandLineArguments(argc, argv);
+  if((0 == strlen(ipPort)) || (nullptr == strchr(ipPort, ':'))){
     return FORTE_WRONG_PARAMETERS;
   }
+
+  C4diacFORTEInstance *instance = new C4diacFORTEInstance();
+  if(!instance->startupNewDevice(ipPort)) {
+    delete instance;
+    return FORTE_COULD_NOT_CREATE_DEVICE;
+  }
+  *paResultInstance = instance;
 
   return FORTE_OK;
 }
 
-void forteStopInstance(int, TForteInstance paInstance){
-  if(!CForteArchitecture::isInitialized() || paResultInstance == nullptr){
+void forteRequestStopInstance(TForteInstance paInstance){
+  if(!CForteArchitecture::isInitialized() || paInstance == nullptr){
     return;
   }
-  C4diacFORTEInstance *instance = static_cast<C4diacFORTEInstance *>(paResultInstance);
+  auto *instance = static_cast<C4diacFORTEInstance *>(paInstance);
   instance->triggerDeviceShutdown();
+}
+
+void forteWaitForInstanceToStop(TForteInstance paInstance) {
+   if(!CForteArchitecture::isInitialized() || paInstance == nullptr){
+    return;
+  }
+  auto *instance = static_cast<C4diacFORTEInstance *>(paInstance);
   instance->awaitDeviceShutdown();
   delete instance;
-  DEVLOG_INFO("FORTE finished\n");
 }
 
 bool checkEndianess(){

src/arch/ecos/forte_instance.h → src/arch/forte.h

@@ -10,8 +10,8 @@
  *  Jose Cabral - initial API and implementation and/or initial documentation
  *******************************************************************************/
 
-#ifndef FORTE_INSTANCE_H_
-#define FORTE_INSTANCE_H_
+#ifndef SRC_ARCH_FORTE_H_
+#define SRC_ARCH_FORTE_H_
 
 /* When moving this file to the outside of the architecture,
  * the corresponding defines for exporting in windows or other platform
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
   enum FORTE_STATUS{
-    FORTE_OK,
+    FORTE_OK = 0,
     FORTE_DEVICE_ALREADY_STARTED,
     FORTE_WRONG_ENDIANESS,
     FORTE_WRONG_PARAMETERS,
@@ -44,41 +44,50 @@ extern "C" {
 
   /**
    * \brief Start forte instance
-   * @param pa_port The port on which to forte will listen. Use 0 for default (normally 61499)
-   * @param pa_resultDevice Address of an instance of forte
+   * @param paPort The port on which to forte will listen. Use 0 for default (normally 61499)
+   * @param paResultInstance Address of an instance of forte
    * @return FORTE_OK if no error occurred, other values otherwise
    */
-  FORTE_SHARED_PREFIX int FORTE_SHARED_CALL forteStartInstance(unsigned int pa_port, TForteInstance* paResultInstance);
+  FORTE_SHARED_PREFIX FORTE_STATUS FORTE_SHARED_CALL forteStartInstance(unsigned int paPort, TForteInstance* paResultInstance);
 
   /**
    * \brief Start forte instance with posibilities of more arguments
    * @param argc Number of arguments in arg
-   * @param arg Arguments
-   * @param pa_resultDevice Address of an instance of forte
+   * @param argv Arguments
+   * @param paResultInstance Address of an instance of forte
    * @return FORTE_OK if no error occurred, other values otherwise
    */
-  FORTE_SHARED_PREFIX int FORTE_SHARED_CALL forteStartInstanceGeneric(int argc, char *arg[], TForteInstance* paResultInstance);
+  FORTE_SHARED_PREFIX FORTE_STATUS FORTE_SHARED_CALL forteStartInstanceGeneric(int argc, char *argv[], TForteInstance* paResultInstance);
 
   /**
-   * \brief Terminates a Forte instance
-   * @param signal  Signal value to terminate instance
-   * @param pa_resultDevice Instance to terminate
+   * \brief Request termination of a Forte instance
+   * @param paInstance Instance to terminate
    */
-  FORTE_SHARED_PREFIX void FORTE_SHARED_CALL forteStopInstance(int signal, TForteInstance paInstance);
+  FORTE_SHARED_PREFIX void FORTE_SHARED_CALL forteRequestStopInstance(TForteInstance paInstance);
+
+  /**
+   * \brief Waits indefinitely for the intance to stop
+   * @param paInstance Instance to terminate
+  */
+  FORTE_SHARED_PREFIX void FORTE_SHARED_CALL forteWaitForInstanceToStop(TForteInstance paInstance);
 
   /**
    * \brief Initializes the architecture. Prepare all resources needed by the Forte's instances. Must be called once before the first Forte instance is started
+   * @param argc Number of arguments in arg
+   * @param argv Arguments
+   * @return 0 if no error occurred, other values otherwise
    */
-  FORTE_SHARED_PREFIX void FORTE_SHARED_CALL forteGlobalInitialize();
+  FORTE_SHARED_PREFIX int FORTE_SHARED_CALL forteGlobalInitialize(int argc, char *argv[]);
 
   /**
    * \brief Deinitializes the architecture. Frees all resources used by Forte's instances. Must be called after the last instance is ended
+   * @return 0 if no error occurred, other values otherwise
    */
-  FORTE_SHARED_PREFIX void FORTE_SHARED_CALL forteGlobalDeinitialize();
+  FORTE_SHARED_PREFIX int FORTE_SHARED_CALL forteGlobalDeinitialize();
 
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* FORTE_INSTANCE_H_ */
+#endif /* SRC_ARCH_FORTE_H_ */