merge with git master

[simgrid.git] / src / xbt / xbt_context_private.h

diff --git a/src/xbt/xbt_context_private.h b/src/xbt/xbt_context_private.h
index d6ba31a..7527119 100644 (file)
--- a/src/xbt/xbt_context_private.h
+++ b/src/xbt/xbt_context_private.h
@@ -1,3 +1,11 @@
+/* a fast and simple context switching library                              */
+
+/* Copyright (c) 2004-2008 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. */
+
 #ifndef _XBT_CONTEXT_PRIVATE_H
 #define _XBT_CONTEXT_PRIVATE_H
 
@@ -12,31 +20,36 @@ SG_BEGIN_DECL()
 /* *********************** */
 /* the following function pointers describe the interface that all context concepts must implement */
      typedef void (*xbt_pfn_context_free_t) (xbt_context_t);    /* pointer type to the function used to destroy the specified context   */
+
      typedef void (*xbt_pfn_context_kill_t) (xbt_context_t);    /* pointer type to the function used to kill the specified context              */
+
      typedef void (*xbt_pfn_context_schedule_t) (xbt_context_t);        /* pointer type to the function used to resume the specified context    */
+
      typedef void (*xbt_pfn_context_yield_t) (void);    /* pointer type to the function used to yield the specified context             */
+
      typedef void (*xbt_pfn_context_start_t) (xbt_context_t);   /* pointer type to the function used to start the specified context             */
+
      typedef void (*xbt_pfn_context_stop_t) (int);      /* pointer type to the function used to stop the current context                */
 
 /* each context type must contain this macro at its begining -- OOP in C :/ */
 #define XBT_CTX_BASE_T \
-       s_xbt_swag_hookup_t hookup; \
-       char *name; \
-       void_f_pvoid_t cleanup_func; \
-       void *cleanup_arg; \
-       ex_ctx_t *exception; \
-       int iwannadie; \
-       xbt_main_func_t code; \
-       int argc; \
-       char **argv; \
-       void_f_pvoid_t startup_func; \
-       void *startup_arg; \
-       xbt_pfn_context_free_t free; \
-       xbt_pfn_context_kill_t kill; \
-       xbt_pfn_context_schedule_t schedule; \
-       xbt_pfn_context_yield_t yield; \
-       xbt_pfn_context_start_t start; \
-       xbt_pfn_context_stop_t stop
+  s_xbt_swag_hookup_t hookup; \
+  char *name; \
+  void_f_pvoid_t cleanup_func; \
+  void *cleanup_arg; \
+  ex_ctx_t *exception; \
+  int iwannadie; \
+  xbt_main_func_t code; \
+  int argc; \
+  char **argv; \
+  void_f_pvoid_t startup_func; \
+  void *startup_arg; \
+  xbt_pfn_context_free_t free; \
+  xbt_pfn_context_kill_t kill; \
+  xbt_pfn_context_schedule_t schedule; \
+  xbt_pfn_context_yield_t yield; \
+  xbt_pfn_context_start_t start; \
+  xbt_pfn_context_stop_t stop
 
 /* all other context types derive from this structure */
      typedef struct s_xbt_context {
@@ -49,10 +62,12 @@ SG_BEGIN_DECL()
 
 /* Important guys */
      extern xbt_context_t current_context;
+
      extern xbt_context_t maestro_context;
 
 /* All dudes lists */
      extern xbt_swag_t context_living;
+
      extern xbt_swag_t context_to_destroy;
 
 /* *********************** */
@@ -72,8 +87,8 @@ SG_BEGIN_DECL()
                                                                        char
                                                                        **);
      typedef
-       int (*xbt_pfn_context_factory_create_maestro_context_t) (xbt_context_t
-                                                                *);
+     int (*xbt_pfn_context_factory_create_maestro_context_t) (xbt_context_t
+                                                              *);
 
 /* this function finalize the specified context factory */
      typedef int (*xbt_pfn_context_factory_finalize_t) (xbt_context_factory_t
@@ -103,6 +118,8 @@ SG_BEGIN_DECL()
  * If the factory cannot be found, an exception is raised.
  */
      void
+
+
       
        xbt_context_init_factory_by_name(xbt_context_factory_t * factory,
                                         const char *name);
@@ -110,7 +127,9 @@ SG_BEGIN_DECL()
 
 /* All factories init */
      void xbt_ctx_thread_factory_init(xbt_context_factory_t * factory);
+
      void xbt_ctx_sysv_factory_init(xbt_context_factory_t * factory);
+
      void xbt_ctx_java_factory_init(xbt_context_factory_t * factory);