A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop trying to build on native WIN32, it's broken anyway
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
26eecf3
..
7704619
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-202
3
. The SimGrid Team. All rights reserved. */
/* 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. */
/* 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. */
@@
-16,10
+16,6
@@
#include <fstream>
#include <string>
#include <fstream>
#include <string>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)");
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)");
@@
-70,12
+66,16
@@
const std::vector<surf_model_description_t> surf_cpu_model_description = {
{"Cas01", "Simplistic CPU model (time=size/speed).", &surf_cpu_model_init_Cas01},
};
{"Cas01", "Simplistic CPU model (time=size/speed).", &surf_cpu_model_init_Cas01},
};
+const std::vector<surf_model_description_t> surf_disk_model_description = {
+ {"S19", "Simplistic disk model.", &surf_disk_model_init_S19},
+};
+
const std::vector<surf_model_description_t> surf_host_model_description = {
const std::vector<surf_model_description_t> surf_host_model_description = {
- {"default", "Default host model. Currently, CPU:Cas01
and network:LV08 (with cross traffic enabled)
",
+ {"default", "Default host model. Currently, CPU:Cas01
, network:LV08 (with cross traffic enabled), and disk:S19
",
&surf_host_model_init_current_default},
&surf_host_model_init_current_default},
- {"compound", "Host model that is automatically chosen if you change the
network and CPU
models",
+ {"compound", "Host model that is automatically chosen if you change the
CPU, network, and disk
models",
&surf_host_model_init_compound},
&surf_host_model_init_compound},
- {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks",
+ {"ptask_L07", "Host model somehow similar to Cas01+CM02
+S19
but allowing parallel tasks",
&surf_host_model_init_ptask_L07},
};
&surf_host_model_init_ptask_L07},
};
@@
-88,25
+88,10
@@
const std::vector<surf_model_description_t> surf_optimization_mode_description =
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
};
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
};
-const std::vector<surf_model_description_t> surf_disk_model_description = {
- {"default", "Simplistic disk model.", &surf_disk_model_init_default},
-};
-
/* returns whether #file_path is an absolute file path. Surprising, isn't it ? */
static bool is_absolute_file_path(const std::string& file_path)
{
/* returns whether #file_path is an absolute file path. Surprising, isn't it ? */
static bool is_absolute_file_path(const std::string& file_path)
{
-#ifdef _WIN32
- WIN32_FIND_DATA wfd = {0};
- HANDLE hFile = FindFirstFile(file_path.c_str(), &wfd);
-
- if (INVALID_HANDLE_VALUE == hFile)
- return false;
-
- FindClose(hFile);
- return true;
-#else
return (file_path.c_str()[0] == '/');
return (file_path.c_str()[0] == '/');
-#endif
}
std::ifstream* surf_ifsopen(const std::string& name)
}
std::ifstream* surf_ifsopen(const std::string& name)