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
implement s4u::Comm::recv_async()
[simgrid.git]
/
src
/
simdag
/
private.h
diff --git
a/src/simdag/private.h
b/src/simdag/private.h
index
19a9022
..
8549aea
100644
(file)
--- a/
src/simdag/private.h
+++ b/
src/simdag/private.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006
, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2006
-2015
. 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
@@
-10,13
+10,14
@@
#include "xbt/dict.h"
#include "xbt/dynar.h"
#include "xbt/fifo.h"
#include "xbt/dict.h"
#include "xbt/dynar.h"
#include "xbt/fifo.h"
-#include "simdag/simdag.h"
-#include "simdag/datatypes.h"
+#include "simgrid/simdag.h"
#include "surf/surf.h"
#include "xbt/swag.h"
#include "xbt/mallocator.h"
#include <stdbool.h>
#include "surf/surf.h"
#include "xbt/swag.h"
#include "xbt/mallocator.h"
#include <stdbool.h>
+SG_BEGIN_DECL()
+
/* Global variables */
typedef struct SD_global {
/* Global variables */
typedef struct SD_global {
@@
-48,13
+49,6
@@
typedef struct SD_global {
extern SD_global_t sd_global;
extern SD_global_t sd_global;
-/* Link */
-typedef struct SD_link {
- void *surf_link; /* surf object */
- void *data; /* user data */
- e_SD_link_sharing_policy_t sharing_policy;
-} s_SD_link_t;
-
/* Workstation */
typedef s_xbt_dictelm_t s_SD_workstation_t;
typedef struct SD_workstation {
/* Workstation */
typedef s_xbt_dictelm_t s_SD_workstation_t;
typedef struct SD_workstation {
@@
-65,16
+59,16
@@
typedef struct SD_workstation {
SD_task_t current_task; /* only used in sequential mode */
} s_SD_workstation_priv_t, *SD_workstation_priv_t;
SD_task_t current_task; /* only used in sequential mode */
} s_SD_workstation_priv_t, *SD_workstation_priv_t;
-static inline SD_workstation_priv_t SD_workstation_priv(SD_workstation_t host){
- return xbt_lib_get_level(host, SD_HOST_LEVEL);
-}
-
/* Storage */
typedef s_xbt_dictelm_t s_SD_storage_t;
typedef struct SD_storage {
void *data; /* user data */
/* Storage */
typedef s_xbt_dictelm_t s_SD_storage_t;
typedef struct SD_storage {
void *data; /* user data */
+ const char *host;
} s_SD_storage_priv_t, *SD_storage_priv_t;
} s_SD_storage_priv_t, *SD_storage_priv_t;
+static inline SD_storage_priv_t SD_storage_priv(SD_storage_t storage){
+ return (SD_storage_priv_t)xbt_lib_get_level(storage, SD_STORAGE_LEVEL);
+}
/* Task */
typedef struct SD_task {
/* Task */
typedef struct SD_task {
@@
-106,14
+100,12
@@
typedef struct SD_task {
/* scheduling parameters (only exist in state SD_SCHEDULED) */
int workstation_nb;
SD_workstation_t *workstation_list; /* surf workstations */
/* scheduling parameters (only exist in state SD_SCHEDULED) */
int workstation_nb;
SD_workstation_t *workstation_list; /* surf workstations */
- double *
computation
_amount;
- double *
communication
_amount;
+ double *
flops
_amount;
+ double *
bytes
_amount;
double rate;
double rate;
-#ifdef HAVE_TRACING
long long int counter; /* task unique identifier for instrumentation */
char *category; /* sd task category for instrumentation */
long long int counter; /* task unique identifier for instrumentation */
char *category; /* sd task category for instrumentation */
-#endif
} s_SD_task_t;
/* Task dependencies */
} s_SD_task_t;
/* Task dependencies */
@@
-129,9
+121,6
@@
typedef struct SD_dependency {
XBT_PUBLIC(xbt_swag_t) SD_simulate_swag(double how_long); /* could be public, but you need to see the internals of the SD_task_t to use it */
XBT_PUBLIC(xbt_swag_t) SD_simulate_swag(double how_long); /* could be public, but you need to see the internals of the SD_task_t to use it */
-SD_link_t __SD_link_create(void *surf_link, void *data);
-#define __SD_link_destroy xbt_free_f
-
SD_workstation_t __SD_workstation_create(void *surf_workstation,
void *data);
void __SD_workstation_destroy(void *workstation);
SD_workstation_t __SD_workstation_create(void *surf_workstation,
void *data);
void __SD_workstation_destroy(void *workstation);
@@
-218,5
+207,6
@@
void TRACE_sd_task_execute_start(SD_task_t task);
void TRACE_sd_task_execute_end(SD_task_t task);
void TRACE_sd_task_destroy(SD_task_t task);
void TRACE_sd_task_execute_end(SD_task_t task);
void TRACE_sd_task_destroy(SD_task_t task);
+SG_END_DECL()
#endif
#endif