FEATURE: Namespace the includes of the rest of libraries, specificall…

…y 'runtime' Namespace all C and C++ libraries under the 'src/libraries' mount-point. Specifically the 'runtime' one (RTAPI) using a higher level abstraction (parts that are a 'runtime', but for some or other reason are in multiple directories and namespaced 'runtime_*' are all in one 'runtime' namespace for imports).
PocketNC · Dec 22, 2021 · 6612dbc · 6612dbc
1 parent 5c8619d
commit 6612dbc
Show file tree

Hide file tree

Showing 475 changed files with 1,244 additions and 1,138 deletions.
diff --git a/decide_what_to_do/hal/components/attic/boss_plc.c b/decide_what_to_do/hal/components/attic/boss_plc.c
@@ -115,8 +115,8 @@
  ******************************************************************************/
 
 
-#include "rtapi.h"              // RTAPI realtime OS API.
-#include "rtapi_app.h"          // RTAPI realtime module decls.
+#include "runtime/rtapi.h"              // RTAPI realtime OS API.
+#include "runtime/rtapi_app.h"          // RTAPI realtime module decls.
 #include "hal/hal.h"                // HAL public API decls.
 
 

diff --git a/decide_what_to_do/hal/components/attic/modmath.c b/decide_what_to_do/hal/components/attic/modmath.c
@@ -31,12 +31,12 @@
 *
 ********************************************************************/
 
-#include "rtapi.h"		/* RTAPI realtime OS API */
-#include "rtapi_app.h"		/* RTAPI realtime module decls */
+#include "runtime/rtapi.h"		/* RTAPI realtime OS API */
+#include "runtime/rtapi_app.h"		/* RTAPI realtime module decls */
 #include "hal/hal.h"		/* HAL public API decls */
 
 #include <linux/types.h>
-#include "rtapi_math.h"
+#include "runtime/rtapi_math.h"
 
 /* module information */
 MODULE_AUTHOR("Stephen Wille Padnos");

diff --git a/decide_what_to_do/hal/components/attic/supply.c b/decide_what_to_do/hal/components/attic/supply.c
@@ -44,8 +44,8 @@
     information, go to https://github.com/machinekit.
 */
 
-#include "rtapi.h"		/* RTAPI realtime OS API */
-#include "rtapi_app.h"		/* RTAPI realtime module decls */
+#include "runtime/rtapi.h"		/* RTAPI realtime OS API */
+#include "runtime/rtapi_app.h"		/* RTAPI realtime module decls */
 #include "hal/hal.h"		/* HAL public API decls */
 
 /* module information */

diff --git a/decide_what_to_do/hal/components/hal_pru.c b/decide_what_to_do/hal/components/hal_pru.c
@@ -1,16 +1,16 @@
 // based on supply.c
 
 
-#include "config.h"
+#include "runtime/config.h"
 
 // this probably should be an ARM335x #define
 #if !defined(TARGET_PLATFORM_BEAGLEBONE)
 #error "This driver is for the beaglebone platform only"
 #endif
 
-#include "rtapi.h"		/* RTAPI realtime OS API */
-#include "rtapi_compat.h"       /* RTAPI support functions */
-#include "rtapi_app.h"		/* RTAPI realtime module decls */
+#include "runtime/rtapi.h"		/* RTAPI realtime OS API */
+#include "runtime/rtapi_compat.h"       /* RTAPI support functions */
+#include "runtime/rtapi_app.h"		/* RTAPI realtime module decls */
 #include "hal/hal.h"		/* HAL public API decls */
 #include <pthread.h>
 #include <sys/types.h>

diff --git a/decide_what_to_do/hal/components/hal_prudebug.c b/decide_what_to_do/hal/components/hal_prudebug.c
@@ -1,7 +1,7 @@
 // based on supply.c
 
 
-#include "config.h"
+#include "runtime/config.h"
 
 // this probably should be an ARM335x #define
 #if !defined(TARGET_PLATFORM_BEAGLEBONE)
@@ -12,8 +12,8 @@
 // not part of debugging
 #define EXPLORE_COUNTERS 1
 
-#include "rtapi.h"		/* RTAPI realtime OS API */
-#include "rtapi_app.h"		/* RTAPI realtime module decls */
+#include "runtime/rtapi.h"		/* RTAPI realtime OS API */
+#include "runtime/rtapi_app.h"		/* RTAPI realtime module decls */
 #include "hal/hal.h"		/* HAL public API decls */
 #include <pthread.h>
 

diff --git a/decide_what_to_do/hal/lib/hal_alias.c b/decide_what_to_do/hal/lib/hal_alias.c
@@ -1,8 +1,8 @@
 // HAL alias (aka 'oldname') API
 // usage not recommended - ready for deprecation
 
-#include "config.h"
-#include "rtapi.h"		/* RTAPI realtime OS API */
+#include "runtime/config.h"
+#include "runtime/rtapi.h"		/* RTAPI realtime OS API */
 #include "hal/hal.h"		/* HAL public API decls */
 #include "hal/hal_priv.h"		/* HAL private decls */
 #include "hal/hal_internal.h"

diff --git a/decide_what_to_do/hal/lib/hal_plug.c b/decide_what_to_do/hal/lib/hal_plug.c
@@ -1,6 +1,6 @@
 
-#include "config.h"
-#include "rtapi.h"		/* RTAPI realtime OS API */
+#include "runtime/config.h"
+#include "runtime/rtapi.h"		/* RTAPI realtime OS API */
 #include "hal/hal.h"		/* HAL public API decls */
 #include "hal/hal_priv.h"		/* HAL private decls */
 #include "hal/hal_ring.h"

diff --git a/decide_what_to_do/hal/lib/syslog_async.c b/decide_what_to_do/hal/lib/syslog_async.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "syslog_async.h"
+#include "syslog_async/syslog_async.h"
 
 /* From RFC 3164 */
 #define MAX_MESSAGE 1024

diff --git a/decide_what_to_do/hal/vtable-example/vcode.c b/decide_what_to_do/hal/vtable-example/vcode.c
@@ -1,4 +1,4 @@
-#include "rtapi.h"
+#include "runtime/rtapi.h"
 
 #include "vtexample.h"
 

diff --git a/decide_what_to_do/hal/vtable-example/vtexport.c b/decide_what_to_do/hal/vtable-example/vtexport.c
@@ -1,6 +1,6 @@
 
-#include "rtapi.h"
-#include "rtapi_app.h"
+#include "runtime/rtapi.h"
+#include "runtime/rtapi_app.h"
 #include "hal/hal.h"
 #include "hal/hal_priv.h"
 

diff --git a/decide_what_to_do/hal/vtable-example/vtuse.c b/decide_what_to_do/hal/vtable-example/vtuse.c
@@ -1,6 +1,6 @@
 
-#include "rtapi.h"
-#include "rtapi_app.h"
+#include "runtime/rtapi.h"
+#include "runtime/rtapi_app.h"
 #include "hal/hal.h"
 #include "hal/hal_priv.h"
 

diff --git a/decide_what_to_do/hal_comp.c b/decide_what_to_do/hal_comp.c
@@ -1,7 +1,7 @@
 // HAL components API
 
-#include "config.h"
-#include "rtapi.h"		/* RTAPI realtime OS API */
+#include "runtime/config.h"
+#include "runtime/rtapi.h"		/* RTAPI realtime OS API */
 #include "hal/hal.h"		/* HAL public API decls */
 #include "hal/hal_priv.h"		/* HAL private decls */
 #include "hal/hal_internal.h"

diff --git a/decide_what_to_do/halsh.c b/decide_what_to_do/halsh.c
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <tcl.h>
-#include "halcmd.h"
-#include "mk-inifile.h"
+#include "hal_command/halcmd.h"
+#include "mkini/mk-inifile.h"
 
 #define BUFFERLEN 80
 

diff --git a/decide_what_to_do/regressions/check-tests/check_tests.c b/decide_what_to_do/regressions/check-tests/check_tests.c
@@ -7,8 +7,8 @@
 #include "timers.h"
 #include "check-util.h"
 
-#include "rtapi.h"
-#include "ring.h"
+#include "runtime/rtapi.h"
+#include "runtime/ring.h"
 
 
 

diff --git a/decide_what_to_do/regressions/check-tests/triple-buffer-suite.h b/decide_what_to_do/regressions/check-tests/triple-buffer-suite.h
@@ -4,7 +4,7 @@
 
 // see if this works for us:
 // http://remis-thoughts.blogspot.co.at/2012/01/triple-buffering-as-concurrency_30.html
-#include <triple-buffer.h>
+#include <runtime/triple-buffer.h>
 
 TB_FLAG_FAST(tb);
 int tb_buf[3];

diff --git a/decide_what_to_do/shmem/shmemtask.c b/decide_what_to_do/shmem/shmemtask.c
@@ -19,8 +19,8 @@
   Set up a periodic task that increments a heartbeat in shared memory.
 */
 
-#include "rtapi.h"
-#include "rtapi_app.h"		/* rtapi_app_main,exit() */
+#include "runtime/rtapi.h"
+#include "runtime/rtapi_app.h"		/* rtapi_app_main,exit() */
 #include "common.h"		/* shmem structure, SHMEM_KEY */
 
 static int module;

diff --git a/decide_what_to_do/shmem/shmemusr.c b/decide_what_to_do/shmem/shmemusr.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <signal.h>		/* signal(), SIGINT */
 #include <unistd.h>		/* sleep() */
-#include "rtapi.h"		/* user-level API to RT Linux */
+#include "runtime/rtapi.h"		/* user-level API to RT Linux */
 #include "common.h"		/* shmem structure */
 
 static int module;

diff --git a/decide_what_to_do/timer/timertask.c b/decide_what_to_do/timer/timertask.c
@@ -20,8 +20,8 @@
   is stopped, the cumulative counter value is printed.
 */
 
-#include "rtapi.h"
-#include "rtapi_app.h"		/* rtapi_app_main,exit() */
+#include "runtime/rtapi.h"
+#include "runtime/rtapi_app.h"		/* rtapi_app_main,exit() */
 
 static int module;
 static int timer_task;		/* the task ID */

diff --git a/src/executables/comp/src/comp.g b/src/executables/comp/src/comp.g
@@ -254,12 +254,12 @@ def prologue(f):
     f.write("/* Autogenerated by %s -- do not edit */\n" % (
         sys.argv[0]))
     f.write("""\
-#include "rtapi.h"
+#include "runtime/rtapi.h"
 #ifdef RTAPI
-#include "rtapi_app.h"
+#include "runtime/rtapi_app.h"
 #endif
-#include "rtapi_string.h"
-#include "rtapi_errno.h"
+#include "runtime/rtapi_string.h"
+#include "runtime/rtapi_errno.h"
 #include "hal/hal.h"
 
 static int comp_id;

diff --git a/src/executables/encdec/src/encdec.cc b/src/executables/encdec/src/encdec.cc
@@ -14,7 +14,7 @@
 #include <machinetalk/protobuf/message.pb.h>
 #include <machinetalk/protobuf/object.pb.h>
 
-#include <json2pb.hh>
+#include <machinetalk/json2pb.hh>
 
 using namespace machinetalk;
 using namespace std;

diff --git a/src/executables/halcmd/src/halcmd_completion.c b/src/executables/halcmd/src/halcmd_completion.c
@@ -38,10 +38,10 @@
  */
 
 #include "halcmd_completion.h"
-#include "config.h"
+#include "runtime/config.h"
 #include "linux/limits.h"
 #include "stdlib.h"
-#include "rtapi.h"      /* RTAPI realtime OS API */
+#include "runtime/rtapi.h"      /* RTAPI realtime OS API */
 #include "hal/hal.h"        /* HAL public API decls */
 #include "hal/hal_priv.h"   /* private HAL decls */
 #include "hal/hal_ring.h"           /* ringbuffer declarations */

diff --git a/src/executables/halcmd/src/halcmd_main.c b/src/executables/halcmd/src/halcmd_main.c
@@ -37,14 +37,14 @@
  *  information, go to https://github.com/machinekit.
  */
 
-#include "config.h"
-#include "rtapi.h"
+#include "runtime/config.h"
+#include "runtime/rtapi.h"
 #include "hal/hal.h"
 #include "hal/hal_priv.h"
-#include "halcmd.h"
-#include "halcmd_commands.h"
+#include "hal_command/halcmd.h"
+#include "hal_command/halcmd_commands.h"
 #include "halcmd_completion.h"
-#include "halcmd_rtapiapp.h"
+#include "hal_command/halcmd_rtapiapp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -59,7 +59,7 @@
 #include <time.h>
 #include <fnmatch.h>
 #include <search.h>
-#include <mk-inifile.h>
+#include <mkini/mk-inifile.h>
 
 static int get_input(FILE *srcfile, char *buf, size_t bufsize);
 static void print_help_general(int showR);

diff --git a/src/executables/inivar/src/inivar.cc b/src/executables/inivar/src/inivar.cc
@@ -26,8 +26,8 @@
 #include <string.h>		/* strcmp(), strcpy() */
 #include <limits.h>
 
-#include "config.h"
-#include "mk-inifile.hh"
+#include "runtime/config.h"
+#include "mkini/mk-inifile.hh"
 
 // Compiler warnings
 // Copying a string of unknown length into a fixed size buffer

diff --git a/src/executables/instcomp/src/instcomp.g b/src/executables/instcomp/src/instcomp.g
@@ -333,12 +333,12 @@ def prologue(f):
 
 
     f.write("""\
-#include "rtapi.h"
+#include "runtime/rtapi.h"
 #ifdef RTAPI
-#include "rtapi_app.h"
+#include "runtime/rtapi_app.h"
 #endif
-#include "rtapi_string.h"
-#include "rtapi_errno.h"
+#include "runtime/rtapi_string.h"
+#include "runtime/rtapi_errno.h"
 #include "hal/hal.h"
 #include "hal/hal_priv.h"
 #include "hal/hal_accessor.h"

diff --git a/src/executables/linmove/src/linmove.cc b/src/executables/linmove/src/linmove.cc
@@ -10,7 +10,7 @@
 #include <machinetalk/protobuf/emcclass.pb.h>
 #include <machinetalk/protobuf/message.pb.h>
 
-#include <json2pb.hh>
+#include <machinetalk/json2pb.hh>
 
 using namespace std;
 using namespace google::protobuf;

diff --git a/src/executables/messagebus/src/messagebus.cc b/src/executables/messagebus/src/messagebus.cc
@@ -30,7 +30,7 @@
 #include <syslog.h>
 #include <uuid/uuid.h>
 #include <czmq.h>
-#include <syslog_async.h>
+#include <syslog_async/syslog_async.h>
 
 #include <string>
 #include <unordered_set>
@@ -39,16 +39,16 @@
 #error This is intended as a userspace component only.
 #endif
 
-//#include "config.h"
-#include <rtapi.h>
+//#include "runtime/config.h"
+#include <runtime/rtapi.h>
 #include <hal/hal.h>
 #include <hal/hal_priv.h>
 #include <hal/hal_ring.h>
-#include <setup_signals.h>
-#include <mk-zeroconf.hh>
+#include <machinetalk/setup_signals.h>
+#include <machinetalk/mk-zeroconf.hh>
 //#include <select_interface.h>
-#include <mk-inifile.h>
-#include <inihelp.hh>
+#include <mkini/mk-inifile.h>
+#include <machinetalk/inihelp.hh>
 
 #include <machinetalk/protobuf/message.pb.h>
 using namespace google::protobuf;

diff --git a/src/executables/messagebus/src/rtproxy.cc b/src/executables/messagebus/src/rtproxy.cc
@@ -10,8 +10,8 @@
 #error This is intended as a userspace component only.
 #endif
 
-#include <rtapi.h>
-#include <rtapi_hexdump.h>
+#include <runtime/rtapi.h>
+#include <runtime/rtapi_hexdump.h>
 #include <hal/hal.h>
 #include <hal/hal_priv.h>
 #include <hal/hal_ring.h>
@@ -23,7 +23,7 @@
 
 #include "messagebus.hh"
 #include "rtproxy.hh"
-#include "multiframe_flag.h"
+#include "runtime/multiframe_flag.h"
 
 // inproc variant for comms with RT proxy threads
 // defined in messagbus.cc

diff --git a/src/executables/mksocmemio/CMakeLists.txt b/src/executables/mksocmemio/CMakeLists.txt
@@ -33,7 +33,7 @@ if(BUILD_MKSOCMEMIO_EXECUTABLE)
 
   target_sources(mksocmemio PRIVATE ${SOURCE_FILES})
 
-  target_link_libraries(mksocmemio PRIVATE runtime_api)
+  target_link_libraries(mksocmemio PRIVATE runtime_api hal_api)
 
   target_compile_definitions(mksocmemio PRIVATE "ULAPI")
 endif()
diff --git a/src/executables/mksocmemio/src/mksocmemio.c b/src/executables/mksocmemio/src/mksocmemio.c
@@ -1,10 +1,10 @@
-#include "config.h"
+#include "runtime/config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "rtapi.h"
-#include "rtapi_compat.h"
+#include "runtime/rtapi.h"
+#include "runtime/rtapi_compat.h"
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <unistd.h>