Trying to solve memory leaks on C# loader.

Author: viferga

source/loaders/cs_loader/netcore/source/MetacallEntryPoint.cs

@@ -59,9 +59,12 @@ public static bool ExecutionPathW([System.Runtime.InteropServices.MarshalAs(Syst
 
         public static bool Load(string source)
         {
-            try {
+            try
+            {
                 return loader.LoadFromSourceFunctions(new string[] { source });
-            } catch (Exception ex) {
+            }
+            catch (Exception ex)
+            {
                 // TODO: Implement error handling
                 log.Error(ex.Message, ex);
                 return false;
@@ -70,9 +73,12 @@ public static bool Load(string source)
 
         public static bool Load(string[] files)
         {
-            try {
+            try
+            {
                 return loader.LoadFromFileFunctions(files);
-            } catch (Exception ex) {
+            }
+            catch (Exception ex)
+            {
                 // TODO: Implement error handling
                 log.Error(ex.Message, ex);
                 return false;
@@ -176,5 +182,16 @@ public static bool LoadFromAssemblyW([System.Runtime.InteropServices.MarshalAs(S
         {
             return LoadFromAssembly(assemblyFile);
         }
+
+        // TODO: Is this needed?
+        /*
+        public static void Destroy()
+        {
+            loader = null;
+            log = null;
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+        }
+        */
     }
-}
+}

source/loaders/cs_loader/netcore/source/Providers/LoaderBase.cs

@@ -21,6 +21,11 @@ protected LoaderBase(ILog log)
             this.log = log;
         }
 
+        ~LoaderBase()
+        {
+            paths.Clear();
+        }
+
         public bool ExecutionPath(string path)
         {
             if (!paths.Contains(path))
@@ -71,7 +76,7 @@ private string LoadFromFileFunctionsRelative(string file)
                 {
                     return System.IO.File.ReadAllText(Path.Combine(path, file));
                 }
-                catch (Exception ex)
+                catch
                 {
                     continue;
                 }

source/loaders/cs_loader/source/cs_loader_impl.c

@@ -35,6 +35,8 @@
 #include <cs_loader/simple_netcore.h>
 #include <stdlib.h>
 
+// TODO: This design has to change, it needs an AppDomain per list of functions (https://github.com/metacall/core/issues/123)
+
 typedef struct
 {
 	netcore_handle handle;
@@ -63,6 +65,7 @@ function_return function_cs_interface_invoke(function func, function_impl impl,
 	}
 	else
 	{
+		// TODO: Do not hardcode this, take the information from the function and (probably) preload the list of arguments
 		parameters params[10];
 
 		for (int i = 0; i < cs_f->func->param_count; ++i)

source/loaders/cs_loader/source/netcore_linux.cpp

@@ -55,7 +55,7 @@ netcore_linux::netcore_linux(char *dotnet_root, char *dotnet_loader_assembly_pat
 
 netcore_linux::~netcore_linux()
 {
-	//this->stop();
+	this->stop();
 }
 
 bool netcore_linux::ConfigAssemblyName()
@@ -280,11 +280,9 @@ bool netcore_linux::start()
 
 void netcore_linux::stop()
 {
-	int status = -1;
-
-	status = (*this->coreclr_shutdown)(this->hostHandle, this->domainId);
+	int status = (*this->coreclr_shutdown)(this->hostHandle, this->domainId);
 
-	if (status < 0)
+	if (status != 0)
 	{
 		log_write("metacall", LOG_LEVEL_ERROR, "Stop status (0x%08x)", status);
 	}

source/loaders/cs_loader/source/simple_netcore.cpp

@@ -54,12 +54,6 @@ reflect_function *simple_netcore_get_functions(netcore_handle handle, int *count
 	return core->get_functions(count);
 }
 
-void simple_netcore_destroy(netcore_handle handle)
-{
-	netcore *core = (netcore *)handle;
-	delete core;
-}
-
 int simple_netcore_load_script_from_files(netcore_handle handle, const char *files[MAX_FILES], size_t size)
 {
 	netcore *core = (netcore *)handle;
@@ -110,3 +104,14 @@ void simple_netcore_destroy_execution_result(netcore_handle handle, execution_re
 
 	core->destroy_execution_result(er);
 }
+
+void simple_netcore_destroy(netcore_handle handle)
+{
+#if defined(__linux) | defined(linux)
+	netcore_linux *netcore_impl = (netcore_linux *)handle;
+#else
+	netcore_win *netcore_impl = (netcore_win *)handle;
+#endif
+
+	delete netcore_impl;
+}

source/tests/metacall_cs_test/source/metacall_cs_test.cpp

@@ -98,3 +98,14 @@ TEST_F(metacall_cs_test, Fail)
 
 	EXPECT_EQ((int)1, (int)metacall_load_from_memory("cs", buffer, sizeof(buffer), NULL));
 }
+
+TEST_F(metacall_cs_test, FailRelativePath)
+{
+	/* TODO: Review source/ports/node_port/test/index.js in the fail/require section for more information */
+	/* This test is not reproducing the same bug (segmentation fault), we should investigate why */
+	static const char *scripts[] = {
+		"./asd.invalid"
+	};
+
+	EXPECT_EQ((int)1, (int)metacall_load_from_file("cs", scripts, sizeof(scripts) / sizeof(scripts[0]), NULL));
+}