summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
798f93f)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5306
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
#include "surf_private.h"
#include "network_common.h"
#include "surf_private.h"
#include "network_common.h"
+#include "surf/random_mgr.h"
#include "xbt/dict.h"
#include "xbt/str.h"
#include "xbt/log.h"
#include "xbt/dict.h"
#include "xbt/str.h"
#include "xbt/log.h"
-#define CONSTANT_VALUE 1.0
typedef struct network_card_Constant {
char *name;
int id;
typedef struct network_card_Constant {
char *name;
int id;
typedef struct surf_action_network_Constant {
s_surf_action_t generic_action;
double latency;
typedef struct surf_action_network_Constant {
s_surf_action_t generic_action;
double latency;
int suspended;
network_card_Constant_t src;
network_card_Constant_t dst;
} s_surf_action_network_Constant_t, *surf_action_network_Constant_t;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
int suspended;
network_card_Constant_t src;
network_card_Constant_t dst;
} s_surf_action_network_Constant_t, *surf_action_network_Constant_t;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+static random_data_t random_latency = NULL;
static int card_number = 0;
static int host_number = 0;
static int card_number = 0;
static int host_number = 0;
}
}
double_update(&(action->generic_action.remains),
}
}
double_update(&(action->generic_action.remains),
- action->generic_action.cost * delta/ CONSTANT_VALUE);
+ action->generic_action.cost * delta/action->lat_init);
if (action->generic_action.max_duration != NO_MAX_DURATION)
double_update(&(action->generic_action.max_duration), delta);
if (action->generic_action.max_duration != NO_MAX_DURATION)
double_update(&(action->generic_action.max_duration), delta);
xbt_swag_insert(action, action->generic_action.state_set);
xbt_swag_insert(action, action->generic_action.state_set);
- action->latency = CONSTANT_VALUE;
- action->lat_current = action->latency;
+ action->latency = random_generate(random_latency);
+ action->lat_init = action->latency;
static void finalize(void)
{
xbt_dict_free(&network_card_set);
static void finalize(void)
{
xbt_dict_free(&network_card_set);
- xbt_dict_free(&link_set);
xbt_swag_free(surf_network_model->common_public->states.
ready_action_set);
xbt_swag_free(surf_network_model->common_public->states.
xbt_swag_free(surf_network_model->common_public->states.
ready_action_set);
xbt_swag_free(surf_network_model->common_public->states.
surf_network_model->common_public->get_properties = get_properties;
surf_network_model->common_public->get_properties = get_properties;
- link_set = xbt_dict_new();
network_card_set = xbt_dict_new();
network_card_set = xbt_dict_new();
+ if(!random_latency)
+ random_latency = random_new(RAND, 0.0, 1.0, .125, .034);
}
void surf_network_model_init_Constant(const char *filename)
}
void surf_network_model_init_Constant(const char *filename)