Skip to content

JFR PhysicalMemory event fix-up #24315

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

Open
thallium wants to merge 1 commit into
base: master
Choose a base branch
from
+115 −20
Open

JFR PhysicalMemory event fix-up #24315

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
6 changes: 6 additions & 0 deletions runtime/oti/j9nonbuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,12 @@ typedef struct J9JFRThreadAllocationStatistics {
U_64 allocated;
} J9JFRThreadAllocationStatistics;

typedef struct J9JFRPhysicalMemory {
J9JFR_EVENT_COMMON_FIELDS
U_64 totalSize;
U_64 usedSize;
} J9JFRPhysicalMemory;

#endif /* defined(J9VM_OPT_JFR) */

/* @ddr_namespace: map_to_type=J9CfrError */
Expand Down
4 changes: 3 additions & 1 deletion runtime/vm/BufferWriter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,13 @@ class VM_BufferWriter {
{
OMRPORT_ACCESS_FROM_J9PORT(_portLibrary);
va_list args;
va_list args_copy;
va_start(args, format);
va_copy(args_copy, args);
/* Minus 1 because omrstr_vprintf accounts for null terminator if buffer is null. */
uintptr_t totalLength = omrstr_vprintf(NULL, 0, format, args) - 1;
if (checkBounds(totalLength)) {
omrstr_vprintf((char *)_cursor, _bufferEnd - _cursor, format, args);
omrstr_vprintf((char *)_cursor, _bufferEnd - _cursor, format, args_copy);
_cursor += totalLength;
}
va_end(args);
Expand Down
36 changes: 30 additions & 6 deletions runtime/vm/JFRChunkWriter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class VM_JFRChunkWriter {
static constexpr int MONITOR_ENTER_EVENT_SIZE = sizeof(U_32) + (3 * LEB128_64_SIZE) + (5 * LEB128_32_SIZE);
static constexpr int THREAD_PARK_EVENT_SIZE = (9 * sizeof(U_64)) + sizeof(U_32);
static constexpr int JVM_INFORMATION_EVENT_SIZE = 3000;
static constexpr int PHYSICAL_MEMORY_EVENT_SIZE = (4 * sizeof(U_64)) + sizeof(U_32);
static constexpr int PHYSICAL_MEMORY_EVENT_SIZE = LEB128_32_SIZE + (4 * LEB128_64_SIZE);
static constexpr int VIRTUALIZATION_INFORMATION_EVENT_SIZE = 50;
static constexpr int CPU_INFORMATION_EVENT_SIZE = 600;
static constexpr int OS_INFORMATION_EVENT_SIZE = 100;
Expand Down Expand Up @@ -479,6 +479,8 @@ class VM_JFRChunkWriter {

pool_do(_constantPoolTypes.getGarbageCollectionTable(), &writeGarbageCollectionEvent, _bufferWriter);

pool_do(_constantPoolTypes.getPhysicalMemoryTable(), &writePhysicalMemoryEvent, _bufferWriter);

pool_do(_constantPoolTypes.getGCHeapSummaryTable(), &writeGCHeapSummaryEvent, _bufferWriter);

pool_do(_constantPoolTypes.getNetworkUtilizationTable(), &writeNetworkUtilizationEvent, this);
Expand Down Expand Up @@ -544,10 +546,6 @@ class VM_JFRChunkWriter {
if (_constantPoolTypes.shouldWriteYoungGenerationConfigurationEvent()) {
writeYoungGenerationConfigurationEvent();
}

if (_constantPoolTypes.shouldWritePhysicalMemory()) {
writePhysicalMemoryEvent();
}
}

writeJFRHeader();
Expand Down Expand Up @@ -875,6 +873,32 @@ class VM_JFRChunkWriter {
writeEventSize(_bufferWriter, dataStart);
}

static void
writePhysicalMemoryEvent(void *anElement, void *userData)
{
PhysicalMemoryEntry *entry = (PhysicalMemoryEntry *)anElement;
VM_BufferWriter *_bufferWriter = (VM_BufferWriter *)userData;

/* reserve size field */
U_8 *dataStart = reserveEventSize(_bufferWriter);

/* write event type */
_bufferWriter->writeLEB128(PhysicalMemoryID);

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

/* write total size */
_bufferWriter->writeLEB128(entry->totalSize);

/* write used size */
_bufferWriter->writeLEB128(entry->usedSize);

/* write size */
writeEventSize(_bufferWriter, dataStart);
}


void
writeJFRChunkToFile()
{
Expand Down Expand Up @@ -1047,7 +1071,7 @@ class VM_JFRChunkWriter {

requiredBufferSize += OS_INFORMATION_EVENT_SIZE;

requiredBufferSize += PHYSICAL_MEMORY_EVENT_SIZE;
requiredBufferSize += (_constantPoolTypes.getPhysicalMemoryCount() * PHYSICAL_MEMORY_EVENT_SIZE);

requiredBufferSize += VIRTUALIZATION_INFORMATION_EVENT_SIZE;

Expand Down
22 changes: 22 additions & 0 deletions runtime/vm/JFRConstantPoolTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,6 +1561,28 @@ VM_JFRConstantPoolTypes::addThreadAllocationStatistics(J9JFRThreadAllocationStat
entry->threadIndex = threadAlocationData->currentThreadTID;
entry->allocated = threadAlocationData->allocated;

_threadAllocationStatisticsCount += 1;

done:
return;
}

void
VM_JFRConstantPoolTypes::addPhysicalMemoryEntry(J9JFRPhysicalMemory *physicalMemoryData)
{
PhysicalMemoryEntry *entry = (PhysicalMemoryEntry *)pool_newElement(_physicalMemoryTable);

if (NULL == entry) {
_buildResult = OutOfMemory;
goto done;
}

entry->ticks = physicalMemoryData->startTicks;
entry->totalSize = physicalMemoryData->totalSize;
entry->usedSize = physicalMemoryData->usedSize;

_physicalMemoryCount += 1;

done:
return;
}
Expand Down
40 changes: 32 additions & 8 deletions runtime/vm/JFRConstantPoolTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,12 @@ struct ThreadDumpEntry {
UDATA resultLength;
};

struct PhysicalMemoryEntry {
I_64 ticks;
U_64 totalSize;
U_64 usedSize;
};

struct JFRConstantEvents {
JVMInformationEntry JVMInfoEntry;
CPUInformationEntry CPUInfoEntry;
Expand Down Expand Up @@ -563,6 +569,8 @@ class VM_JFRConstantPoolTypes {
UDATA _threadDumpCount;
J9Pool *_threadAllocationStatisticsTable;
UDATA _threadAllocationStatisticsCount;
J9Pool *_physicalMemoryTable;
UDATA _physicalMemoryCount;

/* Periodic events. */
bool _shouldWriteJVMInformation;
Expand All @@ -573,7 +581,6 @@ class VM_JFRConstantPoolTypes {
bool _shouldWriteInitialEnvironmentVariableEvents;
bool _shouldWritewriteGCHeapConfigurationEvent;
bool _shouldWriteYoungGenerationConfigurationEvent;
bool _shouldWritePhysicalMemory;
bool _shouldWriteSystemProcess;
bool _shouldWriteNativeLibrary;
bool _shouldWriteModuleRequire;
Expand Down Expand Up @@ -881,6 +888,9 @@ class VM_JFRConstantPoolTypes {
void addGCHeapSummaryEntry(J9JFRGCHeapSummary *gcHeapSummaryData);

void addNetworkUtilizationEntry(J9JFRNetworkUtilization *networkUtilizationData);

void addPhysicalMemoryEntry(J9JFRPhysicalMemory *physicalMemoryData);

void addDataLossEntry(J9JFRDataLoss *dataLossData);

void addThreadDumpEntry(J9JFRThreadDump *threadDumpData);
Expand Down Expand Up @@ -1274,6 +1284,16 @@ class VM_JFRConstantPoolTypes {
return _stackFrameCount;
}

UDATA getPhysicalMemoryCount()
{
return _physicalMemoryCount;
}

J9Pool *getPhysicalMemoryTable()
{
return _physicalMemoryTable;
}

bool shouldWriteJVMInformation()
{
return _shouldWriteJVMInformation;
Expand Down Expand Up @@ -1314,11 +1334,6 @@ class VM_JFRConstantPoolTypes {
return _shouldWriteYoungGenerationConfigurationEvent;
}

bool shouldWritePhysicalMemory()
{
return _shouldWritePhysicalMemory;
}

bool shouldWriteSystemProcess()
{
return _shouldWriteSystemProcess;
Expand Down Expand Up @@ -1448,7 +1463,7 @@ class VM_JFRConstantPoolTypes {
_shouldWriteYoungGenerationConfigurationEvent = true;
break;
case J9JFR_EVENT_TYPE_PHYSICAL_MEMORY:
_shouldWritePhysicalMemory = true;
addPhysicalMemoryEntry((J9JFRPhysicalMemory *)event);
break;
case J9JFR_EVENT_TYPE_SYSTEM_PROCESS:
_shouldWriteSystemProcess = true;
Expand Down Expand Up @@ -2232,6 +2247,8 @@ class VM_JFRConstantPoolTypes {
, _threadDumpCount(0)
, _threadAllocationStatisticsTable(NULL)
, _threadAllocationStatisticsCount(0)
, _physicalMemoryTable(NULL)
, _physicalMemoryCount(0)
, _shouldWriteJVMInformation(false)
, _shouldWriteCPUInformationEvent(false)
, _shouldWriteVirtualizationInformationEvent(false)
Expand All @@ -2240,7 +2257,6 @@ class VM_JFRConstantPoolTypes {
, _shouldWriteInitialEnvironmentVariableEvents(false)
, _shouldWritewriteGCHeapConfigurationEvent(false)
, _shouldWriteYoungGenerationConfigurationEvent(false)
, _shouldWritePhysicalMemory(false)
, _shouldWriteSystemProcess(false)
, _shouldWriteNativeLibrary(false)
, _shouldWriteModuleRequire(false)
Expand Down Expand Up @@ -2406,6 +2422,13 @@ class VM_JFRConstantPoolTypes {
goto done;
}

_physicalMemoryTable = pool_new(sizeof(PhysicalMemoryEntry), 0, sizeof(U_64), 0, J9_GET_CALLSITE(), OMRMEM_CATEGORY_VM, POOL_FOR_PORT(privatePortLibrary));
if (NULL == _physicalMemoryTable) {
_buildResult = OutOfMemory;
goto done;
}


_systemProcessTable = pool_new(sizeof(SystemProcessEntry), 0, sizeof(U_64), 0, J9_GET_CALLSITE(), OMRMEM_CATEGORY_VM, POOL_FOR_PORT(privatePortLibrary));
if (NULL == _systemProcessTable) {
_buildResult = OutOfMemory;
Expand Down Expand Up @@ -2585,6 +2608,7 @@ class VM_JFRConstantPoolTypes {
pool_kill(_dataLossTable);
pool_kill(_threadDumpTable);
pool_kill(_threadAllocationStatisticsTable);
pool_kill(_physicalMemoryTable);
freeNetworkInterfaceNames();
j9mem_free_memory(_globalStringTable);
}
Expand Down
27 changes: 22 additions & 5 deletions runtime/vm/jfr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,16 @@ jfrEventSize(J9JFREvent *jfrEvent)
case J9JFR_EVENT_TYPE_INITIAL_ENVIRONMENT_VARIABLE:
case J9JFR_EVENT_TYPE_GC_HEAP_CONFIGURATION:
case J9JFR_EVENT_TYPE_YOUNG_GENERATION_CONFIGURATION:
case J9JFR_EVENT_TYPE_PHYSICAL_MEMORY:
case J9JFR_EVENT_TYPE_SYSTEM_PROCESS:
case J9JFR_EVENT_TYPE_MODULE_REQUIRE:
case J9JFR_EVENT_TYPE_MODULE_EXPORT:
case J9JFR_EVENT_TYPE_CLASS_LOADER_STATISTICS:
case J9JFR_EVENT_TYPE_NATIVE_LIBRARY:
size = sizeof(J9JFREvent);
break;
case J9JFR_EVENT_TYPE_PHYSICAL_MEMORY:
size = sizeof(J9JFRPhysicalMemory);
break;
default:
Assert_VM_unreachable();
break;
Expand Down Expand Up @@ -1621,6 +1623,24 @@ jfrThreadStatistics(J9VMThread *currentThread)

}

static void
jfrPhysicalMemory(J9VMThread *currentThread)
{
PORT_ACCESS_FROM_VMC(currentThread);

J9MemoryInfo memInfo = {0};
I_32 rc = j9sysinfo_get_memory_info(&memInfo);

if (0 == rc) {
J9JFRPhysicalMemory *jfrEvent = (J9JFRPhysicalMemory *)reserveBuffer(currentThread, currentThread, sizeof(J9JFRPhysicalMemory));
if (NULL != jfrEvent) {
initializeEventFields(currentThread, currentThread, (J9JFREvent *)jfrEvent, J9JFR_EVENT_TYPE_PHYSICAL_MEMORY);
jfrEvent->totalSize = memInfo.totalPhysical;
jfrEvent->usedSize = memInfo.totalPhysical - memInfo.availPhysical;
}
}
}

static int J9THREAD_PROC
jfrSamplingThreadProc(void *entryArg)
{
Expand Down Expand Up @@ -2352,10 +2372,7 @@ JfrPeriodicEventSet::requestClassLoaderStatistics(J9VMThread *currentThread)
void
JfrPeriodicEventSet::requestPhysicalMemory(J9VMThread *currentThread)
{
J9JFREvent *jfrEvent = (J9JFREvent *)reserveBuffer(currentThread, currentThread, sizeof(J9JFREvent));
if (NULL != jfrEvent) {
initializeEventFields(currentThread, currentThread, jfrEvent, J9JFR_EVENT_TYPE_PHYSICAL_MEMORY);
}
jfrPhysicalMemory(currentThread);
}

void
Expand Down