[SCM] FreeCAD packaging branch, master, updated. debian/0.11.4446-dfsg-1-6-g8932ee7

[Anton Gladky]

The following commit has been merged in the master branch:
commit 8932ee74d000458387bd8268ad1cff8762d6b00e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Sep 24 16:18:27 2011 +0200

    Disable memory check in SMDS.

diff --git a/debian/patches/disable_memory_check.patch b/debian/patches/disable_memory_check.patch
new file mode 100644
index 0000000..97a3c5e
--- /dev/null
+++ b/debian/patches/disable_memory_check.patch
@@ -0,0 +1,128 @@
+Description: Disable memory-check in SMDS because sysinfo.h is not working 
+ on BSD-systems and causes FTBFS. It is better to disable it only on 
+ BSD-platforms.
+ Or use http://code.google.com/p/sysinfo-bsd/source/browse/sysinfo.c
+ for them.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Bug-Debian: http://bugs.debian.org/623560
+Last-Update: 2011-09-24
+
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+@@ -42,12 +42,6 @@
+ #include <iterator>
+ using namespace std;
+ 
+-#ifndef WIN32
+-#if !(defined(__MACH__) && defined(__APPLE__))
+-#include <sys/sysinfo.h>
+-#endif
+-#endif
+-
+ // number of added entitis to check memory after
+ #define CHECKMEMORY_INTERVAL 1000
+ 
+@@ -61,49 +55,7 @@
+ 
+ int SMDS_Mesh::CheckMemory(const bool doNotRaise) throw (std::bad_alloc)
+ {
+-#if (defined(__MACH__) && defined(__APPLE__))
+   return 1000;
+-#else
+-#ifndef WIN32
+-  struct sysinfo si;
+-  int err = sysinfo( &si );
+-  if ( err )
+-    return -1;
+-
+-  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);
+-    }
+-    if ( limit < 20 )
+-      limit = 20;
+-    else
+-      limit = int( limit * 1.5 );
+-#ifdef _DEBUG_
+-    MESSAGE ( "SMDS_Mesh::CheckMemory() memory limit = " << limit << " MB" );
+-#endif
+-  }
+-
+-  const unsigned long Mbyte = 1024 * 1024;
+-  // compute separately to avoid overflow
+-  int freeMb =
+-    ( si.freeram  * si.mem_unit ) / Mbyte +
+-    ( si.freeswap * si.mem_unit ) / Mbyte;
+-
+-  if ( freeMb > limit )
+-    return freeMb - limit;
+-
+-  if ( doNotRaise )
+-    return 0;
+-#ifdef _DEBUG_
+-  MESSAGE ("SMDS_Mesh::CheckMemory() throws as free memory too low: " << freeMb <<" MB" );
+-#endif
+-  throw std::bad_alloc();
+-#else
+-  return -1;
+-#endif
+-#endif
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MemoryLimit.cpp
+@@ -27,11 +27,6 @@
+ // This is not done inside a function of SALOME because allocated memory is not returned
+ // to the system. (PAL16631)
+ //
+-#ifndef WIN32
+-#if !(defined(__MACH__) && defined(__APPLE__))
+-#include <sys/sysinfo.h>
+-#endif
+-#endif
+ 
+ #ifdef _DEBUG_
+ #include <iostream>
+@@ -39,39 +34,5 @@
+ 
+ int main (int argc, char ** argv)
+ {
+-#if (defined(__MACH__) && defined(__APPLE__))
+-	//do nothing
+-#else
+-  // To better understand what is going on here, consult bug [SALOME platform 0019911]
+-#ifndef WIN32
+-  struct sysinfo si;
+-  int err = sysinfo( &si );
+-  if ( err )
+-    return -1;
+-  unsigned long freeRamKb = ( si.freeram  * si.mem_unit ) / 1024;
+-
+-  // totat RAM size in Gb, float is in order not to have 1 instead of 1.9
+-  float totalramGb = float( si.totalram * si.mem_unit ) / 1024 / 1024 / 1024;
+-
+-  // nb Kbites to allocate at one step. Small nb leads to hung up
+-  const int stepKb = int( 5 * totalramGb );
+-
+-  unsigned long nbSteps = freeRamKb / stepKb * 2;
+-  try {
+-    while ( nbSteps-- ) {
+-      new char[stepKb*1024];
+-      err = sysinfo( &si );
+-      if ( !err )
+-        freeRamKb = ( si.freeram  * si.mem_unit ) / 1024;
+-    }
+-  } catch (...) {}
+-
+-// #ifdef _DEBUG_
+-//   std::cout << freeRamKb / 1024 << std::endl;
+-// #endif
+-  return freeRamKb / 1024;
+-#endif
+-#endif
+-
+   return -1;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 14f1f33..8ce48b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_compilation_with_gcc-4.6.patch
 fix_typo_errors.patch
+disable_memory_check.patch

-- 
FreeCAD packaging