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
Add a cmake flag to not compile MSG at all
[simgrid.git]
/
src
/
msg
/
msg_process.cpp
diff --git
a/src/msg/msg_process.cpp
b/src/msg/msg_process.cpp
index
7ecfd44
..
fc52b04
100644
(file)
--- a/
src/msg/msg_process.cpp
+++ b/
src/msg/msg_process.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
20
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-6,16
+6,8
@@
#include "msg_private.hpp"
#include "simgrid/Exception.hpp"
#include "simgrid/s4u/Host.hpp"
#include "msg_private.hpp"
#include "simgrid/Exception.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/instr/instr_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/simix/smx_private.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
-
-std::string instr_pid(simgrid::s4u::Actor const& proc)
-{
- return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid());
-}
-
/******************************** Process ************************************/
/** @brief Creates and runs a new #msg_process_t.
*
/******************************** Process ************************************/
/** @brief Creates and runs a new #msg_process_t.
*
@@
-34,7
+26,7
@@
msg_process_t MSG_process_create(const char *name, xbt_main_func_t code, void *d
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param code is a function describing the behavior of the process.
* @param data a pointer to any data one may want to attach to the new object. It is for user-level information and
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param code is a function describing the behavior of the process.
* @param data a pointer to any data one may want to attach to the new object. It is for user-level information and
- * can be nullptr. It can be retrieved with the function
@ref MSG_process_get_data
.
+ * can be nullptr. It can be retrieved with the function
MSG_process_get_data()
.
* @param host the location where the new process is executed.
* @param argc first argument passed to @a code
* @param argv second argument passed to @a code
* @param host the location where the new process is executed.
* @param argc first argument passed to @a code
* @param argv second argument passed to @a code
@@
-54,7
+46,7
@@
msg_process_t MSG_process_create_with_arguments(const char *name, xbt_main_func_
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param code is a function describing the behavior of the process.
* @param data a pointer to any data one may want to attach to the new object. It is for user-level information and
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param code is a function describing the behavior of the process.
* @param data a pointer to any data one may want to attach to the new object. It is for user-level information and
- * can be nullptr. It can be retrieved with the function
@ref MSG_process_get_data
.
+ * can be nullptr. It can be retrieved with the function
MSG_process_get_data()
.
* @param host the location where the new process is executed.
* @param argc first argument passed to @a code
* @param argv second argument passed to @a code. WARNING, these strings are freed by the SimGrid kernel when the
* @param host the location where the new process is executed.
* @param argc first argument passed to @a code
* @param argv second argument passed to @a code. WARNING, these strings are freed by the SimGrid kernel when the
@@
-110,12
+102,6
@@
xbt_dynar_t MSG_processes_as_dynar() {
return res;
}
return res;
}
-/** @brief Return the current number MSG processes. */
-int MSG_process_get_number()
-{
- return SIMIX_process_count();
-}
-
/** @brief Add a function to the list of "on_exit" functions for the current process.
* The on_exit functions are the functions executed when your process is killed.
* You should use them to free the data used by your process.
/** @brief Add a function to the list of "on_exit" functions for the current process.
* The on_exit functions are the functions executed when your process is killed.
* You should use them to free the data used by your process.