Skip to content

Commit 106ca85

Browse files
peter-lawreypeter-lawrey
committed
Merge remote-tracking branch 'origin/master'
2 parents 1a81486 + 913ec60 commit 106ca85

7 files changed

Lines changed: 248 additions & 20 deletions

File tree

‎LICENSE‎

Lines changed: 199 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,201 @@
1-
Licensed under the *Apache License, Version 2.0* (the "License");
2-
you may not use this file except in compliance with the License.
3-
You may obtain a copy of the License at
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
44

5-
http://www.apache.org/licenses/LICENSE-2.0
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
66

7-
Unless required by applicable law or agreed to in writing, software
8-
distributed under the License is distributed on an "AS IS" BASIS,
9-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10-
See the License for the specific language governing permissions and
11-
limitations under the License.
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2014-2018 Chronicle Software Ltd
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ OpenHFT Java Thread Affinity library
1111
See [affinity/src/test/java](https://github.com/OpenHFT/Java-Thread-Affinity/tree/master/affinity/src/test/java)
1212
for working examples of how to use this library.
1313

14+
## Wold Wide Usage
1415
[Thread Affinity usage Heatmap](http://jrvis.com/red-dwarf/?user=openhft&repo=Java-Thread-Affinity)
1516

1617
## Changes

‎affinity/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<modelVersion>4.0.0</modelVersion>
2828
<artifactId>affinity</artifactId>
29-
<version>3.1.7-SNAPSHOT</version>
29+
<version>3.1.8-SNAPSHOT</version>
3030
<packaging>bundle</packaging>
3131

3232
<name>OpenHFT/Java-Thread-Affinity/affinity</name>

‎affinity/src/main/java/net/openhft/affinity/AffinityLock.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class AffinityLock implements Closeable {
4646
public static final BitSet RESERVED_AFFINITY;
4747
private static final Logger LOGGER = LoggerFactory.getLogger(AffinityLock.class);
4848
private static final LockInventory LOCK_INVENTORY;
49+
static final int ANY_CPU = -1;
4950

5051
static {
5152
int processors = Runtime.getRuntime().availableProcessors();
@@ -162,7 +163,7 @@ public static AffinityLock acquireCore() {
162163
* @return A handle for an affinity lock.
163164
*/
164165
public static AffinityLock acquireLock(boolean bind) {
165-
return acquireLock(bind, -1, AffinityStrategies.ANY);
166+
return acquireLock(bind, ANY_CPU, AffinityStrategies.ANY);
166167
}
167168

168169

@@ -188,7 +189,7 @@ public static AffinityLock acquireLock(int cpuId) {
188189
* @return A handle for an affinity lock.
189190
*/
190191
public static AffinityLock acquireCore(boolean bind) {
191-
return acquireCore(bind, -1, AffinityStrategies.ANY);
192+
return acquireCore(bind, ANY_CPU, AffinityStrategies.ANY);
192193
}
193194

194195
private static AffinityLock acquireLock(boolean bind, int cpuId, @NotNull AffinityStrategy... strategies) {

‎affinity/src/main/java/net/openhft/affinity/LockInventory.java‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,33 @@ public final synchronized void set(CpuLayout cpuLayout) {
8383
}
8484

8585
public final synchronized AffinityLock acquireLock(boolean bind, int cpuId, AffinityStrategy... strategies) {
86+
final boolean specificCpuRequested = !isAnyCpu(cpuId);
87+
if (specificCpuRequested && cpuId != 0) {
88+
final AffinityLock required = logicalCoreLocks[cpuId];
89+
if (required.canReserve() && anyStrategyMatches(cpuId, cpuId, strategies)) {
90+
updateLockForCurrentThread(bind, required, false);
91+
return required;
92+
}
93+
}
8694

95+
LOGGER.warn("Unable to acquire lock on CPU {} for thread {}, trying to find another CPU",
96+
cpuId, Thread.currentThread());
8797

8898
for (AffinityStrategy strategy : strategies) {
8999
// consider all processors except cpu 0 which is usually used by the OS.
90100
// if you have only one core, this library is not appropriate in any case.
91101
for (int i = logicalCoreLocks.length - 1; i > 0; i--) {
92102
AffinityLock al = logicalCoreLocks[i];
93-
if (al.canReserve() && (cpuId < 0 || strategy.matches(cpuId, al.cpuId()))) {
94-
al.assignCurrentThread(bind, false);
95-
LockCheck.updateCpu(al.cpuId());
103+
if (al.canReserve() && (isAnyCpu(cpuId) || strategy.matches(cpuId, al.cpuId()))) {
104+
updateLockForCurrentThread(bind, al, false);
96105
return al;
97106
}
98107
}
99108
}
100109

101110
LOGGER.warn("No reservable CPU for {}", Thread.currentThread());
102111

103-
return newLock(-1, false, false);
112+
return newLock(AffinityLock.ANY_CPU, false, false);
104113
}
105114

106115
public final synchronized AffinityLock acquireCore(boolean bind, int cpuId, AffinityStrategy... strategies) {
@@ -112,8 +121,7 @@ public final synchronized AffinityLock acquireCore(boolean bind, int cpuId, Affi
112121
continue LOOP;
113122

114123
final AffinityLock al = als[0];
115-
al.assignCurrentThread(bind, true);
116-
LockCheck.updateCpu(al.cpuId());
124+
updateLockForCurrentThread(bind, al, true);
117125
return al;
118126
}
119127
}
@@ -196,4 +204,22 @@ private void releaseAffinityLock(final Thread t, final AffinityLock al, final St
196204
LOGGER.warn("Failed to delete lock file at " + lockFilePath);
197205
}
198206
}
207+
208+
private static boolean anyStrategyMatches(final int cpuOne, final int cpuTwo, final AffinityStrategy[] strategies) {
209+
for (AffinityStrategy strategy : strategies) {
210+
if (strategy.matches(cpuOne, cpuTwo)) {
211+
return true;
212+
}
213+
}
214+
return false;
215+
}
216+
217+
private static boolean isAnyCpu(final int cpuId) {
218+
return cpuId == AffinityLock.ANY_CPU;
219+
}
220+
221+
private static void updateLockForCurrentThread(final boolean bind, final AffinityLock al, final boolean b) {
222+
al.assignCurrentThread(bind, b);
223+
LockCheck.updateCpu(al.cpuId());
224+
}
199225
}

‎affinity/src/main/java/net/openhft/affinity/NonForkingAffinityLock.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static AffinityLock acquireCore() {
6868
* @return A handle for an affinity lock.
6969
*/
7070
public static AffinityLock acquireLock(boolean bind) {
71-
return acquireLock(bind, -1, AffinityStrategies.ANY);
71+
return acquireLock(bind, AffinityLock.ANY_CPU, AffinityStrategies.ANY);
7272
}
7373

7474
/**
@@ -80,7 +80,7 @@ public static AffinityLock acquireLock(boolean bind) {
8080
* @return A handle for an affinity lock.
8181
*/
8282
public static AffinityLock acquireCore(boolean bind) {
83-
return acquireCore(bind, -1, AffinityStrategies.ANY);
83+
return acquireCore(bind, AffinityLock.ANY_CPU, AffinityStrategies.ANY);
8484
}
8585

8686
private static AffinityLock acquireLock(boolean bind, int cpuId, @NotNull AffinityStrategy... strategies) {

‎affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import static org.junit.Assert.assertEquals;
3434
import static org.junit.Assert.assertNotSame;
3535
import static org.junit.Assert.assertThat;
36+
import static org.junit.Assume.assumeTrue;
3637

3738
/**
3839
* @author peter.lawrey
@@ -218,6 +219,15 @@ public void run() {
218219
displayStatus();
219220
}
220221

222+
@Test
223+
public void shouldReturnLockForSpecifiedCpu() {
224+
assumeTrue(Runtime.getRuntime().availableProcessors() > 3);
225+
226+
try (final AffinityLock affinityLock = AffinityLock.acquireLock(2)) {
227+
assertThat(affinityLock.cpuId(), is(2));
228+
}
229+
}
230+
221231
@Test
222232
public void lockFilesShouldBeRemovedOnRelease() {
223233
final AffinityLock lock = AffinityLock.acquireLock();

0 commit comments

Comments
 (0)