Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

X.26 #120

Merged
merged 13 commits into from
May 28, 2024
Merged

X.26 #120

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
959768b
Initial branch of x.26
peter-lawrey Mar 25, 2024
c05061f
fix deprecated usage
peter-lawrey Mar 28, 2024
f4c5df5
Tidy up compiler setting and some warnings
peter-lawrey Apr 3, 2024
cfdc2f6
tidy SuppressWarnings
peter-lawrey Apr 10, 2024
25b2106
Fix newlines
peter-lawrey May 7, 2024
4b8f50d
type:pom order
peter-lawrey May 20, 2024
8386232
Remove old comment (long since addressed)
Apr 17, 2024
eb3ec15
parent poms -> x.26.0
peter-lawrey May 22, 2024
b21836e
correct version
peter-lawrey May 23, 2024
bec873c
Bump the snapshot version for affinity
peter-lawrey May 23, 2024
4a33d97
Bump the snapshot version for affinity
peter-lawrey May 23, 2024
91e88fd
java-parent-pom -> 1.26.0
peter-lawrey May 23, 2024
5dcf176
java-parent-pom -> 1.26.0 (finalize)
peter-lawrey May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions affinity-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<artifactId>affinity-test</artifactId>
<version>3.24ea0-SNAPSHOT</version>
<version>3.26ea0-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>OpenHFT/Java-Thread-Affinity/affinity-test</name>
Expand All @@ -42,7 +42,7 @@
<groupId>net.openhft</groupId>
<artifactId>third-party-bom</artifactId>
<type>pom</type>
<version>3.24.0</version>
<version>3.26.0-SNAPSHOT</version>
<scope>import</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions affinity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<artifactId>affinity</artifactId>
<version>3.24ea0-SNAPSHOT</version>
<version>3.26ea0-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>OpenHFT/Java-Thread-Affinity/affinity</name>
Expand All @@ -43,13 +43,13 @@
<groupId>net.openhft</groupId>
<artifactId>third-party-bom</artifactId>
<type>pom</type>
<version>3.24.0</version>
<version>3.26.0-SNAPSHOT</version>
<scope>import</scope>
</dependency>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>chronicle-bom</artifactId>
<version>2.24ea-SNAPSHOT</version>
<version>2.26ea-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public String getSysname() {
return new String(sysname, 0, length(sysname));
}

@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("unused")
public String getNodename() {
return new String(nodename, 0, length(nodename));
}
Expand Down Expand Up @@ -270,7 +270,7 @@ public String getMachine() {
return new String(machine, 0, length(machine));
}

@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("UnusedDeclaration")
public String getDomainname() {
return new String(domainname, 0, length(domainname));
}
Expand All @@ -295,7 +295,7 @@ public cpu_set_t() {
}
}

@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("UnusedDeclaration")
public static void __CPU_ZERO(cpu_set_t cpuset) {
for (NativeLong bits : cpuset.__bits) {
bits.setValue(0L);
Expand All @@ -310,19 +310,19 @@ public static long __CPUMASK(int cpu) {
return 1L << (cpu % __NCPUBITS);
}

@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("UnusedDeclaration")
public static void __CPU_SET(int cpu, cpu_set_t cpuset) {
cpuset.__bits[__CPUELT(cpu)].setValue(
cpuset.__bits[__CPUELT(cpu)].longValue() | __CPUMASK(cpu));
}

@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("UnusedDeclaration")
public static void __CPU_CLR(int cpu, cpu_set_t cpuset) {
cpuset.__bits[__CPUELT(cpu)].setValue(
cpuset.__bits[__CPUELT(cpu)].longValue() & ~__CPUMASK(cpu));
}

@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("UnusedDeclaration")
public static boolean __CPU_ISSET(int cpu, cpu_set_t cpuset) {
return (cpuset.__bits[__CPUELT(cpu)].longValue() & __CPUMASK(cpu)) != 0;
}
Expand Down
2 changes: 1 addition & 1 deletion affinity/src/main/java/net/openhft/affinity/impl/VersionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public int hashCode() {
return (major << 16) | (minor << 8) | release;
}

@SuppressWarnings({"UnusedDeclaration"})
@SuppressWarnings("unused")
public boolean majorMinorEquals(final VersionHelper ver) {
return ver != null
&& this.major == ver.major
Expand Down
3 changes: 2 additions & 1 deletion affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.openhft.affinity.impl.Utilities;
import net.openhft.affinity.impl.VanillaCpuLayout;
import net.openhft.affinity.testimpl.TestFileLockBasedLockChecker;
import org.hamcrest.MatcherAssert;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import org.slf4j.Logger;
Expand Down Expand Up @@ -244,7 +245,7 @@ public void shouldReturnLockForSpecifiedCpu() {
assumeTrue(Runtime.getRuntime().availableProcessors() > 3);

try (final AffinityLock affinityLock = AffinityLock.acquireLock(3)) {
assertThat(affinityLock.cpuId(), is(3));
MatcherAssert.assertThat(affinityLock.cpuId(), is(3));
}
assertEquals(AffinityLock.BASE_AFFINITY, Affinity.getAffinity());
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<artifactId>Java-Thread-Affinity</artifactId>
<version>3.24ea0-SNAPSHOT</version>
<version>3.64ea0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>OpenHFT/Java-Thread-Affinity Parent</name>
Expand Down