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
Update copyright notices
[simgrid.git]
/
src
/
msg
/
msg_private.h
diff --git
a/src/msg/msg_private.h
b/src/msg/msg_private.h
index
c6c17a3
..
3740c6c
100644
(file)
--- a/
src/msg/msg_private.h
+++ b/
src/msg/msg_private.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-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
@@
-7,7
+7,7
@@
#ifndef METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
#ifndef METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
-#include "
msg
/msg.h"
+#include "
simgrid
/msg.h"
#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
@@
-41,8
+41,8
@@
SG_BEGIN_DECL()
typedef struct simdata_task {
smx_synchro_t compute; /* SIMIX modeling of computation */
smx_synchro_t comm; /* SIMIX modeling of communication */
typedef struct simdata_task {
smx_synchro_t compute; /* SIMIX modeling of computation */
smx_synchro_t comm; /* SIMIX modeling of communication */
- double
message_size;
/* Data size */
- double
computation
_amount; /* Computation size */
+ double
bytes_amount;
/* Data size */
+ double
flops
_amount; /* Computation size */
msg_process_t sender;
msg_process_t receiver;
msg_host_t source;
msg_process_t sender;
msg_process_t receiver;
msg_host_t source;
@@
-56,9
+56,9
@@
typedef struct simdata_task {
void *isused; /* Indicates whether the task is used in SIMIX currently */
int host_nb; /* ==0 if sequential task; parallel task if not */
/******* Parallel Tasks Only !!!! *******/
void *isused; /* Indicates whether the task is used in SIMIX currently */
int host_nb; /* ==0 if sequential task; parallel task if not */
/******* Parallel Tasks Only !!!! *******/
- s
mx
_host_t *host_list;
- double *
comp
_amount;
- double *
comm
_amount;
+ s
g
_host_t *host_list;
+ double *
flops_parallel
_amount;
+ double *
bytes_parallel
_amount;
} s_simdata_task_t;
/********************************* File **************************************/
} s_simdata_task_t;
/********************************* File **************************************/
@@
-68,7
+68,7
@@
typedef struct simdata_file {
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
- double
computation
_amount; /* Computation size */
+ double
flops
_amount; /* Computation size */
double dispatch_latency;
double collect_latency;
int isused; /* Indicates whether the task is used in SIMIX currently */
double dispatch_latency;
double collect_latency;
int isused; /* Indicates whether the task is used in SIMIX currently */
@@
-154,14
+154,15
@@
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
# define MSG_RETURN(val) return(val)
#endif
# define MSG_RETURN(val) return(val)
#endif
-msg_host_t __MSG_host_create(s
mx_host_t workstation
);
+msg_host_t __MSG_host_create(s
g_host_t host
);
msg_storage_t __MSG_storage_create(smx_storage_t storage);
void __MSG_host_destroy(msg_host_t host);
msg_storage_t __MSG_storage_create(smx_storage_t storage);
void __MSG_host_destroy(msg_host_t host);
+void __MSG_host_priv_free(msg_host_priv_t priv);
void __MSG_storage_destroy(msg_storage_priv_t host);
void __MSG_file_destroy(msg_file_priv_t host);
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
void __MSG_storage_destroy(msg_storage_priv_t host);
void __MSG_file_destroy(msg_file_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,
+
smx_process_t MSG_process_create_from_SIMIX(
const char *name,
xbt_main_func_t code, void *data,
const char *hostname, double kill_time,
int argc, char **argv,
xbt_main_func_t code, void *data,
const char *hostname, double kill_time,
int argc, char **argv,
@@
-171,10
+172,6
@@
void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_s
void MSG_post_create_environment(void);
void MSG_post_create_environment(void);
-static inline void *msg_host_resource_priv(const void *host) {
- return xbt_lib_get_level((void *)host, MSG_HOST_LEVEL);
-}
-
void MSG_host_add_task(msg_host_t host, msg_task_t task);
void MSG_host_del_task(msg_host_t host, msg_task_t task);
void MSG_host_add_task(msg_host_t host, msg_task_t task);
void MSG_host_del_task(msg_host_t host, msg_task_t task);