expose rcl_shutdown function

ros2-dotnet · Nov 29, 2024 · 9c62675 · 9c62675
1 parent c31d886
commit 9c62675
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/rcldotnet/RCLdotnet.cs b/rcldotnet/RCLdotnet.cs
@@ -47,6 +47,11 @@ internal delegate void NativeRCLGetErrorStringType(
 
         internal static NativeRCLOkType native_rcl_ok = null;
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        internal delegate RCLRet NativeRCLShutdownType();
+
+        internal static NativeRCLShutdownType native_rcl_shutdown = null;
+
         [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
         internal delegate RCLRet NativeRCLCreateNodeHandleType(
             ref SafeNodeHandle nodeHandle, [MarshalAs(UnmanagedType.LPStr)] string nodeName, [MarshalAs(UnmanagedType.LPStr)] string nodeNamespace);
@@ -409,6 +414,12 @@ static RCLdotnetDelegates()
                 (NativeRCLOkType)Marshal.GetDelegateForFunctionPointer(
                     native_rcl_ok_ptr, typeof(NativeRCLOkType));
 
+            IntPtr native_rcl_shutdown_ptr =
+                _dllLoadUtils.GetProcAddress(nativeLibrary, "native_rcl_shutdown");
+            RCLdotnetDelegates.native_rcl_shutdown =
+                (NativeRCLShutdownType)Marshal.GetDelegateForFunctionPointer(
+                    native_rcl_shutdown_ptr, typeof(NativeRCLShutdownType));
+
             IntPtr native_rcl_create_node_handle_ptr =
                 _dllLoadUtils.GetProcAddress(nativeLibrary, "native_rcl_create_node_handle");
             RCLdotnetDelegates.native_rcl_create_node_handle =
@@ -744,7 +755,8 @@ public static class RCLdotnet
 
         public static bool Ok()
         {
-            return RCLdotnetDelegates.native_rcl_ok() != 0;
+            bool ret = RCLdotnetDelegates.native_rcl_ok() != 0;
+            return ret;
         }
 
         public static Node CreateNode(string nodeName)
@@ -774,6 +786,12 @@ public static void Spin(Node node)
             }
         }
 
+        public static void Shutdown()
+        {
+            RCLRet ret = RCLdotnetDelegates.native_rcl_shutdown();
+            RCLExceptionHelper.CheckReturnValue(ret, $"{nameof(RCLdotnetDelegates.native_rcl_shutdown)}() failed.");
+        }
+
         public static Clock CreateClock(ClockType type = ClockType.RosTime)
         {
             var clockHandle = new SafeClockHandle();

diff --git a/rcldotnet/rcldotnet.c b/rcldotnet/rcldotnet.c
@@ -83,6 +83,15 @@ int32_t native_rcl_ok() {
   return result ? 1 : 0;
 }
 
+int32_t native_rcl_shutdown() {
+  rcl_ret_t ret = rcl_shutdown(&context);
+  if (ret != RCL_RET_OK) {
+    return ret;
+  }
+
+  return rcl_context_fini(&context);
+}
+
 int32_t native_rcl_create_node_handle(void **node_handle, const char *name, const char *namespace) {
   rcl_node_t *node = (rcl_node_t *)malloc(sizeof(rcl_node_t));
   *node = rcl_get_zero_initialized_node();

diff --git a/rcldotnet/rcldotnet.h b/rcldotnet/rcldotnet.h
@@ -38,6 +38,9 @@ void RCLDOTNET_CDECL native_rcl_reset_error(void);
 RCLDOTNET_EXPORT
 int32_t RCLDOTNET_CDECL native_rcl_ok();
 
+RCLDOTNET_EXPORT
+int32_t RCLDOTNET_CDECL native_rcl_shutdown();
+
 RCLDOTNET_EXPORT
 int32_t RCLDOTNET_CDECL native_rcl_create_node_handle(void **, const char *, const char *);