Thanks to visit codestin.com
Credit goes to github.com

Skip to content

add a scope class to manage the context of interaction with Python an… #381

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

Merged
merged 22 commits into from
Jun 9, 2017
Merged

add a scope class to manage the context of interaction with Python an… #381

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8e0b1a2
Deprecate public RunString
vmuriart Mar 3, 2017
72003aa
add a scope class to manage the context of interaction with Python an…
yagweb Feb 15, 2017
efd3798
Rename several methods and add three methods
yagweb Feb 23, 2017
9f50e25
rebased
yagweb Feb 24, 2017
add5ba8
Rebased update
vmuriart Feb 28, 2017
c15555c
format cleanup
vmuriart Feb 28, 2017
b0d57e9
create unnamed pyscope, make PyScope.GILState save
yagweb Mar 1, 2017
ceaaef0
fixup! create unnamed pyscope, make PyScope.GILState save
yagweb Mar 2, 2017
dec39c7
remove GIL and rebased
yagweb Mar 7, 2017
e117d60
Add several methods
yagweb Mar 7, 2017
904d9ed
add a Variables method
yagweb Mar 14, 2017
5484451
fixup! add a Variables method
yagweb Mar 15, 2017
2e063c2
remove private method _GetVariable
yagweb Mar 15, 2017
dd492f4
add unit test for Variables() method
yagweb Mar 15, 2017
df6a49a
add several methods and rebased
yagweb Apr 7, 2017
f35d75b
add a new class PyScopeManager
yagweb Apr 24, 2017
497d7aa
cleaned up the Import methods
yagweb Apr 28, 2017
60ce28b
Merge branch 'master' into add_scope
May 24, 2017
ebf5a2b
Merge branch 'master' into add_scope
May 24, 2017
2c3db3d
updated according to filmor's comments
yagweb May 31, 2017
30543eb
fixup! updated according to filmor's comments
yagweb May 31, 2017
b9dcdac
Get/Set Methods renamed
yagweb Jun 1, 2017
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
remove GIL and rebased
  • Loading branch information
@yagweb
yagweb committed Apr 7, 2017
commit dec39c74f5edc0e69ea1f4bf32eebc5304c31691
154 changes: 105 additions & 49 deletions src/embed_tests/pyscope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,20 @@ public class PyScopeTest
[SetUp]
public void SetUp()
{
ps = Py.Session("test");
using (Py.GIL())
{
ps = Py.Scope("test");
}
}

[TearDown]
public void Dispose()
{
ps.Dispose();
using (Py.GIL())
{
ps.Dispose();
ps = null;
}
}

/// <summary>
Expand All @@ -26,9 +33,12 @@ public void Dispose()
[Test]
public void TestEval()
{
ps.SetVariable("a", 1);
var result = ps.Eval<int>("a + 2");
Assert.AreEqual(result, 3);
using (Py.GIL())
{
ps.SetVariable("a", 1);
var result = ps.Eval<int>("a + 2");
Assert.AreEqual(result, 3);
}
}

/// <summary>
Expand All @@ -37,11 +47,14 @@ public void TestEval()
[Test]
public void TestExec()
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable
ps.Exec("aa = bb + cc + 3");
var result = ps.GetVariable<int>("aa");
Assert.AreEqual(result, 113);
using (Py.GIL())
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable
ps.Exec("aa = bb + cc + 3");
var result = ps.GetVariable<int>("aa");
Assert.AreEqual(result, 113);
}
}

/// <summary>
Expand All @@ -51,11 +64,14 @@ public void TestExec()
[Test]
public void TestCompileExpression()
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable
PyObject script = ps.Compile("bb + cc + 3", "", RunFlagType.Eval);
var result = ps.Execute<int>(script);
Assert.AreEqual(result, 113);
using (Py.GIL())
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable
PyObject script = ps.Compile("bb + cc + 3", "", RunFlagType.Eval);
var result = ps.Execute<int>(script);
Assert.AreEqual(result, 113);
}
}

/// <summary>
Expand All @@ -66,12 +82,15 @@ public void TestCompileExpression()
[Test]
public void TestCompileStatements()
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable
PyObject script = ps.Compile("aa = bb + cc + 3", "", RunFlagType.File);
ps.Execute(script);
var result = ps.GetVariable<int>("aa");
Assert.AreEqual(result, 113);
using (Py.GIL())
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable
PyObject script = ps.Compile("aa = bb + cc + 3", "", RunFlagType.File);
ps.Execute(script);
var result = ps.GetVariable<int>("aa");
Assert.AreEqual(result, 113);
}
}

/// <summary>
Expand All @@ -80,16 +99,19 @@ public void TestCompileStatements()
[Test]
public void TestSubScope()
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable
using (Py.GIL())
{
ps.SetVariable("bb", 100); //declare a global variable
ps.SetVariable("cc", 10); //declare a local variable

PyScope scope = ps.SubScope();
scope.Exec("aa = bb + cc + 3");
var result = scope.GetVariable<int>("aa");
Assert.AreEqual(result, 113); //
scope.Dispose();
PyScope scope = ps.SubScope();
scope.Exec("aa = bb + cc + 3");
var result = scope.GetVariable<int>("aa");
Assert.AreEqual(result, 113); //
scope.Dispose();

Assert.IsFalse(ps.ContainsVariable("aa"));
Assert.IsFalse(ps.ContainsVariable("aa"));
}
}

/// <summary>
Expand All @@ -99,14 +121,17 @@ public void TestSubScope()
[Test]
public void TestImport()
{
dynamic sys = ps.Import("sys");
Assert.IsTrue(ps.ContainsVariable("sys"));

ps.Exec("sys.attr1 = 2");
var value1 = ps.Eval<int>("sys.attr1");
var value2 = (int)sys.attr1.AsManagedObject(typeof(int));
Assert.AreEqual(value1, 2);
Assert.AreEqual(value2, 2);
using (Py.GIL())
{
dynamic sys = ps.Import("sys");
Assert.IsTrue(ps.ContainsVariable("sys"));

ps.Exec("sys.attr1 = 2");
var value1 = ps.Eval<int>("sys.attr1");
var value2 = (int)sys.attr1.AsManagedObject(typeof(int));
Assert.AreEqual(value1, 2);
Assert.AreEqual(value2, 2);
}
}

/// <summary>
Expand All @@ -116,28 +141,59 @@ public void TestImport()
[Test]
public void TestImportAs()
{
ps.ImportAs("sys", "sys1");
Assert.IsTrue(ps.ContainsVariable("sys1"));
using (Py.GIL())
{
ps.ImportAs("sys", "sys1");
Assert.IsTrue(ps.ContainsVariable("sys1"));
}
}

/// <summary>
/// Suspend the Session, and reuse it later.
/// </summary>
[Test]
public void TestSuspend()
public void TestThread()
{
ps.SetVariable("bb", 100);
ps.SetVariable("cc", 10);
ps.Suspend();

//I open an proposal here https://github.com/pythonnet/pythonnet/pull/419
//after it merged, the BeginAllowThreads statement blow and the last EndAllowThreads statement
//should be removed.
var ts = PythonEngine.BeginAllowThreads();
using (Py.GIL())
{
PythonEngine.RunSimpleString("import sys;");
ps.SetVariable("res", 0);
ps.SetVariable("bb", 100);
ps.SetVariable("th_cnt", 0);
}

ps.Exec("aa = bb + cc + 3");
var result = ps.GetVariable<int>("aa");
Assert.AreEqual(result, 113);
int th_cnt = 3;
for (int i =0; i< th_cnt; i++)
{
System.Threading.Thread th = new System.Threading.Thread(()=>
{
using (Py.GIL())
{
ps.Exec(
"res += bb + 1\n" +
"th_cnt += 1\n");
}
});
th.Start();
}
//do not use Thread.Join to make this test more complicate
int cnt = 0;
while(cnt != th_cnt)
{
using (Py.GIL())
{
cnt = ps.GetVariable<int>("th_cnt");
}
System.Threading.Thread.Sleep(10);
}
using (Py.GIL())
{
var result = ps.GetVariable<int>("res");
Assert.AreEqual(101* th_cnt, result);
}
PythonEngine.EndAllowThreads(ts);
}
}
}
Loading