From: David Wells <wellsd2@rpi.edu>
Date: Sat, 19 Dec 2015 22:46:41 +0000 (-0500)
Subject: Remove an unimplemented configuration option.
X-Git-Tag: v8.4.0-rc2~146^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1996%2Fhead;p=dealii.git

Remove an unimplemented configuration option.

This option, for detecting leaks with deallog, was implemented in
d809993768 and is not supported by the current CMake configuration.

The usage of 'string' instead of 'std::string' implies that no one has
used this code recently.
---

diff --git a/source/base/logstream.cc b/source/base/logstream.cc
index cb69e64a9d..eb99ccc045 100644
--- a/source/base/logstream.cc
+++ b/source/base/logstream.cc
@@ -445,37 +445,6 @@ LogStream::print_line_head()
   double utime = 0.;
 #endif
 
-  /*
-   * The following lines were used for debugging a memory leak.
-   * They work on Linux, not on Solaris, since the /proc filesystem
-   * on Solaris is quite cryptic. For other systems, we don't know.
-   *
-   * Unfortunately, the information in /proc/pid/stat is updated slowly,
-   * therefore, the information is quite unreliable.
-   *
-   * Furthermore, the constructor of ifstream caused another memory leak.
-   *
-   * Still, this code might be useful sometimes, so I kept it here.
-   * When we have more information about the kernel, this should be
-   * incorporated properly. Suggestions are welcome!
-   */
-
-#ifdef DEALII_MEMORY_DEBUG
-  static const pid_t id = getpid();
-
-  std::ostringstream statname;
-  statname << "/proc/" << id << "/stat";
-
-  static long size;
-  static string dummy;
-  ifstream stat(statname.str());
-  // ignore 22 values
-  stat >> dummy >> dummy >> dummy >> dummy >> dummy >> dummy >>
-       dummy >> dummy >> dummy >> dummy >> dummy >>
-       dummy >> dummy >> dummy >> dummy >> dummy >> dummy >>
-       dummy >> dummy >> dummy >> dummy >> dummy >> size;
-#endif
-
   const std::string &head = get_prefix();
   const unsigned int thread = Threads::this_thread_id();
 
@@ -485,9 +454,6 @@ LogStream::print_line_head()
         {
           int p = std_out->width(5);
           *std_out << utime << ':';
-#ifdef DEALII_MEMORY_DEBUG
-          *std_out << size << ':';
-#endif
           std_out->width(p);
         }
       if (print_thread_id)
@@ -503,9 +469,6 @@ LogStream::print_line_head()
         {
           int p = file->width(6);
           *file << utime << ':';
-#ifdef DEALII_MEMORY_DEBUG
-          *file << size << ':';
-#endif
           file->width(p);
         }
       if (print_thread_id)