Skip to content

Commit 5a601e5

Browse files
pschichtelpschichtel
committed
split core and epoll into separate modules
1 parent ea43201 commit 5a601e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+512
-225
lines changed

‎.run/Build Fast.run.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Build Fast" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="profiles">
9+
<set />
10+
</option>
11+
<option name="goals">
12+
<list>
13+
<option value="compile" />
14+
<option value="-Djavacan.build.arch=x64" />
15+
</list>
16+
</option>
17+
<option name="pomFileName" />
18+
<option name="profilesMap">
19+
<map />
20+
</option>
21+
<option name="resolveToWorkspace" value="false" />
22+
<option name="workingDirPath" value="$PROJECT_DIR$" />
23+
</MavenRunnerParameters>
24+
</option>
25+
</MavenSettings>
26+
<method v="2" />
27+
</configuration>
28+
</component>

‎.run/Clean Build Fast.run.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Clean Build Fast" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="profiles">
9+
<set />
10+
</option>
11+
<option name="goals">
12+
<list>
13+
<option value="clean" />
14+
<option value="compile" />
15+
<option value="-Djavacan.build.arch=x64" />
16+
</list>
17+
</option>
18+
<option name="pomFileName" />
19+
<option name="profilesMap">
20+
<map />
21+
</option>
22+
<option name="resolveToWorkspace" value="false" />
23+
<option name="workingDirPath" value="$PROJECT_DIR$" />
24+
</MavenRunnerParameters>
25+
</option>
26+
</MavenSettings>
27+
<method v="2" />
28+
</configuration>
29+
</component>

‎.run/Clean.run.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Clean" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="profiles">
9+
<set />
10+
</option>
11+
<option name="goals">
12+
<list>
13+
<option value="clean" />
14+
</list>
15+
</option>
16+
<option name="pomFileName" />
17+
<option name="profilesMap">
18+
<map />
19+
</option>
20+
<option name="resolveToWorkspace" value="false" />
21+
<option name="workingDirPath" value="$PROJECT_DIR$" />
22+
</MavenRunnerParameters>
23+
</option>
24+
</MavenSettings>
25+
<method v="2" />
26+
</configuration>
27+
</component>

‎.run/Install Fast.run.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Install Fast" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="profiles">
9+
<set />
10+
</option>
11+
<option name="goals">
12+
<list>
13+
<option value="clean" />
14+
<option value="source:jar" />
15+
<option value="javadoc:jar" />
16+
<option value="install" />
17+
<option value="-Djavacan.build.arch=x64" />
18+
</list>
19+
</option>
20+
<option name="pomFileName" />
21+
<option name="profilesMap">
22+
<map />
23+
</option>
24+
<option name="resolveToWorkspace" value="false" />
25+
<option name="workingDirPath" value="$PROJECT_DIR$" />
26+
</MavenRunnerParameters>
27+
</option>
28+
</MavenSettings>
29+
<method v="2" />
30+
</configuration>
31+
</component>

‎.run/Install.run.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Install" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="profiles">
9+
<set />
10+
</option>
11+
<option name="goals">
12+
<list>
13+
<option value="clean" />
14+
<option value="source:jar" />
15+
<option value="javadoc:jar" />
16+
<option value="install" />
17+
</list>
18+
</option>
19+
<option name="pomFileName" />
20+
<option name="profilesMap">
21+
<map />
22+
</option>
23+
<option name="resolveToWorkspace" value="false" />
24+
<option name="workingDirPath" value="$PROJECT_DIR$" />
25+
</MavenRunnerParameters>
26+
</option>
27+
</MavenSettings>
28+
<method v="2" />
29+
</configuration>
30+
</component>

‎.run/Test All Fast.run.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Test All Fast" type="JUnit" factoryName="JUnit">
3+
<useClassPathOnly />
4+
<option name="PACKAGE_NAME" value="tel.schich.javacan" />
5+
<option name="MAIN_CLASS_NAME" value="" />
6+
<option name="METHOD_NAME" value="" />
7+
<option name="TEST_OBJECT" value="package" />
8+
<option name="PARAMETERS" value="" />
9+
<option name="TEST_SEARCH_SCOPE">
10+
<value defaultName="wholeProject" />
11+
</option>
12+
<dir value="$PROJECT_DIR$/src/test/java/tel/schich/javacan/test" />
13+
<method v="2">
14+
<option name="Make" enabled="true" />
15+
</method>
16+
</configuration>
17+
</component>

‎.run/Test All.run.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Test All" type="JUnit" factoryName="JUnit">
3+
<useClassPathOnly />
4+
<option name="PACKAGE_NAME" value="tel.schich.javacan" />
5+
<option name="MAIN_CLASS_NAME" value="" />
6+
<option name="METHOD_NAME" value="" />
7+
<option name="TEST_OBJECT" value="package" />
8+
<option name="PARAMETERS" value="" />
9+
<option name="TEST_SEARCH_SCOPE">
10+
<value defaultName="wholeProject" />
11+
</option>
12+
<dir value="$PROJECT_DIR$/src/test/java/tel/schich/javacan/test" />
13+
<method v="2">
14+
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Clean" run_configuration_type="MavenRunConfiguration" />
15+
<option name="Make" enabled="true" />
16+
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Build Fast" run_configuration_type="MavenRunConfiguration" />
17+
</method>
18+
</configuration>
19+
</component>

‎core/pom.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@
2222
<plugin>
2323
<groupId>org.apache.maven.plugins</groupId>
2424
<artifactId>maven-compiler-plugin</artifactId>
25-
<version>3.8.0</version>
26-
<configuration>
27-
<source>1.8</source>
28-
<target>1.8</target>
29-
<optimize>true</optimize>
30-
<showWarnings>true</showWarnings>
31-
<showDeprecation>true</showDeprecation>
32-
</configuration>
3325
<executions>
3426
<execution>
3527
<id>default-compile</id>
@@ -46,6 +38,18 @@
4638
<groupId>org.codehaus.mojo</groupId>
4739
<artifactId>exec-maven-plugin</artifactId>
4840
</plugin>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-jar-plugin</artifactId>
44+
<version>3.1.0</version>
45+
<executions>
46+
<execution>
47+
<goals>
48+
<goal>test-jar</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
</plugin>
4953
</plugins>
5054
</build>
5155
</project>

‎core/src/main/c/common.c

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
* THE SOFTWARE.
2222
*/
2323
#include "common.h"
24-
#include <unistd.h>
24+
#include <errno.h>
2525
#include <fcntl.h>
26-
#include <sys/socket.h>
27-
#include <sys/poll.h>
26+
#include <jni-c-to-java.h>
27+
#include <jni.h>
2828
#include <linux/can.h>
2929
#include <linux/can/raw.h>
30-
#include <errno.h>
31-
#include <string.h>
3230
#include <stdint.h>
33-
#include <jni.h>
34-
#include <jni-c-to-java.h>
31+
#include <string.h>
32+
#include <sys/poll.h>
33+
#include <sys/socket.h>
34+
#include <unistd.h>
3535

3636
inline int create_can_raw_socket() {
3737
return socket(PF_CAN, SOCK_RAW, CAN_RAW);
@@ -148,11 +148,5 @@ void throw_native_exception(JNIEnv *env, char *msg) {
148148
// may become changed due to the VM operations.
149149
int errorNumber = errno;
150150

151-
throw_tel_schich_javacan_linux_LinuxNativeOperationException_cstr(env, msg, errorNumber, strerror(errorNumber));
152-
}
153-
154-
void close_fd(JNIEnv *env, int fd) {
155-
if (close(fd)) {
156-
throw_native_exception(env, "Unable to close epoll fd");
157-
}
151+
throw_tel_schich_javacan_platform_linux_LinuxNativeOperationException_cstr(env, msg, errorNumber, strerror(errorNumber));
158152
}

‎core/src/main/c/common.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#ifndef _JAVACAN_HELPERS
2424
#define _JAVACAN_HELPERS
2525

26+
#include <jni.h>
27+
#include <stdbool.h>
2628
#include <stdint.h>
2729
#include <sys/time.h>
28-
#include <stdbool.h>
29-
#include <jni.h>
3030

3131
#define MICROS_PER_SECOND 1000000
3232

@@ -43,6 +43,5 @@ int set_boolean_opt(int sock, int opt, bool enable);
4343
int get_boolean_opt(int sock, int opt);
4444
short poll_single(int, short, int);
4545
void throw_native_exception(JNIEnv *env, char *msg);
46-
void close_fd(JNIEnv *env, int fd);
4746

4847
#endif

0 commit comments

Comments
 (0)