Now supernovae mode works out of project directory.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e533911..30d3213 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/")
+set(INCLUDES "-I${PROJECT_DIRECTORY} -I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/")
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 if(EXISTS /usr/include/)
@@ -30,9 +30,6 @@ if(WIN32)
        foreach(include_dir ${INCLUDES_MORE})
                set(INCLUDES "${INCLUDES} -I\"${include_dir}\"")
        endforeach(include_dir ${INCLUDES_MORE})
-endif(WIN32)
-
-if(WIN32)
        message("       Be sure all those variables are correctely set.")
     message("          -- C_COMPILER                   $ENV{CC}")
     message("          -- CXX_COMPILER                 $ENV{CXX}")    
@@ -42,8 +39,8 @@ if(WIN32)
     message("          -- MAKE_PROGRAM                 ${CMAKE_MAKE_PROGRAM}")
     message("          -- CMAKE_BUILD_TOOL             ${CMAKE_BUILD_TOOL}")
     message("          -- LINKER                       ${CMAKE_LINKER}")
-    message("          -- CMAKE_GENERATOR              ${CMAKE_GENERATOR}\n\n")
-    message("          -- INCLUDES                     ${INCLUDES}")
+    message("          -- CMAKE_GENERATOR              ${CMAKE_GENERATOR}")
+    message("          -- INCLUDES                     ${INCLUDES}\n\n")
     set(__STRICT_ANSI__ 1)
     set(_MSC_VER 1)
     set(_WIN32 1)

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 00b4d8e..e7e7286 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -194,9 +194,9 @@ endif(enable_java)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT GTNETS
-if(NOT enable_gtnets)
+if(NOT enable_gtnets OR enable_supernovae)
        SET(HAVE_GTNETS 0)
-else(NOT enable_gtnets)
+else(NOT enable_gtnets OR enable_supernovae)
        set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")
        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
        exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR) 
@@ -207,7 +207,7 @@ else(NOT enable_gtnets)
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
        endif(COMPILE_GTNETS_VAR)
-endif(NOT enable_gtnets)
+endif(NOT enable_gtnets OR enable_supernovae)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 02d3e57..ce004f9 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -155,7 +155,7 @@ message("")
 message("      INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 message("")
 
-exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/")
+exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI)
 file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build  "SVN version : ${SVN_VERSION}\n")
 file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Release     : simgrid-${release_version}\n")
  

diff --git a/buildtools/Cmake/Supernovae.cmake b/buildtools/Cmake/Supernovae.cmake
index 36cc483..424e7d0 100644 (file)
--- a/buildtools/Cmake/Supernovae.cmake
+++ b/buildtools/Cmake/Supernovae.cmake
@@ -1,14 +1,14 @@
 ### Make supernovae files and libs
 
 set(simgrid_fragile_sources 
-${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.c
-${PROJECT_DIRECTORY}/src/surf/surfxml_parse.c
-${PROJECT_DIRECTORY}/src/xbt/graphxml_parse.c
-${PROJECT_DIRECTORY}/src/simdag/sd_daxloader.c
+src/gras/DataDesc/ddt_parse.yy.c
+src/surf/surfxml_parse.c
+src/xbt/graphxml_parse.c
+src/simdag/sd_daxloader.c
 )
 set(gras_fragile_sources
-${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.c
-${PROJECT_DIRECTORY}/src/xbt/graphxml_parse.c
+src/gras/DataDesc/ddt_parse.yy.c
+src/xbt/graphxml_parse.c
 )
 set(temp_src_smpi "")
 set(temp_src_simgrid "")
@@ -29,9 +29,9 @@ foreach(file ${simgrid_sources})
                endif(file_delete MATCHES "${file}")
        endforeach (file_delete ${simgrid_fragile_sources})
        if(en_plus)
-               if(file MATCHES "${PROJECT_DIRECTORY}/src/xbt/log.c")
+               if(file MATCHES "src/xbt/log.c")
                        set(file "xbt/log.c")
-               endif(file MATCHES "${PROJECT_DIRECTORY}/src/xbt/log.c")
+               endif(file MATCHES "src/xbt/log.c")
                set(temp_src_simgrid "${temp_src_simgrid} ${file}")
        endif(en_plus)
 endforeach(file ${simgrid_sources})
@@ -45,19 +45,19 @@ foreach(file ${gras_sources})
                endif(file_delete MATCHES "${file}")
        endforeach (file_delete ${gras_fragile_sources})
        if(en_plus)
-               if(file MATCHES "${PROJECT_DIRECTORY}/src/xbt/log.c")
+               if(file MATCHES "src/xbt/log.c")
                        set(file "xbt/log.c")
-               endif(file MATCHES "${PROJECT_DIRECTORY}/src/xbt/log.c")
+               endif(file MATCHES "src/xbt/log.c")
                set(temp_src_gras "${temp_src_gras} ${file}")
        endif(en_plus)
 endforeach(file ${gras_sources})
 
-exec_program("${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${PROJECT_DIRECTORY}/src/supernovae_smpi.c"OUTPUT_VARIABLE "SUPER_OK")
+exec_program("${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${PROJECT_DIRECTORY}/src/supernovae_smpi.c" OUTPUT_VARIABLE "SUPER_OK")
 exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/mk_supernovae.sh" OUTPUT_VARIABLE "SUPER_OK")
-exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_sg.c   ${temp_src_simgrid}" OUTPUT_VARIABLE "SUPER_OK")
-exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${temp_src_gras}"   OUTPUT_VARIABLE "SUPER_OK")
+exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_sg.c   ${temp_src_simgrid}" "${PROJECT_DIRECTORY}" OUTPUT_VARIABLE "SUPER_OK")
+exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${temp_src_gras}" "${PROJECT_DIRECTORY}"    OUTPUT_VARIABLE "SUPER_OK")
 if(enable_smpi)
-       exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_smpi.c ${temp_src_smpi}"    OUTPUT_VARIABLE "SUPER_OK")
+       exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_smpi.c ${temp_src_smpi}" "${PROJECT_DIRECTORY}"     OUTPUT_VARIABLE "SUPER_OK")
 endif(enable_smpi)
 
 add_library(simgrid    SHARED  ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
@@ -65,5 +65,4 @@ add_library(simgrid_static STATIC ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${sim
 add_library(gras       SHARED  ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${gras_fragile_sources})
 if(enable_smpi)
        add_library(smpi        SHARED  ${PROJECT_DIRECTORY}/src/supernovae_smpi.c)
-endif(enable_smpi)
-
+endif(enable_smpi)
\ No newline at end of file

diff --git a/src/surf/network_vivaldi.c b/src/surf/network_vivaldi.c
index 3be1d31..8be7582 100644 (file)
--- a/src/surf/network_vivaldi.c
+++ b/src/surf/network_vivaldi.c
@@ -23,12 +23,12 @@ typedef struct s_netviva_coords {
 xbt_dict_t coords; /* Host name -> coordinates */
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static random_data_t random_latency = NULL;
-static int host_number_int = 0;
+static random_data_t random_latency_viva = NULL;
+static int host_number_int_viva = 0;
 
 static void netviva_count_hosts(void)
 {
-  host_number_int++;
+  host_number_int_viva++;
 }
 
 static void netviva_define_callbacks(const char *file)
@@ -140,7 +140,7 @@ static surf_action_t netviva_communicate(const char *src_name, const char *dst_n
 
   action->suspended = 0;
 
-  action->latency = sqrt((c1->x-c2->x)*(c1->x-c2->x) + (c1->y-c2->y)*(c1->y-c2->y)) + fabs(c1->h)+ fabs(c2->h) ;          //random_generate(random_latency);
+  action->latency = sqrt((c1->x-c2->x)*(c1->x-c2->x) + (c1->y-c2->y)*(c1->y-c2->y)) + fabs(c1->h)+ fabs(c2->h) ;          //random_generate(random_latency_viva);
   action->lat_init = action->latency;
 
   if (action->latency <= 0.0) {
@@ -168,7 +168,7 @@ static double netviva_get_link_latency(const void *link)
   DIE_IMPOSSIBLE;
 }
 
-static int link_shared(const void *link)
+static int netviva_link_shared(const void *link)
 {
   DIE_IMPOSSIBLE;
 }
@@ -200,12 +200,6 @@ static void netviva_finalize(void)
   surf_network_model = NULL;
 }
 
-
-static void net_define_callbacks(const char *file)
-{
-  /* Figuring out the network links */
-}
-
 static void netviva_parse_host(void) {
   netviva_coords_t coord = xbt_new(s_netviva_coords_t,1);
 
@@ -255,10 +249,10 @@ void surf_network_model_init_Vivaldi(const char *filename)
   surf_network_model->extension.network.get_link_bandwidth =
     netviva_get_link_bandwidth;
   surf_network_model->extension.network.get_link_latency = netviva_get_link_latency;
-  surf_network_model->extension.network.link_shared = link_shared;
+  surf_network_model->extension.network.link_shared = netviva_link_shared;
 
-  if (!random_latency)
-    random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
+  if (!random_latency_viva)
+    random_latency_viva = random_new(RAND, 100, 0.0, 1.0, .125, .034);
   netviva_define_callbacks(filename);
   xbt_dynar_push(model_list, &surf_network_model);
 

diff --git a/src/xbt/mmalloc/mmap-sup.c b/src/xbt/mmalloc/mmap-sup.c
index e5cd973..4388ff9 100644 (file)
--- a/src/xbt/mmalloc/mmap-sup.c
+++ b/src/xbt/mmalloc/mmap-sup.c
@@ -64,6 +64,7 @@ extern int getpagesize (void);
 void*
 __mmalloc_mmap_morecore (struct mdesc *mdp, int size)
 {
+  ssize_t test = 0;
   void* result = NULL;
   off_t foffset;       /* File offset at which new mapping will start */
   size_t mapbytes;     /* Number of bytes to map */
@@ -116,7 +117,7 @@ __mmalloc_mmap_morecore (struct mdesc *mdp, int size)
       if( mdp -> fd > 0){
          /* FIXME:  Test results of lseek() and write() */
         lseek (mdp -> fd, foffset + mapbytes - 1, SEEK_SET);
-             write (mdp -> fd, &buf, 1);
+        test = write (mdp -> fd, &buf, 1);
       }
            
            /* Let's call mmap. Note that it is possible that mdp->top