From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 11 Jan 2017 14:38:28 +0000 (+0100)
Subject: fix a bug detected by mac (leading to segfault) but not others
X-Git-Tag: v3_15~562
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2143caf36b35ee1c0a92cf29d8454725b418601b

fix a bug detected by mac (leading to segfault) but not others
---

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 3d7be6fc91..e9fb0c74f3 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -241,8 +241,14 @@ std::list<Cpu*> CpuAction::cpus() {
   lmm_system_t sys = getModel()->getMaxminSystem();
   int llen = lmm_get_number_of_cnst_from_var(sys, getVariable());
 
-  for(int i = 0; i<llen; i++)
-    retlist.push_back( (Cpu*)(lmm_constraint_id( lmm_get_cnst_from_var(sys, getVariable(), i) )) );
+  for (int i = 0; i < llen; i++) {
+    /* Beware of composite actions: ptasks put links and cpus together */
+    // extra pb: we cannot dynamic_cast from void*...
+    Resource* resource = static_cast<Resource*>(lmm_constraint_id(lmm_get_cnst_from_var(sys, getVariable(), i)));
+    Cpu* cpu           = dynamic_cast<Cpu*>(resource);
+    if (cpu != nullptr)
+      retlist.push_back(cpu);
+  }
 
   return retlist;
 }