X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/94974c282c6e6d096238716853bb053330170d76..0c43de62fbe4bfc243d6512296e09207e80bcd54:/src/simix/smx_context_thread.c diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index d703ead894..e254af439c 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -1,6 +1,6 @@ /* context_thread - implementation of context switching with native threads */ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2012. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,7 +12,6 @@ #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); @@ -93,12 +92,16 @@ smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, if (code) { context->begin = xbt_os_sem_init(0); context->end = xbt_os_sem_init(0); + if (smx_context_stack_size_was_set) + xbt_os_thread_setstacksize(smx_context_stack_size); + /* create and start the process */ /* NOTE: The first argument to xbt_os_thread_create used to be the process * * name, but now the name is stored at SIMIX level, so we pass a null */ context->thread = xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context, context); + /* wait the starting of the newly created process */ xbt_os_sem_acquire(context->end); @@ -113,7 +116,7 @@ static void smx_ctx_thread_free(smx_context_t pcontext) { smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext; - /* check if this is the context of maestro (it doesn't has a real thread) */ + /* check if this is the context of maestro (it doesn't have a real thread) */ if (context->thread) { /* wait about the thread terminason */ xbt_os_thread_join(context->thread, NULL);