Simplify the management of processes in MSG.

[simgrid.git] / src / include / simix / context.h

diff --git a/src/include/simix/context.h b/src/include/simix/context.h
index abdea17..072ab5d 100644 (file)
--- a/src/include/simix/context.h
+++ b/src/include/simix/context.h
@@ -1,21 +1,43 @@
-#ifndef XBT_CONTEXT_H\r
-#define XBT_CONTEXT_H\r
-\r
-#include "xbt/misc.h"                          /* XBT_PUBLIC(), SG_BEGIN_DECL() and SG_END_DECL() definitions  */\r
-#include "xbt/function_types.h"                /* function pointer types declarations                                                  */      \r
-#include "xbt_modinter.h"                      /* xbt_context_init() and xbt_context_exit() declarations               */\r
-     \rSG_BEGIN_DECL() \r \rtypedef struct s_xbt_context *xbt_context_t;
-\r\r\rXBT_PUBLIC(xbt_context_t) \r
-xbt_context_new(const char *name, xbt_main_func_t code,
-                \rvoid_f_pvoid_t startup_func, void *startup_arg,
-                \rvoid_f_pvoid_t cleanup_func, void *cleanup_arg, int argc,
-                \rchar *argv[]);
-\r\r\rXBT_PUBLIC(void) \r xbt_context_kill(xbt_context_t context);
-\r\r\rXBT_PUBLIC(void) \r xbt_context_start(xbt_context_t context);
-\r\r\rXBT_PUBLIC(void) \r xbt_context_yield(void);
-\r\r\rXBT_PUBLIC(void) \r xbt_context_schedule(xbt_context_t context);
-     \r\r\rvoid \rxbt_context_empty_trash(void);
-     \r\r\rvoid \rxbt_context_stop(int exit_code);
-     \r\r\rvoid \rxbt_context_free(xbt_context_t context);
-\r\r\r\rSG_END_DECL() \r \r
-#endif  /* !XBT_CONTEXT_H */\r
+/* Copyright (c) 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. */
+
+#ifndef XBT_CONTEXT_H
+#define XBT_CONTEXT_H
+
+#include "xbt/misc.h"           /* XBT_PUBLIC(), SG_BEGIN_DECL() and SG_END_DECL() definitions  */
+#include "xbt/function_types.h" /* function pointer types declarations                                                  */
+#include "xbt_modinter.h"       /* xbt_context_init() and xbt_context_exit() declarations               */
+#include "simix/simix.h"
+
+SG_BEGIN_DECL()
+
+typedef struct s_xbt_context *xbt_context_t;
+
+
+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_pfn_smxprocess_t cleanup_func,
+                                          smx_process_t process,
+                                          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_empty_trash(void);
+
+void xbt_context_stop(int exit_code);
+
+void xbt_context_free(xbt_context_t context);
+
+SG_END_DECL()
+#endif                          /* !XBT_CONTEXT_H */