Merge branch 'master' into PR/Codecs

filmor · web-flow · commit 44bfec27c645 · 2020-02-23T18:05:20.000+01:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -15,6 +15,7 @@
 -   Alex Earl ([@slide](https://github.com/slide))
 -   Alex Helms ([@alexhelms](https://github.com/alexhelms))
 -   Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))
+-   Andrey Sant'Anna ([@andreydani](https://github.com/andreydani))
 -   Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
 -   Benoît Hudson ([@benoithudson](https://github.com/benoithudson))
 -   Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
   together with Nuitka
 - Fixes bug where delegates get casts (dotnetcore)
 - Determine size of interpreter longs at runtime
+- Handling exceptions ocurred in ModuleObject's getattribute 
 
 ## [2.4.0][]
 
diff --git a/src/perf_tests/BaselineComparisonConfig.cs b/src/perf_tests/BaselineComparisonConfig.cs
@@ -5,6 +5,7 @@
 
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Horology;
 
 namespace Python.PerformanceTests
 {
@@ -18,7 +19,11 @@ public BaselineComparisonConfig()
 
             string deploymentRoot = BenchmarkTests.DeploymentRoot;
 
-            var baseJob = Job.Default;
+            var baseJob = Job.Default
+                .WithLaunchCount(1)
+                .WithWarmupCount(3)
+                .WithMaxIterationCount(100)
+                .WithIterationTime(TimeInterval.FromMilliseconds(100));
             this.Add(baseJob
                 .WithId("baseline")
                 .WithEnvironmentVariable(EnvironmentVariableName,
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -273,7 +273,18 @@ public static IntPtr tp_getattro(IntPtr ob, IntPtr key)
                 return self.dict;
             }
 
-            ManagedType attr = self.GetAttribute(name, true);
+            ManagedType attr = null;
+
+            try
+            {
+                attr = self.GetAttribute(name, true);
+            }
+            catch (Exception e)
+            {
+                Exceptions.SetError(e);
+                return IntPtr.Zero;
+            }
+            
 
             if (attr == null)
             {
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -21,7 +21,7 @@ public class PythonException : System.Exception, IPyDisposable
         public PythonException()
         {
             IntPtr gs = PythonEngine.AcquireLock();
-            Runtime.PyErr_Fetch(ref _pyType, ref _pyValue, ref _pyTB);
+            Runtime.PyErr_Fetch(out _pyType, out _pyValue, out _pyTB);
             if (_pyType != IntPtr.Zero && _pyValue != IntPtr.Zero)
             {
                 string type;
@@ -161,12 +161,23 @@ public void Dispose()
                 if (Runtime.Py_IsInitialized() > 0 && !Runtime.IsFinalizing)
                 {
                     IntPtr gs = PythonEngine.AcquireLock();
-                    Runtime.XDecref(_pyType);
-                    Runtime.XDecref(_pyValue);
+                    if (_pyType != IntPtr.Zero)
+                    {
+                        Runtime.XDecref(_pyType);
+                        _pyType= IntPtr.Zero;
+                    }
+
+                    if (_pyValue != IntPtr.Zero)
+                    {
+                        Runtime.XDecref(_pyValue);
+                        _pyValue = IntPtr.Zero;
+                    }
+
                     // XXX Do we ever get TraceBack? //
                     if (_pyTB != IntPtr.Zero)
                     {
                         Runtime.XDecref(_pyTB);
+                        _pyTB = IntPtr.Zero;
                     }
                     PythonEngine.ReleaseLock(gs);
                 }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1942,7 +1942,7 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)
         internal static extern IntPtr PyErr_Occurred();
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void PyErr_Fetch(ref IntPtr ob, ref IntPtr val, ref IntPtr tb);
+        internal static extern void PyErr_Fetch(out IntPtr ob, out IntPtr val, out IntPtr tb);
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void PyErr_Restore(IntPtr ob, IntPtr val, IntPtr tb);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class PythonException : System.Exception, IPyDisposable`
`21`	`21`	`public PythonException()`
`22`	`22`	`{`
`23`	`23`	`IntPtr gs = PythonEngine.AcquireLock();`
`24`		`- Runtime.PyErr_Fetch(ref _pyType, ref _pyValue, ref _pyTB);`
	`24`	`+ Runtime.PyErr_Fetch(out _pyType, out _pyValue, out _pyTB);`
`25`	`25`	`if (_pyType != IntPtr.Zero && _pyValue != IntPtr.Zero)`
`26`	`26`	`{`
`27`	`27`	`string type;`
`@@ -161,12 +161,23 @@ public void Dispose()`
`161`	`161`	`if (Runtime.Py_IsInitialized() > 0 && !Runtime.IsFinalizing)`
`162`	`162`	`{`
`163`	`163`	`IntPtr gs = PythonEngine.AcquireLock();`
`164`		`- Runtime.XDecref(_pyType);`
`165`		`- Runtime.XDecref(_pyValue);`
	`164`	`+ if (_pyType != IntPtr.Zero)`
	`165`	`+ {`
	`166`	`+ Runtime.XDecref(_pyType);`
	`167`	`+ _pyType= IntPtr.Zero;`
	`168`	`+ }`
	`169`	`+`
	`170`	`+ if (_pyValue != IntPtr.Zero)`
	`171`	`+ {`
	`172`	`+ Runtime.XDecref(_pyValue);`
	`173`	`+ _pyValue = IntPtr.Zero;`
	`174`	`+ }`
	`175`	`+`
`166`	`176`	`// XXX Do we ever get TraceBack? //`
`167`	`177`	`if (_pyTB != IntPtr.Zero)`
`168`	`178`	`{`
`169`	`179`	`Runtime.XDecref(_pyTB);`
	`180`	`+ _pyTB = IntPtr.Zero;`
`170`	`181`	`}`
`171`	`182`	`PythonEngine.ReleaseLock(gs);`
`172`	`183`	`}`