Skip to content
Commits on Source (24)
Show whitespace changes
Inline Side-by-side
.gitignore 100755 → 100644
View file @ 2597ae73
### How to update
# This is copied from OpenHFT/.gitignore
# update the original and run OpenHFT/update_gitignore.sh
### Compiled class file
*.class
# Package Files #
### Package Files
*.jar
*.war
*.ear
# IntelliJ
### Log file
*.log
### IntelliJ
*.iml
*.ipr
*.iws
.idea
.attach_pid*
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
### Virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# Eclipse
### Maven template
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
### Eclipse template
*.pydevproject
.metadata
.gradle
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.project
.settings/
.loadpath
# maven
target
### Queue files
*.cq4t
*.cq4
.travis.yml 0 → 100644
View file @ 2597ae73
language: java
jdk:
- oraclejdk8
\ No newline at end of file
LICENSE deleted 100644 → 0
View file @ 1fb9dc54
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
\ No newline at end of file
LICENSE.adoc 0 → 100644
View file @ 2597ae73
== Copyright 2016 higherfrequencytrading.com
Licensed under the *Apache License, Version 2.0* (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
\ No newline at end of file
README.md
View file @ 2597ae73
Chronicle Core
==========
==============
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.openhft/chronicle-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.openhft/chronicle-core)
This library wraps up low level access to
......@@ -12,20 +14,23 @@ This library wraps up low level access to
- [Maths Functions](#maths-functions) for casting types, rounding double, faster hashing.
- [Serializable Lambdas](#serializable-lambdas)
- [Histogram](#histogram) A high performance wide range histogram.
- [JLBH](#jlbh) Java Latency Benchmarking Harness.
Off Heap Memory Access
=================
This allows you to access native memory using primitives and some thread safe operations.
```java
Memory m = OS.memory();
Memory memory = OS.memory();
long address = memory.allocate(1024);
try {
long addr = m.allocate(1024);
m.writeInt(0L, 1);
boolean b = m.compareAndSwap(0L, 1, 2);
assert b;
memory.writeInt(address, 1);
assert memory.readInt(address) == 1;
final boolean swapped = memory.compareAndSwapInt(address, 1, 2);
assert swapped;
assert memory.readInt(address) == 2;
} finally {
m.free(addr);
memory.freeMemory(address, 1024);
}
```
......@@ -70,7 +75,7 @@ String targetDir = OS.getTarget(); // where is the target directory during build
Memory mapped files
```java
FileChanel fc = new RandomAccessFile(fileName, "rw").getFileChannel();
FileChannel fc = new RandomAccessFile(fileName, "rw").getChannel();
// map in 64 KiB
long address = OS.map(fc, MapMode.READ_WRITE, 0, 64 << 10);
// use address
......@@ -171,3 +176,13 @@ for (int i = 0; i <= 1000_000_000; i++) {
}
System.out.println(h.toLongMicrosFormat(instance::toMicros));
```
JLBH
==============
Java Latency Benchmark Harness is a tool that allows you to benchmark your code
running in context, rather than in a microbenchmark. An excellent introduction can be found in
[this series of articles.](http://www.rationaljava.com/2016/04/a-series-of-posts-on-jlbh-java-latency.html)
Since those articles were written the main change has been to allow JLBH to be installed to an event loop,
rather than it running in its own thread. To do this, use
the JLBH.eventLoopHandler method rather than JLBH.start.
\ No newline at end of file
benchmarks/pom.xml 0 → 100755
View file @ 2597ae73
<!--
~ Copyright 2016 chronicle.software
~
~ Licensed under the *Apache License, Version 2.0* (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.openhft</groupId>
<artifactId>chronicle-core-benchmarks</artifactId>
<version>0.1-SNAPSHOT</version>
<name>OpenHFT/Chronicle-Core/Benchmarks</name>
<description>Chronicle-Core-Benchmarks</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<uberjar.name>core-benchmarks</uberjar.name>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>third-party-bom
</artifactId> <!-- PLEASE DON'T LEAVE THIS ON A SNAPSHOT because they get missed in a release -->
<type>pom</type>
<version>3.6.9</version>
<scope>import</scope>
</dependency>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>chronicle-bom</artifactId>
<version>2.17.131</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>chronicle-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version>
<configuration>
<compilerVersion>1.8</compilerVersion>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>${uberjar.name}</finalName>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>net.openhft.chronicle.core.benchmark.Main</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<!--
Shading signed JARs will fail without this.
http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
-->
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
benchmarks/src/main/java/net/openhft/chronicle/core/benchmark/Interrupted.java 0 → 100755
View file @ 2597ae73
/*
* Copyright (C) 2015 higherfrequencytrading.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.openhft.chronicle.core.benchmark;
import net.openhft.chronicle.core.Jvm;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;
import org.openjdk.jmh.runner.options.TimeValue;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.concurrent.TimeUnit;
@State(Scope.Thread)
public class Interrupted {
Thread currentThread = null;
MyThread myThread = new MyThread();
public static void main(String... args) throws RunnerException, InvocationTargetException, IllegalAccessException {
if (Jvm.isDebug()) {
Interrupted main = new Interrupted();
for (Method m : Interrupted.class.getMethods()) {
if (m.getAnnotation(Benchmark.class) != null) {
m.invoke(main);
}
}
} else {
int time = Boolean.getBoolean("longTest") ? 30 : 1;
System.out.println("measurementTime: " + time + " secs");
Options opt = new OptionsBuilder()
.include(Interrupted.class.getSimpleName())
.warmupIterations(5)
.measurementIterations(5)
.forks(5)
.mode(Mode.SampleTime)
.measurementTime(TimeValue.seconds(time))
.timeUnit(TimeUnit.NANOSECONDS)
.build();
new Runner(opt).run();
}
}
@Benchmark
public boolean interrupted() {
if (currentThread == null)
currentThread = Thread.currentThread();
return currentThread.isInterrupted();
}
@Benchmark
public boolean volatileBoolean() {
// only included to be like to for like
if (currentThread == null)
currentThread = Thread.currentThread();
// end of dummy code.
return myThread.isInterrupted();
}
static class MyThread extends Thread {
volatile boolean interrupted;
@Override
public void interrupt() {
interrupted = true;
}
@Override
public boolean isInterrupted() {
return interrupted;
}
}
}
benchmarks/src/main/java/net/openhft/chronicle/core/benchmark/Main.java 0 → 100755
View file @ 2597ae73
/*
* Copyright (C) 2015 higherfrequencytrading.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.openhft.chronicle.core.benchmark;
import net.openhft.chronicle.core.Jvm;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;
import org.openjdk.jmh.runner.options.TimeValue;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.concurrent.TimeUnit;
/*
* Created by Peter Lawrey on 11/08/15.
*
* Windows 10
Benchmark Mode Cnt Score Error Units
Main.systemNanoTime sample 1071824 24.531 ± 0.566 ns/op
Main.systemNanoTime:systemNanoTime·p0.00 sample ≈ 0 ns/op
Main.systemNanoTime:systemNanoTime·p0.50 sample ≈ 0 ns/op
Main.systemNanoTime:systemNanoTime·p0.90 sample ≈ 0 ns/op
Main.systemNanoTime:systemNanoTime·p0.95 sample 284.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.99 sample 285.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.999 sample 285.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.9999 sample 1422.000 ns/op
Main.systemNanoTime:systemNanoTime·p1.00 sample 73088.000 ns/op
Main.threadLocal_get sample 1267035 19.575 ± 0.365 ns/op
Main.threadLocal_get:threadLocal_get·p0.00 sample ≈ 0 ns/op
Main.threadLocal_get:threadLocal_get·p0.50 sample ≈ 0 ns/op
Main.threadLocal_get:threadLocal_get·p0.90 sample ≈ 0 ns/op
Main.threadLocal_get:threadLocal_get·p0.95 sample 284.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.99 sample 285.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.999 sample 285.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.9999 sample 285.000 ns/op
Main.threadLocal_get:threadLocal_get·p1.00 sample 16480.000 ns/op
* Centos 7, Linux 3.10.0-514.26.2.el7.x86_64, due to Firmware bug relating to the X299 chipset.
*
Benchmark Mode Cnt Score Error Units
Main.systemNanoTime sample 1202315 10292.618 ± 13.440 ns/op
Main.systemNanoTime:systemNanoTime·p0.00 sample 8944.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.50 sample 8992.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.90 sample 13488.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.95 sample 17984.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.99 sample 35968.000 ns/op
Main.systemNanoTime:systemNanoTime·p0.999 sample 54955.776 ns/op
Main.systemNanoTime:systemNanoTime·p0.9999 sample 72832.000 ns/op
Main.systemNanoTime:systemNanoTime·p1.00 sample 180736.000 ns/op
Main.threadLocal_get sample 1502246 5126.690 ± 7.549 ns/op
Main.threadLocal_get:threadLocal_get·p0.00 sample 4456.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.50 sample 4496.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.90 sample 4536.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.95 sample 8992.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.99 sample 13488.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.999 sample 40448.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.9999 sample 55168.000 ns/op
Main.threadLocal_get:threadLocal_get·p1.00 sample 103552.000 ns/op
* Centos 7, Linux 4.12.8-1.el7.elrepo.x86_64
* Benchmark Mode Cnt Score Error Units
Main.threadLocal_get sample 1747321 28.047 ± 0.400 ns/op
Main.threadLocal_get:threadLocal_get·p0.00 sample 17.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.50 sample 24.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.90 sample 34.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.95 sample 36.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.99 sample 38.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.999 sample 43.000 ns/op
Main.threadLocal_get:threadLocal_get·p0.9999 sample 10544.000 ns/op
Main.threadLocal_get:threadLocal_get·p1.00 sample 17184.000 ns/op
*/
@State(Scope.Thread)
public class Main {
ThreadLocal threadLocal = ThreadLocal.withInitial(Object::new);
Object ob = getClass();
Object oc = System.getenv();
public static void main(String... args) throws RunnerException, InvocationTargetException, IllegalAccessException {
if (Jvm.isDebug()) {
Main main = new Main();
for (Method m : Main.class.getMethods()) {
if (m.getAnnotation(Benchmark.class) != null) {
m.invoke(main);
}
}
} else {
int time = Boolean.getBoolean("longTest") ? 30 : 1;
System.out.println("measurementTime: " + time + " secs");
Options opt = new OptionsBuilder()
.include(Main.class.getSimpleName())
.warmupIterations(5)
.measurementIterations(5)
.forks(5)
.mode(Mode.SampleTime)
.measurementTime(TimeValue.seconds(time))
.timeUnit(TimeUnit.NANOSECONDS)
.build();
new Runner(opt).run();
}
}
// @Benchmark
public Thread currentThread() {
return Thread.currentThread();
}
// @Benchmark
public long currentThread_getId() {
return Thread.currentThread().getId();
}
//@Benchmark
public Object threadLocal_get() {
return threadLocal.get();
}
// @Benchmark
public long systemNanoTime() {
return System.nanoTime();
}
@Benchmark
@BenchmarkMode({Mode.SampleTime, Mode.Throughput})
public void nullCheck() {
if (threadLocal == null) throw new NullPointerException();
if (ob == null) throw new NullPointerException();
if (oc == null) throw new NullPointerException();
}
@Benchmark
@BenchmarkMode({Mode.SampleTime, Mode.Throughput})
public void nullCheck2(Blackhole bc) {
threadLocal.getClass();
ob.getClass();
oc.getClass();
}
}
checked-exceptions/README.adoc 0 → 100644
View file @ 2597ae73
= README
This adds checked versions of a number of common unchecked exceptions we have.
We can add these temporaily as we don't expect developers to be force to handle these exceptions but we want to ensure
- we want handle these correctly in our code.
- we want handle these consistently with the right exception and making these checked helps review the choices made.
- we want to document when these unchecked exceptions can/cannot occur.
checked-exceptions/pom.xml
View file @ 2597ae73
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (C) 2015 higherfrequencytrading.com
~ Copyright 2016 chronicle.software
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU Lesser General Public License as published by
~ the Free Software Foundation, either version 3 of the License.
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU Lesser General Public License for more details.
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ You should have received a copy of the GNU Lesser General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -21,13 +21,13 @@
<parent>
<groupId>net.openhft</groupId>
<artifactId>java-parent-pom</artifactId>
<version>1.1.10</version>
<version>1.1.12</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>chronicle-core-checked</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.11.0-SNAPSHOT</version>
<name>OpenHFT/Chronicle-Core-Checked</name>
<description>Chronicle-Core-Checked</description>
<packaging>bundle</packaging>
......@@ -55,6 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version>
<configuration>
<compilerArgument>-Xlint:deprecation</compilerArgument>
<source>1.8</source>
......
checked-exceptions/src/main/java/java/lang/Appendable.java
View file @ 2597ae73
......@@ -58,7 +58,6 @@ public interface Appendable {
* @throws IndexOutOfBoundsException If <tt>start</tt> or <tt>end</tt> are negative, <tt>start</tt>
* is greater than <tt>end</tt>, or <tt>end</tt> is greater than
* <tt>csq.length()</tt>
* @throws IOException If an I/O error occurs
*/
Appendable append(CharSequence csq, int start, int end) throws IndexOutOfBoundsException;
......@@ -67,7 +66,6 @@ public interface Appendable {
*
* @param c The character to append
* @return A reference to this <tt>Appendable</tt>
* @throws IOException If an I/O error occurs
*/
Appendable append(char c);
}
\ No newline at end of file
checked-exceptions/src/main/java/java/lang/IllegalArgumentException.java
View file @ 2597ae73
package java.lang;
public class IllegalArgumentException extends Exception {
public IllegalArgumentException() {
}
public IllegalArgumentException(String message) {
super(message);
}
......
checked-exceptions/src/main/java/java/lang/IndexOutOfBoundsException.java 100644 → 100755
View file @ 2597ae73
......@@ -16,8 +16,8 @@
package java.lang;
/**
* Created by peter on 01/09/15.
/*
* Created by Peter Lawrey on 01/09/15.
*/
public class IndexOutOfBoundsException extends Exception {
public IndexOutOfBoundsException(String message) {
......
debian/changelog
View file @ 2597ae73
openhft-chronicle-core (2.17.5-1) unstable; urgency=medium
* New upstream version 2.17.5.
* Use java11 profile when building.
* Make sure the compiler args are used, set fork=true.
* Set source and target to Java 11
* Java 11 drops defineClass from sun.misc.Unsafe (Closes: #917736).
-- Andrej Shadura <andrewsh@debian.org> Wed, 27 Feb 2019 17:10:30 +0100
openhft-chronicle-core (1.16.25-1) experimental; urgency=medium
* Team upload to experimental.
* New upstream version 1.16.25
-- tony mancill <tmancill@debian.org> Sat, 15 Sep 2018 21:47:41 -0700
openhft-chronicle-core (1.16.24-1) experimental; urgency=medium
* Team upload to experimental.
* New upstream version 1.16.24
* Set source and target to Java 8
* Build-dep on openhft-affinity 3.1.7.
* Bump Standards-Version to 4.2.1
* Update Vcs URLs to point to Salsa
* Set source encoding to UTF-8 in debian/maven.properties
* Enable tests
-- tony mancill <tmancill@debian.org> Wed, 12 Sep 2018 20:29:36 -0700
openhft-chronicle-core (1.1.8-1) unstable; urgency=medium
* Initial release (Closes: #832906)
......
debian/control
View file @ 2597ae73
......@@ -10,12 +10,12 @@ Build-Depends:
libintellij-annotations-java,
libmaven-bundle-plugin-java,
libmockito-java,
libopenhft-affinity-java,
libopenhft-affinity-java (>= 3.1.2),
libslf4j-java,
maven-debian-helper (>= 2.0)
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/openhft-chronicle-core.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/openhft-chronicle-core.git
Standards-Version: 4.2.1
Vcs-Git: https://salsa.debian.org/java-team/openhft-chronicle-core.git
Vcs-Browser: https://salsa.debian.org/java-team/openhft-chronicle-core
Homepage: https://github.com/OpenHFT/Chronicle-Core
Package: libopenhft-chronicle-core-java
......
debian/copyright
View file @ 2597ae73
......@@ -3,11 +3,12 @@ Upstream-Name: OpenHFT Chronicle Core
Source: https://github.com/OpenHFT/Chronicle-Core
Files: *
Copyright: 2014-2015, High Frequency Trading
Copyright: 2014-2018, High Frequency Trading
License: Apache-2.0
Files: debian/*
Copyright: 2016, Emmanuel Bourg <ebourg@apache.org>
2018, tony mancill <tmancill@debian.org>
License: Apache-2.0
License: Apache-2.0
......
debian/maven.properties
View file @ 2597ae73
......@@ -2,4 +2,8 @@
# For example:
# maven.test.skip=true
maven.test.skip=true
project.build.sourceEncoding=UTF-8
maven.test.skip=false
maven.compiler.source=11
maven.compiler.target=11
maven.compiler.fork=true
debian/patches/java11-compatiblitily.patch 0 → 100644
View file @ 2597ae73
From: Andrej Shadura <andrewsh@debian.org>
Date: Wed, 27 Feb 2019 17:03:02 +0100
Subject: Fixes the compatibility with Java 11
--- a/src/main/java/net/openhft/chronicle/core/ClassLoading.java
+++ b/src/main/java/net/openhft/chronicle/core/ClassLoading.java
@@ -45,6 +45,10 @@
* @return the class loaded.
*/
private static Class defineClass(ClassLoader classLoader, String className, @NotNull byte[] bytes) {
- return UnsafeMemory.UNSAFE.defineClass(className, bytes, 0, bytes.length, classLoader, null);
+ try {
+ return (Class) UnsafeMemory.defineClassMethodHandle.bindTo(classLoader).invokeWithArguments(className, bytes, 0, bytes.length);
+ } catch (Throwable e) {
+ throw new RuntimeException(e);
+ }
}
}
--- a/src/main/java/net/openhft/chronicle/core/UnsafeMemory.java
+++ b/src/main/java/net/openhft/chronicle/core/UnsafeMemory.java
@@ -19,6 +19,9 @@
import net.openhft.chronicle.core.annotation.ForceInline;
import org.jetbrains.annotations.NotNull;
import sun.misc.Unsafe;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
import java.lang.reflect.Field;
import java.util.concurrent.atomic.AtomicLong;
@@ -28,6 +31,7 @@
@NotNull
public static final Unsafe UNSAFE;
+ public static final MethodHandle defineClassMethodHandle;
public static final UnsafeMemory INSTANCE;
// see java.nio.Bits.copyMemory
// This number limits the number of bytes to copy per call to Unsafe's
@@ -43,6 +47,14 @@
} catch (@NotNull NoSuchFieldException | IllegalAccessException | IllegalArgumentException e) {
throw new AssertionError(e);
}
+ try {
+ MethodHandles.Lookup baseLookup = MethodHandles.lookup();
+ MethodType defineClassMethodType = MethodType.methodType(Class.class, new Class[]{String.class, byte[].class, int.class, int.class});
+ MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(ClassLoader.class, baseLookup);
+ defineClassMethodHandle = lookup.findVirtual(ClassLoader.class, "defineClass", defineClassMethodType);
+ } catch (Throwable e) {
+ throw new RuntimeException(e);
+ }
INSTANCE = Jvm.isArm() ? new ARMMemory() : new UnsafeMemory();
}
debian/patches/series 0 → 100644
View file @ 2597ae73
java11-compatiblitily.patch
debian/rules
View file @ 2597ae73
......@@ -3,5 +3,11 @@
%:
dh $@ --buildsystem=maven
override_dh_auto_build:
dh_auto_build -- -P java11 package
override_dh_auto_test:
dh_auto_test -- -P java11 test
get-orig-source:
uscan --download-current-version --force-download --repack --rename --compression xz