/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <ctype.h>
-
#include "surf_private.h"
#include "xbt/module.h"
#include "mc/mc.h"
+#include "simix/smx_host_private.h"
#include "surf/surf_resource.h"
#include "xbt/xbt_os_thread.h"
+#include <ctype.h>
+
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
#ifdef HAVE_NS3
{"NS3",
"Network pseudo-model using the NS3 tcp model instead of an analytic model",
- surf_network_model_init_NS3},
+ surf_network_model_init_NS3},
#endif
{"Reno",
"Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
+/* ********************************************************************* */
+/* TUTORIAL: New model */
+s_surf_model_description_t surf_new_model_description[] = {
+ {"default",
+ "Tutorial model.",
+ surf_new_model_init_default},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
+};
+/* ********************************************************************* */
+
#ifdef CONTEXT_THREADS
static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
#endif
xbt_free(elm);
}
+static XBT_INLINE void routing_asr_prop_free(void *p)
+{
+ xbt_dict_t elm = p;
+ xbt_dict_free(&elm);
+}
+
+void sg_version(int *ver_major,int *ver_minor,int *ver_patch) {
+ *ver_major = SIMGRID_VERSION_MAJOR;
+ *ver_minor = SIMGRID_VERSION_MINOR;
+ *ver_patch = SIMGRID_VERSION_PATCH;
+}
+
+xbt_dynar_t sg_cmdline = NULL;
+
void surf_init(int *argc, char **argv)
{
XBT_DEBUG("Create all Libs");
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();
storage_type_lib = xbt_lib_new();
+ watched_hosts_lib = xbt_dict_new();
- XBT_DEBUG("ADD ROUTING LEVEL");
+ XBT_DEBUG("Add routing levels");
ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free);
+ ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free);
- XBT_DEBUG("ADD SURF LEVELS");
+ XBT_DEBUG("Add SURF levels");
SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
+ sg_cmdline = xbt_dynar_new(sizeof(char*),NULL);
+ int i;
+ for (i=0;i<*argc;i++) {
+ xbt_dynar_push(sg_cmdline,&(argv[i]));
+ }
xbt_init(argc, argv);
if (!model_list)
model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL);
surf_config_init(argc, argv);
surf_action_init();
- if (MC_IS_ENABLED)
+ if (MC_is_active())
MC_memory_init();
}
#endif
xbt_dynar_free(&surf_path);
+ xbt_dynar_free(&sg_cmdline);
xbt_lib_free(&host_lib);
xbt_lib_free(&link_lib);
xbt_lib_free(&storage_lib);
xbt_lib_free(&storage_type_lib);
+ xbt_dict_free(&watched_hosts_lib);
+
tmgr_finalize();
surf_parse_lex_destroy();
surf_parse_free_callbacks();
/* parallel version */
#ifdef CONTEXT_THREADS
xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+#else
+ xbt_die("Asked to run in parallel, but no thread at hand...");
#endif
}
else {
}
if (next_event_date == -1.0) {
- XBT_DEBUG("no next TRACE event. Stop searching for it");
- break;
+ XBT_DEBUG("no next TRACE event. Stop searching for it");
+ break;
}
if ((min != -1.0) && (next_event_date > NOW + min)) break;
* This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
* The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
if (min == -1.0) {
- XBT_DEBUG("No next event at all. Bail out now.");
+ XBT_DEBUG("No next event at all. Bail out now.");
return -1.0;
}
surf_nthreads = nthreads;
}
+
+void surf_watched_hosts(void)
+{
+ char *key;
+ void *host;
+ xbt_dict_cursor_t cursor;
+
+ XBT_DEBUG("Check for host SURF_RESOURCE_ON on watched_hosts_lib");
+ xbt_dict_foreach(watched_hosts_lib,cursor,key,host)
+ {
+ if(SIMIX_host_get_state(host) == SURF_RESOURCE_ON){
+ XBT_INFO("Restart processes on host: %s",SIMIX_host_get_name(host));
+ SIMIX_host_autorestart(host);
+ xbt_dict_remove(watched_hosts_lib,key);
+ }
+ else
+ XBT_DEBUG("See SURF_RESOURCE_OFF on host: %s",key);
+ }
+}