From d4f336db4048d6174bfdd37aea3bfa87feda7d9b Mon Sep 17 00:00:00 2001 From: sakridge Date: Wed, 20 Nov 2019 10:22:26 -0800 Subject: [PATCH] Fix unpin argument (#7057) automerge --- perf/src/cuda_runtime.rs | 2 +- perf/src/packet.rs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/perf/src/cuda_runtime.rs b/perf/src/cuda_runtime.rs index 38c07570e..61e919afd 100644 --- a/perf/src/cuda_runtime.rs +++ b/perf/src/cuda_runtime.rs @@ -160,7 +160,7 @@ impl PinnedVec { pub fn reserve_and_pin(&mut self, size: usize) { if self.x.capacity() < size { if self.pinned { - unpin(&mut self.x); + unpin(self.x.as_mut_ptr()); self.pinned = false; } self.x.reserve(size); diff --git a/perf/src/packet.rs b/perf/src/packet.rs index 8fc146379..18daa1a6e 100644 --- a/perf/src/packet.rs +++ b/perf/src/packet.rs @@ -153,4 +153,12 @@ mod tests { assert_eq!(rv[0].packets.len(), NUM_PACKETS); assert_eq!(rv[1].packets.len(), 1); } + + #[test] + fn test_to_packets_pinning() { + let recycler = PacketsRecycler::default(); + for i in 0..2 { + let _first_packets = Packets::new_with_recycler(recycler.clone(), i + 1, "first one"); + } + } }