#include <errno.h>
#include <math.h>
#include <stdarg.h> /* va_arg */
-#ifndef _MSC_VER
-#include <libgen.h>
-#endif
#include "xbt/misc.h"
#include "xbt/log.h"
#include "xbt/str.h"
+#include "xbt/file.h"
#include "xbt/dict.h"
#include "surf/surfxml_parse.h"
-#include "surf/surf_private.h"
+#include "src/surf/surf_private.h"
#include "surf/random_mgr.h"
#include "simgrid/sg_config.h"
/* Stag and Etag parse functions */
void STag_surfxml_platform(void) {
- _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
+ XBT_ATTRIB_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
"You're using an ancient XML file.\n"
host.coord = A_surfxml_host_coordinates;
sg_platf_new_host(&host);
+ xbt_dynar_free(&host.power_peak);
current_property_set = NULL;
}
xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), NULL);
}
-/* ***************************************** */
-/* TUTORIAL: New TAG */
-void STag_surfxml_gpu(void)
-{
- XBT_DEBUG("STag_surfxml_gpu");
-}
-void ETag_surfxml_gpu(void)
-{
- s_sg_platf_gpu_cbarg_t gpu = SG_PLATF_GPU_INITIALIZER;
- memset(&gpu,0,sizeof(gpu));
-
- gpu.name = A_surfxml_gpu_name;
-
- sg_platf_new_gpu(&gpu);
-}
-/* ***************************************** */
+void STag_surfxml_gpu(void) {}
+void ETag_surfxml_gpu(void) {}
/* nothing to do in those functions */
void ETag_surfxml_prop(void){}
if (!surf_parsed_filename_stack)
surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-#ifdef _MSC_VER
- /* There is no dirname on windows... */
- char drive[_MAX_DRIVE];
- char dir[_MAX_DIR];
- errno_t err;
- err = _splitpath_s(file, drive, _MAX_DRIVE, dir, _MAX_DIR, NULL,0, NULL,0);
- char *dir = bprintf("%s%s",drive,dir);
-#else
surf_parsed_filename = xbt_strdup(file);
- char *dir = dirname(surf_parsed_filename);
-#endif
+ char *dir = xbt_dirname(file);
xbt_dynar_push(surf_path, &dir);
surf_file_to_parse = surf_fopen(file, "r");