/* context_base - Code factorization across context switching implementations */
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2014. 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. */
-
#include "xbt/function_types.h"
-#include "simix/simix.h"
-#include "simix/context.h"
-#include "simix/private.h"
+#include "simgrid/simix.h"
+#include "smx_private.h"
+#include "mc/mc.h"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
void smx_ctx_base_factory_init(smx_context_factory_t *factory)
{
(*factory)->suspend = NULL;
(*factory)->runall = NULL;
(*factory)->self = smx_ctx_base_self;
- (*factory)->get_data = smx_ctx_base_get_data;
+ (*factory)->get_process = smx_ctx_base_get_process;
(*factory)->name = "base context factory";
}
}
smx_context_t
-smx_ctx_base_factory_create_context_sized(size_t size,
- xbt_main_func_t code, int argc,
- char **argv,
+smx_ctx_base_factory_create_context_sized(size_t size, xbt_main_func_t code,
+ int argc, char **argv,
void_pfn_smxprocess_t cleanup_func,
- void *data)
+ smx_process_t process)
{
smx_context_t context = xbt_malloc0(size);
+ /* Store the address of the stack in heap to compare it apart of heap comparison */
+ if(MC_is_active())
+ MC_ignore_heap(context, size);
+
/* If the user provided a function for the process then use it.
Otherwise, it is the context for maestro and we should set it as the
current context */
} else {
SIMIX_context_set_current(context);
}
- context->data = data;
+ context->process = process;
return context;
}
void smx_ctx_base_free(smx_context_t context)
{
int i;
-
if (context) {
/* free argv */
void smx_ctx_base_stop(smx_context_t context)
{
if (context->cleanup_func)
- context->cleanup_func(context->data);
+ context->cleanup_func(context->process);
+ context->process->suspended = 0;
context->iwannadie = 0;
- SIMIX_req_process_cleanup(context->data);
+ simcall_process_cleanup(context->process);
context->iwannadie = 1;
}
return SIMIX_context_get_current();
}
-void *smx_ctx_base_get_data(smx_context_t context)
+smx_process_t smx_ctx_base_get_process(smx_context_t context)
{
- return context->data;
+ return context->process;
}