8232239: ZGC: Inline ZCPU::count() and ZCPU:id()
Reviewed-by: tschatzl
This commit is contained in:
parent
cb5e226306
commit
ee4c8f5f19
src/hotspot
@ -22,7 +22,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "gc/z/zErrno.hpp"
|
#include "gc/z/zErrno.hpp"
|
||||||
#include "gc/z/zCPU.hpp"
|
#include "gc/z/zCPU.inline.hpp"
|
||||||
#include "gc/z/zNUMA.hpp"
|
#include "gc/z/zNUMA.hpp"
|
||||||
#include "runtime/globals.hpp"
|
#include "runtime/globals.hpp"
|
||||||
#include "runtime/os.hpp"
|
#include "runtime/os.hpp"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -22,15 +22,15 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "precompiled.hpp"
|
#include "precompiled.hpp"
|
||||||
#include "gc/z/zCPU.hpp"
|
#include "gc/z/zCPU.inline.hpp"
|
||||||
#include "logging/log.hpp"
|
#include "logging/log.hpp"
|
||||||
#include "memory/padded.inline.hpp"
|
#include "memory/padded.inline.hpp"
|
||||||
#include "runtime/os.hpp"
|
#include "runtime/os.hpp"
|
||||||
#include "runtime/thread.inline.hpp"
|
#include "runtime/thread.inline.hpp"
|
||||||
#include "utilities/debug.hpp"
|
#include "utilities/debug.hpp"
|
||||||
|
|
||||||
#define ZCPU_UNKNOWN_AFFINITY (Thread*)-1;
|
#define ZCPU_UNKNOWN_AFFINITY ((Thread*)-1)
|
||||||
#define ZCPU_UNKNOWN_SELF (Thread*)-2;
|
#define ZCPU_UNKNOWN_SELF ((Thread*)-2)
|
||||||
|
|
||||||
PaddedEnd<ZCPU::ZCPUAffinity>* ZCPU::_affinity = NULL;
|
PaddedEnd<ZCPU::ZCPUAffinity>* ZCPU::_affinity = NULL;
|
||||||
THREAD_LOCAL Thread* ZCPU::_self = ZCPU_UNKNOWN_SELF;
|
THREAD_LOCAL Thread* ZCPU::_self = ZCPU_UNKNOWN_SELF;
|
||||||
@ -51,20 +51,13 @@ void ZCPU::initialize() {
|
|||||||
os::initial_active_processor_count());
|
os::initial_active_processor_count());
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t ZCPU::count() {
|
uint32_t ZCPU::id_slow() {
|
||||||
return os::processor_count();
|
// Set current thread
|
||||||
}
|
if (_self == ZCPU_UNKNOWN_SELF) {
|
||||||
|
_self = Thread::current();
|
||||||
uint32_t ZCPU::id() {
|
|
||||||
assert(_affinity != NULL, "Not initialized");
|
|
||||||
|
|
||||||
// Fast path
|
|
||||||
if (_affinity[_cpu]._thread == _self) {
|
|
||||||
return _cpu;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Slow path
|
// Set current CPU
|
||||||
_self = Thread::current();
|
|
||||||
_cpu = os::processor_id();
|
_cpu = os::processor_id();
|
||||||
|
|
||||||
// Update affinity table
|
// Update affinity table
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -40,6 +40,8 @@ private:
|
|||||||
static THREAD_LOCAL Thread* _self;
|
static THREAD_LOCAL Thread* _self;
|
||||||
static THREAD_LOCAL uint32_t _cpu;
|
static THREAD_LOCAL uint32_t _cpu;
|
||||||
|
|
||||||
|
static uint32_t id_slow();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static void initialize();
|
static void initialize();
|
||||||
|
|
||||||
|
47
src/hotspot/share/gc/z/zCPU.inline.hpp
Normal file
47
src/hotspot/share/gc/z/zCPU.inline.hpp
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
*
|
||||||
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This code 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 General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef SHARE_GC_Z_ZCPU_INLINE_HPP
|
||||||
|
#define SHARE_GC_Z_ZCPU_INLINE_HPP
|
||||||
|
|
||||||
|
#include "gc/z/zCPU.hpp"
|
||||||
|
#include "runtime/os.hpp"
|
||||||
|
#include "utilities/debug.hpp"
|
||||||
|
|
||||||
|
inline uint32_t ZCPU::count() {
|
||||||
|
return os::processor_count();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline uint32_t ZCPU::id() {
|
||||||
|
assert(_affinity != NULL, "Not initialized");
|
||||||
|
|
||||||
|
// Fast path
|
||||||
|
if (_affinity[_cpu]._thread == _self) {
|
||||||
|
return _cpu;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Slow path
|
||||||
|
return id_slow();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // SHARE_GC_Z_ZCPU_INLINE_HPP
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include "precompiled.hpp"
|
#include "precompiled.hpp"
|
||||||
#include "gc/z/zCollectedHeap.hpp"
|
#include "gc/z/zCollectedHeap.hpp"
|
||||||
#include "gc/z/zCPU.hpp"
|
#include "gc/z/zCPU.inline.hpp"
|
||||||
#include "gc/z/zGlobals.hpp"
|
#include "gc/z/zGlobals.hpp"
|
||||||
#include "gc/z/zHeap.inline.hpp"
|
#include "gc/z/zHeap.inline.hpp"
|
||||||
#include "gc/z/zLargePages.inline.hpp"
|
#include "gc/z/zLargePages.inline.hpp"
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#ifndef SHARE_GC_Z_ZVALUE_INLINE_HPP
|
#ifndef SHARE_GC_Z_ZVALUE_INLINE_HPP
|
||||||
#define SHARE_GC_Z_ZVALUE_INLINE_HPP
|
#define SHARE_GC_Z_ZVALUE_INLINE_HPP
|
||||||
|
|
||||||
#include "gc/z/zCPU.hpp"
|
#include "gc/z/zCPU.inline.hpp"
|
||||||
#include "gc/z/zGlobals.hpp"
|
#include "gc/z/zGlobals.hpp"
|
||||||
#include "gc/z/zNUMA.hpp"
|
#include "gc/z/zNUMA.hpp"
|
||||||
#include "gc/z/zThread.inline.hpp"
|
#include "gc/z/zThread.inline.hpp"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user