OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3050 Add memory count to progress dialog.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-06-15 13:28:43 +02:00
parent ef2f8087dc
commit 8f0fb820a5
5 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Fwk/AppFwk/CommonCode/CMakeLists.txt
View File

@@ -42,9 +42,6 @@ add_library( ${PROJECT_NAME}
cafVecIjk.cpp
cafVecIjk.h
cafMemoryInspector.cpp
cafMemoryInspector.h
${MOC_FILES_CPP}
)

145
Fwk/AppFwk/CommonCode/cafMemoryInspector.cpp
View File

@@ -1,145 +0,0 @@
#include "cafMemoryInspector.h"
#include <QFile>
#include <QRegExp>
#include <QString>
#include <QStringList>
#ifdef _WIN32
#include "windows.h"
#include "psapi.h"
#elif defined (__linux__)
#include <map>
#include <unistd.h>
#include "sys/types.h"
#include "sys/sysinfo.h"
#endif
#define MIB_DIV 1048576
#ifdef __linux__
//--------------------------------------------------------------------------------------------------
/// Read bytes of memory of different types for current process from /proc/self/statm
/// See: http://man7.org/linux/man-pages/man5/proc.5.html
/// The first three columns in statm are:
/// * VmSize: size of virtual memory
/// * RSS: resident memory size of process
/// * Shared: shared memory used by process
//--------------------------------------------------------------------------------------------------
std::map<QString, uint64_t> readProcessBytesLinux()
{
std::map<QString, uint64_t> quantities;
int pageSize = getpagesize();
QFile procSelfStatus("/proc/self/statm");
if (procSelfStatus.open(QIODevice::ReadOnly | QIODevice::Text))
{
QString line(procSelfStatus.readLine(256));
QStringList lineWords = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
quantities["VmSize"] = static_cast<uint64_t>(lineWords[0].toLongLong() * pageSize);
quantities["RSS"] = static_cast<uint64_t>(lineWords[1].toLongLong() * pageSize);
quantities["Shared"] = static_cast<uint64_t>(lineWords[2].toLongLong() * pageSize);
}
return quantities;
}
#endif
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
uint64_t caf::MemoryInspector::getApplicationPhysicalMemoryUsageMiB()
{
#ifdef _WIN32
PROCESS_MEMORY_COUNTERS_EX pmc;
GetProcessMemoryInfo(GetCurrentProcess(), (PPROCESS_MEMORY_COUNTERS) &pmc, sizeof(pmc));
SIZE_T physicalMemUsedByMe = pmc.WorkingSetSize;
return static_cast<uint64_t>(physicalMemUsedByMe / MIB_DIV);
#elif defined(__linux__)
return readProcessBytesLinux()["RSS"] / MIB_DIV;
#else
return 0u;
#endif
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
uint64_t caf::MemoryInspector::getApplicationVirtualMemoryUsageMiB()
{
#ifdef _WIN32
PROCESS_MEMORY_COUNTERS_EX pmc;
GetProcessMemoryInfo(GetCurrentProcess(), (PPROCESS_MEMORY_COUNTERS)&pmc, sizeof(pmc));
SIZE_T virtualMemUsedByMe = pmc.PrivateUsage;
return static_cast<uint64_t>(virtualMemUsedByMe / MIB_DIV);
#elif defined(__linux__)
return readProcessBytesLinux()["VmSize"] / MIB_DIV;
#else
return 0u;
#endif
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
uint64_t caf::MemoryInspector::getTotalVirtualMemoryMiB()
{
#ifdef _WIN32
MEMORYSTATUSEX memInfo;
memInfo.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&memInfo);
DWORDLONG totalVirtualMem = memInfo.ullTotalPageFile;
return static_cast<uint64_t> (totalVirtualMem / MIB_DIV);
#elif defined(__linux__)
struct sysinfo memInfo;
sysinfo(&memInfo);
long long totalVirtualMem = memInfo.totalram;
totalVirtualMem += memInfo.totalswap;
totalVirtualMem *= memInfo.mem_unit;
return totalVirtualMem / MIB_DIV;
#else
return 0u;
#endif
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
uint64_t caf::MemoryInspector::getTotalPhysicalMemoryMiB()
{
#ifdef _WIN32
MEMORYSTATUSEX memInfo;
memInfo.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&memInfo);
DWORDLONG totalPhysMem = memInfo.ullTotalPhys;
return static_cast<uint64_t>(totalPhysMem / MIB_DIV);
#elif defined(__linux__)
struct sysinfo memInfo;
sysinfo(&memInfo);
long long totalPhysicalMem = memInfo.totalram;
totalPhysicalMem *= memInfo.mem_unit;
return totalPhysicalMem / MIB_DIV;
#else
return 0u;
#endif
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
uint64_t caf::MemoryInspector::getAvailableVirtualMemoryMiB()
{
#ifdef _WIN32
MEMORYSTATUSEX memInfo;
memInfo.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&memInfo);
DWORDLONG availVirtualMem = memInfo.ullAvailPageFile;
return static_cast<uint64_t> (availVirtualMem / MIB_DIV);
#elif defined(__linux__)
struct sysinfo memInfo;
sysinfo(&memInfo);
long long availVirtualMem = memInfo.freeram;
availVirtualMem += memInfo.freeswap;
availVirtualMem *= memInfo.mem_unit;
return availVirtualMem / MIB_DIV;
#else
return 0u;
#endif
}

51
Fwk/AppFwk/CommonCode/cafMemoryInspector.h
View File

@@ -1,51 +0,0 @@
//##################################################################################################
//
// Custom Visualization Core library
// Copyright (C) 2018- Ceetron AS
//
// This library may be used under the terms of either the GNU General Public License or
// the GNU Lesser General Public License as follows:
//
// GNU General Public License Usage
// This library is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This library 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 at <<http://www.gnu.org/licenses/gpl.html>>
// for more details.
//
// GNU Lesser General Public License Usage
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This library 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 Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
// for more details.
//
//##################################################################################################
#pragma once
#include <cstdint>
namespace caf
{
namespace MemoryInspector
{
uint64_t getApplicationPhysicalMemoryUsageMiB();
uint64_t getApplicationVirtualMemoryUsageMiB();
uint64_t getTotalVirtualMemoryMiB();
uint64_t getTotalPhysicalMemoryMiB();
uint64_t getAvailableVirtualMemoryMiB();
}
}