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
Give a p_netcard to simgrid::Host instead of relying on extensions for that
[simgrid.git]
/
include
/
simgrid
/
simdag.h
diff --git
a/include/simgrid/simdag.h
b/include/simgrid/simdag.h
index
916a672
..
573d411
100644
(file)
--- a/
include/simgrid/simdag.h
+++ b/
include/simgrid/simdag.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-2010, 2012-201
4
. The SimGrid Team.
+/* Copyright (c) 2006-2010, 2012-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-22,7
+22,7
@@
SG_BEGIN_DECL()
resource with computing capabilities</em> and has a <em>name</em>.
@see SD_workstation_management */
resource with computing capabilities</em> and has a <em>name</em>.
@see SD_workstation_management */
-typedef
xbt_dictelm
_t SD_workstation_t;
+typedef
sg_host
_t SD_workstation_t;
/** @brief Workstation access mode
@ingroup SD_datatypes_management
/** @brief Workstation access mode
@ingroup SD_datatypes_management
@@
-117,7
+117,11
@@
XBT_PUBLIC(const char*) SD_as_router_get_property_value(const char * as,
* @{
*/
XBT_PUBLIC(const SD_link_t *) SD_link_get_list(void);
* @{
*/
XBT_PUBLIC(const SD_link_t *) SD_link_get_list(void);
-XBT_PUBLIC(int) SD_link_get_number(void);
+/** @brief Returns the number of links in the whole platform */
+static inline int SD_link_get_number(void) {
+ return sg_link_amount();
+}
+
/** @brief Returns the user data of a link */
static inline void *SD_link_get_data(SD_link_t link) {
return sg_link_data(link);
/** @brief Returns the user data of a link */
static inline void *SD_link_get_data(SD_link_t link) {
return sg_link_data(link);
@@
-328,7
+332,7
@@
XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst);
/** @defgroup SD_simulation Simulation
* @brief Functions for creating the environment and launching the simulation
*
/** @defgroup SD_simulation Simulation
* @brief Functions for creating the environment and launching the simulation
*
- * This section describes the functions for initiali
s
ing SimDag, launching
+ * This section describes the functions for initiali
z
ing SimDag, launching
* the simulation and exiting SimDag.
*
* @{
* the simulation and exiting SimDag.
*
* @{
@@
-348,7
+352,8
@@
XBT_PUBLIC(void) uniq_transfer_task_name(SD_task_t task);
/** @} */
/** @} */
+SG_END_DECL()
+
#include "simgrid/instr.h"
#include "simgrid/instr.h"
-SG_END_DECL()
#endif
#endif