X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87dcbdd62cdd688ee0d9cefc7ae54854148ec5fb..986fb5fef4507d37b47b9ff8ee5ba5c26e8a5cee:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index cc8b6b1e0a..ee203f4dd3 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2007, 2008, 2009, 2010. 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. */ @@ -8,444 +7,531 @@ #include "private.h" #include "xbt/sysdep.h" #include "xbt/log.h" +#include "xbt/dict.h" +#include "msg/mailbox.h" +#include "mc/mc.h" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, - "Logging specific to SIMIX (process)"); -/** \defgroup m_process_management Management Functions of Agents - * \brief This section describes the agent structure of MSG - * (#m_process_t) and the functions for managing it. - * \htmlonly \endhtmlonly - * - * We need to simulate many independent scheduling decisions, so - * the concept of process is at the heart of the - * simulator. A process may be defined as a code, with - * some private data, executing in a location. - * \see m_process_t - */ + "Logging specific to SIMIX (process)"); -/******************************** Process ************************************/ -/** \ingroup m_process_management - * \brief Creates and runs a new #m_process_t. +static unsigned long simix_process_count = 0; + +/** + * \brief Returns the current agent. + * + * This functions returns the currently running SIMIX process. * - * Does exactly the same as #MSG_process_create_with_arguments but without - providing standard arguments (\a argc, \a argv, \a start_time, \a kill_time). - * \sa MSG_process_create_with_arguments + * \return The SIMIX process */ -smx_process_t SIMIX_process_create(const char *name, - smx_process_code_t code, void *data, - smx_host_t host) +XBT_INLINE smx_process_t SIMIX_process_self(void) { - return SIMIX_process_create_with_arguments(name, code, data, host, -1, NULL); + if (simix_global) + return SIMIX_context_get_data(SIMIX_context_self()); + + return NULL; } -static void SIMIX_process_cleanup(void *arg) +/** + * \brief Move a process to the list of processes to destroy. + */ +void SIMIX_process_cleanup(smx_process_t process) { - xbt_swag_remove(arg, simix_global->process_list); - xbt_swag_remove(arg, simix_global->process_to_run); - xbt_swag_remove(arg, ((smx_process_t) arg)->simdata->host->simdata->process_list); - free(((smx_process_t) arg)->name); - ((smx_process_t) arg)->name = NULL; - free(((smx_process_t) arg)->simdata); - ((smx_process_t) arg)->simdata = NULL; - free(arg); -} - -/** \ingroup m_process_management - * \brief Creates and runs a new #m_process_t. - - * A constructor for #m_process_t taking four arguments and returning the - * corresponding object. The structure (and the corresponding thread) is - * created, and put in the list of ready process. - * \param name a name for the object. It is for user-level information - and can be NULL. - * \param code is a function describing the behavior of the agent. It - should then only use functions described in \ref - m_process_management (to create a new #m_process_t for example), - in \ref m_host_management (only the read-only functions i.e. whose - name contains the word get), in \ref m_task_management (to create - or destroy some #m_task_t for example) and in \ref - msg_gos_functions (to handle file transfers and task processing). - * \param data a pointer to any data one may want to attach to the new - object. It is for user-level information and can be NULL. It can - be retrieved with the function \ref MSG_process_get_data. - * \param host the location where the new agent is executed. - * \param argc first argument passed to \a code - * \param argv second argument passed to \a code - * \see m_process_t - * \return The new corresponding object. + DEBUG1("Cleanup process %s", process->name); + xbt_swag_remove(process, simix_global->process_to_run); + xbt_swag_remove(process, simix_global->process_list); + xbt_swag_remove(process, process->smx_host->process_list); + xbt_swag_insert(process, simix_global->process_to_destroy); +} + +/** + * Garbage collection + * + * Should be called some time to time to free the memory allocated for processes + * that have finished (or killed). */ -smx_process_t SIMIX_process_create_with_arguments(const char *name, - smx_process_code_t code, void *data, - smx_host_t host, int argc, char **argv) +void SIMIX_process_empty_trash(void) { - simdata_process_t simdata = xbt_new0(s_simdata_process_t,1); - smx_process_t process = xbt_new0(s_smx_process_t,1); - smx_process_t self = NULL; + smx_process_t process = NULL; - xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters"); - /* Simulator Data */ + while ((process = xbt_swag_extract(simix_global->process_to_destroy))) { + SIMIX_context_free(process->context); - simdata->host = host; - simdata->argc = argc; - simdata->argv = argv; - simdata->context = xbt_context_new(code, NULL, NULL, - SIMIX_process_cleanup, process, - simdata->argc, simdata->argv); + /* Free the exception allocated at creation time */ + if (process->running_ctx) + free(process->running_ctx); + if (process->properties) + xbt_dict_free(&process->properties); - simdata->last_errno=SIMIX_OK; + free(process->name); + process->name = NULL; + free(process); + } +} +/** + * \brief Creates and runs the maestro process + */ +void SIMIX_create_maestro_process() +{ + smx_process_t maestro = NULL; + + /* Create maestro process and intilialize it */ + maestro = xbt_new0(s_smx_process_t, 1); + maestro->pid = simix_process_count++; + maestro->name = (char *) ""; + maestro->running_ctx = xbt_new(xbt_running_ctx_t, 1); + XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx); + maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro); + + simix_global->maestro_process = maestro; + return; +} - /* Process structure */ - process->name = xbt_strdup(name); - process->simdata = simdata; - process->data = data; +/** + * \brief Same as SIMIX_process_create() but with only one argument (used by timers). + * \return the process created + */ +smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) { + + smx_process_t process; + + if (simix_global->create_process_function) { + process = simix_global->create_process_function(args->name, + args->code, + args->data, + args->hostname, + args->argc, + args->argv, + args->properties); + } + else { + process = SIMIX_process_create(args->name, + args->code, + args->data, + args->hostname, + args->argc, + args->argv, + args->properties); + } + // FIXME: to simplify this, simix_global->create_process_function could just + // be SIMIX_process_create() by default (and the same thing in smx_deployment.c) + + return process; +} + +/** + * \brief Internal function to create a process. + * + * This function actually creates the process. + * It may be called when a REQ_PROCESS_CREATE request occurs, + * or directly for SIMIX internal purposes. + * + * \return the process created + */ +smx_process_t SIMIX_process_create(const char *name, + xbt_main_func_t code, + void *data, + const char *hostname, + int argc, char **argv, + xbt_dict_t properties) { + + smx_process_t process = NULL; + smx_host_t host = SIMIX_host_get_by_name(hostname); + + DEBUG2("Start process %s on host %s", name, hostname); + + if (!SIMIX_host_get_state(host)) { + WARN2("Cannot launch process '%s' on failed host '%s'", name, + hostname); + } + else { + process = xbt_new0(s_smx_process_t, 1); + + xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters"); + + /* Process data */ + process->pid = simix_process_count++; + process->name = xbt_strdup(name); + process->smx_host = host; + process->data = data; + + VERB1("Create context %s", process->name); + process->context = SIMIX_context_new(code, argc, argv, + simix_global->cleanup_process_function, process); - xbt_swag_insert_at_head(process, host->simdata->process_list); + process->running_ctx = xbt_new(xbt_running_ctx_t, 1); + XBT_RUNNING_CTX_INITIALIZE(process->running_ctx); - /* *************** FIX du current_process !!! *************** */ - self = simix_global->current_process; - xbt_context_start(process->simdata->context); - simix_global->current_process = self; + /* Add properties */ + process->properties = properties; - xbt_swag_insert_at_head(process,simix_global->process_list); - DEBUG2("Inserting %s(%s) in the to_run list",process->name, - host->name); - xbt_swag_insert_at_head(process,simix_global->process_to_run); + /* Add the process to it's host process list */ + xbt_swag_insert(process, host->process_list); + + DEBUG1("Start context '%s'", process->name); + + /* Now insert it in the global process list and in the process to run list */ + xbt_swag_insert(process, simix_global->process_list); + DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name); + xbt_swag_insert(process, simix_global->process_to_run); + } return process; } -/** \ingroup m_process_management - * \param process poor victim +/** + * \brief Internal function to kill a SIMIX process. + * + * This function may be called when a REQ_PROCESS_KILL request occurs, + * or directly for SIMIX internal purposes. * - * This function simply kills a \a process... scarry isn't it ? :) + * \param process poor victim */ -void SIMIX_process_kill(smx_process_t process) -{ - //int i; - simdata_process_t p_simdata = process->simdata; - //simdata_host_t h_simdata= p_simdata->host->simdata; - //int _cursor; - //smx_process_t proc = NULL; - - DEBUG2("Killing %s on %s",process->name, p_simdata->host->name); - - /* - - if(p_simdata->waiting_task) { - xbt_dynar_foreach(p_simdata->waiting_task->simdata->sleeping,_cursor,proc) { - if(proc==process) - xbt_dynar_remove_at(p_simdata->waiting_task->simdata->sleeping,_cursor,&proc); - } - if(p_simdata->waiting_task->simdata->compute) - surf_workstation_resource->common_public-> - action_free(p_simdata->waiting_task->simdata->compute); - else if (p_simdata->waiting_task->simdata->comm) { - surf_workstation_resource->common_public-> - action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED); - surf_workstation_resource->common_public-> - action_free(p_simdata->waiting_task->simdata->comm); - } else { - xbt_die("UNKNOWN STATUS. Please report this bug."); +void SIMIX_process_kill(smx_process_t process, smx_process_t killer) { + + DEBUG2("Killing process %s on %s", process->name, process->smx_host->name); + + process->context->iwannadie = 1; + process->blocked = 0; + process->suspended = 0; + /* FIXME: set doexception to 0 also? */ + + if (process->waiting_action) { + + switch (process->waiting_action->type) { + + case SIMIX_ACTION_EXECUTE: + case SIMIX_ACTION_PARALLEL_EXECUTE: + SIMIX_host_execution_destroy(process->waiting_action); + break; + + case SIMIX_ACTION_COMMUNICATE: + SIMIX_comm_destroy(process->waiting_action); + break; + + case SIMIX_ACTION_SLEEP: + SIMIX_process_sleep_destroy(process->waiting_action); + break; + + case SIMIX_ACTION_SYNCHRO: + SIMIX_synchro_stop_waiting(process, process->request); + SIMIX_synchro_destroy(process->waiting_action); + break; + + case SIMIX_ACTION_IO: + THROW_UNIMPLEMENTED; + break; } } - if ((i==msg_global->max_channel) && (process!=MSG_process_self()) && - (!p_simdata->waiting_task)) { - xbt_die("UNKNOWN STATUS. Please report this bug."); + /* If I'm killing myself then stop, otherwise schedule the process to kill. */ + if (process == killer) { + SIMIX_context_stop(process->context); } -*/ - xbt_swag_remove(process,simix_global->process_to_run); - xbt_swag_remove(process,simix_global->process_list); - xbt_context_free(process->simdata->context); - - if(process==SIMIX_process_self()) { - /* I just killed myself */ - xbt_context_yield(); + else { + xbt_swag_insert(process, simix_global->process_to_run); } } -/** \ingroup m_process_management - * \brief Migrates an agent to another location. +/** + * \brief Kills all running processes. * - * This functions checks whether \a process and \a host are valid pointers - and change the value of the #m_host_t on which \a process is running. + * Only maestro can kill everyone. */ -SIMIX_error_t SIMIX_process_change_host(smx_process_t process, smx_host_t host) +void SIMIX_process_killall(void) { - simdata_process_t simdata = NULL; + smx_process_t p = NULL; - /* Sanity check */ + while ((p = xbt_swag_extract(simix_global->process_list))) + SIMIX_process_kill(p, SIMIX_process_self()); - xbt_assert0(((process) && (process->simdata) - && (host)), "Invalid parameters"); - simdata = process->simdata; + SIMIX_process_empty_trash(); +} - xbt_swag_remove(process,simdata->host->simdata->process_list); - simdata->host = host; - xbt_swag_insert_at_head(process,host->simdata->process_list); +void SIMIX_process_change_host(smx_process_t process, + const char *source, const char *dest) +{ + smx_host_t h1 = NULL; + smx_host_t h2 = NULL; + xbt_assert0((process != NULL), "Invalid parameters"); + h1 = SIMIX_host_get_by_name(source); + h2 = SIMIX_host_get_by_name(dest); + process->smx_host = h2; + xbt_swag_remove(process, h1->process_list); + xbt_swag_insert(process, h2->process_list); +} - return SIMIX_OK; +void SIMIX_pre_process_suspend(smx_req_t req) +{ + smx_process_t process = req->process_suspend.process; + SIMIX_process_suspend(process, req->issuer); + + if (process != req->issuer) { + SIMIX_request_answer(req); + } + /* If we are suspending ourselves, then just do not replay the request. */ } -/** \ingroup m_process_management - * \brief Return the user data of a #m_process_t. - * - * This functions checks whether \a process is a valid pointer or not - and return the user data associated to \a process if it is possible. - */ -void *SIMIX_process_get_data(smx_process_t process) +void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) { - xbt_assert0((process != NULL), "Invalid parameters"); + xbt_assert0(process, "Invalid parameters"); + + process->suspended = 1; + + /* If we are suspending another process, and it is waiting on an action, + suspend it's action. */ + if (process != issuer) { + + if (process->waiting_action) { + + switch (process->waiting_action->type) { - return (process->data); + case SIMIX_ACTION_EXECUTE: + case SIMIX_ACTION_PARALLEL_EXECUTE: + SIMIX_host_execution_suspend(process->waiting_action); + break; + + case SIMIX_ACTION_COMMUNICATE: + SIMIX_comm_suspend(process->waiting_action); + break; + + case SIMIX_ACTION_SLEEP: + SIMIX_process_sleep_suspend(process->waiting_action); + break; + + default: + THROW_IMPOSSIBLE; + } + } + } } -/** \ingroup m_process_management - * \brief Set the user data of a #m_process_t. - * - * This functions checks whether \a process is a valid pointer or not - and set the user data associated to \a process if it is possible. - */ -SIMIX_error_t SIMIX_process_set_data(smx_process_t process,void *data) +void SIMIX_process_resume(smx_process_t process, smx_process_t issuer) { xbt_assert0((process != NULL), "Invalid parameters"); - xbt_assert0((process->data == NULL), "Data already set"); - - process->data = data; - - return SIMIX_OK; + + process->suspended = 0; + + /* If we are resuming another process, resume the action it was waiting for + if any. Otherwise add it to the list of process to run in the next round. */ + if (process != issuer) { + + if (process->waiting_action) { + + switch (process->waiting_action->type) { + + case SIMIX_ACTION_EXECUTE: + case SIMIX_ACTION_PARALLEL_EXECUTE: + SIMIX_host_execution_resume(process->waiting_action); + break; + + case SIMIX_ACTION_COMMUNICATE: + SIMIX_comm_resume(process->waiting_action); + break; + + case SIMIX_ACTION_SLEEP: + SIMIX_process_sleep_resume(process->waiting_action); + break; + + default: + THROW_IMPOSSIBLE; + } + } + else { + xbt_swag_insert(process, simix_global->process_to_run); + } + } } -/** \ingroup m_process_management - * \brief Return the location on which an agent is running. - * - * This functions checks whether \a process is a valid pointer or not - and return the m_host_t corresponding to the location on which \a - process is running. - */ -smx_host_t SIMIX_process_get_host(smx_process_t process) +int SIMIX_process_count(void) { - xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters"); + return xbt_swag_size(simix_global->process_list); +} - return (((simdata_process_t) process->simdata)->host); +void* SIMIX_process_self_get_data(void) +{ + smx_process_t me = SIMIX_process_self(); + if (!me) { + return NULL; + } + return SIMIX_process_get_data(me); } -/** \ingroup m_process_management - * \brief Return the name of an agent. - * - * This functions checks whether \a process is a valid pointer or not - and return its name. - */ -const char *SIMIX_process_get_name(smx_process_t process) +void SIMIX_process_self_set_data(void *data) { - xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters"); + SIMIX_process_set_data(SIMIX_process_self(), data); +} - return (process->name); +void* SIMIX_process_get_data(smx_process_t process) +{ + return process->data; } -/** \ingroup m_process_management - * \brief Return the current agent. - * - * This functions returns the currently running #m_process_t. - */ -smx_process_t SIMIX_process_self(void) +void SIMIX_process_set_data(smx_process_t process, void *data) { - return simix_global ? simix_global->current_process : NULL; + process->data = data; } -/** \ingroup m_process_management - * \brief Suspend the process. - * - * This functions suspend the process by suspending the task on which - * it was waiting for the completion. - */ -SIMIX_error_t SIMIX_process_suspend(smx_process_t process) +smx_host_t SIMIX_process_get_host(smx_process_t process) { -/* - simdata_process_t simdata = NULL; - simdata_task_t simdata_task = NULL; + return process->smx_host; +} - XBT_IN2("(%p(%s))", process, process->name); +/* needs to be public and without request because it is called + by exceptions and logging events */ +const char* SIMIX_process_self_get_name(void) { - xbt_assert0(((process) && (process->simdata)), "Invalid parameters"); + smx_process_t process = SIMIX_process_self(); + if (process == NULL || process == simix_global->maestro_process) + return ""; - PAJE_PROCESS_PUSH_STATE(process,"S",NULL); + return SIMIX_process_get_name(process); +} - if(process!=SIMIX_process_self()) { - simdata = process->simdata; - - xbt_assert0(simdata->waiting_task,"Process not waiting for anything else. Weird !"); +const char* SIMIX_process_get_name(smx_process_t process) +{ + return process->name; +} - simdata_task = simdata->waiting_task->simdata; +int SIMIX_process_is_suspended(smx_process_t process) +{ + return process->suspended; +} - simdata->suspended = 1; - if(simdata->blocked) { - XBT_OUT; - return SIMIX_OK; - } +int SIMIX_process_is_enabled(smx_process_t process) +{ + if (process->request && SIMIX_request_is_enabled(process->request)) + return TRUE; - xbt_assert0(((simdata_task->compute)||(simdata_task->comm))&& - !((simdata_task->compute)&&(simdata_task->comm)), - "Got a problem in deciding which action to choose !"); - simdata->suspended = 1; - if(simdata_task->compute) - surf_workstation_resource->common_public->suspend(simdata_task->compute); - else - surf_workstation_resource->common_public->suspend(simdata_task->comm); - } else { - m_task_t dummy = MSG_TASK_UNINITIALIZED; - dummy = MSG_task_create("suspended", 0.0, 0, NULL); - - simdata = process->simdata; - simdata->suspended = 1; - __MSG_task_execute(process,dummy); - surf_workstation_resource->common_public->suspend(dummy->simdata->compute); - __MSG_wait_for_computation(process,dummy); - simdata->suspended = 0; - - MSG_task_destroy(dummy); - } - XBT_OUT; - */ - return SIMIX_OK; + return FALSE; } -/** \ingroup m_process_management - * \brief Resume a suspended process. - * - * This functions resume a suspended process by resuming the task on - * which it was waiting for the completion. - */ -SIMIX_error_t SIMIX_process_resume(smx_process_t process) +xbt_dict_t SIMIX_process_get_properties(smx_process_t process) { -/* - simdata_process_t simdata = NULL; - simdata_task_t simdata_task = NULL; - - xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters"); - CHECK_HOST(); + return process->properties; +} - XBT_IN2("(%p(%s))", process, process->name); +void SIMIX_pre_process_sleep(smx_req_t req) +{ + if (MC_IS_ENABLED) { + req->process_sleep.result = SIMIX_DONE; + SIMIX_request_answer(req); + } + smx_action_t action = SIMIX_process_sleep(req->issuer, req->process_sleep.duration); + xbt_fifo_push(action->request_list, req); + req->issuer->waiting_action = action; +} - if(process == SIMIX_process_self()) { - XBT_OUT; - SIMIX_RETURN(SIMIX_OK); +smx_action_t SIMIX_process_sleep(smx_process_t process, double duration) +{ + smx_action_t action; + smx_host_t host = process->smx_host; + + /* check if the host is active */ + if (surf_workstation_model->extension. + workstation.get_state(host->host) != SURF_RESOURCE_ON) { + THROW1(host_error, 0, "Host %s failed, you cannot call this function", + host->name); } - simdata = process->simdata; + action = xbt_new0(s_smx_action_t, 1); + action->type = SIMIX_ACTION_SLEEP; + action->request_list = xbt_fifo_new(); + action->name = xbt_strdup("sleep"); +#ifdef HAVE_TRACING + action->category = NULL; +#endif - if(simdata->blocked) { - PAJE_PROCESS_POP_STATE(process); + action->sleep.host = host; + action->sleep.surf_sleep = + surf_workstation_model->extension.workstation.sleep(host->host, duration); - simdata->suspended = 0; *//* He'll wake up by itself */ - /*XBT_OUT; - SIMIX_RETURN(SIMIX_OK); - } + surf_workstation_model->action_data_set(action->sleep.surf_sleep, action); + DEBUG1("Create sleep action %p", action); - if(!(simdata->waiting_task)) { - xbt_assert0(0,"Process not waiting for anything else. Weird !"); - XBT_OUT; - return SIMIX_WARNING; - } - simdata_task = simdata->waiting_task->simdata; + return action; +} +void SIMIX_post_process_sleep(smx_action_t action) +{ + e_smx_state_t state = SIMIX_action_map_state(surf_workstation_model->action_state_get(action->sleep.surf_sleep)); + smx_req_t req; - if(simdata_task->compute) { - surf_workstation_resource->common_public->resume(simdata_task->compute); - PAJE_PROCESS_POP_STATE(process); - } - else { - PAJE_PROCESS_POP_STATE(process); - surf_workstation_resource->common_public->resume(simdata_task->comm); + while ((req = xbt_fifo_shift(action->request_list))) { + req->process_sleep.result = state; + req->issuer->waiting_action = NULL; + SIMIX_request_answer(req); } - XBT_OUT; - */ - SIMIX_RETURN(SIMIX_OK); + SIMIX_process_sleep_destroy(action); } -/** \ingroup m_process_management - * \brief Returns true if the process is suspended . - * - * This checks whether a process is suspended or not by inspecting the - * task on which it was waiting for the completion. - */ -int SIMIX_process_is_suspended(smx_process_t process) +void SIMIX_process_sleep_destroy(smx_action_t action) { - xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters"); - - return (process->simdata->suspended); + DEBUG1("Destroy action %p", action); + if (action->name) + xbt_free(action->name); + if (action->sleep.surf_sleep) + action->sleep.surf_sleep->model_type->action_unref(action->sleep.surf_sleep); +#ifdef HAVE_TRACING + TRACE_smx_action_destroy(action); +#endif + xbt_fifo_free(action->request_list); + xbt_free(action); } -int __SIMIX_process_block(double max_duration, const char *info) +void SIMIX_process_sleep_suspend(smx_action_t action) { -/* - smx_process_t process = SIMIX_process_self(); - m_task_t dummy = SIMIX_TASK_UNINITIALIZED; - char blocked_name[512]; - snprintf(blocked_name,512,"blocked [%s] (%s:%s)", - info, process->name, process->simdata->host->name); - - XBT_IN1(": max_duration=%g",max_duration); - - dummy = MSG_task_create(blocked_name, 0.0, 0, NULL); - - PAJE_PROCESS_PUSH_STATE(process,"B",NULL); - - process->simdata->blocked=1; - __MSG_task_execute(process,dummy); - surf_workstation_resource->common_public->suspend(dummy->simdata->compute); - if(max_duration>=0) - surf_workstation_resource->common_public->set_max_duration(dummy->simdata->compute, - max_duration); - __MSG_wait_for_computation(process,dummy); - MSG_task_destroy(dummy); - process->simdata->blocked=0; - - if(process->simdata->suspended) { - DEBUG0("I've been suspended in the meantime"); - SIMIX_process_suspend(process); - DEBUG0("I've been resumed, let's keep going"); - } - - PAJE_PROCESS_POP_STATE(process); + surf_workstation_model->suspend(action->sleep.surf_sleep); +} - XBT_OUT; - */ - return 1; +void SIMIX_process_sleep_resume(smx_action_t action) +{ + surf_workstation_model->resume(action->sleep.surf_sleep); } -SIMIX_error_t __SIMIX_process_unblock(smx_process_t process) +/** + * Calling this function makes the process to yield. + * Only the processes can call this function, giving back the control to maestro + */ +void SIMIX_process_yield(void) { -/* - simdata_process_t simdata = NULL; - simdata_task_t simdata_task = NULL; + smx_process_t self = SIMIX_process_self(); - xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters"); - CHECK_HOST(); + DEBUG1("Yield process '%s'", self->name); - XBT_IN2(": %s unblocking %s", SIMIX_process_self()->name,process->name); + /* Go into sleep and return control to maestro */ + SIMIX_context_suspend(self->context); - simdata = process->simdata; - if(!(simdata->waiting_task)) { - xbt_assert0(0,"Process not waiting for anything else. Weird !"); - XBT_OUT; - return SIMIX_WARNING; - } - simdata_task = simdata->waiting_task->simdata; + /* Ok, maestro returned control to us */ + DEBUG1("Maestro returned control to me: '%s'", self->name); - xbt_assert0(simdata->blocked,"Process not blocked"); + if (self->context->iwannadie) + SIMIX_context_stop(self->context); - surf_workstation_resource->common_public->resume(simdata_task->compute); + if (self->doexception) { + DEBUG0("Wait, maestro left me an exception"); + self->doexception = 0; + RETHROW; + } +} - XBT_OUT; -*/ - SIMIX_RETURN(SIMIX_OK); +/* callback: context fetching */ +xbt_running_ctx_t *SIMIX_process_get_running_context(void) +{ + return SIMIX_process_self()->running_ctx; } -int __SIMIX_process_isBlocked(smx_process_t process) +/* callback: termination */ +void SIMIX_process_exception_terminate(xbt_ex_t * e) { - xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters"); + xbt_ex_display(e); + abort(); +} - return (process->simdata->blocked); +smx_context_t SIMIX_process_get_context(smx_process_t p) { + return p->context; +} +void SIMIX_process_set_context(smx_process_t p,smx_context_t c) { + p->context = c; }