From 0894facb1046b3a55e453017a7fd7da5f3817b27 Mon Sep 17 00:00:00 2001 From: cherierm Date: Thu, 15 Nov 2007 18:38:46 +0000 Subject: [PATCH] these files are useless in the new implementation of the context switch mechanism git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5044 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/xbt/context.h | 50 ---- src/java/jxbt_context.c | 317 ------------------------ src/java/jxbt_context.h | 49 ---- src/xbt/context.c | 500 -------------------------------------- src/xbt/context_private.h | 65 ----- 5 files changed, 981 deletions(-) delete mode 100644 src/include/xbt/context.h delete mode 100644 src/java/jxbt_context.c delete mode 100644 src/java/jxbt_context.h delete mode 100644 src/xbt/context.c delete mode 100644 src/xbt/context_private.h diff --git a/src/include/xbt/context.h b/src/include/xbt/context.h deleted file mode 100644 index dece9ead7e..0000000000 --- a/src/include/xbt/context.h +++ /dev/null @@ -1,50 +0,0 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. 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. */ - -#ifndef _XBT_CONTEXT_H -#define _XBT_CONTEXT_H - -#include "xbt/misc.h" -#include "xbt/function_types.h" -#include "xbt_modinter.h" /* init/exit of this module */ - -/** @addtogroup XBT_context - * - * INTERNALS OF SIMGRID, DON'T USE IT. - * - * This is a portable to Unix and Windows context implementation. - * - * @{ - */ - -/** @name Context types - * @{ - */ - - /** @brief A context */ - typedef struct s_xbt_context *xbt_context_t; - -/* @}*/ - -void xbt_context_empty_trash(void); -XBT_PUBLIC(xbt_context_t) xbt_context_new(const char*name,xbt_main_func_t code, - void_f_pvoid_t startup_func, void *startup_arg, - void_f_pvoid_t cleanup_func, void *cleanup_arg, - int argc, char *argv[]); -XBT_PUBLIC(void) xbt_context_kill(xbt_context_t context); -XBT_PUBLIC(void) xbt_context_start(xbt_context_t context); -XBT_PUBLIC(void) xbt_context_yield(void); -XBT_PUBLIC(void) xbt_context_schedule(xbt_context_t context); - -void xbt_context_set_jprocess(xbt_context_t context, void *jp); -void* xbt_context_get_jprocess(xbt_context_t context); - -void xbt_context_set_jenv(xbt_context_t context,void* je); -void* xbt_context_get_jenv(xbt_context_t context); - -/* @} */ -#endif /* _XBT_CONTEXT_H */ diff --git a/src/java/jxbt_context.c b/src/java/jxbt_context.c deleted file mode 100644 index 1e17340195..0000000000 --- a/src/java/jxbt_context.c +++ /dev/null @@ -1,317 +0,0 @@ -/* - * $Id$ - * - * Copyright 2006,2007 Arnaud Legrand,Martin Quinson,Malek Cherier - * All right 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 "portable.h" -#include "xbt/log.h" -#include "xbt/dynar.h" -#include "xbt/xbt_os_thread.h" -#include "xbt/ex_interface.h" -#include "java/jxbt_context.h" -#include "java/jmsg.h" -#include "java/jmsg_process.h" - -/* get the right definition of the xbt_ctx with all we need here */ -#ifndef JAVA_SIMGRID -#define JAVA_SIMGRID -#endif - -#include "xbt/context_private.h" - -pfn_schedule_t __process_schedule= NULL; -pfn_schedule_t __process_unschedule= NULL; - - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ctx, xbt, "Context"); - - -static xbt_context_t current_context = NULL; /* the current context */ -static xbt_context_t init_context = NULL; /* the initial context */ -static xbt_swag_t context_to_destroy = NULL; /* the list of the contexs to destroy */ -static xbt_swag_t context_living = NULL; /* the list of the contexts in use */ - -static void -__xbt_process_schedule(xbt_context_t context); - -static void -__xbt_process_unschedule(xbt_context_t context); - -static void -__xbt_context_yield(xbt_context_t context); - -static void -__xbt_process_schedule(xbt_context_t context) { - (*(__process_schedule))(context); -} - -static void -__xbt_process_unschedule(xbt_context_t context) { - (*(__process_unschedule))(context); -} - -static void -__xbt_context_yield(xbt_context_t context) { - - if(context) { - xbt_context_t self = current_context; - current_context = context; - __xbt_process_schedule(context); - - current_context = self; - } - - if(current_context->iwannadie) - __context_exit(current_context, 1); - -} -static void -xbt_context_free(xbt_context_t context) { - - if(context) - { - if(context->jprocess) - { - jobject jprocess = context->jprocess; - context->jprocess = NULL; - - /* if the java process is alive join it */ - if(jprocess_is_alive(jprocess,get_current_thread_env())) - { - jprocess_join(jprocess,get_current_thread_env()); - } - } - - if(context->exception) - free(context->exception); - - free(context->name); - free(context); - context = NULL; - } -} -/* - * This function is only called by the main thread. - */ -void -__context_exit(xbt_context_t context ,int value) { - /* call the cleanup function of the context */ - - if(context->cleanup_func) - context->cleanup_func(context->cleanup_arg); - - /* remove the context from the list of the contexts in use. */ - xbt_swag_remove(context, context_living); - - /* insert the context in the list of contexts to destroy. */ - xbt_swag_insert(context, context_to_destroy); - - /* - * signal the condition of the java process - */ - if (context->jprocess) - { - if (jprocess_is_alive(context->jprocess,get_current_thread_env())) - { - jobject jprocess; - __xbt_process_schedule(context); - jprocess = context->jprocess; - context->jprocess = NULL; - jprocess_exit(jprocess,get_current_thread_env()); - } - } -} - -/* - * This function is called by a java process (only). - */ -void -jcontext_exit(xbt_context_t context ,int value,JNIEnv* env) { - - jobject __jprocess = context->jprocess; - context->jprocess = NULL; - - if(context->cleanup_func) - context->cleanup_func(context->cleanup_arg); - - /* remove the context of the list of living contexts */ - xbt_swag_remove(context, context_living); - - /* insert the context in the list of the contexts to destroy */ - xbt_swag_insert(context, context_to_destroy); - - /* the global reference to the java process instance is deleted */ - jprocess_delete_global_ref(__jprocess,get_current_thread_env()); -} - -/* callback: context fetching */ -static ex_ctx_t * -__context_ex_ctx(void) { - return current_context->exception; -} - -/* callback: termination */ -static void -__context_ex_terminate(xbt_ex_t *e) { - xbt_ex_display(e); - - abort(); -} - -/** - * This function initialize the xbt module context which contains - * all functions of the context API . - * - * @remark This function must be called before use all other function - * of this API. - */ -void -xbt_context_init(void) { - if(!current_context) { - /* allocate the current context. */ - current_context = init_context = xbt_new0(s_xbt_context_t,1); - - /* context exception */ - init_context->exception = xbt_new(ex_ctx_t,1); - XBT_CTX_INITIALIZE(init_context->exception); - __xbt_ex_ctx = __context_ex_ctx; - __xbt_ex_terminate = __context_ex_terminate; - - /* this list contains the context to destroy */ - context_to_destroy = xbt_swag_new(xbt_swag_offset(*current_context,hookup)); - /* this list contains the context in use */ - context_living = xbt_swag_new(xbt_swag_offset(*current_context,hookup)); - - /* append the current context in the list of context in use */ - xbt_swag_insert(init_context, context_living); - - __process_schedule = jprocess_schedule; - __process_unschedule = jprocess_unschedule; - } -} - -/** - * This function is used as a garbage collection - * Should be called some time to time to free the memory allocated for contexts - * that have finished executing their main functions. - */ -void xbt_context_empty_trash(void) { - xbt_context_t context=NULL; - - /* destroy all the context contained in the list of context to destroy */ - while((context=xbt_swag_extract(context_to_destroy))) - xbt_context_free(context); -} - -void -xbt_context_start(xbt_context_t context) { - DEBUG3("xbt_context_start of %p (jproc=%p, jenv=%p)", - context, context->jprocess, get_current_thread_env()); - - /* the main thread starts the java process */ - jprocess_start(context->jprocess,get_current_thread_env()); -} - - -xbt_context_t -xbt_context_new(const char *name, xbt_main_func_t code, - void_f_pvoid_t startup_func, void *startup_arg, - void_f_pvoid_t cleanup_func, void *cleanup_arg, - int argc, char *argv[]) { - xbt_context_t context = xbt_new0(s_xbt_context_t,1); - - context->code = code; - context->name = xbt_strdup(name); - - context->argc = argc; - context->argv = argv; - context->startup_func = startup_func; - context->startup_arg = startup_arg; - context->cleanup_func = cleanup_func; - context->cleanup_arg = cleanup_arg; - context->exception = xbt_new(ex_ctx_t,1); - XBT_CTX_INITIALIZE(context->exception); - - xbt_swag_insert(context, context_living); - - return context; -} - - -void xbt_context_yield(void) { - __xbt_process_unschedule(current_context); - - -} - -/** - * \param context the winner - * - * Calling this function blocks the current context and schedule \a context. - * When \a context will call xbt_context_yield, it will return - * to this function as if nothing had happened. - */ -void xbt_context_schedule(xbt_context_t context) { - xbt_assert0((current_context==init_context),"You are not supposed to run this function here!"); - __xbt_context_yield(context); -} - -/** - * This function kill all existing context and free all the memory - * that has been allocated in this module. - */ -void xbt_context_exit(void) { - - xbt_context_t context=NULL; - - xbt_context_empty_trash(); - - while((context=xbt_swag_extract(context_living))) { - if(context!=init_context) - xbt_context_kill(context); - } - - free(init_context->exception); - free(init_context); - - init_context = current_context = NULL ; - - xbt_context_empty_trash(); - - xbt_swag_free(context_to_destroy); - xbt_swag_free(context_living); -} - -/** - * \param context poor victim - * - * This function simply kills \a context... scarry isn't it ? - */ -void xbt_context_kill(xbt_context_t context) { - - context->iwannadie=1; - __xbt_context_yield(context); -} - -void xbt_context_set_jprocess(xbt_context_t context, void *jp) { - context->jprocess = jp; -} -void* xbt_context_get_jprocess(xbt_context_t context) { - return context->jprocess; -} - -void xbt_context_set_jenv(xbt_context_t context,void* je) { - context->jenv = je; -} -void* xbt_context_get_jenv(xbt_context_t context) { - return get_current_thread_env(); -} - - - -/* @} */ diff --git a/src/java/jxbt_context.h b/src/java/jxbt_context.h deleted file mode 100644 index c0c7b0c63b..0000000000 --- a/src/java/jxbt_context.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * $Id$ - * - * Copyright 2006,2007 Arnaud Legrand, Martin Quinson, Malek Cherier - * All right 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. - */ - -#ifndef XBT_JCONTEXT_H -#define XBT_JCONTEXT_H - - -#include "xbt/sysdep.h" -#include "xbt/swag.h" -#include "xbt/dynar.h" /* void_f_pvoid_t */ -#include "portable.h" /* loads context system definitions */ -#include "xbt/context.h" -#include "xbt/ex.h" -#include "xbt/xbt_os_thread.h" -#include - -SG_BEGIN_DECL() - -/* pointers to schedule and unschedule functions */ -typedef void (*pfn_schedule_t)(xbt_context_t); -typedef pfn_schedule_t pfn_unschedule_t; - -/* - * This function is called by the simulator to terminate a java process instance. - * - * @param context The context of the java process to terminate. - * @param value not used. - */ -void __context_exit(xbt_context_t context ,int value); - -/* - * This function is called by the java process to indicate it's done - * - * @param context The context of the process concerning by the ending. - * @parma value not used. - * @param env The jni interface pointer of the process. - */ -void jcontext_exit(xbt_context_t context ,int value,JNIEnv* env); - -SG_END_DECL() - -#endif /* !_XBT_CONTEXT_PRIVATE_H */ diff --git a/src/xbt/context.c b/src/xbt/context.c deleted file mode 100644 index 136411cf09..0000000000 --- a/src/xbt/context.c +++ /dev/null @@ -1,500 +0,0 @@ -/* $Id$ */ - -/* a fast and simple context switching library */ - -/* Copyright (c) 2004 Arnaud Legrand. */ -/* Copyright (c) 2004, 2005 Martin Quinson. */ -/* 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 "portable.h" -#include "context_private.h" -#include "xbt/log.h" -#include "xbt/dynar.h" -#include "xbt/xbt_os_thread.h" -#include "xbt/ex_interface.h" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ctx, xbt, "Context"); - -#define VOIRP(expr) DEBUG1(" {" #expr " = %p }", expr) - -static xbt_context_t current_context = NULL; -static xbt_context_t init_context = NULL; -static xbt_swag_t context_to_destroy = NULL; -static xbt_swag_t context_living = NULL; - - - -/********************/ -/* Module init/exit */ -/********************/ -#ifndef CONTEXT_THREADS -/* callback: context fetching (used only with ucontext, os_thread deal with it - for us otherwise) */ -static ex_ctx_t *_context_ex_ctx(void) -{ - return current_context->exception; -} - -/* callback: termination */ -static void _context_ex_terminate(xbt_ex_t * e) -{ - xbt_ex_display(e); - - abort(); - /* FIXME: there should be a configuration variable to - choose to kill everyone or only this one */ -} -#endif - -#ifdef CONTEXT_THREADS - -static void -schedule(xbt_context_t c); - -static void -yield(xbt_context_t c); - -static void -schedule(xbt_context_t c) -{ - xbt_os_sem_release(c->begin); - xbt_os_sem_acquire(c->end); -} - -static void yield(xbt_context_t c) -{ - xbt_os_sem_release(c->end); - xbt_os_sem_acquire(c->begin); -} -#endif - -/** \name Functions - * \ingroup XBT_context - */ -/* @{ */ -/** Context module initialization - * - * \warning It has to be called before using any other function of this module. - */ -void xbt_context_init(void) -{ - if (!current_context) { - current_context = init_context = xbt_new0(s_xbt_context_t, 1); - DEBUG1("Init Context (%p)", init_context); - init_context->iwannadie = 0; /* useless but makes valgrind happy */ - context_to_destroy = - xbt_swag_new(xbt_swag_offset(*current_context, hookup)); - context_living = xbt_swag_new(xbt_swag_offset(*current_context, hookup)); - xbt_swag_insert(init_context, context_living); - - #ifndef CONTEXT_THREADS - init_context->exception = xbt_new(ex_ctx_t, 1); - XBT_CTX_INITIALIZE(init_context->exception); - __xbt_ex_ctx = _context_ex_ctx; - __xbt_ex_terminate = _context_ex_terminate; -#endif - } -} - -/** - * This function kill all existing context and free all the memory - * that has been allocated in this module. - */ -void xbt_context_exit(void) -{ - xbt_context_t context = NULL; - - xbt_context_empty_trash(); - - while ((context = xbt_swag_extract(context_living))) { - if (context != init_context) { - xbt_context_kill(context); - } - } - -#ifndef CONTEXT_THREADS - free(init_context->exception); -#endif - - free(init_context); - init_context = current_context = NULL; - - xbt_context_empty_trash(); - xbt_swag_free(context_to_destroy); - xbt_swag_free(context_living); - -} - - -/*******************************/ -/* Object creation/destruction */ -/*******************************/ -/** - * \param code a main function - * \param startup_func a function to call when running the context for - * the first time and just before the main function \a code - * \param startup_arg the argument passed to the previous function (\a startup_func) - * \param cleanup_func a function to call when running the context, just after - the termination of the main function \a code - * \param cleanup_arg the argument passed to the previous function (\a cleanup_func) - * \param argc first argument of function \a code - * \param argv seconde argument of function \a code - */ -xbt_context_t -xbt_context_new(const char *name, - xbt_main_func_t code, - void_f_pvoid_t startup_func, - void *startup_arg, - void_f_pvoid_t cleanup_func, - void *cleanup_arg, int argc, char *argv[] - ) -{ - xbt_context_t res = NULL; - - res = xbt_new0(s_xbt_context_t, 1); - - res->code = code; - res->name = xbt_strdup(name); - -#ifdef CONTEXT_THREADS - /* - * initialize the semaphores used to schedule/yield - * the process associated to the newly created context - */ - res->begin = xbt_os_sem_init(0); - res->end = xbt_os_sem_init(0); -#else - - xbt_assert2(getcontext(&(res->uc)) == 0, - "Error in context saving: %d (%s)", errno, strerror(errno)); - res->uc.uc_link = NULL; - /* res->uc.uc_link = &(current_context->uc); */ - /* WARNING : when this context is over, the current_context (i.e. the - father), is awaken... Theorically, the wrapper should prevent using - this feature. */ - res->uc.uc_stack.ss_sp = pth_skaddr_makecontext(res->stack, STACK_SIZE); - res->uc.uc_stack.ss_size = pth_sksize_makecontext(res->stack, STACK_SIZE); - - res->exception = xbt_new(ex_ctx_t, 1); - XBT_CTX_INITIALIZE(res->exception); -#endif /* CONTEXT_THREADS or not */ - - res->iwannadie = 0; /* useless but makes valgrind happy */ - - res->argc = argc; - res->argv = argv; - res->startup_func = startup_func; - res->startup_arg = startup_arg; - res->cleanup_func = cleanup_func; - res->cleanup_arg = cleanup_arg; - - xbt_swag_insert(res, context_living); - - return res; -} - -/* Scenario for the end of a context: - * - * CASE 1: death after end of function - * __context_wrapper, called by os thread, calls xbt_context_stop after user code stops - * xbt_context_stop calls user cleanup_func if any (in context settings), - * add current to trashbin - * yields back to maestro (destroy os thread on need) - * From time to time, maestro calls xbt_context_empty_trash, - * which maps xbt_context_free on the content - * xbt_context_free frees some more memory, - * joins os thread - * - * CASE 2: brutal death - * xbt_context_kill (from any context) - * set context->wannadie to 1 - * yields to the context - * the context is awaken in the middle of __yield. - * At the end of it, it checks that wannadie == 1, and call xbt_context_stop - * (same than first case afterward) - */ - - -/* Argument must be stopped first -- runs in maestro context */ -static void xbt_context_free(xbt_context_t context) -{ - int i; - - if (!context) - return; - - DEBUG1("Freeing %p", context); - free(context->name); - - DEBUG0("Freeing arguments"); - - for (i = 0; i < context->argc; i++) - if (context->argv[i]) - free(context->argv[i]); - - if (context->argv) - free(context->argv); - -#ifdef CONTEXT_THREADS - DEBUG1("\t joining %p", (void *) context->thread); - - xbt_os_thread_join(context->thread, NULL); - - /* destroy the semaphore used to schedule/unshedule the process */ - xbt_os_sem_destroy(context->begin); - xbt_os_sem_destroy(context->end); - - context->thread = NULL; - context->begin = NULL; - context->end = NULL; -#else - if (context->exception) - free(context->exception); -#endif - - free(context); -} - -/************************/ -/* Start/stop a context */ -/************************/ -static void xbt_context_stop(int retvalue); -static void __xbt_context_yield(xbt_context_t context); - -static void *__context_wrapper(void *c) -{ - xbt_context_t context = current_context; - -#ifdef CONTEXT_THREADS - context = (xbt_context_t) c; - /*context->thread = xbt_os_thread_self();*/ - - /* signal its starting to the maestro and wait to start its job*/ - yield(context); - -#endif - - if (context->startup_func) - context->startup_func(context->startup_arg); - - DEBUG0("Calling the main function"); - - xbt_context_stop((context->code) (context->argc, context->argv)); - return NULL; -} -/** - * \param context the context to start - * - * Calling this function prepares \a context to be run. It will - however run effectively only when calling #xbt_context_schedule - */ -void xbt_context_start(xbt_context_t context) -{ -#ifdef CONTEXT_THREADS - /* create the process and start it */ - context->thread = xbt_os_thread_create(context->name,__context_wrapper, context); - - /* wait the starting of the newly created process */ - xbt_os_sem_acquire(context->end); -#else - makecontext(&(context->uc), (void (*)(void)) __context_wrapper, 1, context); -#endif -} - -/* Stops current context: calls user's cleanup function, kills os thread, and yields back to maestro */ -static void xbt_context_stop(int retvalue) -{ - DEBUG1("--------- %p is exiting ---------", current_context); - - if (current_context->cleanup_func) { - DEBUG0("Calling cleanup function"); - current_context->cleanup_func(current_context->cleanup_arg); - } - - DEBUG0("Putting context in the to_destroy set"); - xbt_swag_remove(current_context, context_living); - xbt_swag_insert(current_context, context_to_destroy); - - DEBUG0("Yielding"); - -#ifdef CONTEXT_THREADS - /* signal to the maestro that it has finished */ - xbt_os_sem_release(current_context->end); - /* exit*/ - xbt_os_thread_exit(NULL); /* We should provide return value in case other wants it */ -#else - __xbt_context_yield(current_context); -#endif - THROW_IMPOSSIBLE; -} - - - -/** Garbage collection - * - * Should be called some time to time to free the memory allocated for contexts - * that have finished executing their main functions. - */ -void xbt_context_empty_trash(void) -{ - xbt_context_t context = NULL; - - DEBUG1("Emptying trashbin (%d contexts to free)", - xbt_swag_size(context_to_destroy)); - - while ((context = xbt_swag_extract(context_to_destroy))) - xbt_context_free(context); -} - -/*********************/ -/* context switching */ -/*********************/ - -static void __xbt_context_yield(xbt_context_t context) -{ - xbt_assert0(current_context, "You have to call context_init() first."); - xbt_assert0(context, "Invalid argument"); - - if (current_context == context) { - DEBUG1 - ("--------- current_context (%p) is yielding back to maestro ---------", - context); - } else { - DEBUG2 - ("--------- current_context (%p) is yielding to context(%p) ---------", - current_context, context); - } - -#ifdef CONTEXT_THREADS - - if(current_context != init_context && !context->iwannadie) - {/* it's a process and it doesn't wants to die (xbt_context_yield()) */ - - /* save the current context */ - xbt_context_t self = current_context; - - /* update the current context to this context */ - current_context = context; - - /* yield itself */ - yield(context); - - /* restore the current context to the previously saved context */ - current_context = self; - } - else - { /* maestro wants to schedule a process or a process wants to die (xbt_context_schedule() or xbt_context_kill())*/ - - /* save the current context */ - xbt_context_t self = current_context; - - /* update the current context */ - current_context = context; - - /* schedule the process associated with this context */ - schedule(context); - - /* restore the current context to the previously saved context */ - current_context = self; - } - -#else /* use SUSv2 contexts */ - VOIRP(current_context); - VOIRP(current_context->save); - - VOIRP(context); - VOIRP(context->save); - - int return_value = 0; - - if (context->save == NULL) { - DEBUG1("[%p] **** Yielding to somebody else ****", current_context); - DEBUG2("Saving current_context value (%p) to context(%p)->save", - current_context, context); - context->save = current_context; - DEBUG1("current_context becomes context(%p) ", context); - current_context = context; - DEBUG1 - ("Current position memorized (context->save). Jumping to context (%p)", - context); - return_value = swapcontext(&(context->save->uc), &(context->uc)); - xbt_assert0((return_value == 0), "Context swapping failure"); - DEBUG1("I am (%p). Coming back\n", context); - } else { - xbt_context_t old_context = context->save; - - DEBUG1("[%p] **** Back ! ****", context); - DEBUG2("Setting current_context (%p) to context(%p)->save", - current_context, context); - current_context = context->save; - DEBUG1("Setting context(%p)->save to NULL", context); - context->save = NULL; - DEBUG2("Current position memorized (%p). Jumping to context (%p)", - context, old_context); - return_value = swapcontext(&(context->uc), &(old_context->uc)); - xbt_assert0((return_value == 0), "Context swapping failure"); - DEBUG1("I am (%p). Coming back\n", context); - } -#endif - - if (current_context->iwannadie) - xbt_context_stop(1); -} - -/** - * Calling this function makes the current context yield. The context - * that scheduled it returns from xbt_context_schedule as if nothing - * had happened. - * - * Only the processes can call this function, giving back the control - * to the maestro - */ -void xbt_context_yield(void) -{ - __xbt_context_yield(current_context); -} - -/** - * \param context the winner - * - * Calling this function blocks the current context and schedule \a context. - * When \a context will call xbt_context_yield, it will return - * to this function as if nothing had happened. - * - * Only the maestro can call this function to run a given process. - */ -void xbt_context_schedule(xbt_context_t context) -{ - DEBUG1("Scheduling %p", context); - xbt_assert0((current_context == init_context), - "You are not supposed to run this function here!"); - __xbt_context_yield(context); -} - - -/** - * \param context poor victim - * - * This function simply kills \a context... scarry isn't it ? - */ -void xbt_context_kill(xbt_context_t context) -{ - DEBUG1("Killing %p", context); - - context->iwannadie = 1; - - DEBUG1("Scheduling %p", context); - __xbt_context_yield(context); - DEBUG1("End of Scheduling %p", context); -} - -/* Java cruft I'm gonna kill in the next cleanup round */ -void xbt_context_set_jprocess(xbt_context_t context, void *jp){} -void* xbt_context_get_jprocess(xbt_context_t context){return NULL;} -void xbt_context_set_jenv(xbt_context_t context,void* je){} -void* xbt_context_get_jenv(xbt_context_t context){return NULL;} - -/* @} */ diff --git a/src/xbt/context_private.h b/src/xbt/context_private.h deleted file mode 100644 index 75d378a0d6..0000000000 --- a/src/xbt/context_private.h +++ /dev/null @@ -1,65 +0,0 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. 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. */ - -#ifndef _XBT_CONTEXT_PRIVATE_H -#define _XBT_CONTEXT_PRIVATE_H - - -#include "xbt/sysdep.h" -#include "xbt/swag.h" -#include "xbt/dynar.h" /* void_f_pvoid_t */ -#include "portable.h" /* loads context system definitions */ - -#include "xbt/context.h" -#include "xbt/ex.h" - -#ifdef CONTEXT_THREADS -# include "xbt/xbt_os_thread.h" -#else -# include "ucontext_stack.h" /* loads context system definitions */ -# include -# define STACK_SIZE 128*1024 /* Lower this if you want to reduce the memory consumption */ -#endif /* not CONTEXT_THREADS */ - - -typedef struct s_xbt_context { - s_xbt_swag_hookup_t hookup; - char *name; - - /* Declaration of the thread running the process */ -#ifdef JAVA_SIMGRID /* come first because other ones are defined too */ - jobject jprocess; /* the java process instance */ - JNIEnv* jenv; /* jni interface pointer for this thread */ - ex_ctx_t *exception; /* exception container -- only in ucontext&java, os_threads deals with it for us otherwise */ -#else -# ifdef CONTEXT_THREADS - xbt_os_thread_t thread; /* a plain dumb thread (portable to posix or windows) */ - xbt_os_sem_t begin; /* this semaphore is used to schedule/unschedule the process */ - xbt_os_sem_t end; /* this semaphore is used to schedule/unschedule the process */ -# else - ucontext_t uc; /* the thread that execute the code */ - char stack[STACK_SIZE]; - struct s_xbt_context *save; - ex_ctx_t *exception; /* exception container -- only in ucontext&java, os_threads deals with it for us otherwise */ -# endif /* CONTEXT_THREADS */ -#endif /* JAVA_SIMGRID */ - - /* What to run */ - xbt_main_func_t code; /* the scheduled fonction */ - int argc; - char **argv; - - /* Init/exit functions */ - void_f_pvoid_t startup_func; - void *startup_arg; - void_f_pvoid_t cleanup_func; - void *cleanup_arg; - int iwannadie; /* Set to true by the context when it wants to commit suicide */ -} s_xbt_context_t; - - -#endif /* !_XBT_CONTEXT_PRIVATE_H */ -- 2.20.1