kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Disable memory-check in SMDS because sysinfo.h is not working on BSD.

Browse Source 
The SMDS memory check cause the build to fail on on BSD-systems. It would be
better to disable it only on BSD-platforms, or use
http://code.google.com/p/sysinfo-bsd/source/browse/sysinfo.c for them.

This fixes Debian bug https://bugs.debian.org/623560 .

Patch by Anton Gladky <gladk@debian.org>.

Been part of the Debian edition of FreeCAD since 2011.
This commit is contained in:
Petter Reinholdtsen
2023-07-01 08:15:05 +02:00
committed by Chris Hennes
parent 961bd5fa37
commit 5647e54e4e
1 changed files with 1 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp vendored
View File

@@ -61,13 +61,6 @@
#include <iterator>
using namespace std;
#ifndef WIN32
#if !(defined(__MACH__) && defined(__APPLE__))
#include <sys/sysinfo.h>
#endif
#include <sys/wait.h>
#endif
// number of added entities to check memory after
#define CHECKMEMORY_INTERVAL 100000
@@ -85,56 +78,7 @@ int SMDS_Mesh::chunkSize = 1024;
int SMDS_Mesh::CheckMemory(const bool doNotRaise)
{
#if 0
#if (defined(__MACH__) && defined(__APPLE__))
return 1000;
#else
#ifndef WIN32
struct sysinfo si;
int err = sysinfo( &si );
if ( err )
return -1;
const unsigned long Mbyte = 1024 * 1024;
static int limit = -1;
if ( limit < 0 ) {
int status = system("SMDS_MemoryLimit"); // it returns lower limit of free RAM
if (status >= 0 ) {
limit = WEXITSTATUS(status);
}
else {
double factor = ( si.totalswap == 0 ) ? 0.1 : 0.2;
limit = int(( factor * si.totalram * si.mem_unit ) / Mbyte );
}
if ( limit < 20 )
limit = 20;
else
limit = int ( limit * 1.5 );
MESSAGE ( "SMDS_Mesh::CheckMemory() memory limit = " << limit << " MB" );
}
// compute separately to avoid overflow
int freeMb =
( si.freeram * si.mem_unit ) / Mbyte +
( si.freeswap * si.mem_unit ) / Mbyte;
//cout << "freeMb = " << freeMb << " limit = " << limit << endl;
if ( freeMb > limit )
return freeMb - limit;
if ( doNotRaise )
return 0;
MESSAGE ("SMDS_Mesh::CheckMemory() throws as free memory too low: " << freeMb <<" MB" );
throw std::bad_alloc();
#else
return -1;
#endif
#endif
#else
return 1000;
#endif
return 1000;
}
///////////////////////////////////////////////////////////////////////////////