From 93bc0226e3b100b84273204a75a5bbd203ebc880 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Mon, 12 Dec 2011 16:07:27 +0100 Subject: [PATCH] Cosmetics --- src/surf/cpu_cas01.c | 15 +++++---------- src/surf/network_im.c | 12 +++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index 8c18d28c86..dcc738c293 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -667,19 +667,14 @@ static void surf_cpu_model_init_internal(const char* name) surf_cpu_model->model_private->resource_used = cpu_resource_used; - if(cpu_update_mechanism == UM_LAZY) + if(cpu_update_mechanism == UM_LAZY) { surf_cpu_model->model_private->share_resources = cpu_share_resources_lazy; - else if (cpu_update_mechanism == UM_FULL) - surf_cpu_model->model_private->share_resources = cpu_share_resources_full; - else - xbt_die("Invalide update mechanism!"); - - if(cpu_update_mechanism == UM_LAZY) surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state_lazy; - else if(cpu_update_mechanism == UM_FULL) + } else if (cpu_update_mechanism == UM_FULL) { + surf_cpu_model->model_private->share_resources = cpu_share_resources_full; surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state_full; - else - xbt_die("Incompatible optimization mode"); + } else + xbt_die("Invalid update mechanism!"); surf_cpu_model->model_private->update_resource_state = cpu_update_resource_state; diff --git a/src/surf/network_im.c b/src/surf/network_im.c index 06f07c18bc..83e5ad0649 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -1072,15 +1072,13 @@ static void im_surf_network_model_init_internal(void) #endif surf_network_model->model_private->resource_used = im_net_resource_used; - if(network_update_mechanism == UM_LAZY) + if(network_update_mechanism == UM_LAZY) { surf_network_model->model_private->share_resources = net_share_resources_lazy; - else if(network_update_mechanism == UM_FULL) + surf_network_model->model_private->update_actions_state = net_update_actions_state_lazy; + } else if(network_update_mechanism == UM_FULL) { surf_network_model->model_private->share_resources = net_share_resources_full; - - if(network_update_mechanism == UM_LAZY) - surf_network_model->model_private->update_actions_state =net_update_actions_state_lazy; - else if(network_update_mechanism == UM_FULL) - surf_network_model->model_private->update_actions_state =net_update_actions_state_full; + surf_network_model->model_private->update_actions_state = net_update_actions_state_full; + } surf_network_model->model_private->update_resource_state = net_update_resource_state; -- 2.20.1