In safepoint.cpp, _safepoint_counter should be increased once in safepointSynchronize::end(). But it was increased in EventSafepointWaitBlocked and safepointSynchronize::end(). This results confusing safepoint id in JFR events: synch safepoint id = begin safepoint id +1.