Skip to content

Commit 0334606

Browse files
peter-lawreypeter-lawrey
committed
Merge remote-tracking branch 'origin/master'
Conflicts: README pom.xml src/main/java/vanilla/java/affinity/impl/NativeAffinity.java src/test/java/vanilla/java/affinity/AffinityLockTest.java
2 parents 3b19154 + 2eb1744 commit 0334606

16 files changed

Lines changed: 754 additions & 39 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
libaffinity.so
2-
31
affinity.iml
42

53
affinity.ipr

‎README‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ https://www.ohloh.net/p/Java-Thread-Affinity
44

55
[ Version History ]
66

7-
Version 1.5.4 - Added AffinityLock.isAllocated() and isBound() so you can check whether a CPU could be allocated.
7+
Version 1.6.3 - Added AffinityLock.isAllocated() and isBound() so you can check whether a CPU could be allocated.
8+
9+
Version 1.6.2 - Initial implementation for Mac OS for its thread policies. This is not the same as affinity but may be equivalent.
10+
11+
Version 1.6.1 - Improved behaviour on machines without thread affinity support esp. Macs.
12+
13+
Version 1.6 - First formal release available under https://github.com/peter-lawrey/Java-Thread-Affinity/tree/master/repository
14+
15+
Version 1.5.5 - Added native support for Linux/amd64, thank you akerbos.
16+
17+
Version 1.5.4 - Added native support extracted from JAR and native build for Linux/i386, thank you isopov.
818

919
Version 1.5.3 - Build on Windows cleanly. Added a Unix profile for Unix enhanced build.
1020

‎pom.xml‎

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

2323
<groupId>vanilla.java</groupId>
2424
<artifactId>affinity</artifactId>
25-
<version>1.5.4</version>
25+
<version>1.6.3-SNAPSHOT</version>
2626
<packaging>jar</packaging>
2727

2828
<licenses>

‎repository/vanilla/java/affinity/1.6/affinity-1.6-sources.jar‎

32.6 KB
Binary file not shown.

‎repository/vanilla/java/affinity/1.6/affinity-1.6.jar‎

45.5 KB
Binary file not shown.

‎repository/vanilla/java/affinity/1.6/affinity-1.6.pom‎

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2011 Peter Lawrey
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
23+
<groupId>vanilla.java</groupId>
24+
<artifactId>affinity</artifactId>
25+
<version>1.6</version>
26+
<packaging>jar</packaging>
27+
28+
<licenses>
29+
<license>
30+
<name>Apache License Version 2.0</name>
31+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
32+
<comments>A business-friendly OSS license</comments>
33+
<distribution>repo</distribution>
34+
</license>
35+
</licenses>
36+
37+
<properties>
38+
<native.source.dir>src/main/c</native.source.dir>
39+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40+
</properties>
41+
42+
<dependencies>
43+
<dependency>
44+
<groupId>junit</groupId>
45+
<artifactId>junit</artifactId>
46+
<version>4.8.2</version>
47+
<scope>test</scope>
48+
</dependency>
49+
<!-- on linux install with sudo apt-get install libjna-java -->
50+
<dependency>
51+
<groupId>net.java.dev.jna</groupId>
52+
<artifactId>jna</artifactId>
53+
<version>3.4.0</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>net.java.dev.jna</groupId>
57+
<artifactId>platform</artifactId>
58+
<version>3.4.0</version>
59+
</dependency>
60+
</dependencies>
61+
62+
<profiles>
63+
<profile>
64+
<id>Unix</id>
65+
66+
<build>
67+
<pluginManagement>
68+
<plugins>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-surefire-plugin</artifactId>
72+
<version>2.9</version>
73+
<configuration>
74+
<environmentVariables>
75+
<LD_LIBRARY_PATH>target/classes</LD_LIBRARY_PATH>
76+
<DYLD_LIBRARY_PATH>target/classes</DYLD_LIBRARY_PATH>
77+
</environmentVariables>
78+
</configuration>
79+
</plugin>
80+
</plugins>
81+
</pluginManagement>
82+
<plugins>
83+
84+
<!-- TODO make git remember that the file should be executable -->
85+
<plugin>
86+
<artifactId>maven-antrun-plugin</artifactId>
87+
<version>1.7</version>
88+
<executions>
89+
<execution>
90+
<id>build-native</id>
91+
<phase>process-classes</phase>
92+
<goals>
93+
<goal>run</goal>
94+
</goals>
95+
<configuration>
96+
<target>
97+
<property name="makefile"
98+
value="${project.basedir}/${native.source.dir}/Makefile"/>
99+
<!-- make it executable -->
100+
<chmod file="${makefile}" perm="u+x"/>
101+
</target>
102+
</configuration>
103+
104+
</execution>
105+
</executions>
106+
</plugin>
107+
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>exec-maven-plugin</artifactId>
111+
<version>1.2.1</version>
112+
<executions>
113+
<execution>
114+
<!-- this execution happens just after compiling the java classes, and builds the native code. -->
115+
<id>build-native</id>
116+
<phase>process-classes</phase>
117+
<goals>
118+
<goal>exec</goal>
119+
</goals>
120+
<configuration>
121+
<executable>src/main/c/Makefile</executable>
122+
<workingDirectory>src/main/c</workingDirectory>
123+
</configuration>
124+
</execution>
125+
</executions>
126+
</plugin>
127+
</plugins>
128+
</build>
129+
</profile>
130+
</profiles>
131+
132+
<build>
133+
<pluginManagement>
134+
<plugins>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-surefire-plugin</artifactId>
138+
<version>2.9</version>
139+
<configuration>
140+
<environmentVariables>
141+
<LD_LIBRARY_PATH>target/classes</LD_LIBRARY_PATH>
142+
<DYLD_LIBRARY_PATH>target/classes</DYLD_LIBRARY_PATH>
143+
</environmentVariables>
144+
</configuration>
145+
</plugin>
146+
</plugins>
147+
</pluginManagement>
148+
149+
<plugins>
150+
<plugin>
151+
<artifactId>maven-compiler-plugin</artifactId>
152+
<version>2.3.2</version>
153+
<configuration>
154+
<source>1.6</source>
155+
<target>1.6</target>
156+
</configuration>
157+
</plugin>
158+
159+
<plugin>
160+
<artifactId>maven-source-plugin</artifactId>
161+
<version>2.1.2</version>
162+
<executions>
163+
<execution>
164+
<phase>package</phase>
165+
<goals>
166+
<goal>jar</goal>
167+
</goals>
168+
</execution>
169+
</executions>
170+
</plugin>
171+
<plugin>
172+
<artifactId>maven-javadoc-plugin</artifactId>
173+
<version>2.5</version>
174+
<executions>
175+
<execution>
176+
<phase>package</phase>
177+
<goals>
178+
<goal>javadoc</goal>
179+
</goals>
180+
</execution>
181+
</executions>
182+
</plugin>
183+
184+
<plugin>
185+
<artifactId>maven-jar-plugin</artifactId>
186+
<version>2.3.1</version>
187+
<configuration>
188+
<archive>
189+
<manifest>
190+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
191+
</manifest>
192+
</archive>
193+
</configuration>
194+
</plugin>
195+
196+
<plugin>
197+
<groupId>org.apache.felix</groupId>
198+
<artifactId>maven-bundle-plugin</artifactId>
199+
<version>2.3.6</version>
200+
<extensions>true</extensions>
201+
<configuration>
202+
<instructions>
203+
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
204+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
205+
<Export-Package>${project.groupId}.*;version="${project.version}"</Export-Package>
206+
</instructions>
207+
</configuration>
208+
</plugin>
209+
</plugins>
210+
</build>
211+
212+
213+
<scm>
214+
<connection>scm:svn:https://github.com/peter-lawrey/Java-Thread-Affinity.git/trunk</connection>
215+
<developerConnection>scm:svn:https://github.com/peter-lawrey/Java-Thread-Affinity.git/trunk
216+
</developerConnection>
217+
<url>https://github.com/peter-lawrey/Java-Thread-Affinity</url>
218+
</scm>
219+
220+
<distributionManagement>
221+
<repository>
222+
<uniqueVersion>false</uniqueVersion>
223+
<id>github</id>
224+
<url>svn:https://github.com/peter-lawrey/Java-Thread-Affinity.git/repo/</url>
225+
</repository>
226+
</distributionManagement>
227+
</project>

‎repository/vanilla/java/affinity/maven-metadata-local.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata>
3+
<groupId>vanilla.java</groupId>
4+
<artifactId>affinity</artifactId>
5+
<versioning>
6+
<release>1.6</release>
7+
<versions>
8+
<version>1.6</version>
9+
</versions>
10+
<lastUpdated>20120308000000</lastUpdated>
11+
</versioning>
12+
</metadata>

0 commit comments

Comments
 (0)