#include "surf_private.h"
#include "xbt/module.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_global, surf,
- "Logging specific to the SURF global module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_main, surf,
+ "Logging specific to the SURF maxmin module");
+typedef struct surf_resource_object {
+ surf_resource_t resource;
+} s_surf_resource_object_t, *surf_resource_object_t;
static double NOW = 0;
return -1.0;
if (value > 0) {
- min = value = action->remains / value;
+ min = action->remains / value;
if ((action->max_duration >= 0) && (action->max_duration < min))
min = action->max_duration;
} else
{
surf_action_state_t action_state =
&(action->resource_type->common_public->states);
-
+ XBT_IN2("(%p,%s)", action,
+ (((state==SURF_ACTION_READY)?("SURF_ACTION_READY"):
+ ((state==SURF_ACTION_RUNNING)?("SURF_ACTION_RUNNING"):
+ ((state==SURF_ACTION_FAILED)?("SURF_ACTION_FAILED"):
+ ((state==SURF_ACTION_DONE)?("SURF_ACTION_DONE"):
+ ((state==SURF_ACTION_TO_FREE)?("SURF_ACTION_TO_FREE"):
+ ((state==SURF_ACTION_NOT_IN_THE_SYSTEM)?("SURF_ACTION_NOT_IN_THE_SYSTEM"):
+ ""))))))));
xbt_swag_remove(action, action->state_set);
if (state == SURF_ACTION_READY)
if (action->state_set)
xbt_swag_insert(action, action->state_set);
+ XBT_OUT;
}
void surf_action_set_data(surf_action_t action,
action->data=data;
}
-/* HACKHACK: msg_global must be set to a sensible value (like NULL) to use the logging mecanisme
- * since log_default_appender use xbt_procname which, in SG, is defined in src/msg/m_process.c
- * (in RL, xbt_procname is defined in src/gras/Virtu/rl_process.c)
- */
-extern void *msg_global;
-
void surf_init(int *argc, char **argv)
{
int i,j;
char *opt;
xbt_init(argc, argv);
- msg_global=NULL; /* see HACKHACK note above */
if (!surf_path) {
const char *initial_path = "./";
surf_path = xbt_dynar_new(sizeof(char*), NULL);
int i;
char* path = NULL;
FILE *file = NULL;
+ int path_name_len = 0; /* don't count '\0' */
- xbt_assert1((name!=NULL), "Need a real file name, not \"%s\"\n",name);
+ xbt_assert0(name, "Need a non-NULL file name");
xbt_assert0(surf_path,"surf_init has to be called before using surf_fopen");
- if(!path_name) path_name=xbt_new0(char,strlen(name)+1);
-
- xbt_dynar_foreach(surf_path,i,path) {
- if(strlen(path_name)<strlen(path)+strlen(name)+2)
- path_name=xbt_realloc(path_name,strlen(path)+strlen(name)+2);
- strcpy(path_name, path);
- strcat(path_name,"/");
- strcat(path_name,name);
- file = fopen(path_name,mode);
- if(file) return file;
+
+ if (name[0] == '/') { /* don't mess with absolute file names */
+ return fopen(name,mode);
+
+ } else { /* search relative files in the path */
+
+ if(!path_name) {
+ path_name_len = strlen(name);
+ path_name=xbt_new0(char,path_name_len+1);
+ }
+
+ xbt_dynar_foreach(surf_path,i,path) {
+ if(path_name_len < strlen(path)+strlen(name)+1) {
+ path_name_len = strlen(path)+strlen(name)+1; /* plus '/' */
+ path_name=xbt_realloc(path_name,path_name_len+1);
+ }
+ sprintf(path_name,"%s/%s",path, name);
+ file = fopen(path_name,mode);
+ if (file) return file;
+ }
}
return file;
}
-void surf_finalize(void)
+void surf_exit(void)
{
int i;
surf_resource_t resource = NULL;
free(path_name);
path_name = NULL;
}
+ xbt_exit();
}
double surf_solve(void)