# HG changeset patch # User mgronlun # Date 1569154719 -7200 # Node ID f9648f8ca4da92c1cbbd6b2d7e2f63bd3a8b0981 # Parent a6ccade6b295ef0ac0413c0680000f735fadee5a update class names diff -r a6ccade6b295 -r f9648f8ca4da src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp --- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp Sun Sep 22 14:00:00 2019 +0200 +++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp Sun Sep 22 14:18:39 2019 +0200 @@ -323,7 +323,7 @@ WriteOperation wo(chunkwriter); WriterHost wh(wo); CheckpointReleaseOperation cro(mspace, Thread::current(), false); - CompositeOperation, CheckpointReleaseOperation, And> co(&wh, &cro); + CompositeOperation, CheckpointReleaseOperation, CompositeOperationAnd> co(&wh, &cro); assert(mspace->is_full_empty(), "invariant"); process_free_list(co, mspace); return wo.processed(); diff -r a6ccade6b295 -r f9648f8ca4da src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp --- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp Sun Sep 22 14:00:00 2019 +0200 +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp Sun Sep 22 14:18:39 2019 +0200 @@ -604,7 +604,7 @@ typedef Retired NonRetired; typedef Excluded NonExcluded; -typedef CompositeOperation BufferPredicate; +typedef CompositeOperation BufferPredicate; typedef PredicatedMutexedWriteOp ThreadLocalMutexedWriteOperation; typedef PredicatedConcurrentWriteOp ThreadLocalConcurrentWriteOperation; diff -r a6ccade6b295 -r f9648f8ca4da src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp Sun Sep 22 14:00:00 2019 +0200 +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp Sun Sep 22 14:18:39 2019 +0200 @@ -31,21 +31,21 @@ #include "jfr/utilities/jfrTypes.hpp" #include "runtime/thread.hpp" -class Or { +class CompositeOperationOr { public: static bool evaluate(bool value) { return !value; } }; -class And { +class CompositeOperationAnd { public: static bool evaluate(bool value) { return value; } }; -template +template class CompositeOperation { private: Operation* _op;