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>
Fri, 23 Oct 2015 13:25:14 +0000 (15:25 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Fri, 23 Oct 2015 13:25:14 +0000 (15:25 +0200)
examples/lua/CMakeLists.txt
examples/msg/energy/vm/CMakeLists.txt
include/smpi/mpif.h.in
include/smpi/smpi.h
src/bindings/lua/factories/host.lua
src/smpi/smpi_pmpi.c
src/smpi/smpi_rma.c
tools/cmake/DefinePackages.cmake

index 8c30ca4..8b1e47c 100644 (file)
@@ -36,6 +36,7 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/kademlia/kademlia.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/kademlia/routing_table.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/kademlia/tools.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/master.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/master_slave.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/slave.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/mult_matrix.lua
index 314be4c..14ae4f6 100644 (file)
@@ -13,6 +13,7 @@ set(tesh_files
 
 set(xml_files
   ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_consumption.xml
   PARENT_SCOPE
   )
 
index 3d4d949..84adf93 100644 (file)
       parameter(MPI_GROUP_NULL=-1)
       parameter(MPI_GROUP_EMPTY=-2)
 
+      integer MPI_WIN_NULL
+      parameter(MPI_WIN_NULL=-1)
+
       integer MPI_ERRORS_RETURN, MPI_ERRORS_ARE_FATAL
       integer MPI_ERRHANDLER_NULL
       parameter(MPI_ERRORS_RETURN=0)
index a9117e2..429f818 100644 (file)
@@ -178,7 +178,7 @@ SG_BEGIN_DECL()
 #define MPI_ROOT 0
 #define MPI_INFO_NULL NULL
 #define MPI_COMM_TYPE_SHARED    1
-#define MPI_WIN_NULL NULL
+#define MPI_WIN_NULL ((MPI_Win)NULL)
 
 #define MPI_VERSION 1
 #define MPI_SUBVERSION 1
index f8f07cd..17c21b1 100644 (file)
@@ -1,7 +1,7 @@
 
 hostFactory = function(host_args)
     if type(host_args.power) ~= "number" then
-        error("FUCK")
+        error("OOPS")
     end
     return function(more_args)
     end
index 99fdf8a..fae3690 100644 (file)
@@ -1820,10 +1820,11 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
   int dt_size_recv = 1;
   if(!known)
     dt_size_recv = smpi_datatype_size(recvtype);
+  if((smpi_comm_rank(comm)==root)){
   extra->recvcounts= xbt_malloc(size*sizeof(int));
   for(i=0; i< size; i++)//copy data to avoid bad free
     extra->recvcounts[i] = recvcounts[i]*dt_size_recv;
-
+  }
   TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra);
 
   smpi_mpi_gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts,
@@ -2023,9 +2024,11 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
   int dt_size_send = 1;
   if(!known)
     dt_size_send = smpi_datatype_size(sendtype);
+  if((smpi_comm_rank(comm)==root)){
   extra->sendcounts= xbt_malloc(size*sizeof(int));
   for(i=0; i< size; i++)//copy data to avoid bad free
     extra->sendcounts[i] = sendcounts[i]*dt_size_send;
+  }
   extra->datatype2 = encode_datatype(recvtype, &known);
   int dt_size_recv = 1;
   if(!known)
index 6afba57..859bd91 100644 (file)
@@ -89,7 +89,7 @@ int smpi_mpi_win_free( MPI_Win* win){
     MPI_Info_free(&(*win)->info);
   }
   xbt_free(*win);
-  win = MPI_WIN_NULL;
+  *win = MPI_WIN_NULL;
   return MPI_SUCCESS;
 }
 
index 06c0d93..e402f08 100644 (file)
@@ -564,6 +564,7 @@ list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
 list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
 set(LUA_SRC
+  src/bindings/lua/factories/host.lua
   src/bindings/lua/lua_comm.c
   src/bindings/lua/lua_host.c
   src/bindings/lua/lua_platf.c
@@ -981,6 +982,7 @@ set(DOC_IMG
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/DiscoveringSimgrid.gif
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png
@@ -1015,6 +1017,7 @@ set(txt_files
   COPYING
   README
   README.java
+  README.lua
   ChangeLog
   ChangeLog.SimGrid-java
   INSTALL
@@ -1056,6 +1059,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/cloud/CMakeLists.txt
   examples/msg/energy/consumption/CMakeLists.txt
   examples/msg/energy/onoff/CMakeLists.txt
+  examples/msg/energy/vm/CMakeLists.txt
   examples/msg/energy/pstate/CMakeLists.txt
   examples/msg/energy/vm/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
@@ -1108,6 +1112,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/bug-17132/CMakeLists.txt
   teshsuite/java/CMakeLists.txt
   teshsuite/java/sleep_host_off/CMakeLists.txt
+  teshsuite/lua/lua_platforms.tesh
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
@@ -1276,6 +1281,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cloud.xml
   examples/platforms/cluster.xml
   examples/platforms/cluster_and_one_host.xml
+  examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_no_backbone.xml
   examples/platforms/clusters_routing_full.xml
   examples/platforms/crosstraffic.xml
@@ -1300,9 +1306,11 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
+  examples/platforms/platform.lua
   examples/platforms/platform.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
+  examples/platforms/routing_cluster.lua
   examples/platforms/routing_none.xml
   examples/platforms/storage/content/small_content.txt
   examples/platforms/storage/content/storage_content.txt
@@ -1311,6 +1319,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/storage/remote_io.xml
   examples/platforms/storage/storage.xml
   examples/platforms/small_platform.xml
+  examples/platforms/small_platform.lua
   examples/platforms/small_platform_fatpipe.xml
   examples/platforms/small_platform_one_link_routes.xml
   examples/platforms/small_platform_with_failures.xml