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
7820b43f
Commit
7820b43f
authored
Mar 22, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Review: ensure reentrant, rearrange coroutine job management
parent
789317fb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
107 additions
and
101 deletions
+107
-101
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
...moe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+107
-101
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View file @
7820b43f
...
@@ -180,6 +180,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
...
@@ -180,6 +180,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
// caches
// caches
private
val
_pendingEnabled
=
atomic
(
true
)
private
val
_pendingEnabled
=
atomic
(
true
)
internal
val
pendingEnabled
get
()
=
_pendingEnabled
.
value
internal
val
pendingEnabled
get
()
=
_pendingEnabled
.
value
@Volatile
internal
var
pendingIncomingPackets
:
LockFreeLinkedList
<
KnownPacketFactories
.
IncomingPacket
<
*
>>?
=
internal
var
pendingIncomingPackets
:
LockFreeLinkedList
<
KnownPacketFactories
.
IncomingPacket
<
*
>>?
=
LockFreeLinkedList
()
LockFreeLinkedList
()
...
@@ -191,7 +192,13 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
...
@@ -191,7 +192,13 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
bot
.
friends
.
delegate
.
clear
()
bot
.
friends
.
delegate
.
clear
()
bot
.
groups
.
delegate
.
clear
()
bot
.
groups
.
delegate
.
clear
()
val
friendListJob
=
launch
{
if
(!
pendingEnabled
)
{
pendingIncomingPackets
=
LockFreeLinkedList
()
_pendingEnabled
.
value
=
true
}
coroutineScope
{
launch
{
lateinit
var
loadFriends
:
suspend
()
->
Unit
lateinit
var
loadFriends
:
suspend
()
->
Unit
// 不要用 fun, 不要 join declaration, 不要用 val, 编译失败警告
// 不要用 fun, 不要 join declaration, 不要用 val, 编译失败警告
loadFriends
=
suspend
loadFriends
@
{
loadFriends
=
suspend
loadFriends
@
{
...
@@ -239,7 +246,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
...
@@ -239,7 +246,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
loadFriends
()
loadFriends
()
}
}
val
groupJob
=
launch
{
launch
{
try
{
try
{
logger
.
info
(
"开始加载群组列表与群成员列表"
)
logger
.
info
(
"开始加载群组列表与群成员列表"
)
val
troopListData
=
FriendList
.
GetTroopListSimplify
(
bot
.
client
)
val
troopListData
=
FriendList
.
GetTroopListSimplify
(
bot
.
client
)
...
@@ -301,8 +308,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
...
@@ -301,8 +308,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
logger
.
error
(
e
)
logger
.
error
(
e
)
}
}
}
}
}
joinAll
(
friendListJob
,
groupJob
)
withTimeoutOrNull
(
5000
)
{
withTimeoutOrNull
(
5000
)
{
lateinit
var
listener
:
Listener
<
PacketReceivedEvent
>
lateinit
var
listener
:
Listener
<
PacketReceivedEvent
>
...
...
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