Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
StackExchange.Redis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
StackExchange.Redis
Commits
5a36dc7a
Commit
5a36dc7a
authored
Mar 14, 2020
by
Nick Craver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix naming of _activeMessage
Tidying this up so the diff/fix in #1374 is easier to analyze.
parent
08bc1fb6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
PhysicalBridge.cs
src/StackExchange.Redis/PhysicalBridge.cs
+4
-4
No files found.
src/StackExchange.Redis/PhysicalBridge.cs
View file @
5a36dc7a
...
...
@@ -638,12 +638,12 @@ internal bool TryEnqueue(List<Message> messages, bool isSlave)
private
readonly
MutexSlim
_singleWriterMutex
;
private
Message
_activeMess
s
age
;
private
Message
_activeMessage
;
private
WriteResult
WriteMessageInsideLock
(
PhysicalConnection
physical
,
Message
message
)
{
WriteResult
result
;
var
existingMessage
=
Interlocked
.
CompareExchange
(
ref
_activeMess
s
age
,
message
,
null
);
var
existingMessage
=
Interlocked
.
CompareExchange
(
ref
_activeMessage
,
message
,
null
);
if
(
existingMessage
!=
null
)
{
Multiplexer
?.
OnInfoMessage
(
$"reentrant call to WriteMessageTakingWriteLock for
{
message
.
CommandAndKey
}
,
{
existingMessage
.
CommandAndKey
}
is still active"
);
...
...
@@ -1072,7 +1072,7 @@ private WriteResult HandleWriteException(Message message, Exception ex)
[
MethodImpl
(
MethodImplOptions
.
AggressiveInlining
)]
private
void
UnmarkActiveMessage
(
Message
message
)
=>
Interlocked
.
CompareExchange
(
ref
_activeMess
s
age
,
null
,
message
);
// remove if it is us
=>
Interlocked
.
CompareExchange
(
ref
_activeMessage
,
null
,
message
);
// remove if it is us
private
State
ChangeState
(
State
newState
)
{
...
...
@@ -1301,6 +1301,6 @@ internal void SimulateConnectionFailure()
physical
?.
RecordConnectionFailed
(
ConnectionFailureType
.
SocketFailure
);
}
internal
RedisCommand
?
GetActiveMessage
()
=>
Volatile
.
Read
(
ref
_activeMess
s
age
)?.
Command
;
internal
RedisCommand
?
GetActiveMessage
()
=>
Volatile
.
Read
(
ref
_activeMessage
)?.
Command
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment