Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add JFR NativeLibrary support #20543

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add JFR NativeLibrary support #20543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions runtime/vm/JFRChunkWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
*
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
*******************************************************************************/
#include "JFRUtils.hpp"
#include "vm_internal.h"

#if defined(J9VM_OPT_JFR)

#include "JFRChunkWriter.hpp"

#include "JFRConstantPoolTypes.hpp"
#include "JFRUtils.hpp"

void
VM_JFRChunkWriter::writeJFRHeader()
Expand Down Expand Up @@ -815,4 +815,14 @@ VM_JFRChunkWriter::writeInitialSystemPropertyEvents(J9JavaVM *vm)
}
}


void
VM_JFRChunkWriter::writeNativeLibraryEvents()
{
#if defined(LINUX)
dl_iterate_phdr(dlIterateCallback, this);
#endif /* defined(LINUX) */

/* TODO: add implementations for other platforms */
}
#endif /* defined(J9VM_OPT_JFR) */
65 changes: 65 additions & 0 deletions runtime/vm/JFRChunkWriter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@

#if defined(J9VM_OPT_JFR)

#if defined(LINUX)
#include <link.h>
#endif /* defined(LINUX) */

#include "BufferWriter.hpp"
#include "JFRConstantPoolTypes.hpp"
#include "JFRUtils.hpp"
Expand Down Expand Up @@ -75,6 +79,7 @@ enum MetadataTypeID {
ThreadCPULoadID = 95,
PhysicalMemoryID = 107,
ExecutionSampleID = 108,
NativeLibraryID = 111,
ThreadID = 163,
ThreadGroupID = 164,
ClassID = 165,
Expand Down Expand Up @@ -162,6 +167,7 @@ class VM_JFRChunkWriter {
static constexpr int INITIAL_SYSTEM_PROPERTY_EVENT_SIZE = 6000;
static constexpr int CPU_LOAD_EVENT_SIZE = (3 * sizeof(float)) + (3 * sizeof(I_64));
static constexpr int THREAD_CPU_LOAD_EVENT_SIZE = (2 * sizeof(float)) + (4 * sizeof(I_64));
static constexpr int NATIVE_LIBRARY_EVENT_SIZE = 3000;

static constexpr int METADATA_ID = 1;

Expand All @@ -183,6 +189,40 @@ class VM_JFRChunkWriter {
return false;
}

#if defined(LINUX)
static int
dlIterateCallback(struct dl_phdr_info *info, size_t size, void *data)
{
if ((NULL == info->dlpi_name) || ('\0' == info->dlpi_name[0])) {
return 0;
}

UDATA baseAddress = 0;
UDATA topAddress = 0;

for (int i = 0; i < info->dlpi_phnum; i++) {
const ElfW(Phdr) *phdr = info->dlpi_phdr + i;
if (PT_LOAD == phdr->p_type) {
UDATA phdrBase = info->dlpi_addr + phdr->p_vaddr;
UDATA phdrTop = phdrBase + phdr->p_memsz;

if ((0 == baseAddress) || (phdrBase < baseAddress)) {
baseAddress = phdrBase;
}

if ((0 == topAddress) || (phdrTop > topAddress)) {
topAddress = phdrTop;
}
}
}

VM_JFRChunkWriter *chunkWriter = (VM_JFRChunkWriter *)data;
chunkWriter->writeNativeLibraryEvent(baseAddress, topAddress, info->dlpi_name);

return 0;
}
#endif /* defined(LINUX) */

protected:

public:
Expand Down Expand Up @@ -351,6 +391,8 @@ class VM_JFRChunkWriter {

writePhysicalMemoryEvent();

writeNativeLibraryEvents();

writeJFRHeader();

if (_bufferWriter->overflowOccurred()) {
Expand Down Expand Up @@ -595,6 +637,25 @@ class VM_JFRChunkWriter {
_bufferWriter->writeLEB128PaddedU32(dataStart, _bufferWriter->getCursor() - dataStart);
}

void
writeNativeLibraryEvent(UDATA baseAddress, UDATA topAddress, const char *name)
{
/* reserve size field */
U_8 *dataStart = _bufferWriter->getAndIncCursor(sizeof(U_32));

_bufferWriter->writeLEB128(NativeLibraryID);

/* write start time */
_bufferWriter->writeLEB128(j9time_current_time_millis());

writeStringLiteral(name);

_bufferWriter->writeLEB128(baseAddress);
_bufferWriter->writeLEB128(topAddress);
/* write size */
_bufferWriter->writeLEB128PaddedU32(dataStart, _bufferWriter->getCursor() - dataStart);
}

void
writeJFRChunkToFile()
{
Expand Down Expand Up @@ -657,6 +718,8 @@ class VM_JFRChunkWriter {

U_8 *writeOSInformationEvent();

void writeNativeLibraryEvents();

void writeInitialSystemPropertyEvents(J9JavaVM *vm);

UDATA
Expand Down Expand Up @@ -717,6 +780,8 @@ class VM_JFRChunkWriter {

requiredBufferSize += _constantPoolTypes.getThreadCPULoadCount() * THREAD_CPU_LOAD_EVENT_SIZE;

requiredBufferSize += NATIVE_LIBRARY_EVENT_SIZE;

return requiredBufferSize;
}

Expand Down