summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
fc1a581)
details:
- no longer use smx_action_t and surf_action_t, let
those things be handled in the instrumentation code
/* from resource_utilization.c */
void TRACE_surf_host_set_utilization(const char *resource,
/* from resource_utilization.c */
void TRACE_surf_host_set_utilization(const char *resource,
- smx_action_t smx_action,
- surf_action_t surf_action,
- double value, double now,
+ const char *category,
+ double value,
+ double now,
-void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_action,
- surf_action_t surf_action,
- double value, double now,
+void TRACE_surf_link_set_utilization(const char *resource,
+ const char *category,
+ double value,
+ double now,
double delta);
void TRACE_surf_resource_utilization_alloc(void);
void TRACE_surf_resource_utilization_release(void);
double delta);
void TRACE_surf_resource_utilization_alloc(void);
void TRACE_surf_resource_utilization_release(void);
/*
* TRACE_surf_link_set_utilization: entry point from SimGrid
*/
/*
* TRACE_surf_link_set_utilization: entry point from SimGrid
*/
-void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_action,
- surf_action_t surf_action,
- double value, double now,
+void TRACE_surf_link_set_utilization(const char *resource,
+ const char *category,
+ double value,
+ double now,
double delta)
{
//only trace link utilization if link is known by tracing mechanism
double delta)
{
//only trace link utilization if link is known by tracing mechanism
//trace categorized utilization
if (TRACE_categorized()){
//trace categorized utilization
if (TRACE_categorized()){
- if (!surf_action->category)
return;
//variable of this category starts by 'b', because we have a link here
char category_type[INSTR_DEFAULT_STR_SIZE];
return;
//variable of this category starts by 'b', because we have a link here
char category_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", surf_action->category);
+ snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", category);
XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
container_t container = PJ_container_get (resource);
type_t type = PJ_type_get (category_type, container->type);
XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
container_t container = PJ_container_get (resource);
type_t type = PJ_type_get (category_type, container->type);
* TRACE_surf_host_set_utilization: entry point from SimGrid
*/
void TRACE_surf_host_set_utilization(const char *resource,
* TRACE_surf_host_set_utilization: entry point from SimGrid
*/
void TRACE_surf_host_set_utilization(const char *resource,
- smx_action_t smx_action,
- surf_action_t surf_action,
- double value, double now,
+ const char *category,
+ double value,
+ double now,
double delta)
{
//only trace host utilization if host is known by tracing mechanism
double delta)
{
//only trace host utilization if host is known by tracing mechanism
//trace categorized utilization
if (TRACE_categorized()){
//trace categorized utilization
if (TRACE_categorized()){
- if (!surf_action->category)
return;
//variable of this category starts by 'p', because we have a host here
char category_type[INSTR_DEFAULT_STR_SIZE];
return;
//variable of this category starts by 'p', because we have a host here
char category_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", surf_action->category);
+ snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", category);
XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
container_t container = PJ_container_get (resource);
type_t type = PJ_type_get (category_type, container->type);
XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
container_t container = PJ_container_get (resource);
type_t type = PJ_type_get (category_type, container->type);