andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#6134] Do not limit the PID to be <= 4194304

Browse Source 
Motivation:

On some platforms the PID my be bigger then 4194304 so we should not limit it to 4194304.

Modifications:

Only check that the PID is a valid Integer

Result:

No more warnings on systems where the PID is bigger then 4194304.
This commit is contained in:
Norman Maurer 2016-12-15 14:57:43 +00:00
parent 06e7627b5f
commit cfd8fb10db
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
transport/src/main/java/io/netty/channel/DefaultChannelId.java
View File

@ -43,9 +43,6 @@ public final class DefaultChannelId implements ChannelId {
private static final int MACHINE_ID_LEN = MacAddressUtil.MAC_ADDRESS_LENGTH;
private static final byte[] MACHINE_ID;
private static final int PROCESS_ID_LEN = 4;
// Maximal value for 64bit systems is 2^22. See man 5 proc.
// See https://github.com/netty/netty/issues/2706
private static final int MAX_PROCESS_ID = 4194304;
private static final int PROCESS_ID;
private static final int SEQUENCE_LEN = 4;
private static final int TIMESTAMP_LEN = 8;
@ -72,7 +69,7 @@ public final class DefaultChannelId implements ChannelId {
// Malformed input.
}
if (processId < 0 || processId > MAX_PROCESS_ID) {
if (processId < 0) {
processId = -1;
logger.warn("-Dio.netty.processId: {} (malformed)", customProcessId);
} else if (logger.isDebugEnabled()) {
@ -173,8 +170,8 @@ public final class DefaultChannelId implements ChannelId {
pid = -1;
}
if (pid < 0 || pid > MAX_PROCESS_ID) {
pid = ThreadLocalRandom.current().nextInt(MAX_PROCESS_ID + 1);
if (pid < 0) {
pid = ThreadLocalRandom.current().nextInt();
logger.warn("Failed to find the current process ID from '{}'; using a random value: {}", value, pid);
}