Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	jctools-benchmarks/src/main/java/org/jctools/channels/spsc/SpscProxyChannelBenchmark.java
  • Loading branch information
nitsanw committed May 25, 2017
2 parents 56b5e58 + 9557959 commit 011e1c3
Show file tree
Hide file tree
Showing 60 changed files with 3,053 additions and 769 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[![Build Status](https://travis-ci.org/JCTools/JCTools.svg?branch=master)](https://travis-ci.org/JCTools/JCTools)

[![Gitter](https://badges.gitter.im/JCTools/JCTools.svg)](https://gitter.im/JCTools/JCTools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

JCTools
==========
Java Concurrency Tools for the JVM. This project aims to offer some concurrent data structures currently missing from
Expand Down Expand Up @@ -71,6 +73,12 @@ Benchmarks
JCTools is benchmarked using both JMH benchmarks and handrolled harnesses. The benchmarks and related instructions can be
found in the jctools-benchmarks module README. Go wild and please let us know how it did on your hardware.

Concurrency Testing
===========
mvn package
cd jctools-concurrency-test
java -jar target/concurrency-test.jar -v

Come up to the lab...
==========
Experimental work is available under the jctools-experimental module. Most of the stuff is developed with an eye to
Expand Down
Loading

0 comments on commit 011e1c3

Please sign in to comment.