Use a pointer to retrieve the library's error

carlosmn · carlosmn · commit b1f1f4744c1e · 2015-12-11T02:37:38.000+01:00
As the first step to moving away from marshalling data into managed
memory when we can avoid it, we start with a simple one which we only
read from.
diff --git a/LibGit2Sharp/Core/EncodingMarshaler.cs b/LibGit2Sharp/Core/EncodingMarshaler.cs
@@ -93,7 +93,12 @@ public static void Cleanup(IntPtr pNativeData)
 
 public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData)
{
- if (pNativeData == IntPtr.Zero)
+ return FromNative(encoding, (byte*)pNativeData);
+ }
+
+ public static unsafe string FromNative(Encoding encoding, byte* pNativeData)
+{
+ if (pNativeData == null)
{
 return null;
 }
@@ -112,7 +117,7 @@ public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData)
 return String.Empty;
 }
 
- return new String((sbyte*)pNativeData.ToPointer(), 0, (int)(walk - start), encoding);
+ return new String((sbyte*)pNativeData, 0, (int)(walk - start), encoding);
 }
 
 public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, int length)
diff --git a/LibGit2Sharp/Core/Ensure.cs b/LibGit2Sharp/Core/Ensure.cs
@@ -130,25 +130,19 @@ private static readonly Dictionary<GitErrorCode, Func<string, GitErrorCode, GitE
{GitErrorCode.Peel, (m, r, c) => new PeelException(m, r, c) },
 };
 
- private static void HandleError(int result)
+ private static unsafe void HandleError(int result)
{
 string errorMessage;
- GitError error = null;
- var errHandle = NativeMethods.giterr_last();
-
- if (errHandle != null && !errHandle.IsInvalid)
-{
- error = errHandle.MarshalAsGitError();
- }
+ GitErrorCategory errorCategory = GitErrorCategory.Unknown;
+ GitError* error = NativeMethods.giterr_last();
 
 if (error == null)
{
- error = new GitError{Category = GitErrorCategory.Unknown, Message = IntPtr.Zero };
 errorMessage = "No error message has been provided by the native library";
 }
 else
{
- errorMessage = LaxUtf8Marshaler.FromNative(error.Message);
+ errorMessage = LaxUtf8Marshaler.FromNative(error->Message);
 }
 
 Func<string, GitErrorCode, GitErrorCategory, LibGit2SharpException> exceptionBuilder;
@@ -157,7 +151,7 @@ private static void HandleError(int result)
 exceptionBuilder = (m, r, c) => new LibGit2SharpException(m, r, c);
 }
 
- throw exceptionBuilder(errorMessage, (GitErrorCode)result, error.Category);
+ throw exceptionBuilder(errorMessage, (GitErrorCode)result, errorCategory);
 }
 
 /// <summary>
diff --git a/LibGit2Sharp/Core/GitError.cs b/LibGit2Sharp/Core/GitError.cs
@@ -4,9 +4,9 @@
 namespace LibGit2Sharp.Core
{
 [StructLayout(LayoutKind.Sequential)]
- internal class GitError
+ internal unsafe struct GitError
{
- public IntPtr Message;
+ public char* Message;
 public GitErrorCategory Category;
 }
 }
diff --git a/LibGit2Sharp/Core/Handles/GitErrorSafeHandle.cs b/LibGit2Sharp/Core/Handles/GitErrorSafeHandle.cs
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -79,7 +79,7 @@ static NativeMethods()
 }
 
 [DllImport(libgit2)]
- internal static extern GitErrorSafeHandle giterr_last();
+ internal static extern unsafe GitError* giterr_last();
 
 [DllImport(libgit2)]
 internal static extern void giterr_set_str(
diff --git a/LibGit2Sharp/Core/Utf8Marshaler.cs b/LibGit2Sharp/Core/Utf8Marshaler.cs
@@ -112,6 +112,11 @@ public override IntPtr MarshalManagedToNative(object managedObj)
 
 #endregion
 
+ public static unsafe string FromNative(char* pNativeData)
+{
+ return FromNative(Encoding, (byte*)pNativeData);
+ }
+
 public static string FromNative(IntPtr pNativeData)
{
 return FromNative(Encoding, pNativeData);
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -280,7 +280,6 @@
 <Compile Include="Core\GitErrorCategory.cs" />
 <Compile Include="Core\GitOdbBackend.cs" />
 <Compile Include="Core\GitOdbBackendStream.cs" />
- <Compile Include="Core\Handles\GitErrorSafeHandle.cs" />
 <Compile Include="Core\Handles\NoteSafeHandle.cs" />
 <Compile Include="Core\Handles\ObjectDatabaseSafeHandle.cs" />
 <Compile Include="Core\Handles\DiffSafeHandle.cs" />

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,12 @@ public static void Cleanup(IntPtr pNativeData)`
`93`	`93`
`94`	`94`	`publicstaticunsafestringFromNative(Encodingencoding,IntPtrpNativeData)`
`95`	`95`	`{`
`96`		`-if(pNativeData==IntPtr.Zero)`
	`96`	`+returnFromNative(encoding,(byte*)pNativeData);`
	`97`	`+}`
	`98`	`+`
	`99`	`+publicstaticunsafestringFromNative(Encodingencoding,byte*pNativeData)`
	`100`	`+{`
	`101`	`+if(pNativeData==null)`
`97`	`102`	`{`
`98`	`103`	`returnnull;`
`99`	`104`	`}`
`@@ -112,7 +117,7 @@ public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData)`
`112`	`117`	`returnString.Empty;`
`113`	`118`	`}`
`114`	`119`
`115`		`-returnnewString((sbyte*)pNativeData.ToPointer(),0,(int)(walk-start),encoding);`
	`120`	`+returnnewString((sbyte*)pNativeData,0,(int)(walk-start),encoding);`
`116`	`121`	`}`
`117`	`122`
`118`	`123`	`publicstaticunsafestringFromNative(Encodingencoding,IntPtrpNativeData,intlength)`
Original file line number	Diff line number	Diff line change
`@@ -130,25 +130,19 @@ private static readonly Dictionary<GitErrorCode, Func<string, GitErrorCode, GitE`
`130`	`130`	`{GitErrorCode.Peel,(m,r,c)=>newPeelException(m,r,c)},`
`131`	`131`	`};`
`132`	`132`
`133`		`-privatestaticvoidHandleError(intresult)`
	`133`	`+privatestaticunsafevoidHandleError(intresult)`
`134`	`134`	`{`
`135`	`135`	`stringerrorMessage;`
`136`		`-GitErrorerror=null;`
`137`		`-varerrHandle=NativeMethods.giterr_last();`
`138`		`-`
`139`		`-if(errHandle!=null&&!errHandle.IsInvalid)`
`140`		`-{`
`141`		`-error=errHandle.MarshalAsGitError();`
`142`		`-}`
	`136`	`+GitErrorCategoryerrorCategory=GitErrorCategory.Unknown;`
	`137`	`+GitError*error=NativeMethods.giterr_last();`
`143`	`138`
`144`	`139`	`if(error==null)`
`145`	`140`	`{`
`146`		`-error=newGitError{Category=GitErrorCategory.Unknown,Message=IntPtr.Zero};`
`147`	`141`	`errorMessage="No error message has been provided by the native library";`
`148`	`142`	`}`
`149`	`143`	`else`
`150`	`144`	`{`
`151`		`-errorMessage=LaxUtf8Marshaler.FromNative(error.Message);`
	`145`	`+errorMessage=LaxUtf8Marshaler.FromNative(error->Message);`
`152`	`146`	`}`
`153`	`147`
`154`	`148`	`Func<string,GitErrorCode,GitErrorCategory,LibGit2SharpException>exceptionBuilder;`
`@@ -157,7 +151,7 @@ private static void HandleError(int result)`
`157`	`151`	`exceptionBuilder=(m,r,c)=>newLibGit2SharpException(m,r,c);`
`158`	`152`	`}`
`159`	`153`
`160`		`-throwexceptionBuilder(errorMessage,(GitErrorCode)result,error.Category);`
	`154`	`+throwexceptionBuilder(errorMessage,(GitErrorCode)result,errorCategory);`
`161`	`155`	`}`
`162`	`156`
`163`	`157`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`namespaceLibGit2Sharp.Core`
`5`	`5`	`{`
`6`	`6`	`[StructLayout(LayoutKind.Sequential)]`
`7`		`-internalclassGitError`
	`7`	`+internalunsafestructGitError`
`8`	`8`	`{`
`9`		`-publicIntPtrMessage;`
	`9`	`+publicchar*Message;`
`10`	`10`	`publicGitErrorCategoryCategory;`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ static NativeMethods()`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`[DllImport(libgit2)]`
`82`		`-internalstaticexternGitErrorSafeHandlegiterr_last();`
	`82`	`+internalstaticexternunsafeGitError*giterr_last();`
`83`	`83`
`84`	`84`	`[DllImport(libgit2)]`
`85`	`85`	`internalstaticexternvoidgiterr_set_str(`
-Original file line number
+Diff line change
  #endregion
 +publicstaticunsafestringFromNative(char*pNativeData)
 +{
 +returnFromNative(Encoding,(byte*)pNativeData);
 +}
++
 publicstaticstringFromNative(IntPtrpNativeData)
+{
 returnFromNative(Encoding,pNativeData);
-Original file line number
+Diff line change
  <CompileInclude="Core\GitErrorCategory.cs" />
  <CompileInclude="Core\GitOdbBackend.cs" />
  <CompileInclude="Core\GitOdbBackendStream.cs" />
 - <CompileInclude="Core\Handles\GitErrorSafeHandle.cs" />
  <CompileInclude="Core\Handles\NoteSafeHandle.cs" />
  <CompileInclude="Core\Handles\ObjectDatabaseSafeHandle.cs" />
  <CompileInclude="Core\Handles\DiffSafeHandle.cs" />