]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Code Cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 9 Oct 2012 14:20:27 +0000 (14:20 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 9 Oct 2012 14:20:27 +0000 (14:20 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27031 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/checks/check_for_system_features.cmake
deal.II/source/base/job_identifier.cc
deal.II/source/base/logstream.cc
deal.II/source/base/thread_management.cc

index 0ef5050f32ce44f1d34ec96c791e5ba5b8fb1d2c..696f4ac21c9de88fb00f5e3ed316f2f493ff110b 100644 (file)
 INCLUDE(TestBigEndian)
 
 #
-# Check for various posix specific header files:
+# Check for various posix (and linux) specific header files:
 #
 
+CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE("sys/resource.h"  HAVE_SYS_RESOURCE_H)
 CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILE("sys/times.h" HAVE_SYS_TIMES_H)
 CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 
 
 #
index 1c00eaf2c28b73343b638463c6be28bea814b5c2..4a1fcd420be1f66b6c17166d8da0e8dcf35cf35a 100644 (file)
@@ -15,7 +15,7 @@
 #include <deal.II/base/job_identifier.h>
 #include <ctime>
 
-#ifdef HAVE_GETHOSTNAME
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
@@ -34,7 +34,7 @@ JobIdentifier::JobIdentifier()
   time_t t = std::time(0);
   id = std::string("JobId ");
 
-#if defined(HAVE_GETHOSTNAME) && !defined(DEAL_II_BROKEN_GETHOSTNAME) && !defined(DEBUG)
+#if defined(HAVE_UNISTD_H) && defined(HAVE_GETHOSTNAME)
   char name[100];
   gethostname(name,99);
   id += std::string(name) + std::string(" ");
index d21815441a175c42e4481798987709a41e1ca06f..9d6c83d3d649d64e24a684e2207d79c6a09ed08f 100644 (file)
@@ -53,7 +53,7 @@ LogStream::LogStream()
 {
   prefixes.push("DEAL:");
   std_out->setf(std::ios::showpoint | std::ios::left);
-#if defined(HAVE_TIMES) && defined(HAVE_UNISTD_H)
+#if defined(HAVE_UNISTD_H) && defined(HAVE_TIMES)
   reference_time_val = 1./sysconf(_SC_CLK_TCK) * times(&reference_tms);
 #endif
 }
@@ -454,7 +454,7 @@ void
 LogStream::timestamp ()
 {
   struct tms current_tms;
-#if defined(HAVE_TIMES) && defined(HAVE_UNISTD_H)
+#if defined(HAVE_UNISTD_H) && defined(HAVE_TIMES)
   const clock_t tick = sysconf(_SC_CLK_TCK);
   const double time = 1./tick * times(&current_tms);
 #else
index 501274ebee6e1fe0009724d530c8a2cde3726852..db4c00c3c691b60bc78f68f58ccfa3bd7f0a949e 100644 (file)
@@ -136,7 +136,7 @@ namespace Threads
   {
 #ifdef SYS_gettid
     const pid_t this_id = syscall(SYS_gettid);
-#elif defined(HAVE_GETPID)
+#elif defined(HAVE_UNISTD_H) && defined(HAVE_GETPID)
     const pid_t this_id = getpid();
 #else
     const unsigned int this_id = 0;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.