8000 Python to CLR string marshaling LRU cache. by dmitriyse · Pull Request #538 · pythonnet/pythonnet · GitHub
[go: up one dir, main page]
Skip to content

Python to CLR string marshaling LRU cache. #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

Python to CLR string marshaling LRU cache. #538

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9de6f7b
Runtime/Shutdown loop stores old caches and static variables. It's pr…
Aug 31, 2017
e9e5c60
Added all tests finalizer routine.
Sep 2, 2017
64acfcb
Bug: Py_Initialize/Py_Finalize calls during alive PythonEngine. Fixed.
Sep 2, 2017
7898833
Init/Shutdown state variable (IsFinalizing) fix.
Sep 2, 2017
ed29200
TestPythonEngineProperties fixes.
Sep 5, 2017
fc549e3
Managed to python string marshaling cache added.
Sep 6, 2017
06f4faa
Net40 compatibility fix.
Sep 6, 2017 10000
5136c85
Build warnings fix.
Sep 7, 2017
507edc9
Update TestRuntime.cs
Oct 10, 2017
741070b
Python string to CLR string marshaling cache added.
Jul 3, 2017
88c9bc8
Merge branch 'master' into string-marshaling-cache
den-run-ai Feb 10, 2018
ffceeed
Merge branch 'master' into string-marshaling-cache
filmor Oct 16, 2018
f7433f6
Merge branch 'master' into string-marshaling-cache
filmor Oct 17, 2018
b200bcb
Merge branch 'master' into string-marshaling-cache
filmor Nov 14, 2018
0df879e
Merge branch 'master' into string-marshaling-cache
filmor Nov 14, 2018
382c4d6
Merge branch 'master' into string-marshaling-cache
filmor Nov 15, 2018
1865e21
Merge branch 'master' into string-marshaling-cache
filmor Nov 19, 2018
46f2498
Merge branch 'master' into string-marshaling-cache
filmor Mar 6, 2019
49d0d89
Merge branch 'master' into string-marshaling-cache
filmor Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
TestPythonEngineProperties fixes.
  • Loading branch information
dse committed Sep 5, 2017
commit ed29200beba1a6f4918a25332a07d8b6695959dd
40 changes: 37 additions & 3 deletions src/embed_tests/TestPythonEngineProperties.cs
View file
Open in desktop 10000
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using NUnit.Framework;
using Python.Runtime;

Expand Down Expand Up @@ -109,18 +110,41 @@ public static void GetPythonHomeDefault()
[Test]
public void SetPythonHome()
{
// We needs to ensure that engine was started and shutdown at least once before setting dummy home.
// Otherwise engine will not run with dummy path with random problem.
if (!PythonEngine.IsInitialized)
{
PythonEngine.Initialize();
}

PythonEngine.Shutdown();

var pythonHomeBackup = PythonEngine.PythonHome;

var pythonHome = "/dummypath/";

PythonEngine.PythonHome = pythonHome;
PythonEngine.Initialize();

Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
PythonEngine.Shutdown();

// Restoring valid pythonhome.
PythonEngine.PythonHome = pythonHomeBackup;
}

[Test]
public void SetPythonHomeTwice()
{
// We needs to ensure that engine was started and shutdown at least once before setting dummy home.
// Otherwise engine will not run with dummy path with random problem.
if (!PythonEngine.IsInitialized)
{
PythonEngine.Initialize();
}
PythonEngine.Shutdown();

var pythonHomeBackup = PythonEngine.PythonHome;

var pythonHome = "/dummypath/";

PythonEngine.PythonHome = "/dummypath2/";
Expand All @@ -129,18 +153,29 @@ public void SetPythonHomeTwice()

Assert.AreEqual(pythonHome, PythonEngine.PythonHome);
PythonEngine.Shutdown();

PythonEngine.PythonHome = pythonHomeBackup;
}

[Test]
public void SetProgramName()
{
if (PythonEngine.IsInitialized)
{
PythonEngine.Shutdown();
}

var programNameBackup = PythonEngine.ProgramName;

var programName = "FooBar";

PythonEngine.ProgramName = programName;
PythonEngine.Initialize();

Assert.AreEqual(programName, PythonEngine.ProgramName);
PythonEngine.Shutdown();

PythonEngine.ProgramName = programNameBackup;
}

[Test]
Expand All @@ -156,7 +191,7 @@ public void SetPythonPath()
string path = PythonEngine.PythonPath;
PythonEngine.Shutdown();

PythonEngine.ProgramName = path;
PythonEngine.PythonPath = path;
PythonEngine.Initialize();

Assert.AreEqual(path, PythonEngine.PythonPath);
Expand All @@ -171,7 +206,6 @@ public void SetPythonPathExceptionOn27()
Assert.Pass();
}

// Get previous path to avoid crashing Python
PythonEngine.Initialize();
string path = PythonEngine.PythonPath;
PythonEngine.Shutdown();
Expand Down
16 changes: 10 additions & 6 deletions src/runtime/pythonengine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,16 @@ public static void Shutdown()
if (initialized)
{
PyScopeManager.Global.Clear();
Marshal.FreeHGlobal(_pythonHome);
_pythonHome = IntPtr.Zero;
Marshal.FreeHGlobal(_programName);
_programName = IntPtr.Zero;
Marshal.FreeHGlobal(_pythonPath);
_pythonPath = IntPtr.Zero;
// We should not release memory for variables that can be used without initialized python engine.
// It's assumed that Py_GetPythonHome returns valid string without engine initialize. Py_GetPythonHome will always return the
// same pointer that was passed before to Py_SetPythonHome and stored in the _pythonHome.

////Marshal.FreeHGlobal(_pythonHome);
////_pythonHome = IntPtr.Zero;
////Marshal.FreeHGlobal(_programName);
////_programName = IntPtr.Zero;
////Marshal.FreeHGlobal(_pythonPath);
////_pythonPath = IntPtr.Zero;

Runtime.Shutdown();
initialized = false;
Expand Down
0