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
Fix function get_route
[simgrid.git]
/
src
/
surf
/
network_dassf.c
diff --git
a/src/surf/network_dassf.c
b/src/surf/network_dassf.c
index
0667f50
..
1a4651f
100644
(file)
--- a/
src/surf/network_dassf.c
+++ b/
src/surf/network_dassf.c
@@
-7,11
+7,10
@@
#include "network_dassf_private.h"
#include "network_dassf_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network_dassf, surf,
- "Logging specific to the SURF network module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
/* surf_network_resource_t surf_network_resource = NULL; */
/* surf_network_resource_t surf_network_resource = NULL; */
-static xbt_dict_t network_link_set = NULL;
+/*xbt_dict_t network_link_set = NULL;*/
/* xbt_dict_t network_card_set = NULL; */
static int card_number = 0;
/* xbt_dict_t network_card_set = NULL; */
static int card_number = 0;
@@
-411,6
+410,12
@@
static surf_action_t communicate(void *src, void *dst, double size, double rate)
return (surf_action_t) action;
}
return (surf_action_t) action;
}
+static const void** get_route(void *src, void *dst) {
+ /* TODO */
+
+ return NULL;
+}
+
static void action_suspend(surf_action_t action)
{
((surf_action_network_DASSF_t) action)->suspended = 1;
static void action_suspend(surf_action_t action)
{
((surf_action_network_DASSF_t) action)->suspended = 1;
@@
-509,6
+514,7
@@
static void surf_network_resource_init_internal(void)
surf_network_resource->common_public->is_suspended = action_is_suspended;
surf_network_resource->extension_public->communicate = communicate;
surf_network_resource->common_public->is_suspended = action_is_suspended;
surf_network_resource->extension_public->communicate = communicate;
+ surf_network_resource->extension_public->get_route = get_route;
network_link_set = xbt_dict_new();
network_card_set = xbt_dict_new();
network_link_set = xbt_dict_new();
network_card_set = xbt_dict_new();