OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

Revert "0030901: Visualization - OSD_MemInfo moving memory computation out of the constructor"

Browse Source
This commit is contained in:
nds
2019-08-15 11:47:36 +03:00
parent f834363dc3
commit cbf87d0753
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Draw/Draw_BasicCommands.cxx
View File

@@ -763,7 +763,6 @@ static int dmeminfo (Draw_Interpretor& theDI,
const char** theArgVec)
{
OSD_MemInfo aMemInfo;
aMemInfo.Update();
if (theArgNb <= 1)
{
theDI << aMemInfo.ToString();

12
src/OSD/OSD_MemInfo.cxx
View File

@@ -43,11 +43,7 @@
// =======================================================================
OSD_MemInfo::OSD_MemInfo()
{
// reset values
for (Standard_Integer anIter = 0; anIter < MemCounter_NB; ++anIter)
{
myCounters[anIter] = Standard_Size(-1);
}
Update();
}
// =======================================================================
@@ -231,14 +227,14 @@ Standard_Size OSD_MemInfo::Value (const OSD_MemInfo::Counter theCounter) const
// function : ValueMiB
// purpose :
// =======================================================================
Standard_Real OSD_MemInfo::ValueMiB (const OSD_MemInfo::Counter theCounter) const
Standard_Size OSD_MemInfo::ValueMiB (const OSD_MemInfo::Counter theCounter) const
{
if (theCounter < 0 || theCounter >= MemCounter_NB)
{
return Standard_Real(-1.);
return Standard_Size(-1);
}
return (myCounters[theCounter] == Standard_Size(-1))
? Standard_Real(-1.) : ((Standard_Real)myCounters[theCounter] / (1024 * 1024));
? Standard_Size(-1) : (myCounters[theCounter] / (1024 * 1024));
}
// =======================================================================

2
src/OSD/OSD_MemInfo.hxx
View File

@@ -82,7 +82,7 @@ public:
//! Return value or specified counter in MiB.
//! Notice that NOT all counters are available on various systems.
//! Standard_Size(-1) means invalid (unavailable) value.
Standard_EXPORT Standard_Real ValueMiB (const OSD_MemInfo::Counter theCounter) const;
Standard_EXPORT Standard_Size ValueMiB (const OSD_MemInfo::Counter theCounter) const;
public:

1
src/QABugs/QABugs_20.cxx
View File

@@ -2786,7 +2786,6 @@ template<typename T> void AllocDummyArr (Draw_Interpretor& theDI, int theN1, int
NCollection_Array1<T> aMapArr1(0, theN1), aMapArr2(0, theN2);
OSD_MemInfo aMemTool;
aMemTool.Update();
Standard_Size aMem0 = aMemTool.Value (OSD_MemInfo::MemHeapUsage);
for (int i = 1; i < theN1; i++)