AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 04:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

network: set chunk packets to lower priority

Browse Source
This commit is contained in:
Bixilon 2022-05-11 18:12:24 +02:00
parent f2f7c9f371
commit f313efe214
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
7 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/protocol/network/network/client/pipeline/ClientPacketHandler.kt
View File

@ -54,7 +54,7 @@ class ClientPacketHandler(
override fun channelRead0(context: ChannelHandlerContext, queued: QueuedS2CP<*>) { override fun channelRead0(context: ChannelHandlerContext, queued: QueuedS2CP<*>) {
if (queued.type.threadSafe && DefaultThreadPool.queueSize <= DefaultThreadPool.threadCount) { // only handle async when thread pool not busy if (queued.type.threadSafe && DefaultThreadPool.queueSize <= DefaultThreadPool.threadCount) { // only handle async when thread pool not busy
val runnable = ThreadPoolRunnable(priority = ThreadPool.Priorities.HIGH) val runnable = ThreadPoolRunnable(priority = if (queued.type.lowPriority) ThreadPool.Priorities.HIGH else ThreadPool.Priorities.HIGHER)
runnable.runnable = Runnable { tryHandle(context, queued.type, queued.packet);handlers -= runnable } runnable.runnable = Runnable { tryHandle(context, queued.type, queued.packet);handlers -= runnable }
handlers += runnable handlers += runnable
DefaultThreadPool += runnable DefaultThreadPool += runnable

1
src/main/java/de/bixilon/minosoft/protocol/packets/factory/AbstractPacketType.kt
View File

@ -16,4 +16,5 @@ package de.bixilon.minosoft.protocol.packets.factory
interface AbstractPacketType { interface AbstractPacketType {
val direction: PacketDirection val direction: PacketDirection
val threadSafe: Boolean val threadSafe: Boolean
val lowPriority: Boolean
} }

3
src/main/java/de/bixilon/minosoft/protocol/packets/factory/C2SPacketType.kt
View File

@ -21,6 +21,7 @@ class C2SPacketType(
val clazz: Class<out C2SPacket>, val clazz: Class<out C2SPacket>,
val annotation: LoadPacket?, val annotation: LoadPacket?,
override val threadSafe: Boolean = annotation!!.threadSafe, override val threadSafe: Boolean = annotation!!.threadSafe,
override val lowPriority: Boolean = annotation!!.lowPriority,
) : AbstractPacketType { ) : AbstractPacketType {
override val direction = PacketDirection.CLIENT_TO_SERVER override val direction = PacketDirection.CLIENT_TO_SERVER
@ -29,6 +30,6 @@ class C2SPacketType(
} }
companion object { companion object {
val EMPTY = { C2SPacketType(ProtocolStates.HANDSHAKING, C2SPacket::class.java, null, false) } val EMPTY = { C2SPacketType(ProtocolStates.HANDSHAKING, C2SPacket::class.java, null, threadSafe = false, lowPriority = false) }
} }
} }

1
src/main/java/de/bixilon/minosoft/protocol/packets/factory/LoadPacket.kt
View File

@ -22,4 +22,5 @@ annotation class LoadPacket(
val name: String = "", val name: String = "",
val threadSafe: Boolean = true, val threadSafe: Boolean = true,
val parent: Boolean = false, val parent: Boolean = false,
val lowPriority: Boolean = false,
) )

5
src/main/java/de/bixilon/minosoft/protocol/packets/factory/S2CPacketType.kt
View File

@ -19,13 +19,14 @@ import de.bixilon.minosoft.protocol.packets.factory.factories.PacketFactory
import de.bixilon.minosoft.protocol.packets.s2c.S2CPacket import de.bixilon.minosoft.protocol.packets.s2c.S2CPacket
import de.bixilon.minosoft.protocol.protocol.ProtocolStates import de.bixilon.minosoft.protocol.protocol.ProtocolStates
class S2CPacketType( class S2CPacketType constructor(
val state: ProtocolStates, val state: ProtocolStates,
val clazz: Class<out S2CPacket>, val clazz: Class<out S2CPacket>,
private val packetErrorHandler: PacketErrorHandler?, private val packetErrorHandler: PacketErrorHandler?,
val annotation: LoadPacket?, val annotation: LoadPacket?,
val factory: PacketFactory? = null, val factory: PacketFactory? = null,
override val threadSafe: Boolean = annotation!!.threadSafe, override val threadSafe: Boolean = annotation!!.threadSafe,
override val lowPriority: Boolean = annotation!!.lowPriority,
) : AbstractPacketType, PacketErrorHandler { ) : AbstractPacketType, PacketErrorHandler {
override val direction = PacketDirection.SERVER_TO_CLIENT override val direction = PacketDirection.SERVER_TO_CLIENT
@ -40,6 +41,6 @@ class S2CPacketType(
companion object { companion object {
val EMPTY = { S2CPacketType(ProtocolStates.HANDSHAKING, S2CPacket::class.java, null, null, null, false) } val EMPTY = { S2CPacketType(ProtocolStates.HANDSHAKING, S2CPacket::class.java, null, null, null, threadSafe = false, lowPriority = false) }
} }
} }

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkLightS2CP.kt
View File

@ -27,7 +27,7 @@ import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType import de.bixilon.minosoft.util.logging.LogMessageType
import java.util.* import java.util.*
@LoadPacket @LoadPacket(lowPriority = true)
class ChunkLightS2CP @JvmOverloads constructor(buffer: PlayInByteBuffer, chunkPositionGetter: () -> Vec2i = { Vec2i(buffer.readVarInt(), buffer.readVarInt()) }) : PlayS2CPacket { class ChunkLightS2CP @JvmOverloads constructor(buffer: PlayInByteBuffer, chunkPositionGetter: () -> Vec2i = { Vec2i(buffer.readVarInt(), buffer.readVarInt()) }) : PlayS2CPacket {
val chunkPosition: Vec2i = chunkPositionGetter() val chunkPosition: Vec2i = chunkPositionGetter()
var trustEdges: Boolean = false var trustEdges: Boolean = false

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt
View File

@ -47,7 +47,7 @@ import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType import de.bixilon.minosoft.util.logging.LogMessageType
import java.util.* import java.util.*
@LoadPacket @LoadPacket(lowPriority = true)
class ChunkS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { class ChunkS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val chunkPosition: Vec2i val chunkPosition: Vec2i
val chunkData: ChunkData = ChunkData() val chunkData: ChunkData = ChunkData()