[disruptor] 01/02: Merge tag 'upstream/3.2.1'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository disruptor.

commit aa192be72aaa792b16e1bc7cb32ff757113cce02
Merge: 564e27c 7763a4a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 19 12:56:28 2014 +0100

    Merge tag 'upstream/3.2.1'
    
    Upstream version 3.2.1

 .gitignore                                         |  12 +-
 README.md                                          |  10 +
 build.gradle                                       |  13 +-
 config/checkstyle/checkstyle.xml                   |   6 +-
 config/checkstyle/suppress.xml                     |   9 +
 docs/ide/eclipse/Disruptor_eclipse_formatting.xml  | 291 ++++++++++++++++++++
 runme.sh                                           |  20 ++
 runoffheap.sh                                      |  17 ++
 .../com/lmax/disruptor/BatchEventProcessor.java    |   5 -
 .../lmax/disruptor/PhasedBackoffWaitStrategy.java  | 130 ++-------
 .../lmax/disruptor/SingleProducerSequencer.java    |   5 +-
 .../com/lmax/disruptor/SleepingWaitStrategy.java   |  16 +-
 .../java/com/lmax/disruptor/util/MutableLong.java  |   8 +
 ...sruptor.java => AbstractPerfTestDisruptor.java} |  32 +--
 ...VsDisruptor.java => AbstractPerfTestQueue.java} |  38 +--
 ...ectVsEventTranslatorWithByteArrayBenchmark.java | 124 ---------
 ...ctVsEventTranslatorWithSingleLongBenchmark.java | 106 --------
 ...blisherToThreeProcessorPipelineLatencyTest.java | 298 ---------------------
 .../com/lmax/disruptor/immutable/Constants.java    |   7 +
 .../disruptor/immutable/CustomPerformanceTest.java |  58 ++++
 .../lmax/disruptor/immutable/CustomRingBuffer.java |  98 +++++++
 .../lmax/disruptor/immutable/EventAccessor.java    |   6 +
 .../com/lmax/disruptor/immutable/EventHolder.java  |  18 ++
 .../disruptor/immutable/EventHolderHandler.java    |  20 ++
 .../com/lmax/disruptor/immutable/SimpleEvent.java  |  28 ++
 .../disruptor/immutable/SimpleEventHandler.java    |  14 +
 .../disruptor/immutable/SimplePerformanceTest.java |  74 +++++
 .../offheap/OneToOneOffHeapThroughputTest.java     | 188 +++++++++++++
 .../offheap/OneToOneOnHeapThroughputTest.java      | 160 +++++++++++
 .../queue/OneToOneQueueThroughputTest.java         | 102 +++++++
 .../OneToThreeDiamondQueueThroughputTest.java}     |  76 +-----
 .../OneToThreePipelineQueueThroughputTest.java}    | 111 ++------
 .../OneToThreeQueueThroughputTest.java}            | 107 ++------
 .../disruptor/queue/PingPongQueueLatencyTest.java  | 230 ++++++++++++++++
 .../ThreeToOneQueueThroughputTest.java}            |  98 +------
 .../OneToOneRawBatchThroughputTest.java}           |  31 +--
 .../OneToOneRawThroughputTest.java}                |  29 +-
 .../OneToOneSequencedBatchThroughputTest.java}     |  99 +++----
 .../OneToOneSequencedLongArrayThroughputTest.java} | 111 +++-----
 .../OneToOneSequencedThroughputTest.java}          |  80 ++----
 .../OneToThreeDiamondSequencedThroughputTest.java} | 106 +-------
 ...OneToThreePipelineSequencedThroughputTest.java} | 102 ++-----
 .../OneToThreeSequencedThroughputTest.java}        | 109 ++------
 .../PingPongSequencedLatencyTest.java}             | 205 +-------------
 .../ThreeToOneSequencedBatchThroughputTest.java}   | 110 ++------
 .../ThreeToOneSequencedThroughputTest.java}        | 102 ++-----
 .../ThreeToThreeSequencedThroughputTest.java       | 154 +++++++++++
 .../support/EventCountingQueueProcessor.java       |   2 +-
 .../support/LatencyStepQueueProcessor.java         | 104 -------
 ...ventHandler.java => LongArrayEventHandler.java} |  33 +--
 .../lmax/disruptor/support/LongArrayPublisher.java |  63 +++++
 .../support/MultiBufferBatchEventProcessor.java    | 136 ++++++++++
 .../com/lmax/disruptor/support/PerfTestUtil.java   |  16 ++
 .../{ => support}/ValueAdditionWorkHandler.java    |   6 +-
 .../disruptor/support/ValueBatchPublisher.java     |  64 +++++
 .../OneToOneTranslatorThroughputTest.java}         | 137 ++++------
 ...eToThreeReleasingWorkerPoolThroughputTest.java} |  81 ++----
 .../OneToThreeWorkerPoolThroughputTest.java}       |  78 ++----
 .../TwoToTwoWorkProcessorThroughputTest.java}      |  32 ++-
 .../com/lmax/disruptor/RingBufferEventMatcher.java |  56 ++++
 .../java/com/lmax/disruptor/RingBufferTest.java    |  94 ++-----
 .../disruptor/SequenceReportingCallbackTest.java   |   5 +
 src/test/java/com/lmax/disruptor/TortureTest.java  |   8 +-
 .../java/com/lmax/disruptor/dsl/DisruptorTest.java |   5 +-
 64 files changed, 2338 insertions(+), 2355 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/disruptor.git