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
Win32 and APPLE have the same convention for ASM
[simgrid.git]
/
src
/
simix
/
smx_context_raw.c
diff --git
a/src/simix/smx_context_raw.c
b/src/simix/smx_context_raw.c
index
9327b59
..
059870e
100644
(file)
--- a/
src/simix/smx_context_raw.c
+++ b/
src/simix/smx_context_raw.c
@@
-38,10
+38,16
@@
extern void raw_swapcontext(raw_stack_t* old, raw_stack_t new);
#ifdef PROCESSOR_i686
__asm__ (
#ifdef PROCESSOR_i686
__asm__ (
+#if defined(APPLE) || defined(_WIN32)
+ ".text\n"
+ ".globl _raw_makecontext\n"
+ "_raw_makecontext:\n"
+#else
".text\n"
".globl raw_makecontext\n"
".type raw_makecontext,@function\n"
"raw_makecontext:\n"
".text\n"
".globl raw_makecontext\n"
".type raw_makecontext,@function\n"
"raw_makecontext:\n"
+#endif
" movl 4(%esp),%eax\n" /* stack */
" addl 8(%esp),%eax\n" /* size */
" movl 12(%esp),%ecx\n" /* func */
" movl 4(%esp),%eax\n" /* stack */
" addl 8(%esp),%eax\n" /* size */
" movl 12(%esp),%ecx\n" /* func */
@@
-58,10
+64,16
@@
__asm__ (
);
__asm__ (
);
__asm__ (
+#if defined(APPLE) || defined(_WIN32)
+ ".text\n"
+ ".globl _raw_swapcontext\n"
+ "_raw_swapcontext:\n"
+#else
".text\n"
".globl raw_swapcontext\n"
".type raw_swapcontext,@function\n"
"raw_swapcontext:\n"
".text\n"
".globl raw_swapcontext\n"
".type raw_swapcontext,@function\n"
"raw_swapcontext:\n"
+#endif
" movl 4(%esp),%eax\n" /* old */
" movl 8(%esp),%edx\n" /* new */
" pushl %ebp\n"
" movl 4(%esp),%eax\n" /* old */
" movl 8(%esp),%edx\n" /* new */
" pushl %ebp\n"
@@
-78,10
+90,16
@@
__asm__ (
);
#elif PROCESSOR_x86_64
__asm__ (
);
#elif PROCESSOR_x86_64
__asm__ (
+#if defined(APPLE) || defined(_WIN32)
+ ".text\n"
+ ".globl _raw_makecontext\n"
+ "_raw_makecontext:\n"
+#else
".text\n"
".globl raw_makecontext\n"
".type raw_makecontext,@function\n"
".text\n"
".globl raw_makecontext\n"
".type raw_makecontext,@function\n"
- "raw_makecontext:\n" /* Calling convention sets the arguments in rdi, rsi, rdx and rcx, respectively */
+ "raw_makecontext:\n"/* Calling convention sets the arguments in rdi, rsi, rdx and rcx, respectively */
+#endif
" movq %rdi,%rax\n" /* stack */
" addq %rsi,%rax\n" /* size */
" movq $0, -8(%rax)\n" /* @return for func */
" movq %rdi,%rax\n" /* stack */
" addq %rsi,%rax\n" /* size */
" movq $0, -8(%rax)\n" /* @return for func */
@@
-103,10
+121,16
@@
__asm__ (
);
__asm__ (
);
__asm__ (
+#if defined(APPLE) || defined(_WIN32)
+ ".text\n"
+ ".globl _raw_swapcontext\n"
+ "_raw_swapcontext:\n"
+#else
".text\n"
".globl raw_swapcontext\n"
".type raw_swapcontext,@function\n"
".text\n"
".globl raw_swapcontext\n"
".type raw_swapcontext,@function\n"
- "raw_swapcontext:\n" /* Calling convention sets the arguments in rdi and rsi, respectively */
+ "raw_swapcontext:\n" /* Calling convention sets the arguments in rdi and rsi, respectively */
+#endif
" pushq %rdi\n"
" pushq %rsi\n"
" pushq %rdx\n"
" pushq %rdi\n"
" pushq %rsi\n"
" pushq %rdx\n"
@@
-136,6
+160,10
@@
__asm__ (
" retq\n"
);
#else
" retq\n"
);
#else
+
+/* If you implement raw contextes for other processors, don't forget to
+ update the definition of HAVE_RAWCTX in buildtools/Cmake/AddTests.cmake */
+
raw_stack_t raw_makecontext(char* malloced_stack, int stack_size,
rawctx_entry_point_t entry_point, void* arg) {
THROW_UNIMPLEMENTED;
raw_stack_t raw_makecontext(char* malloced_stack, int stack_size,
rawctx_entry_point_t entry_point, void* arg) {
THROW_UNIMPLEMENTED;
@@
-153,8
+181,6
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
static xbt_parmap_t parmap;
#endif
static xbt_parmap_t parmap;
#endif
-static smx_context_factory_t raw_factory;
-
#ifdef TIME_BENCH
#include "xbt/xbt_os_time.h"
#define NUM_THREADS 4
#ifdef TIME_BENCH
#include "xbt/xbt_os_time.h"
#define NUM_THREADS 4
@@
-238,7
+264,7
@@
static void smx_ctx_raw_free(smx_context_t context)
static void smx_ctx_raw_suspend(smx_context_t context)
{
static void smx_ctx_raw_suspend(smx_context_t context)
{
-
smx_current_context = (smx_context_t)maestro_raw_context
;
+
SIMIX_context_set_current((smx_context_t) maestro_raw_context)
;
raw_swapcontext(
&((smx_ctx_raw_t) context)->stack_top,
((smx_ctx_raw_t) context)->old_stack_top);
raw_swapcontext(
&((smx_ctx_raw_t) context)->stack_top,
((smx_ctx_raw_t) context)->old_stack_top);
@@
-260,7
+286,7
@@
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context)
static void smx_ctx_raw_resume(smx_process_t process)
{
smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
static void smx_ctx_raw_resume(smx_process_t process)
{
smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
-
smx_current_context = (smx_context_t)context
;
+
SIMIX_context_set_current((smx_context_t) context)
;
raw_swapcontext(
&((smx_ctx_raw_t) context)->old_stack_top,
((smx_ctx_raw_t) context)->stack_top);
raw_swapcontext(
&((smx_ctx_raw_t) context)->old_stack_top,
((smx_ctx_raw_t) context)->stack_top);
@@
-312,8
+338,6
@@
static void smx_ctx_raw_runall_serial(xbt_dynar_t processes)
XBT_VERB("Time SSR thread %u = %lf (max %lf)", cursor, time_thread_ssr[cursor], tmax);
time_wasted_ssr += tmax - time_thread_ssr[cursor];
}
XBT_VERB("Time SSR thread %u = %lf (max %lf)", cursor, time_thread_ssr[cursor], tmax);
time_wasted_ssr += tmax - time_thread_ssr[cursor];
}
-
- xbt_dynar_reset(processes);
}
void smx_ctx_raw_new_sr(void);
}
void smx_ctx_raw_new_sr(void);
@@
-345,7
+369,6
@@
static void smx_ctx_raw_runall_serial(xbt_dynar_t processes)
XBT_DEBUG("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
smx_ctx_raw_resume(process);
}
XBT_DEBUG("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
smx_ctx_raw_resume(process);
}
- xbt_dynar_reset(processes);
}
#endif
}
#endif
@@
-354,29
+377,15
@@
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
#ifdef CONTEXT_THREADS
xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume, processes);
#endif
#ifdef CONTEXT_THREADS
xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume, processes);
#endif
- xbt_dynar_reset(processes);
-}
-
-static smx_context_t smx_ctx_raw_self_parallel(void)
-{
- return smx_current_context;
-}
-
-static int smx_ctx_raw_get_thread_id(){
- return (int)(unsigned long)xbt_os_thread_get_extra_data();
}
static void smx_ctx_raw_runall(xbt_dynar_t processes)
{
if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
XBT_DEBUG("Runall // %lu", xbt_dynar_length(processes));
}
static void smx_ctx_raw_runall(xbt_dynar_t processes)
{
if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
XBT_DEBUG("Runall // %lu", xbt_dynar_length(processes));
- raw_factory->self = smx_ctx_raw_self_parallel;
- raw_factory->get_thread_id = smx_ctx_raw_get_thread_id;
smx_ctx_raw_runall_parallel(processes);
} else {
XBT_DEBUG("Runall serial %lu", xbt_dynar_length(processes));
smx_ctx_raw_runall_parallel(processes);
} else {
XBT_DEBUG("Runall serial %lu", xbt_dynar_length(processes));
- raw_factory->self = smx_ctx_base_self;
- raw_factory->get_thread_id = smx_ctx_base_get_thread_id;
smx_ctx_raw_runall_serial(processes);
}
}
smx_ctx_raw_runall_serial(processes);
}
}
@@
-404,18
+413,13
@@
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
}
else {
/* always parallel */
}
else {
/* always parallel */
- (*factory)->self = smx_ctx_raw_self_parallel;
- (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
(*factory)->runall = smx_ctx_raw_runall_parallel;
}
}
else {
/* always serial */
(*factory)->runall = smx_ctx_raw_runall_parallel;
}
}
else {
/* always serial */
- (*factory)->self = smx_ctx_base_self;
- (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
(*factory)->runall = smx_ctx_raw_runall_serial;
}
(*factory)->runall = smx_ctx_raw_runall_serial;
}
- raw_factory = *factory;
#ifdef TIME_BENCH
timer = xbt_os_timer_new();
#endif
#ifdef TIME_BENCH
timer = xbt_os_timer_new();
#endif