cosmetics: inline header files loaded only at one location

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5075 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/Makefile.am b/src/Makefile.am
index afc5453..d9dc6eb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,8 +33,6 @@ EXTRA_DIST= \
        xbt/graphxml.dtd \
         xbt/xbt_context_private.h \
         xbt/xbt_context_factory.h \
-        xbt/xbt_thread_context.h \
-        xbt/xbt_ucontext.h \
         xbt/xbt_jcontext.h \
        xbt/log_private.h \
        xbt/ex_interface.h \

diff --git a/src/Makefile.in b/src/Makefile.in
index c7f6d55..025272a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -395,8 +395,7 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
        xbt/dict_private.h xbt/heap_private.h xbt/fifo_private.h \
        xbt/graph_private.h xbt/graphxml_parse.c xbt/graphxml.l \
        xbt/graphxml.c xbt/graphxml.dtd xbt/xbt_context_private.h \
-       xbt/xbt_context_factory.h xbt/xbt_thread_context.h \
-       xbt/xbt_ucontext.h xbt/xbt_jcontext.h xbt/log_private.h \
+       xbt/xbt_context_factory.h xbt/xbt_jcontext.h xbt/log_private.h \
        xbt/ex_interface.h surf/maxmin_private.h \
        surf/trace_mgr_private.h surf/surf_private.h \
        surf/cpu_private.h surf/workstation_private.h \

diff --git a/src/simgrid_units_main.c b/src/simgrid_units_main.c
index b0bd7c4..abe0c75 100644 (file)
--- a/src/simgrid_units_main.c
+++ b/src/simgrid_units_main.c
@@ -57,6 +57,7 @@ extern xbt_test_unit_t _xbt_current_unit;
     void test_config_use(void);
   /* SGU: END FILE */
 
+/* SGU: END PROTOTYPES */
 
 /*******************************/
 /* GENERATED FILE, DO NOT EDIT */

diff --git a/src/xbt/xbt_thread_context.c b/src/xbt/xbt_thread_context.c
index 891a6dd..d69597c 100644 (file)
--- a/src/xbt/xbt_thread_context.c
+++ b/src/xbt/xbt_thread_context.c
@@ -1,7 +1,17 @@
 \r
 #include "xbt/function_types.h"\r
 #include "xbt/xbt_context_factory.h"\r
-#include "xbt/xbt_thread_context.h"\r
+\r
+#include "portable.h"                  /* loads context system definitions */\r
+#include "xbt/swag.h"\r
+\r
+\r
+typedef struct s_xbt_thread_context {\r
+       XBT_CTX_BASE_T;\r
+       xbt_os_thread_t thread;                 /* a plain dumb thread (portable to posix or windows) */\r
+       xbt_os_sem_t begin;                             /* this semaphore is used to schedule/yield the process  */\r
+       xbt_os_sem_t end;                               /* this semaphore is used to schedule/unschedule the process   */\r
+} s_xbt_thread_context_t,* xbt_thread_context_t;\r
 \r
 static xbt_context_t \r
 xbt_thread_context_factory_create_context(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);\r

diff --git a/src/xbt/xbt_thread_context.h b/src/xbt/xbt_thread_context.h
deleted file mode 100644 (file)
index 49ab594..0000000
--- a/src/xbt/xbt_thread_context.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _XBT_THREAD_CONTEXT_H\r
-#define _XBT_THREAD_CONTEXT_H\r
-\r
-#include "portable.h"                  /* loads context system definitions                                                                                                                     */\r
-#include "xbt/xbt_os_thread.h"         /* declaration of the xbt native semaphore and native thread                                                            */\r
-#include "xbt/swag.h"\r
-\r
-SG_BEGIN_DECL()\r
-\r
-\r
-typedef struct s_xbt_thread_context\r
-{\r
-       XBT_CTX_BASE_T;\r
-       xbt_os_thread_t thread;                 /* a plain dumb thread (portable to posix or windows)                                                                           */\r
-       xbt_os_sem_t begin;                             /* this semaphore is used to schedule/yield the process                                                                         */\r
-       xbt_os_sem_t end;                               /* this semaphore is used to schedule/unschedule the process                                                            */\r
-}s_xbt_thread_context_t,* xbt_thread_context_t;\r
-\r
-SG_END_DECL()\r
-\r
-#endif /* !_XBT_THREAD_CONTEXT_H */\r

diff --git a/src/xbt/xbt_ucontext.c b/src/xbt/xbt_ucontext.c
index 0f2c3ce..481b479 100644 (file)
--- a/src/xbt/xbt_ucontext.c
+++ b/src/xbt/xbt_ucontext.c
@@ -2,7 +2,18 @@
 #include "ucontext_stack.h"\r
 #include "xbt/ex_interface.h"\r
 #include "xbt/xbt_context_factory.h"\r
-#include "xbt/xbt_ucontext.h"\r
+\r
+#include "ucontext_stack.h"            /* loads context system definitions                             */\r
+#include <ucontext.h>                  /* context relative declarations                                */                              \r
+#define STACK_SIZE 128*1024            /* lower this if you want to reduce the memory consumption      */\r
+\r
+typedef struct s_xbt_ucontext {\r
+   XBT_CTX_BASE_T;\r
+       ucontext_t uc;                  /* the thread that execute the code                             */\r
+       char stack[STACK_SIZE];         /* the thread stack size                                        */\r
+       struct s_xbt_ucontext* prev;    /* the previous thread                                          */\r
+} s_xbt_ucontext_t,* xbt_ucontext_t;\r
+\r
 \r
 /* callback: context fetching */\r
 static ex_ctx_t*\r

diff --git a/src/xbt/xbt_ucontext.h b/src/xbt/xbt_ucontext.h
deleted file mode 100644 (file)
index dac3ab0..0000000
--- a/src/xbt/xbt_ucontext.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _XBT_UCONTEXT_H\r
-#define _XBT_UCONTEXT_H\r
-\r
-#include "ucontext_stack.h"            /* loads context system definitions                                                                                                                     */\r
-#include <ucontext.h>                  /* context relative declarations                                                                                                                        */                              \r
-#define STACK_SIZE 128*1024            /* lower this if you want to reduce the memory consumption                                                                      */\r
-\r
-typedef struct s_xbt_ucontext\r
-{\r
-       XBT_CTX_BASE_T;\r
-       ucontext_t uc;                                  /* the thread that execute the code                                                                                                                     */\r
-       char stack[STACK_SIZE];                 /* the thread stack size                                                                                                                                        */\r
-       struct s_xbt_ucontext* prev;            /* the previous thread                                                                                                                                  */\r
-}s_xbt_ucontext_t,* xbt_ucontext_t;\r
-\r
-\r
-SG_END_DECL()\r
-\r
-#endif /* !_XBT_UCONTEXT_H */\r