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
[s4u] Remove Host::.set_userdata()
[simgrid.git]
/
include
/
simgrid
/
simdag.h
diff --git
a/include/simgrid/simdag.h
b/include/simgrid/simdag.h
index
68d6963
..
5226d58
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
@@
-98,11
+98,6
@@
typedef enum {
@see SD_storage_management */
typedef xbt_dictelm_t SD_storage_t;
@see SD_storage_management */
typedef xbt_dictelm_t SD_storage_t;
-/************************** AS handling *************************************/
-XBT_PUBLIC(xbt_dict_t) SD_as_router_get_properties(const char *as);
-XBT_PUBLIC(const char*) SD_as_router_get_property_value(const char * as,
- const char *name);
-
/************************** Link handling ***********************************/
/** @defgroup SD_link_management Links
* @brief Functions for managing the network links
/************************** Link handling ***********************************/
/** @defgroup SD_link_management Links
* @brief Functions for managing the network links
@@
-256,8
+251,8
@@
XBT_PUBLIC(double) SD_task_get_execution_time(SD_task_t task,
const SD_workstation_t *
workstation_list,
const double *flops_amount,
const SD_workstation_t *
workstation_list,
const double *flops_amount,
-
const double *bytes_amount);
-XBT_PUBLIC(
in
t) SD_task_get_kind(SD_task_t task);
+ const double *bytes_amount);
+XBT_PUBLIC(
e_SD_task_kind_
t) SD_task_get_kind(SD_task_t task);
XBT_PUBLIC(void) SD_task_schedule(SD_task_t task, int workstation_nb,
const SD_workstation_t *
workstation_list,
XBT_PUBLIC(void) SD_task_schedule(SD_task_t task, int workstation_nb,
const SD_workstation_t *
workstation_list,
@@
-332,7
+327,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.
*
* @{
@@
-352,7
+347,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