Improve marshaling of git oid

Kim Gybels · Kim Gybels · commit 35e9a66b4691 · 2014-04-21T21:38:18.000+02:00
Doing a simple copy of the byte array is a lot faster than using
Marshal.PtrToStructure.
diff --git a/LibGit2Sharp/Core/GitOid.cs b/LibGit2Sharp/Core/GitOid.cs
@@ -7,10 +7,15 @@ namespace LibGit2Sharp.Core
     /// </summary>
     internal struct GitOid
     {
+        /// <summary>
+        /// Number of bytes in the Id.
+        /// </summary>
+        public const int Size = 20;
+
         /// <summary>
         /// The raw binary 20 byte Id.
         /// </summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = Size)]
         public byte[] Id;
 
         public static implicit operator ObjectId(GitOid oid)
diff --git a/LibGit2Sharp/Core/Handles/OidSafeHandle.cs b/LibGit2Sharp/Core/Handles/OidSafeHandle.cs
@@ -6,7 +6,14 @@ internal class OidSafeHandle : NotOwnedSafeHandleBase
     {
         private GitOid? MarshalAsGitOid()
         {
-            return IsInvalid ? null : (GitOid?)handle.MarshalAs<GitOid>();
+            return IsInvalid ? null : (GitOid?)MarshalAsGitOid(handle);
+        }
+
+        private static GitOid MarshalAsGitOid(System.IntPtr data)
+        {
+            var gitOid = new GitOid { Id = new byte[GitOid.Size] };
+            Marshal.Copy(data, gitOid.Id, 0, GitOid.Size);
+            return gitOid;
         }
 
         public ObjectId MarshalAsObjectId()

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,14 @@ internal class OidSafeHandle : NotOwnedSafeHandleBase`
`6`	`6`	`{`
`7`	`7`	`private GitOid? MarshalAsGitOid()`
`8`	`8`	`{`
`9`		`- return IsInvalid ? null : (GitOid?)handle.MarshalAs<GitOid>();`
	`9`	`+ return IsInvalid ? null : (GitOid?)MarshalAsGitOid(handle);`
	`10`	`+ }`
	`11`	`+`
	`12`	`+ private static GitOid MarshalAsGitOid(System.IntPtr data)`
	`13`	`+ {`
	`14`	`+ var gitOid = new GitOid { Id = new byte[GitOid.Size] };`
	`15`	`+ Marshal.Copy(data, gitOid.Id, 0, GitOid.Size);`
	`16`	`+ return gitOid;`
`10`	`17`	`}`
`11`	`18`
`12`	`19`	`public ObjectId MarshalAsObjectId()`