Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/CITATION.bib b/CITATION.bib
index d238b86..d6c13aa 100644 (file)
--- a/CITATION.bib
+++ b/CITATION.bib
@@ -1,15 +1,13 @@
-@InProceedings{Casanova:2008:SGF:1397760.1398183,
-  author =  {Casanova, Henri and Legrand, Arnaud and Quinson, Martin},
-  title =  {SimGrid: a Generic Framework for Large-Scale Distributed Experiments},
-  booktitle = {Proceedings of the Tenth International Conference on Computer Modeling and Simulation},
-  series = {UKSIM '08},
-  year = {2008},
-  isbn = {978-0-7695-3114-4},
-  pages = {126--131},
-  numpages = {6},
-  url = {http://dx.doi.org/10.1109/UKSIM.2008.28},
-  doi = {10.1109/UKSIM.2008.28},
-  acmid = {1398183},
-  publisher = {IEEE Computer Society},
-  address = {Washington, DC, USA},
+@Article{simgrid,
+  hal_id = {hal-01017319},
+  url = {http://hal.inria.fr/hal-01017319},
+  title = {Versatile, Scalable, and Accurate Simulation of Distributed Applications and Platforms},
+  author = {Casanova, Henri and Giersch, Arnaud and Legrand, Arnaud and Quinson, Martin and Suter, Fr{\'e}d{\'e}ric},
+  publisher = {Elsevier},
+  pages = {2899-2917},
+  journal = {Journal of Parallel and Distributed Computing},
+  volume = {74},
+  number = {10},
+  year = {2014},
+  month = Jun,
 }

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 2757e7c..30d1a54 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -81,23 +81,6 @@ XBT_PRIVATE void _mc_cfg_cb_termination(const char *name, int pos);
 extern xbt_dynar_t mc_heap_comparison_ignore;
 extern xbt_dynar_t stacks_areas;
 
-/********************************* Global *************************************/
-void _mc_cfg_cb_reduce(const char *name, int pos);
-void _mc_cfg_cb_checkpoint(const char *name, int pos);
-void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos);
-void _mc_cfg_cb_soft_dirty(const char *name, int pos);
-void _mc_cfg_cb_ksm(const char *name, int pos);
-void _mc_cfg_cb_property(const char *name, int pos);
-void _mc_cfg_cb_timeout(const char *name, int pos);
-void _mc_cfg_cb_hash(const char *name, int pos);
-void _mc_cfg_cb_snapshot_fds(const char *name, int pos);
-void _mc_cfg_cb_max_depth(const char *name, int pos);
-void _mc_cfg_cb_visited(const char *name, int pos);
-void _mc_cfg_cb_dot_output(const char *name, int pos);
-void _mc_cfg_cb_comms_determinism(const char *name, int pos);
-void _mc_cfg_cb_send_determinism(const char *name, int pos);
-void _mc_cfg_cb_termination(const char *name, int pos);
-
 XBT_PUBLIC(void) MC_run(void);
 XBT_PUBLIC(void) MC_init(void);
 XBT_PUBLIC(void) MC_exit(void);

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index c92e147..1fd30c2 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -11,16 +11,6 @@ IF(enable_smpi AND NOT WIN32)
   exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
 ENDIF()
 
-### For code coverage
-### Set some variables
-SET(UPDATE_TYPE "svn")
-SET(DROP_METHOD "http")
-SET(DROP_SITE "cdash.inria.fr/CDash")
-SET(DROP_LOCATION "/submit.php?project=${PROJECT_NAME}")
-SET(DROP_SITE_CDASH TRUE)
-SET(TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi")
-#If you use the --read-var-info option Memcheck will run more slowly but may give a more detailed description of any illegal address.
-
 SET(TESH_COMMAND ${PERL_EXECUTABLE} ${CMAKE_BINARY_DIR}/bin/tesh)
 IF(CMAKE_HOST_WIN32)
   SET(TESH_OPTION $TESH_OPTION --timeout 50)