public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[lifx] Improve selector logic (#8941)

Browse Source 
* Properly handle datagrams that are not immediately available so no NPEs are logged on debug
* Properly handle sockets channels that are not connected so no NPEs are logged on debug
* Prevent load/garbage by reusing ByteBuffer and not allocating trace logging strings

Fixes #8932

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2020-11-02 10:15:59 +01:00 committed by GitHub
parent 87c16da527
commit da490ece4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxSelectorUtil.java
View File

@ -135,6 +135,7 @@ public class LifxSelectorUtil {
e.getMessage()); e.getMessage());
} }
ByteBuffer readBuffer = ByteBuffer.allocate(LifxNetworkUtil.getBufferSize());
Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator(); Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
while (keyIterator.hasNext()) { while (keyIterator.hasNext()) {
@ -151,22 +152,34 @@ public class LifxSelectorUtil {
} }
if (key.isValid() && key.isReadable()) { if (key.isValid() && key.isReadable()) {
LOGGER.trace("{} : Channel is ready for reading", logId); if (LOGGER.isTraceEnabled()) {
LOGGER.trace("{} : Channel is ready for reading", logId);
}
SelectableChannel channel = key.channel(); SelectableChannel channel = key.channel();
ByteBuffer readBuffer = ByteBuffer.allocate(LifxNetworkUtil.getBufferSize()); readBuffer.rewind();
try { try {
if (channel instanceof DatagramChannel) { if (channel instanceof DatagramChannel) {
InetSocketAddress address = (InetSocketAddress) ((DatagramChannel) channel).receive(readBuffer); InetSocketAddress address = (InetSocketAddress) ((DatagramChannel) channel).receive(readBuffer);
if (isRemoteAddress(address.getAddress())) { if (address == null) {
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("{} : No datagram is available", logId);
}
} else if (isRemoteAddress(address.getAddress())) {
supplyParsedPacketToConsumer(readBuffer, address, packetConsumer, logId); supplyParsedPacketToConsumer(readBuffer, address, packetConsumer, logId);
} }
} else if (channel instanceof SocketChannel) { } else if (channel instanceof SocketChannel) {
InetSocketAddress address = (InetSocketAddress) ((SocketChannel) channel).getRemoteAddress();
((SocketChannel) channel).read(readBuffer); ((SocketChannel) channel).read(readBuffer);
if (isRemoteAddress(address.getAddress())) { InetSocketAddress address = (InetSocketAddress) ((SocketChannel) channel).getRemoteAddress();
if (address == null) {
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("{} : Channel socket is not connected", logId);
}
} else if (isRemoteAddress(address.getAddress())) {
supplyParsedPacketToConsumer(readBuffer, address, packetConsumer, logId); supplyParsedPacketToConsumer(readBuffer, address, packetConsumer, logId);
} }
} }
} catch (Exception e) { } catch (Exception e) {
LOGGER.debug("{} while reading data for the light ({}) : {}", e.getClass().getSimpleName(), logId, LOGGER.debug("{} while reading data for the light ({}) : {}", e.getClass().getSimpleName(), logId,