#define VARIABLE_SEPARATOR '#'
-#define METHOD_B
+//to check if variables were previously set to 0, otherwise paje won't simulate them
+static xbt_dict_t platform_variables; /* host or link name -> array of categories */
-#ifdef METHOD_B
-static xbt_dict_t last_platform_variables; /* to control the amount of add/sub variables events:
- dict with key {RESOURCE_NAME}#Time or {RESOURCE_NAME}#Value of dict with variables types == string */
-#endif //METHOD_B
+//B
+static xbt_dict_t method_b_dict;
-#ifdef METHOD_C
+//C
static xbt_dict_t method_c_dict;
-#endif // METHOD_C
/* auxiliary function for resource utilization tracing */
static char *strsplit (char *input, int field, char del) //caller should free the returned string
return ret;
}
-#ifdef METHOD_A
+//resource utilization tracing method
+typedef enum {methodA,methodB,methodC} TracingMethod;
+static TracingMethod currentMethod;
+
+static void __TRACE_define_method (char *method)
+{
+ if (!strcmp(method, "a")){
+ currentMethod = methodA;
+ }else if (!strcmp(method, "b")){
+ currentMethod = methodB;
+ }else if (!strcmp(method, "c")){
+ currentMethod = methodC;
+ }else{
+ currentMethod = methodB; //default
+ }
+}
+
+//used by all methods
+static void __TRACE_surf_check_variable_set_to_zero (double now, const char *variable, const char *resource)
+{
+ /* check if we have to set it to 0 */
+ if (!xbt_dict_get_or_null (platform_variables, resource)){
+ xbt_dynar_t array = xbt_dynar_new(sizeof(char*), xbt_free);
+ char *var_cpy = xbt_strdup(variable);
+ xbt_dynar_push (array, &var_cpy);
+ if (IS_TRACING_PLATFORM) pajeSetVariable (now, variable, resource, "0");
+ xbt_dict_set (platform_variables, resource, array, xbt_dynar_free_voidp);
+ }else{
+ xbt_dynar_t array = xbt_dict_get (platform_variables, resource);
+ unsigned int i;
+ char* cat;
+ int flag = 0;
+ xbt_dynar_foreach (array, i, cat) {
+ if (strcmp(variable, cat)==0){
+ flag = 1;
+ }
+ }
+ if (flag==0){
+ char *var_cpy = xbt_strdup(variable);
+ xbt_dynar_push (array, &var_cpy);
+ if (IS_TRACING_PLATFORM) pajeSetVariable (now, variable, resource, "0");
+ }
+ }
+ /* end of check */
+}
+
+#define A_METHOD
+//A
static void __TRACE_surf_resource_utilization_A (double now, double delta, const char *variable, const char *resource, double value)
{
if (!IS_TRACING_PLATFORM) return;
pajeSubVariable (now+delta, variable, resource, valuestr);
return;
}
-#endif //METHOD_A
-#ifdef METHOD_B
+#define B_METHOD
+//B
static void __TRACE_surf_resource_utilization_initialize_B ()
{
- last_platform_variables = xbt_dict_new();
+ method_b_dict = xbt_dict_new();
}
static void __TRACE_surf_resource_utilization_B (double now, double delta, const char *variable, const char *resource, double value)
snprintf (valuekey, 100, "%s%cValue", resource, VARIABLE_SEPARATOR);
snprintf (variablekey, 100, "%s%cVariable", resource, VARIABLE_SEPARATOR);
- lastvariable = xbt_dict_get_or_null (last_platform_variables, variablekey);
+ lastvariable = xbt_dict_get_or_null (method_b_dict, variablekey);
if (lastvariable == NULL){
__TRACE_surf_check_variable_set_to_zero (now, variable, resource);
pajeAddVariable (now, variable, resource, valuestr);
nowdeltastr_cpy = xbt_strdup (nowdeltastr);
valuestr_cpy = xbt_strdup (valuestr);
variable_cpy = xbt_strdup (variable);
- xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
- xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
- xbt_dict_set (last_platform_variables, variablekey, variable_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, valuekey, valuestr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, variablekey, variable_cpy, xbt_free);
}else{
- lasttime = xbt_dict_get_or_null (last_platform_variables, timekey);
- lastvalue = xbt_dict_get_or_null (last_platform_variables, valuekey);
+ lasttime = xbt_dict_get_or_null (method_b_dict, timekey);
+ lastvalue = xbt_dict_get_or_null (method_b_dict, valuekey);
/* check if it is the same variable */
if (strcmp(lastvariable, variable) == 0){ /* same variable */
/* check if lastvalue equals valuestr */
if (atof(lastvalue) == value){ /* lastvalue == value (good, just advance time) */
char *nowdeltastr_cpy = xbt_strdup (nowdeltastr);
- xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, timekey, nowdeltastr_cpy, xbt_free);
}else{ /* value has changed */
/* value has changed, subtract previous value, add new one */
pajeSubVariable (atof(lasttime), variable, resource, lastvalue);
pajeAddVariable (atof(nowstr), variable, resource, valuestr);
nowdeltastr_cpy = xbt_strdup (nowdeltastr);
valuestr_cpy = xbt_strdup (valuestr);
- xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
- xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, valuekey, valuestr_cpy, xbt_free);
}
}else{ /* lasttime != now */
/* the last time is different from new starting time, subtract to lasttime and add from nowstr */
pajeAddVariable (atof(nowstr), variable, resource, valuestr);
nowdeltastr_cpy = xbt_strdup (nowdeltastr);
valuestr_cpy = xbt_strdup (valuestr);
- xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
- xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, valuekey, valuestr_cpy, xbt_free);
}
}else{ /* variable has changed */
pajeSubVariable (atof(lasttime), lastvariable, resource, lastvalue);
nowdeltastr_cpy = xbt_strdup (nowdeltastr);
valuestr_cpy = xbt_strdup (valuestr);
variable_cpy = xbt_strdup (variable);
- xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
- xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
- xbt_dict_set (last_platform_variables, variablekey, variable_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, valuekey, valuestr_cpy, xbt_free);
+ xbt_dict_set (method_b_dict, variablekey, variable_cpy, xbt_free);
}
}
return;
char *var_cpy = NULL;
xbt_dynar_t resources = NULL;
if (!IS_TRACING_PLATFORM) return;
- if (!xbt_dict_length(last_platform_variables)){
+ if (!xbt_dict_length(method_b_dict)){
return;
}else{
- /* get all resources from last_platform_variables */
+ /* get all resources from method_b_dict */
resources = xbt_dynar_new(sizeof(char*), xbt_free);
- xbt_dict_foreach(last_platform_variables, cursor, key, value) {
+ xbt_dict_foreach(method_b_dict, cursor, key, value) {
res = strsplit (key, 0, VARIABLE_SEPARATOR);
aux = strsplit (key, 1, VARIABLE_SEPARATOR);
if (strcmp (aux, "Time") == 0){ //only need to add one of three
snprintf (valuekey, 100, "%s%cValue", resource, VARIABLE_SEPARATOR);
snprintf (variablekey, 100, "%s%cVariable", resource, VARIABLE_SEPARATOR);
- time = xbt_dict_get_or_null (last_platform_variables, timekey);
+ time = xbt_dict_get_or_null (method_b_dict, timekey);
if (!time) continue;
- value = xbt_dict_get (last_platform_variables, valuekey);
- variable = xbt_dict_get (last_platform_variables, variablekey);
+ value = xbt_dict_get (method_b_dict, valuekey);
+ variable = xbt_dict_get (method_b_dict, variablekey);
pajeSubVariable (atof(time), variable, resource, value);
- xbt_dict_remove (last_platform_variables, timekey);
- xbt_dict_remove (last_platform_variables, valuekey);
- xbt_dict_remove (last_platform_variables, variablekey);
+ xbt_dict_remove (method_b_dict, timekey);
+ xbt_dict_remove (method_b_dict, valuekey);
+ xbt_dict_remove (method_b_dict, variablekey);
}
}
+ xbt_dict_free (&method_b_dict);
}
-#endif //METHOD_B
-
-#ifdef METHOD_C
+#define C_METHOD
+//C
static void __TRACE_surf_resource_utilization_start_C (smx_action_t action)
{
char key[100];
xbt_dict_remove (method_c_dict, key); //should never execute here, but it does
}
xbt_dict_set (method_c_dict, key, xbt_dict_new(), xbt_free);
-
- //fprintf (stderr, "start %p\n", action);
- /*
-
- if (xbt_dict_get_or_null (start_time, key)){
- xbt_dict_remove (start_time, key);
- }
- */
}
static void __TRACE_surf_resource_utilization_end_C (smx_action_t action)
snprintf (key, 100, "%p", action);
xbt_dict_t action_dict = xbt_dict_get (method_c_dict, key);
-// fprintf (stderr, "end %p (%f - %f)\n", action, atof(xbt_dict_get_or_null(action_dict, "start")),
-// atof(xbt_dict_get_or_null(action_dict, "end")));
-
double start_time = atof(xbt_dict_get (action_dict, "start"));
double end_time = atof(xbt_dict_get (action_dict, "end"));
pajeAddVariable (start_time, variable, resource, value_str);
pajeSubVariable (end_time, variable, resource, value_str);
}
-
- //fprintf(stderr, "\t%p (key=%s) %s %s = %s\n",action, action_dict_key, resource, variable, action_dict_value);
- //fprintf(stderr, "\t%f %f\n", start_time, end_time);
}
- //fprintf (stderr, "\n");
-
xbt_dict_remove (method_c_dict, key);
- /*
-
- if (xbt_dict_get_or_null (start_time_dict, key)){
- xbt_dict_remove (start_time_dict, key);
- }
- if (xbt_dict_get_or_null (end_time_dict, key)){
- xbt_dict_remove (end_time_dict, key);
- }
- */
-
}
static void __TRACE_surf_resource_utilization_C (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value)
char new_current_value[100];
snprintf (new_current_value, 100, "%f", current_value_f);
xbt_dict_set (action_dict, res_var, xbt_strdup (new_current_value), xbt_free);
-
- //fprintf (stderr, "event act=%p, now=%f, delta=%f, %s - %s %f\n", action, now, delta, resource, variable, value);
}
static void __TRACE_surf_resource_utilization_initialize_C ()
{
- //start_time_dict = xbt_dict_new();
- //end_time_dict = xbt_dict_new();
method_c_dict = xbt_dict_new();
}
{
xbt_dict_free (&method_c_dict);
}
-#endif //METHOD_C
-
-
+#define RESOURCE_UTILIZATION_INTERFACE
/*
* TRACE_surf_link_set_utilization: entry point from SimGrid
*/
-void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta)
+void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, double value, double now, double delta)
{
char type[100];
if (!IS_TRACING || !IS_TRACED(smx_action)) return;
- if (strcmp (name, "__loopback__")==0 ||
- strcmp (name, "loopback")==0){ //ignore loopback updates
- return;
- }
-
- if (value == 0) return;
+ //only trace link utilization if link is known by tracing mechanism
+ if (!TRACE_surf_link_is_traced (link)) return;
- //if (!xbt_dict_get_or_null (created_links, name)){
-// TRACE_surf_link_missing ();
- //return;
- //}
+ if (!value) return;
+ char resource[100];
+ snprintf (resource, 100, "%p", link);
snprintf (type, 100, "b%s", smx_action->category);
- __TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
-//fprintf (stderr, "%p - (%f - %f = %f) %s %f metric = %f\n", smx_action, now, now+delta, delta, name, value, value*delta);
-// __TRACE_surf_update_action_state_resource (now, delta, type, name, value);
+ TRACE_surf_resource_utilization_event (smx_action, now, delta, type, resource, value);
return;
}
char type[100];
if (!IS_TRACING || !IS_TRACED(smx_action)) return;
- if (value==0){
- return;
- }
+ if (!value) return;
+
snprintf (type, 100, "p%s", smx_action->category);
- __TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
-//fprintf (stderr, "%p - (%f - %f = %f) %s %f metric = %f\n", smx_action, now, now+delta, delta, name, value, value*delta);
-// __TRACE_surf_update_action_state_resource (now, delta, type, name, value);
+ TRACE_surf_resource_utilization_event (smx_action, now, delta, type, name, value);
return;
}
/*
* __TRACE_surf_resource_utilization_*: entry points from tracing functions
*/
-void __TRACE_surf_resource_utilization_start (smx_action_t action)
+void TRACE_surf_resource_utilization_start (smx_action_t action)
{
-#ifdef METHOD_C
- __TRACE_surf_resource_utilization_start_C (action);
-#endif
+ if (currentMethod == methodC){
+ __TRACE_surf_resource_utilization_start_C (action);
+ }
}
-void __TRACE_surf_resource_utilization_end (smx_action_t action)
+void TRACE_surf_resource_utilization_event (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value)
{
-#ifdef METHOD_C
- __TRACE_surf_resource_utilization_end_C (action);
-#endif
+ if (currentMethod == methodA){
+ __TRACE_surf_resource_utilization_A (now, delta, variable, resource, value);
+ }else if (currentMethod == methodB){
+ __TRACE_surf_resource_utilization_B (now, delta, variable, resource, value);
+ }else if (currentMethod == methodC){
+ __TRACE_surf_resource_utilization_C (action, now, delta, variable, resource, value);
+ }
}
-void __TRACE_surf_resource_utilization_event (smx_action_t action, double now, double delta, const char *variable, const char *resource, double value)
+void TRACE_surf_resource_utilization_end (smx_action_t action)
{
-#ifdef METHOD_A
- __TRACE_surf_resource_utilization_A (now, delta, variable, resource, value);
-#else
- #ifdef METHOD_B
- __TRACE_surf_resource_utilization_B (now, delta, variable, resource, value);
- #else
- #ifdef METHOD_C
- __TRACE_surf_resource_utilization_C (action, now, delta, variable, resource, value);
- #endif
- #endif
-#endif
+ if (currentMethod == methodC){
+ __TRACE_surf_resource_utilization_end_C (action);
+ }
}
-void __TRACE_surf_resource_utilization_initialize ()
+void TRACE_surf_resource_utilization_alloc ()
{
-#ifdef METHOD_A
-#else
- #ifdef METHOD_B
- __TRACE_surf_resource_utilization_initialize_B();
- #else
- #ifdef METHOD_C
+ platform_variables = xbt_dict_new();
+
+ __TRACE_define_method (TRACE_get_platform_method());
+
+ if (currentMethod == methodA){
+ }else if (currentMethod == methodB){
+ __TRACE_surf_resource_utilization_initialize_B();
+ }else if (currentMethod == methodC){
__TRACE_surf_resource_utilization_initialize_C();
- #endif
- #endif
-#endif
+ }
}
-void __TRACE_surf_resource_utilization_finalize ()
+void TRACE_surf_resource_utilization_release ()
{
-#ifdef METHOD_A
-#else
- #ifdef METHOD_B
- __TRACE_surf_resource_utilization_finalize_B();
- #else
- #ifdef METHOD_C
+ if (currentMethod == methodA){
+ }else if (currentMethod == methodB){
+ __TRACE_surf_resource_utilization_finalize_B();
+ }else if (currentMethod == methodC){
__TRACE_surf_resource_utilization_finalize_C();
- #endif
- #endif
-#endif
+ }
}
-
-
#endif