FabInfra-Mirror/libs.capnproto-dotnetcore_Runtime
1
0
Fork 0
mirror of https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git synced 2025-03-13 23:31:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use consecutive question IDs rather than random numbers

Browse Source
This commit is contained in:
Christian Köllner 2019-08-25 22:53:15 +02:00
parent eb1f22902b
commit 52fa0ffb5e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Capnp.Net.Runtime/Rpc/RpcEngine.cs
View File

@ -74,7 +74,6 @@ namespace Capnp.Rpc
readonly RpcEngine _host; readonly RpcEngine _host;
readonly IEndpoint _tx; readonly IEndpoint _tx;
readonly Random _random = new Random();
readonly Dictionary<uint, RefCounted<WeakReference<RemoteCapability>>> _importTable = new Dictionary<uint, RefCounted<WeakReference<RemoteCapability>>>(); readonly Dictionary<uint, RefCounted<WeakReference<RemoteCapability>>> _importTable = new Dictionary<uint, RefCounted<WeakReference<RemoteCapability>>>();
readonly Dictionary<uint, RefCounted<Skeleton>> _exportTable = new Dictionary<uint, RefCounted<Skeleton>>(); readonly Dictionary<uint, RefCounted<Skeleton>> _exportTable = new Dictionary<uint, RefCounted<Skeleton>>();
readonly Dictionary<Skeleton, uint> _revExportTable = new Dictionary<Skeleton, uint>(); readonly Dictionary<Skeleton, uint> _revExportTable = new Dictionary<Skeleton, uint>();
@ -85,6 +84,7 @@ namespace Capnp.Rpc
long _recvCount; long _recvCount;
long _sendCount; long _sendCount;
uint _nextId;
internal RpcEndpoint(RpcEngine host, IEndpoint tx) internal RpcEndpoint(RpcEngine host, IEndpoint tx)
{ {
@ -185,9 +185,9 @@ namespace Capnp.Rpc
ReleaseExport(preliminaryId, 1); ReleaseExport(preliminaryId, 1);
} }
uint RandId() uint NextId()
{ {
return unchecked((uint)_random.Next(int.MinValue, int.MaxValue)); return _nextId++;
} }
uint AllocateExport(Skeleton providedCapability, out bool first) uint AllocateExport(Skeleton providedCapability, out bool first)
@ -213,7 +213,7 @@ namespace Capnp.Rpc
{ {
do do
{ {
id = RandId(); id = NextId();
} while (_exportTable.ContainsKey(id)); } while (_exportTable.ContainsKey(id));
@ -236,12 +236,12 @@ namespace Capnp.Rpc
{ {
lock (_reentrancyBlocker) lock (_reentrancyBlocker)
{ {
uint questionId = RandId(); uint questionId = NextId();
var question = new PendingQuestion(this, questionId, target, inParams); var question = new PendingQuestion(this, questionId, target, inParams);
while (!_questionTable.ReplacementTryAdd(questionId, question)) while (!_questionTable.ReplacementTryAdd(questionId, question))
{ {
questionId = RandId(); questionId = NextId();
var oldQuestion = question; var oldQuestion = question;
question = new PendingQuestion(this, questionId, target, inParams); question = new PendingQuestion(this, questionId, target, inParams);
oldQuestion.Dispose(); oldQuestion.Dispose();
@ -277,11 +277,11 @@ namespace Capnp.Rpc
lock (_reentrancyBlocker) lock (_reentrancyBlocker)
{ {
uint id = RandId(); uint id = NextId();
while (!_pendingDisembargos.ReplacementTryAdd(id, tcs)) while (!_pendingDisembargos.ReplacementTryAdd(id, tcs))
{ {
id = RandId(); id = NextId();
} }
return (tcs, id); return (tcs, id);