Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Mon, 14 May 2012 12:59:22 +0000 (14:59 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Mon, 14 May 2012 12:59:22 +0000 (14:59 +0200)
NEWS
buildtools/Cmake/DefinePackages.cmake
examples/msg/chord/generate.py
src/include/simix/context.h [deleted file]
src/simix/smx_context.c
src/simix/smx_context_base.c
src/simix/smx_context_thread.c
src/simix/smx_private.h
src/surf/surf_config.c

diff --git a/NEWS b/NEWS
index 2bb1812..3e57137 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Major changes:
 
  * Major cleanups all around (doc, user options, MSG, lua, internals)
    Small backward compatibility glitches may have been introduced
- * Parallel executino of user code should be stable and efficient now
+ * Parallel execution of user code should be stable and efficient now
  * SMPI is now considered stable
  * Add temporals to Model-Checking (highly experimental right now)
                     _               _____  __    ____
index 8d22b46..41c3f36 100644 (file)
@@ -59,7 +59,6 @@ set(EXTRA_DIST
        src/include/xbt/xbt_os_time.h
        src/include/mc/datatypes.h
        src/include/mc/mc.h
-       src/include/simix/context.h
        src/msg/msg_private.h
        src/msg/msg_mailbox.h
        src/simdag/private.h
index 5c4f760..cc24945 100755 (executable)
@@ -1,5 +1,10 @@
 #!/usr/bin/python
 
+# This script generates a specific deployment file for the Chord example.
+# It assumes that the platform will be a cluster.
+# Usage: python generate.py nb_nodes nb_bits end_date
+# Example: python generate.py 100000 32 1000
+
 import sys, random
 
 if len(sys.argv) != 4:
diff --git a/src/include/simix/context.h b/src/include/simix/context.h
deleted file mode 100644 (file)
index eaa0bfc..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 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 "simgrid/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 */
index f1588b6..f0ec02f 100644 (file)
@@ -11,7 +11,6 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
-#include "simix/context.h"
 #include "gras_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
index 616f669..56efcf1 100644 (file)
@@ -9,7 +9,6 @@
 
 #include "xbt/function_types.h"
 #include "simgrid/simix.h"
-#include "simix/context.h"
 #include "smx_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
index 1af1170..c8260db 100644 (file)
@@ -12,7 +12,6 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt_modinter.h"       /* prototype of os thread module's init/exit in XBT */
-#include "simix/context.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
index b19e966..2e3ca93 100644 (file)
@@ -23,7 +23,6 @@
 #include "smx_network_private.h"
 #include "smx_smurf_private.h"
 #include "smx_synchro_private.h"
-#include "simix/context.h"
 
 /* Define only for SimGrid benchmarking purposes */
 #undef TIME_BENCH
index 7de2320..e2cbb45 100644 (file)
@@ -11,7 +11,6 @@
 #include "xbt/str.h"
 #include "surf/surf_private.h"
 #include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
-#include "simix/context.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
                                 "About the configuration of surf (and the rest of the simulation)");