/* 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. */
-
#include "smx_private.h"
#include "xbt/parmap.h"
+#include "xbt/dynar.h"
#include "mc/mc.h"
-#ifdef HAVE_VALGRIND_VALGRIND_H
-# include <valgrind/valgrind.h>
-#endif /* HAVE_VALGRIND_VALGRIND_H */
-
typedef char * raw_stack_t;
typedef void (*rawctx_entry_point_t)(void *);
s_smx_ctx_base_t super; /* Fields of super implementation */
char *malloced_stack; /* malloced area containing the stack */
raw_stack_t stack_top; /* pointer to stack top (within previous area) */
-#ifdef HAVE_VALGRIND_VALGRIND_H
- unsigned int valgrind_stack_id; /* the valgrind stack id */
-#endif
#ifdef TIME_BENCH_PER_SR
unsigned int thread; /* Just for measuring purposes */
#endif
#endif
" mov %rdi,%rax\n" /* stack */
" add %rsi,%rax\n" /* size */
+ " andq $-16, %rax\n" /* align stack */
" movq $0, -8(%rax)\n" /* @return for func */
" mov %rdx,-16(%rax)\n" /* func */
" mov %rcx,-24(%rax)\n" /* arg/rdi */
#endif
" movl 4(%esp),%eax\n" /* stack */
" addl 8(%esp),%eax\n" /* size */
+ " andl $-16, %eax\n" /* align stack */
" movl 12(%esp),%ecx\n" /* func */
" movl 16(%esp),%edx\n" /* arg */
" movl %edx, -4(%eax)\n"
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory);
static smx_context_t smx_ctx_raw_create_context(xbt_main_func_t code, int argc,
- char **argv, void_pfn_smxprocess_t cleanup_func, void *data);
+ char **argv, void_pfn_smxprocess_t cleanup_func, smx_process_t process);
static void smx_ctx_raw_free(smx_context_t context);
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
static void smx_ctx_raw_stop(smx_context_t context);
static void smx_ctx_raw_suspend_serial(smx_context_t context);
static void smx_ctx_raw_resume_serial(smx_process_t first_process);
+#ifdef TIME_BENCH_PER_SR
+static void smx_ctx_raw_runall_serial(xbt_dynar_t processes);
+void smx_ctx_raw_new_sr(void);
+#else
static void smx_ctx_raw_runall_serial(void);
+#endif
static void smx_ctx_raw_suspend_parallel(smx_context_t context);
static void smx_ctx_raw_resume_parallel(smx_process_t first_process);
static void smx_ctx_raw_runall_parallel(void);
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
{
#ifdef TIME_BENCH_PER_SR
- XBT_CRITICAL("Total wasted time in %u SR: %f", sr_count, time_wasted_sr);
- XBT_CRITICAL("Total wasted time in %u SSR: %f", ssr_count, time_wasted_ssr);
+ XBT_VERB("Total wasted time in %u SR: %f", sr_count, time_wasted_sr);
+ XBT_VERB("Total wasted time in %u SSR: %f", ssr_count, time_wasted_ssr);
#endif
#ifdef CONTEXT_THREADS
* \param argv arguments to pass to the main function
* \param cleanup_func a function to call to free the user data when the
* context finished
- * \param data user data
+ * \param process SIMIX process
*/
static smx_context_t
smx_ctx_raw_create_context(xbt_main_func_t code, int argc, char **argv,
- void_pfn_smxprocess_t cleanup_func,
- void *data)
+ void_pfn_smxprocess_t cleanup_func,
+ smx_process_t process)
{
smx_ctx_raw_t context =
argc,
argv,
cleanup_func,
- data);
+ process);
/* if the user provided a function for the process then use it,
otherwise it is the context for maestro */
if (code) {
- context->malloced_stack = xbt_malloc0(smx_context_stack_size);
+ context->malloced_stack = SIMIX_context_stack_new();
context->stack_top =
- raw_makecontext(context->malloced_stack, smx_context_stack_size,
- (void_f_pvoid_t) smx_ctx_raw_wrapper, context);
-
-#ifdef HAVE_VALGRIND_VALGRIND_H
- context->valgrind_stack_id =
- VALGRIND_STACK_REGISTER(context->malloced_stack,
- context->malloced_stack + smx_context_stack_size);
-#endif /* HAVE_VALGRIND_VALGRIND_H */
+ raw_makecontext(context->malloced_stack,
+ smx_context_usable_stack_size,
+ (void_f_pvoid_t)smx_ctx_raw_wrapper, context);
} else {
- if(data != NULL && raw_maestro_context==NULL)
+ if(process != NULL && raw_maestro_context==NULL)
raw_maestro_context = context;
if(MC_is_active())
static void smx_ctx_raw_free(smx_context_t context)
{
if (context) {
-
-#ifdef HAVE_VALGRIND_VALGRIND_H
- VALGRIND_STACK_DEREGISTER(((smx_ctx_raw_t)
- context)->valgrind_stack_id);
-#endif /* HAVE_VALGRIND_VALGRIND_H */
-
- free(((smx_ctx_raw_t) context)->malloced_stack);
+ SIMIX_context_stack_delete(((smx_ctx_raw_t) context)->malloced_stack);
}
smx_ctx_base_free(context);
}
{
/* determine the next context */
smx_context_t next_context;
- unsigned long int i = raw_process_index++;
-
+ unsigned long int i;
+#ifdef TIME_BENCH_PER_SR
+ i = ++raw_process_index;
+#else
+ i = raw_process_index++;
+#endif
if (i < xbt_dynar_length(simix_global->process_to_run)) {
/* execute the next process */
XBT_DEBUG("Run next process");
{
smx_process_t process;
unsigned int cursor;
-
double elapsed = 0;
double tmax = 0;
- unsigned long num_proc = xbt_dynar_length(processes);
+ unsigned long num_proc = xbt_dynar_length(simix_global->process_to_run);
unsigned int t=0;
unsigned int data_size = (num_proc / NUM_THREADS) + ((num_proc % NUM_THREADS) ? 1 : 0);
ssr_count++;
time_thread_ssr[0] = 0;
- xbt_dynar_foreach(processes, cursor, process) {
- XBT_DEBUG("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
- if(cursor >= t * data_size + data_size){
- if(time_thread_ssr[t] > tmax)
- tmax = time_thread_ssr[t];
- t++;
- time_thread_ssr[t] = 0;
- }
-
- if(new_sr){
- ((smx_ctx_raw_t)process->context)->thread = t;
- time_thread_sr[t] = 0;
- }
-
- xbt_os_cputimer_start(timer);
- smx_ctx_raw_resume(process);
- xbt_os_cputimer_stop(timer);
- elapsed = xbt_os_timer_elapsed(timer);
- time_thread_ssr[t] += elapsed;
- time_thread_sr[((smx_ctx_raw_t)process->context)->thread] += elapsed;
+ xbt_dynar_foreach(processes, cursor, process){
+ XBT_VERB("Schedule item %u of %lu",cursor,num_proc);
+ if(cursor >= t * data_size + data_size){
+ if(time_thread_ssr[t] > tmax)
+ tmax = time_thread_ssr[t];
+ t++;
+ time_thread_ssr[t] = 0;
+ }
+
+ if(new_sr){
+ ((smx_ctx_raw_t)process->context)->thread = t;
+ time_thread_sr[t] = 0;
+ }
+
+ xbt_os_cputimer_start(timer);
+ smx_ctx_raw_resume_serial(process);
+ xbt_os_cputimer_stop(timer);
+ elapsed = xbt_os_timer_elapsed(timer);
+ time_thread_ssr[t] += elapsed;
+ time_thread_sr[((smx_ctx_raw_t)process->context)->thread] += elapsed;
}
if(new_sr)
}
}
-void smx_ctx_raw_new_sr(void);
void smx_ctx_raw_new_sr(void)
{
int i;
time_wasted_sr += tmax - time_thread_sr[i];
}
+ XBT_VERB("Total time SR %u = %f, %d", sr_count, tmax, xbt_dynar_length(simix_global->process_that_ran));
XBT_VERB("New scheduling round");
}
#else
-
/**
* \brief Resumes sequentially all processes ready to run.
*/
} else {
XBT_DEBUG("Runall serial %lu", nb_processes);
simix_global->context_factory->suspend = smx_ctx_raw_suspend_serial;
+ #ifdef TIME_BENCH_PER_SR
+ smx_ctx_raw_runall_serial(simix_global->process_to_run);
+ #else
smx_ctx_raw_runall_serial();
+ #endif
}
}
