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 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_private.h
diff --git
a/src/msg/msg_private.h
b/src/msg/msg_private.h
index
c3cfcdb
..
03d1671
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
@@
-66,6
+66,9
@@
typedef struct simdata_file {
smx_file_t smx_file;
} s_simdata_file_t;
smx_file_t smx_file;
} s_simdata_file_t;
+int __MSG_host_get_file_descriptor_id(msg_host_t host);
+void __MSG_host_release_file_descriptor_id(msg_host_t host, int id);
+
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
double flops_amount; /* Computation size */
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
double flops_amount; /* Computation size */
@@
-162,7
+165,7
@@
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_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,