Use pointers for getting the list of advertised refs

carlosmn · carlosmn · commit ed25e6976bdd · 2015-12-16T13:35:06.000+01:00
diff --git a/LibGit2Sharp/Core/GitOid.cs b/LibGit2Sharp/Core/GitOid.cs
@@ -2,6 +2,12 @@
 
 namespace LibGit2Sharp.Core
 {
+    internal struct git_oid
+    {
+        public const int Size = 20;
+        public unsafe fixed byte Id[20];
+    }
+
     /// <summary>
     /// Represents a unique id in git which is the sha1 hash of this id's content.
     /// </summary>
diff --git a/LibGit2Sharp/Core/GitRemoteHead.cs b/LibGit2Sharp/Core/GitRemoteHead.cs
@@ -4,12 +4,12 @@
 namespace LibGit2Sharp.Core
 {
     [StructLayout(LayoutKind.Sequential)]
-    internal struct GitRemoteHead
+    internal unsafe struct git_remote_head
     {
-        public bool Local;
-        public GitOid Oid;
-        public GitOid Loid;
-        public IntPtr NamePtr;
-        public IntPtr SymRefTargetPtr;
+        public int Local;
+        public git_oid Oid;
+        public git_oid Loid;
+        public char* Name;
+        public char* SymrefTarget;
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -1244,10 +1244,8 @@ internal static extern int git_remote_lookup(
             RepositorySafeHandle repo,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name);
 
-        internal delegate int git_headlist_cb(ref GitRemoteHead remoteHeadPtr, IntPtr payload);
-
         [DllImport(libgit2)]
-        internal static extern int git_remote_ls(out IntPtr heads, out UIntPtr size, RemoteSafeHandle remote);
+        internal static extern unsafe int git_remote_ls(out git_remote_head** heads, out UIntPtr size, RemoteSafeHandle remote);
 
         [DllImport(libgit2)]
         [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))]
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -2214,32 +2214,23 @@ public static IList<string> git_remote_list(RepositorySafeHandle repo)
             }
         }
 
-        public static IEnumerable<Reference> git_remote_ls(Repository repository, RemoteSafeHandle remote)
+        public static unsafe IEnumerable<Reference> git_remote_ls(Repository repository, RemoteSafeHandle remote)
         {
-            IntPtr heads;
+            git_remote_head** heads;
             UIntPtr count;
 
             int res = NativeMethods.git_remote_ls(out heads, out count, remote);
             Ensure.ZeroResult(res);
 
-            var intCount = (int)count.ToUInt32();
-
-            if (intCount < 0)
-            {
-                throw new OverflowException();
-            }
-
+            var intCount = checked(count.ToUInt32());
             var directRefs = new Dictionary<string, Reference>();
             var symRefs = new Dictionary<string, string>();
 
-            IntPtr currentHead = heads;
-
             for (int i = 0; i < intCount; i++)
             {
-                var remoteHead = Marshal.ReadIntPtr(currentHead).MarshalAs<GitRemoteHead>();
-
-                string name = LaxUtf8Marshaler.FromNative(remoteHead.NamePtr);
-                string symRefTarget = LaxUtf8Marshaler.FromNative(remoteHead.SymRefTargetPtr);
+                git_remote_head* currentHead = heads[i];
+                string name = LaxUtf8Marshaler.FromNative(currentHead->Name);
+                string symRefTarget = LaxUtf8Marshaler.FromNative(currentHead->SymrefTarget);
 
                 // The name pointer should never be null - if it is,
                 // this indicates a bug somewhere (libgit2, server, etc).
@@ -2254,10 +2245,8 @@ public static IEnumerable<Reference> git_remote_ls(Repository repository, Remote
                 }
                 else
                 {
-                    directRefs.Add(name, new DirectReference(name, repository, remoteHead.Oid));
+                    directRefs.Add(name, new DirectReference(name, repository, new ObjectId(currentHead->Oid.Id)));
                 }
-
-                currentHead = IntPtr.Add(currentHead, IntPtr.Size);
             }
 
             for (int i = 0; i < symRefs.Count; i++)
diff --git a/LibGit2Sharp/ObjectId.cs b/LibGit2Sharp/ObjectId.cs
@@ -57,6 +57,22 @@ public ObjectId(byte[] rawId)
             Ensure.ArgumentConformsTo(rawId, b => b.Length == rawSize, "rawId");
         }
 
+        internal unsafe ObjectId(byte* rawId)
+        {
+            byte[] id = new byte[GitOid.Size];
+
+            fixed(byte* p = id)
+            {
+                for (int i = 0; i < rawSize; i++)
+                {
+                    p[i] = rawId[i];
+                }
+            }
+
+            this.oid = new GitOid { Id = id };
+            this.sha = ToString(oid.Id, oid.Id.Length * 2);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectId"/> class.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`	`namespace LibGit2Sharp.Core`
`5`	`5`	`{`
`6`	`6`	`[StructLayout(LayoutKind.Sequential)]`
`7`		`- internal struct GitRemoteHead`
	`7`	`+ internal unsafe struct git_remote_head`
`8`	`8`	`{`
`9`		`- public bool Local;`
`10`		`- public GitOid Oid;`
`11`		`- public GitOid Loid;`
`12`		`- public IntPtr NamePtr;`
`13`		`- public IntPtr SymRefTargetPtr;`
	`9`	`+ public int Local;`
	`10`	`+ public git_oid Oid;`
	`11`	`+ public git_oid Loid;`
	`12`	`+ public char* Name;`
	`13`	`+ public char* SymrefTarget;`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2214,32 +2214,23 @@ public static IList<string> git_remote_list(RepositorySafeHandle repo)`
`2214`	`2214`	`}`
`2215`	`2215`	`}`
`2216`	`2216`
`2217`		`- public static IEnumerable<Reference> git_remote_ls(Repository repository, RemoteSafeHandle remote)`
	`2217`	`+ public static unsafe IEnumerable<Reference> git_remote_ls(Repository repository, RemoteSafeHandle remote)`
`2218`	`2218`	`{`
`2219`		`- IntPtr heads;`
	`2219`	`+ git_remote_head** heads;`
`2220`	`2220`	`UIntPtr count;`
`2221`	`2221`
`2222`	`2222`	`int res = NativeMethods.git_remote_ls(out heads, out count, remote);`
`2223`	`2223`	`Ensure.ZeroResult(res);`
`2224`	`2224`
`2225`		`- var intCount = (int)count.ToUInt32();`
`2226`		`-`
`2227`		`- if (intCount < 0)`
`2228`		`- {`
`2229`		`- throw new OverflowException();`
`2230`		`- }`
`2231`		`-`
	`2225`	`+ var intCount = checked(count.ToUInt32());`
`2232`	`2226`	`var directRefs = new Dictionary<string, Reference>();`
`2233`	`2227`	`var symRefs = new Dictionary<string, string>();`
`2234`	`2228`
`2235`		`- IntPtr currentHead = heads;`
`2236`		`-`
`2237`	`2229`	`for (int i = 0; i < intCount; i++)`
`2238`	`2230`	`{`
`2239`		`- var remoteHead = Marshal.ReadIntPtr(currentHead).MarshalAs<GitRemoteHead>();`
`2240`		`-`
`2241`		`- string name = LaxUtf8Marshaler.FromNative(remoteHead.NamePtr);`
`2242`		`- string symRefTarget = LaxUtf8Marshaler.FromNative(remoteHead.SymRefTargetPtr);`
	`2231`	`+ git_remote_head* currentHead = heads[i];`
	`2232`	`+ string name = LaxUtf8Marshaler.FromNative(currentHead->Name);`
	`2233`	`+ string symRefTarget = LaxUtf8Marshaler.FromNative(currentHead->SymrefTarget);`
`2243`	`2234`
`2244`	`2235`	`// The name pointer should never be null - if it is,`
`2245`	`2236`	`// this indicates a bug somewhere (libgit2, server, etc).`
`@@ -2254,10 +2245,8 @@ public static IEnumerable<Reference> git_remote_ls(Repository repository, Remote`
`2254`	`2245`	`}`
`2255`	`2246`	`else`
`2256`	`2247`	`{`
`2257`		`- directRefs.Add(name, new DirectReference(name, repository, remoteHead.Oid));`
	`2248`	`+ directRefs.Add(name, new DirectReference(name, repository, new ObjectId(currentHead->Oid.Id)));`
`2258`	`2249`	`}`
`2259`		`-`
`2260`		`- currentHead = IntPtr.Add(currentHead, IntPtr.Size);`
`2261`	`2250`	`}`
`2262`	`2251`
`2263`	`2252`	`for (int i = 0; i < symRefs.Count; i++)`