Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
fb8829a0
Commit
fb8829a0
authored
Oct 15, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add lock for TemporaryPacketHandlers
parent
f9daee03
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
....mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
+10
-3
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
View file @
fb8829a0
package
net.mamoe.mirai.network.protocol.tim
package
net.mamoe.mirai.network.protocol.tim
import
kotlinx.coroutines.*
import
kotlinx.coroutines.*
import
kotlinx.coroutines.sync.Mutex
import
kotlinx.coroutines.sync.withLock
import
kotlinx.io.core.*
import
kotlinx.io.core.*
import
net.mamoe.mirai.*
import
net.mamoe.mirai.*
import
net.mamoe.mirai.event.EventScope
import
net.mamoe.mirai.event.EventScope
...
@@ -30,12 +32,15 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
...
@@ -30,12 +32,15 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
override
lateinit
var
socket
:
BotSocket
override
lateinit
var
socket
:
BotSocket
internal
val
temporaryPacketHandlers
=
mutableListOf
<
TemporaryPacketHandler
<
*
>>()
internal
val
temporaryPacketHandlers
=
mutableListOf
<
TemporaryPacketHandler
<
*
>>()
private
val
handlersLock
=
Mutex
()
private
var
heartbeatJob
:
Job
?
=
null
private
var
heartbeatJob
:
Job
?
=
null
override
suspend
fun
addHandler
(
temporaryPacketHandler
:
TemporaryPacketHandler
<
*
>)
{
override
suspend
fun
addHandler
(
temporaryPacketHandler
:
TemporaryPacketHandler
<
*
>)
{
temporaryPacketHandlers
.
add
(
temporaryPacketHandler
)
handlersLock
.
withLock
{
temporaryPacketHandlers
.
add
(
temporaryPacketHandler
)
}
temporaryPacketHandler
.
send
(
this
[
ActionPacketHandler
].
session
)
temporaryPacketHandler
.
send
(
this
[
ActionPacketHandler
].
session
)
}
}
...
@@ -170,8 +175,10 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
...
@@ -170,8 +175,10 @@ internal class TIMBotNetworkHandler internal constructor(private val bot: Bot) :
packet
.
use
{
packet
.
use
{
//coz removeIf is not inline
//coz removeIf is not inline
temporaryPacketHandlers
.
removeIfInlined
{
handlersLock
.
withLock
{
it
.
onPacketReceived
(
this
@TIMBotNetworkHandler
[
ActionPacketHandler
].
session
,
packet
)
temporaryPacketHandlers
.
removeIfInlined
{
it
.
onPacketReceived
(
this
@TIMBotNetworkHandler
[
ActionPacketHandler
].
session
,
packet
)
}
}
}
val
name
=
packet
::
class
.
simpleName
val
name
=
packet
::
class
.
simpleName
...
...
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