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
Merge branch 'mc' into mc++
[simgrid.git]
/
src
/
msg
/
msg_private.h
diff --git
a/src/msg/msg_private.h
b/src/msg/msg_private.h
index
611a026
..
d4cc33b
100644
(file)
--- a/
src/msg/msg_private.h
+++ b/
src/msg/msg_private.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2014
. 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
@@
-33,7
+33,10
@@
typedef struct simdata_task {
double priority;
double bound; /* Capping for CPU resource */
double rate; /* Capping for network resource */
double priority;
double bound; /* Capping for CPU resource */
double rate; /* Capping for network resource */
- unsigned long affinity_mask; /* CPU affinity */
+
+ /* CPU affinity database of this task */
+ xbt_dict_t affinity_mask_db; /* smx_host_t host => unsigned long mask */
+
int isused; /* Indicates whether the task is used in SIMIX currently */
int host_nb; /* ==0 if sequential task; parallel task if not */
/******* Parallel Tasks Only !!!! *******/
int isused; /* Indicates whether the task is used in SIMIX currently */
int host_nb; /* ==0 if sequential task; parallel task if not */
/******* Parallel Tasks Only !!!! *******/
@@
-47,6
+50,11
@@
typedef struct simdata_file {
smx_file_t smx_file;
} s_simdata_file_t;
smx_file_t smx_file;
} s_simdata_file_t;
+/********************************* Storage **************************************/
+typedef struct simdata_storage {
+ smx_storage_t smx_storage;
+} s_simdata_storage_t;
+
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
double computation_amount; /* Computation size */
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
double computation_amount; /* Computation size */
@@
-135,7
+143,9
@@
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
#endif
msg_host_t __MSG_host_create(smx_host_t workstation);
#endif
msg_host_t __MSG_host_create(smx_host_t workstation);
+msg_storage_t __MSG_storage_create(smx_storage_t storage);
void __MSG_host_destroy(msg_host_t host);
void __MSG_host_destroy(msg_host_t host);
+void __MSG_storage_destroy(msg_storage_priv_t host);
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,