Skip to content

Commit 4159630

Browse files
Remove cancellationTokens
1 parent 5333ccc commit 4159630

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/VisualStudio/Core/Def/ProjectSystem/MetadataReferences/VisualStudioMetadataReferenceManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ static void GetStorageInfoFromTemporaryStorage(
233233
// location, so we can create a metadata value wrapping that. This will also let us share the memory
234234
// for that metadata value with our OOP process.
235235
copyStream.Position = 0;
236-
storageHandle = temporaryStorageService.WriteToTemporaryStorage(copyStream, CancellationToken.None);
236+
storageHandle = temporaryStorageService.WriteToTemporaryStorage(copyStream);
237237
}
238238

239239
// Now, read the data from the memory-mapped-file back into a stream that we load into the metadata value.
240240
// The ITemporaryStorageStreamHandle should have given us an UnmanagedMemoryStream
241241
// since this only runs on Windows for VS.
242-
stream = (UnmanagedMemoryStream)storageHandle.ReadFromTemporaryStorage(CancellationToken.None);
242+
stream = (UnmanagedMemoryStream)storageHandle.ReadFromTemporaryStorage();
243243

244244
// stream size must be same as what metadata reader said the size should be.
245245
Contract.ThrowIfFalse(stream.Length == size);

src/Workspaces/CoreTest/WorkspaceServiceTests/TemporaryStorageServiceTests.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public void TestTemporaryStorageStream()
6060
data.WriteByte((byte)(i % 2));
6161
}
6262

63-
var handle = service.WriteToTemporaryStorage(data, CancellationToken.None);
63+
var handle = service.WriteToTemporaryStorage(data);
6464

65-
using var result = handle.ReadFromTemporaryStorage(CancellationToken.None);
65+
using var result = handle.ReadFromTemporaryStorage();
6666
Assert.Equal(data.Length, result.Length);
6767

6868
for (var i = 0; i < SharedPools.ByteBufferSize; i++)
@@ -95,10 +95,10 @@ public void TestZeroLengthStreams()
9595
TemporaryStorageStreamHandle handle;
9696
using (var stream1 = new MemoryStream())
9797
{
98-
handle = service.WriteToTemporaryStorage(stream1, CancellationToken.None);
98+
handle = service.WriteToTemporaryStorage(stream1);
9999
}
100100

101-
using var stream2 = handle.ReadFromTemporaryStorage(CancellationToken.None);
101+
using var stream2 = handle.ReadFromTemporaryStorage();
102102
Assert.Equal(0, stream2.Length);
103103
}
104104

@@ -119,15 +119,15 @@ public void TestTemporaryStorageMemoryMappedFileManagement()
119119
{
120120
for (var j = 1; j < 5; j++)
121121
{
122-
var handle1 = service.WriteToTemporaryStorage(new MemoryStream(buffer.GetBuffer(), 0, 1024 * i - 1), CancellationToken.None);
123-
var handle2 = service.WriteToTemporaryStorage(new MemoryStream(buffer.GetBuffer(), 0, 1024 * i), CancellationToken.None);
124-
var handle3 = service.WriteToTemporaryStorage(new MemoryStream(buffer.GetBuffer(), 0, 1024 * i + 1), CancellationToken.None);
122+
var handle1 = service.WriteToTemporaryStorage(new MemoryStream(buffer.GetBuffer(), 0, 1024 * i - 1));
123+
var handle2 = service.WriteToTemporaryStorage(new MemoryStream(buffer.GetBuffer(), 0, 1024 * i));
124+
var handle3 = service.WriteToTemporaryStorage(new MemoryStream(buffer.GetBuffer(), 0, 1024 * i + 1));
125125

126126
await Task.Yield();
127127

128-
using var s1 = handle1.ReadFromTemporaryStorage(CancellationToken.None);
129-
using var s2 = handle2.ReadFromTemporaryStorage(CancellationToken.None);
130-
using var s3 = handle3.ReadFromTemporaryStorage(CancellationToken.None);
128+
using var s1 = handle1.ReadFromTemporaryStorage();
129+
using var s2 = handle2.ReadFromTemporaryStorage();
130+
using var s3 = handle3.ReadFromTemporaryStorage();
131131
Assert.Equal(1024 * i - 1, s1.Length);
132132
Assert.Equal(1024 * i, s2.Length);
133133
Assert.Equal(1024 * i + 1, s3.Length);
@@ -162,13 +162,13 @@ public void TestTemporaryStorageScaling()
162162
var storageHandles = new List<TemporaryStorageStreamHandle>(fileCount);
163163
for (var i = 0; i < fileCount; i++)
164164
{
165-
var handle = service.WriteToTemporaryStorage(data, CancellationToken.None);
165+
var handle = service.WriteToTemporaryStorage(data);
166166
storageHandles.Add(handle);
167167
}
168168

169169
for (var i = 0; i < 1024 * 5; i++)
170170
{
171-
using var s = storageHandles[i].ReadFromTemporaryStorage(CancellationToken.None);
171+
using var s = storageHandles[i].ReadFromTemporaryStorage();
172172
Assert.Equal(1, s.ReadByte());
173173
}
174174
}
@@ -187,10 +187,10 @@ public void StreamTest1()
187187
expected.WriteByte((byte)(i % byte.MaxValue));
188188
}
189189

190-
var handle = service.WriteToTemporaryStorage(expected, CancellationToken.None);
190+
var handle = service.WriteToTemporaryStorage(expected);
191191

192192
expected.Position = 0;
193-
using var stream = handle.ReadFromTemporaryStorage(CancellationToken.None);
193+
using var stream = handle.ReadFromTemporaryStorage();
194194
Assert.Equal(expected.Length, stream.Length);
195195

196196
for (var i = 0; i < expected.Length; i++)
@@ -212,10 +212,10 @@ public void StreamTest2()
212212
expected.WriteByte((byte)(i % byte.MaxValue));
213213
}
214214

215-
var handle = service.WriteToTemporaryStorage(expected, CancellationToken.None);
215+
var handle = service.WriteToTemporaryStorage(expected);
216216

217217
expected.Position = 0;
218-
using var stream = handle.ReadFromTemporaryStorage(CancellationToken.None);
218+
using var stream = handle.ReadFromTemporaryStorage();
219219
Assert.Equal(expected.Length, stream.Length);
220220

221221
var index = 0;
@@ -252,10 +252,10 @@ public void StreamTest3()
252252
expected.WriteByte(value);
253253
}
254254

255-
var handle = service.WriteToTemporaryStorage(expected, CancellationToken.None);
255+
var handle = service.WriteToTemporaryStorage(expected);
256256

257257
expected.Position = 0;
258-
using var stream = handle.ReadFromTemporaryStorage(CancellationToken.None);
258+
using var stream = handle.ReadFromTemporaryStorage();
259259
Assert.Equal(expected.Length, stream.Length);
260260

261261
for (var i = 0; i < expected.Length; i++)

0 commit comments

Comments
 (0)