Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
check this constraint exists before testing something on it
authoralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 27 Mar 2006 12:57:41 +0000 (12:57 +0000)
committeralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 27 Mar 2006 12:57:41 +0000 (12:57 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1989 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/surf/workstation_KCCFLN05.c

index e59c773..7b1a9b3 100644 (file)
@@ -201,9 +201,10 @@ static int resource_used(void *resource_id)
     return (lmm_constraint_used(maxmin_system,
                               ((cpu_KCCFLN05_t) resource_id)->
                               constraint) || 
-           lmm_constraint_used(maxmin_system,
+           ((((cpu_KCCFLN05_t) resource_id)->bus)?
+            lmm_constraint_used(maxmin_system,
                                ((cpu_KCCFLN05_t) resource_id)->
-                               bus));
+                               bus):0));
   else 
     return lmm_constraint_used(maxmin_system,
                               ((network_link_KCCFLN05_t) resource_id)->