From: Paul Bédaride Date: Tue, 18 Feb 2014 09:16:47 +0000 (+0100) Subject: Fix doxygen X-Git-Tag: v3_11_beta~26 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5295fbb473702220cab0389b28d6d4a3097c246d Fix doxygen --- diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index b512d0f87d..745392566f 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -322,22 +322,6 @@ INLINE_SIMPLE_STRUCTS = NO TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penalty. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will roughly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols. - -SYMBOL_CACHE_SIZE = 0 - # Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be # set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given # their name and scope. Since this can be an expensive process and often the diff --git a/doc/doxygen/bindings.doc b/doc/doxygen/bindings.doc index 2ad4cd396d..1283603095 100644 --- a/doc/doxygen/bindings.doc +++ b/doc/doxygen/bindings.doc @@ -128,7 +128,7 @@ http://graal.ens-lyon.fr/~jrouzaud/files/corosimple-linux-amd64-20120914.tgz ~~~~{.sh} sudo apt-get install mercurial ksh libfreetype6-dev libcups2-dev libasound2-dev gawk openjdk-7-jdk libxext-dev libxrender-dev libxtst-dev # Grab the forest extension: we need to source-install it -hg clone https://bitbucket.org/gxti/hgforest hgforest \endverbatim +hg clone https://bitbucket.org/gxti/hgforest hgforest ~~~~ -# Configure the mercurial extensions: Edit ~/.hgrc and paste the following lines. Don't forget to change the /path/to/forest.py to @@ -163,13 +163,12 @@ ls -i patches/hotspot/series sources/hotspot/.hg/patches/series # 9707849 patches/hotspot/series # 9707849 sources/hotspot/.hg/patches/series - # Specify what to compile. -export davinci=$(pwd) guards="buildable testable coro-simple" +export davinci=${pwd} guards="buildable testable coro-simple" # Apply the patches -sh patches/make/each-patch-repo.sh hg qselect --reapply $guards '$(sh $davinci/patches/make/current-release.sh)' +sh patches/make/each-patch-repo.sh hg qselect --reapply $guards `sh $davinci/patches/make/current-release.sh` # Check that it understood that you want the patch applied: -grep GLOBAL_GUARDS patches/make/* -r +grep -r GLOBAL_GUARDS patches/make/ # this should display something like the following (maybe amonst other unrelated lines) # GLOBAL_GUARDS=buildable testable coro-simple # If this does not work, edit patches/make/Makefile, @@ -178,9 +177,10 @@ grep GLOBAL_GUARDS patches/make/* -r # Finish the setup -(cd patches/make; make setup && make force && make && make FORCE_VERSIONS=1 && echo "Sources are properly setup") +cd patches/make; +make setup && make force && make && make FORCE_VERSIONS=1 && echo "Sources are properly setup" # If this last command failed, check your mercurial config within ~/.hgrc (see above) -~~~~ +~~~~ -# Compile it all ~~~~{.sh} unset LD_LIBRARY_PATH diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc index 304781edd8..b9ab520108 100644 --- a/doc/doxygen/options.doc +++ b/doc/doxygen/options.doc @@ -18,7 +18,7 @@ type the following: \verbatim my_simulator --cfg=Item:Value (other arguments) \endverbatim -Several \c --cfg command line arguments can naturally be used. If you +Several \c `--cfg` command line arguments can naturally be used. If you need to include spaces in the argument, don't forget to quote the argument. You can even escape the included quotes (write \' for ' if you have your argument between '). @@ -31,7 +31,8 @@ ignored so you don't really need to pass it. The important par is that within that tag, you can pass one or several \c \ tags to specify the configuration to use. For example, setting \c Item to \c Value can be done by adding the following to the beginning of your platform -file: \verbatim +file: +\verbatim diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 59415583af..41a4aba22d 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -113,6 +113,12 @@ XBT_PUBLIC(uintptr_t) xbt_dicti_get(xbt_dict_t dict, uintptr_t key); XBT_PUBLIC(void) xbt_dicti_remove(xbt_dict_t dict, uintptr_t key); #endif +struct s_xbt_dict_cursor { + xbt_dictelm_t current; + int line; + xbt_dict_t dict; +}; + /** @} */ /** @defgroup XBT_dict_curs Cursors on dictionaries * @ingroup XBT_dict @@ -136,11 +142,6 @@ XBT_PUBLIC(void) xbt_dicti_remove(xbt_dict_t dict, uintptr_t key); * @{ */ /** @brief Cursor on dictionaries (opaque type) */ -struct s_xbt_dict_cursor { - xbt_dictelm_t current; - int line; - xbt_dict_t dict; -}; typedef struct s_xbt_dict_cursor *xbt_dict_cursor_t; static inline xbt_dictelm_t xbt_dict_cursor_get_elm(xbt_dict_cursor_t cursor) { diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index b59b7b04cc..729aa65e20 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -666,17 +666,17 @@ Resource::Resource() : p_name(NULL), p_properties(NULL), p_model(NULL) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props) +Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props) : p_name(xbt_strdup(name)), p_properties(props), p_model(model) , m_running(true), m_stateCurrent(SURF_RESOURCE_ON) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) +Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) : p_name(xbt_strdup(name)), p_properties(props), p_model(model) , m_running(true), m_stateCurrent(SURF_RESOURCE_ON), p_constraint(constraint) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) +Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) : p_name(xbt_strdup(name)), p_properties(props), p_model(model) , m_running(true), m_stateCurrent(stateInit) {}