Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index d38b8e0..7d13e33 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -165,7 +165,7 @@ double Host::speed() {
 }
 /** @brief Returns the number of core of the processor. */
 int Host::coresCount() {
-  return pimpl_cpu->getCore();
+  return pimpl_cpu->getCoreCount();
 }
 
 /** @brief Set the pstate at which the host should run */

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 6598f07..3ed4bf4 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -80,14 +80,13 @@ static void inthandler(int ignored)
 static void segvhandler(int signum, siginfo_t *siginfo, void *context)
 {
   if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) {
-    fprintf(stderr,
-            "Access violation detected.\n"
-            "This can result from a programming error in your code or, although less likely,\n"
-            "from a bug in SimGrid itself.  This can also be the sign of a bug in the OS or\n"
-            "in third-party libraries.  Failing hardware can sometimes generate such errors\n"
-            "too.\n"
-            "Finally, if nothing of the above applies, this can result from a stack overflow.\n"
-            "Try to increase stack size with --cfg=contexts/stack_size (current size is %d KiB).\n",
+    fprintf(stderr, "Access violation detected.\n"
+                    "This can result from a programming error in your code or, although less likely,\n"
+                    "from a bug in SimGrid itself.  This can also be the sign of a bug in the OS or\n"
+                    "in third-party libraries.  Failing hardware can sometimes generate such errors\n"
+                    "too.\n"
+                    "Finally, if nothing of the above applies, this can result from a stack overflow.\n"
+                    "Try to increase stack size with --cfg=contexts/stack-size (current size is %d KiB).\n",
             smx_context_stack_size / 1024);
     if (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
       fprintf(stderr, "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n",

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 3427096..ed4f8dd 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -203,8 +203,7 @@ void Cpu::onSpeedChange() {
   TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak);
 }
 
-
-int Cpu::getCore()
+int Cpu::getCoreCount()
 {
   return coresAmount_;
 }

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 5e85657..9ddf06a 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -106,7 +106,7 @@ public:
   virtual simgrid::surf::Action *sleep(double duration)=0;
 
   /** @brief Get the amount of cores */
-  virtual int getCore();
+  virtual int getCoreCount();
 
   /** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */
   virtual double getSpeed(double load);

diff --git a/teshsuite/simix/stack_overflow/stack_overflow.tesh b/teshsuite/simix/stack_overflow/stack_overflow.tesh
index 83f6662..08e219c 100644 (file)
--- a/teshsuite/simix/stack_overflow/stack_overflow.tesh
+++ b/teshsuite/simix/stack_overflow/stack_overflow.tesh
@@ -7,4 +7,4 @@ $ ${bindir:=.}/stack_overflow --cfg=contexts/stack-size:96 ${srcdir:=.}/examples
 > in third-party libraries.  Failing hardware can sometimes generate such errors
 > too.
 > Finally, if nothing of the above applies, this can result from a stack overflow.
-> Try to increase stack size with --cfg=contexts/stack_size (current size is 96 KiB).
+> Try to increase stack size with --cfg=contexts/stack-size (current size is 96 KiB).