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
Tesh is not ls, and other trivial typos in tesh.1.
[simgrid.git]
/
src
/
simix
/
smx_context_thread.c
diff --git
a/src/simix/smx_context_thread.c
b/src/simix/smx_context_thread.c
index
a602a22
..
c8260db
100644
(file)
--- a/
src/simix/smx_context_thread.c
+++ b/
src/simix/smx_context_thread.c
@@
-7,12
+7,11
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/function_types.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/function_types.h"
-#include "private.h"
+#include "
smx_
private.h"
#include "portable.h" /* loads context system definitions */
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
#include "portable.h" /* loads context system definitions */
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
-#include "simix/context.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
@@
-34,9
+33,8
@@
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
static void smx_ctx_thread_free(smx_context_t context);
static void smx_ctx_thread_stop(smx_context_t context);
static void smx_ctx_thread_suspend(smx_context_t context);
static void smx_ctx_thread_free(smx_context_t context);
static void smx_ctx_thread_stop(smx_context_t context);
static void smx_ctx_thread_suspend(smx_context_t context);
-static void smx_ctx_thread_resume(smx_context_t new_context);
-static void smx_ctx_thread_runall_serial(xbt_dynar_t processes);
-static void smx_ctx_thread_runall_parallel(xbt_dynar_t processes);
+static void smx_ctx_thread_runall_serial(void);
+static void smx_ctx_thread_runall_parallel(void);
static smx_context_t smx_ctx_thread_self(void);
static int smx_ctx_thread_factory_finalize(smx_context_factory_t *factory);
static smx_context_t smx_ctx_thread_self(void);
static int smx_ctx_thread_factory_finalize(smx_context_factory_t *factory);
@@
-114,7
+112,7
@@
static void smx_ctx_thread_free(smx_context_t pcontext)
{
smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext;
{
smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext;
- /* check if this is the context of maestro (it doesn't ha
s
a real thread) */
+ /* check if this is the context of maestro (it doesn't ha
ve
a real thread) */
if (context->thread) {
/* wait about the thread terminason */
xbt_os_thread_join(context->thread, NULL);
if (context->thread) {
/* wait about the thread terminason */
xbt_os_thread_join(context->thread, NULL);
@@
-171,26
+169,26
@@
static void smx_ctx_thread_suspend(smx_context_t context)
xbt_os_sem_acquire(smx_ctx_thread_sem);
}
xbt_os_sem_acquire(smx_ctx_thread_sem);
}
-static void smx_ctx_thread_runall_serial(
xbt_dynar_t processes
)
+static void smx_ctx_thread_runall_serial(
void
)
{
smx_process_t process;
unsigned int cursor;
{
smx_process_t process;
unsigned int cursor;
- xbt_dynar_foreach(
processes
, cursor, process) {
+ xbt_dynar_foreach(
simix_global->process_to_run
, cursor, process) {
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
}
}
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
}
}
-static void smx_ctx_thread_runall_parallel(
xbt_dynar_t processes
)
+static void smx_ctx_thread_runall_parallel(
void
)
{
unsigned int index;
smx_process_t process;
{
unsigned int index;
smx_process_t process;
- xbt_dynar_foreach(
processes
, index, process)
+ xbt_dynar_foreach(
simix_global->process_to_run
, index, process)
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
- xbt_dynar_foreach(
processes
, index, process) {
+ xbt_dynar_foreach(
simix_global->process_to_run
, index, process) {
xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
}
}
xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
}
}