static smx_context_factory_t raw_factory;
+#include "xbt/xbt_os_time.h"
+static xbt_os_timer_t timer;
+static double totaltime;
+
+
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
{
+ INFO1("Total User Time: %lf", totaltime);
if(parmap)
xbt_parmap_destroy(parmap);
return smx_ctx_base_factory_finalize(factory);
static void smx_ctx_raw_suspend(smx_context_t context)
{
smx_current_context = (smx_context_t)maestro_raw_context;
+ xbt_os_timer_stop(timer);
raw_swapcontext(
&((smx_ctx_raw_t) context)->stack_top,
((smx_ctx_raw_t) context)->old_stack_top);
+ xbt_os_timer_start(timer);
}
static void smx_ctx_raw_stop(smx_context_t context)
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context)
{
+ xbt_os_timer_start(timer);
(context->super.code) (context->super.argc, context->super.argv);
smx_ctx_raw_stop((smx_context_t) context);
raw_swapcontext(
&((smx_ctx_raw_t) context)->old_stack_top,
((smx_ctx_raw_t) context)->stack_top);
+ totaltime += xbt_os_timer_elapsed(timer);
}
static void smx_ctx_raw_runall(xbt_dynar_t processes)
{
- if (SIMIX_context_is_parallel()
- && xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
+ if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
DEBUG1("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;
(*factory)->name = "smx_raw_context_factory";
parmap = xbt_parmap_new(2);
- (*factory)->self = smx_ctx_raw_self_parallel;
- (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
- (*factory)->runall = smx_ctx_raw_runall;
+ if (SIMIX_context_is_parallel()) {
+ if (SIMIX_context_get_parallel_threshold() > 1) {
+ /* choose dynamically */
+ (*factory)->runall = smx_ctx_raw_runall;
+ }
+ 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)->self = smx_ctx_base_self;
+ (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
+ (*factory)->runall = smx_ctx_raw_runall_serial;
+ }
raw_factory = *factory;
+
+ timer = xbt_os_timer_new();
}