#define MAX_DRIVE 26
#endif
-#ifdef _WIN32
+#ifdef _XBT_WIN32
#include <windows.h>
static const char *disk_drives_letter_table[MAX_DRIVE] = {
"A:\\",
"Y:\\",
"Z:\\"
};
-#endif /* #ifdef _WIN32 */
+#endif /* #ifdef _XBT_WIN32 */
/*
* Returns the initial path. On Windows the initial path is
const char *__surf_get_initial_path(void)
{
-#ifdef _WIN32
+#ifdef _XBT_WIN32
unsigned i;
char current_directory[MAX_PATH + 1] = { 0 };
unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory);
*/
int __surf_is_absolute_file_path(const char *file_path)
{
-#ifdef _WIN32
+#ifdef _XBT_WIN32
WIN32_FIND_DATA wfd = { 0 };
HANDLE hFile = FindFirstFile(file_path, &wfd);
/* Don't forget to update the option description in smx_config when you change this */
s_surf_model_description_t surf_network_model_description[] = {
- {"Constant", "Simplistic network model where all communication take a constant time (one second)", NULL, surf_network_model_init_Constant},
- {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas", NULL, surf_network_model_init_Vivaldi},
+ {"Constant", "Simplistic network model where all communication take a constant time (one second)", NULL, surf_network_model_init_Constant},
+ {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas", NULL, surf_network_model_init_Vivaldi},
{"CM02", "Realistic network model with lmm_solve and no correction factors", NULL, surf_network_model_init_CM02},
{"LV08", "Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775" , NULL, surf_network_model_init_LegrandVelho},
+ {"SMPI", "Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)", NULL, surf_network_model_init_SMPI},
#ifdef HAVE_GTNETS
{"GTNets", "Network Pseudo-model using the GTNets simulator instead of an analytic model", NULL, surf_network_model_init_GTNETS},
#endif
return min;
}
-
XBT_LOG_EXTERNAL_CATEGORY(surf_cpu);
XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange);
XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
XBT_LOG_EXTERNAL_CATEGORY(surf_config);
-XBT_LOG_EXTERNAL_CATEGORY(surf_routing);
-
+XBT_LOG_EXTERNAL_CATEGORY(surf_route);
#ifdef HAVE_GTNETS
XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
#endif
void surf_init(int *argc, char **argv)
-{
-
- if (_surf_do_model_check)
- MC_memory_init();
-
+{
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(surf_cpu, surf);
XBT_LOG_CONNECT(surf_kernel, surf);
XBT_LOG_CONNECT(surf_timer, surf);
XBT_LOG_CONNECT(surf_workstation, surf);
XBT_LOG_CONNECT(surf_config, surf);
- XBT_LOG_CONNECT(surf_routing, surf);
+ XBT_LOG_CONNECT(surf_route, surf);
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets, surf);
history = tmgr_history_new();
surf_config_init(argc, argv);
+#ifdef HAVE_MC
+ if (_surf_do_model_check)
+ MC_memory_init();
+#endif
}
-#ifdef WIN32
+#ifdef _XBT_WIN32
# define FILE_DELIM "\\"
#else
# define FILE_DELIM "/" /* FIXME: move to better location */
tmgr_finalize();
surf_parse_lex_destroy();
surf_parse_free_callbacks();
- xbt_dict_free(&route_table);
+// xbt_dict_free(&route_table); // COMMENTED BY DAVID
NOW = 0; /* Just in case the user plans to restart the simulation afterward */
}