X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c178c9855b20b64211ebea92eb9f783b875bbe1..455435b8a7cc8d84037aa66104a73d4760d9666f:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 28348f0086..7d5b8d431e 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -10,6 +10,7 @@ set(EXTRA_DIST
   src/mc/mc_record.h
   src/include/simgrid/sg_config.h
   src/include/smpi/smpi_interface.h
+  src/include/smpi/smpi_utils.hpp
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
   src/include/surf/surf.h
@@ -17,7 +18,7 @@ set(EXTRA_DIST
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
-  src/simdag/simdag_private.h
+  src/simdag/simdag_private.hpp
   src/simix/simcalls.in
   src/simix/simcalls.py
   src/simix/popping_private.h
@@ -29,15 +30,14 @@ set(EXTRA_DIST
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
-  src/simix/smx_process_private.h
+  src/simix/ActorImpl.hpp
   src/simix/smx_synchro_private.h
-  src/simix/Synchro.h
-  src/simix/SynchroComm.hpp
-  src/simix/SynchroExec.hpp
-  src/simix/SynchroIo.hpp
-  src/simix/SynchroSleep.hpp
-  src/simix/SynchroRaw.hpp
-  src/smpi/README
+  src/kernel/activity/ActivityImpl.hpp
+  src/kernel/activity/SynchroComm.hpp
+  src/kernel/activity/SynchroExec.hpp
+  src/kernel/activity/SynchroIo.hpp
+  src/kernel/activity/SynchroSleep.hpp
+  src/kernel/activity/SynchroRaw.hpp
   src/smpi/colls/coll_tuned_topo.h
   src/smpi/colls/colls.h
   src/smpi/colls/colls_private.h
@@ -63,26 +63,26 @@ set(EXTRA_DIST
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
 
-  src/surf/AsImpl.hpp
-  src/surf/AsCluster.hpp
-  src/surf/AsClusterFatTree.hpp
-  src/surf/AsClusterTorus.hpp
-  src/surf/AsClusterDragonfly.hpp
-  src/surf/AsDijkstra.hpp
-  src/surf/AsFloyd.hpp
-  src/surf/AsFull.hpp
-  src/surf/AsRoutedGraph.hpp
-  src/surf/AsNone.hpp
-  src/surf/AsVivaldi.hpp
+  src/kernel/routing/AsImpl.hpp
+  src/kernel/routing/AsCluster.hpp
+  src/kernel/routing/AsClusterFatTree.hpp
+  src/kernel/routing/AsClusterTorus.hpp
+  src/kernel/routing/AsClusterDragonfly.hpp
+  src/kernel/routing/AsDijkstra.hpp
+  src/kernel/routing/AsFloyd.hpp
+  src/kernel/routing/AsFull.hpp
+  src/kernel/routing/AsRoutedGraph.hpp
+  src/kernel/routing/AsNone.hpp
+  src/kernel/routing/AsVivaldi.hpp  
+  src/kernel/routing/BypassRoute.hpp
+  src/kernel/routing/NetCard.hpp
 
   src/surf/storage_interface.hpp
   src/surf/storage_n11.hpp
   src/surf/surf_interface.hpp
   src/surf/surf_private.h
   src/surf/surf_routing.hpp
-  src/surf/vm_hl13.hpp
   src/surf/PropertyHolder.hpp
-  src/surf/virtual_machine.hpp
   src/surf/host_clm03.hpp
   src/surf/HostImpl.hpp
   src/surf/ptask_L07.hpp
@@ -116,6 +116,9 @@ set(EXTRA_DIST
   teshsuite/lua/lua_platforms.tesh
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
+  
+  examples/java/.classpath
+  examples/java/.project
   )
 
 set(SMPI_SRC
@@ -238,7 +241,11 @@ set(SMPI_SRC
   src/smpi/smpi_replay.cpp
   src/smpi/smpi_rma.cpp
   src/smpi/smpi_topo.cpp
+  src/smpi/smpi_utils.cpp
   src/smpi/smpi_f77.cpp
+  
+  src/surf/network_smpi.cpp
+  src/surf/network_ib.cpp
   )
 
 set(XBT_SRC
@@ -269,7 +276,7 @@ set(XBT_SRC
   src/xbt/xbt_log_appender_file.c
   src/xbt/xbt_log_layout_format.c
   src/xbt/xbt_log_layout_simple.c
-  src/xbt/xbt_main.c
+  src/xbt/xbt_main.cpp
   src/xbt/xbt_matrix.c
   src/xbt/xbt_os_file.c
   src/xbt/xbt_os_synchro.c
@@ -289,18 +296,21 @@ set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cc )
 
 set(SURF_SRC
-  src/surf/AsImpl.cpp
-  src/surf/AsCluster.cpp
-  src/surf/AsClusterFatTree.cpp
-  src/surf/AsClusterTorus.cpp
-  src/surf/AsClusterDragonfly.cpp
-  src/surf/AsDijkstra.cpp
-  src/surf/AsFloyd.cpp
-  src/surf/AsFull.cpp
-  src/surf/AsRoutedGraph.cpp
-  src/surf/AsNone.cpp
-  src/surf/AsVivaldi.cpp
-  
+  src/kernel/routing/AsImpl.cpp
+  src/kernel/routing/AsCluster.cpp
+  src/kernel/routing/AsClusterFatTree.cpp
+  src/kernel/routing/AsClusterTorus.cpp
+  src/kernel/routing/AsClusterDragonfly.cpp
+  src/kernel/routing/AsDijkstra.cpp
+  src/kernel/routing/AsFloyd.cpp
+  src/kernel/routing/AsFull.cpp
+  src/kernel/routing/AsRoutedGraph.cpp
+  src/kernel/routing/AsNone.cpp
+  src/kernel/routing/AsVivaldi.cpp
+
+  src/kernel/EngineImpl.cpp
+  src/kernel/EngineImpl.hpp
+
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
@@ -312,8 +322,6 @@ set(SURF_SRC
   src/surf/network_cm02.cpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
-  src/surf/network_smpi.cpp
-  src/surf/network_ib.cpp
   src/surf/plugins/energy.cpp
   src/surf/PropertyHolder.cpp
   src/surf/sg_platf.cpp
@@ -328,36 +336,43 @@ set(SURF_SRC
   src/surf/xml/surfxml_parseplatf.cpp
   src/surf/trace_mgr.hpp
   src/surf/trace_mgr.cpp
-  src/surf/vm_hl13.cpp
-  src/surf/virtual_machine.cpp
   src/surf/host_clm03.cpp
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp
   )
 
+set(PLUGINS_SRC
+  src/plugins/vm/s4u_VirtualMachine.cpp
+  src/plugins/vm/VirtualMachineImpl.hpp
+  src/plugins/vm/VirtualMachineImpl.cpp
+  src/plugins/vm/VmHostExt.hpp
+  src/plugins/vm/VmHostExt.cpp
+  )
+  
 set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
   src/kernel/future.cpp
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
-  src/simix/Context.cpp
-  src/simix/ContextRaw.cpp
+  src/kernel/context/Context.cpp
+  src/kernel/context/Context.hpp
+  src/kernel/context/ContextRaw.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
   src/simix/smx_host.cpp
   src/simix/smx_io.cpp
   src/simix/smx_network.cpp
-  src/simix/smx_process.cpp
+  src/simix/ActorImpl.cpp
   src/simix/smx_synchro.cpp
   src/simix/smx_vm.cpp
   src/simix/popping.cpp
-  src/simix/Synchro.cpp
-  src/simix/SynchroComm.cpp
-  src/simix/SynchroExec.cpp
-  src/simix/SynchroSleep.cpp
-  src/simix/SynchroRaw.cpp
-  src/simix/SynchroIo.cpp
+  src/kernel/activity/ActivityImpl.cpp
+  src/kernel/activity/SynchroComm.cpp
+  src/kernel/activity/SynchroExec.cpp
+  src/kernel/activity/SynchroSleep.cpp
+  src/kernel/activity/SynchroRaw.cpp
+  src/kernel/activity/SynchroIo.cpp
   
   ${SIMIX_GENERATED_SRC}
   )
@@ -366,13 +381,13 @@ set(SIMIX_SRC
 if (HAVE_BOOST_CONTEXTS)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 endif()
 
 set(S4U_SRC
@@ -398,7 +413,6 @@ set(SIMGRID_SRC
 set(MSG_SRC
   src/msg/instr_msg_process.cpp
   src/msg/instr_msg_task.cpp
-  src/msg/instr_msg_vm.cpp
   src/msg/msg_actions.cpp
   src/msg/msg_deployment.cpp
   src/msg/msg_environment.cpp
@@ -415,15 +429,11 @@ set(MSG_SRC
 
 set(SIMDAG_SRC
   src/simdag/sd_daxloader.cpp
+  src/simdag/sd_dotloader.cpp
   src/simdag/sd_global.cpp
   src/simdag/sd_task.cpp
   src/simdag/sd_workstation.cpp
   )
-if(HAVE_GRAPHVIZ)
-  set(SIMDAG_SRC    ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp)
-else()
-  set(EXTRA_DIST    ${EXTRA_DIST} src/simdag/sd_dotloader.cpp)
-endif()
 
 set(BINDINGS_SRC
   src/bindings/lua/lua_private.h
@@ -520,12 +530,12 @@ set(TRACING_SRC
   )
 
 set(JEDULE_SRC
-  include/simgrid/jedule/jedule_events.h
-  include/simgrid/jedule/jedule_output.h
-  include/simgrid/jedule/jedule_platform.h
+  include/simgrid/jedule/jedule_events.hpp
+  include/simgrid/jedule/jedule.hpp
+  include/simgrid/jedule/jedule_platform.hpp
   include/simgrid/jedule/jedule_sd_binding.h
   src/instr/jedule/jedule_events.cpp
-  src/instr/jedule/jedule_output.cpp
+  src/instr/jedule/jedule.cpp
   src/instr/jedule/jedule_platform.cpp
   src/instr/jedule/jedule_sd_binding.cpp
   )
@@ -627,12 +637,11 @@ set(headers_to_install
   include/msg/datatypes.h
   include/simdag/simdag.h
   include/simdag/datatypes.h
-  
+  include/simgrid/chrono.hpp
   include/simgrid/plugins/energy.h
   include/simgrid/instr.h
   include/simgrid/msg.h
   include/simgrid/simdag.h
-  include/simgrid.h
   include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
   include/simgrid/forward.h
@@ -643,18 +652,19 @@ set(headers_to_install
   include/simgrid/host.h
   include/simgrid/link.h
   include/simgrid/s4u/forward.hpp
-  include/simgrid/s4u/actor.hpp
-  include/simgrid/s4u/As.hpp
   include/simgrid/s4u/Activity.hpp
+  include/simgrid/s4u/Actor.hpp
+  include/simgrid/s4u/As.hpp
   include/simgrid/s4u/comm.hpp
   include/simgrid/s4u/engine.hpp  
   include/simgrid/s4u/file.hpp  
   include/simgrid/s4u/host.hpp  
-  include/simgrid/s4u/mailbox.hpp  
-  include/simgrid/s4u/mutex.hpp
+  include/simgrid/s4u/Mailbox.hpp
+  include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/storage.hpp  
-  include/simgrid/s4u.h
+  include/simgrid/s4u/VirtualMachine.hpp  
+  include/simgrid/s4u.hpp
   include/simgrid/plugins/energy.h
   include/smpi/mpi.h
   include/smpi/smpi.h
@@ -704,7 +714,7 @@ set(headers_to_install
   include/xbt/str.h
   include/xbt/strbuff.h
   include/xbt/swag.h
-  include/xbt/synchro_core.h
+  include/xbt/synchro.h
   include/xbt/sysdep.h
   include/xbt/system_error.hpp
   include/xbt/utility.hpp
@@ -719,11 +729,11 @@ set(source_of_generated_headers
 ### depend of some variables setted upper
 # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
 if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 endif()
 
 if(${HAVE_THREAD_CONTEXTS}) #pthread
@@ -734,13 +744,14 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/simix/ContextUnix.cpp)
+  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
-  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/ContextUnix.cpp)
+  set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp)
 endif()
 
 ### Simgrid Lib sources
 set(simgrid_sources
+  ${PLUGINS_SRC}
   ${BINDINGS_SRC}
   ${MC_SRC_BASE}
   ${MSG_SRC}
@@ -775,8 +786,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/ContextThread.cpp
-    src/simix/ContextThread.hpp
+    src/kernel/context/ContextThread.cpp
+    src/kernel/context/ContextThread.hpp
     src/xbt/xbt_os_thread.c
     )
 endif()
@@ -807,14 +818,12 @@ set(DOC_SOURCES
   doc/doxygen/FAQ.doc
   doc/doxygen/application.doc
   doc/doxygen/community.doc
-  doc/doxygen/community_contact.doc
-  doc/doxygen/community_extend.doc
-  doc/doxygen/community_giveback.doc
   doc/doxygen/deployment.doc
   doc/doxygen/examples.doc
   doc/doxygen/footer.html
   doc/doxygen/getting_started.doc
   doc/doxygen/header.html
+  doc/doxygen/howtos.doc
   doc/doxygen/index.doc
   doc/doxygen/inside.doc
   doc/doxygen/inside_tests.doc
@@ -847,12 +856,15 @@ set(DOC_SOURCES
   doc/doxygen/scenario.doc
   doc/doxygen/stylesheet.css
   doc/doxygen/uhood.doc
+  doc/doxygen/uhood_switch.doc
+  doc/doxygen/uhood_arch.doc
 
   doc/manpage/smpicc.1
   doc/manpage/smpicxx.1
   doc/manpage/smpif90.1
   doc/manpage/smpiff.1
   doc/manpage/smpirun.1
+  doc/manpage/tesh.pod
 
   doc/msg-tuto-src/deployment0.xml
   doc/msg-tuto-src/deployment1.xml
@@ -916,8 +928,6 @@ set(txt_files
   AUTHORS
   COPYING
   README
-  README.java
-  README.lua
   ChangeLog
   INSTALL
   LICENSE-LGPL-2.1
@@ -999,10 +1009,10 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Java.cmake
   tools/cmake/MakeLib.cmake
   tools/cmake/MakeLibWin.cmake
-  tools/cmake/Modules/FindGFortran.cmake
   tools/cmake/Modules/FindGraphviz.cmake
   tools/cmake/Modules/FindLibdw.cmake
   tools/cmake/Modules/FindLibunwind.cmake
+  tools/cmake/Modules/FindLibevent.cmake
   tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindPAPI.cmake
@@ -1010,14 +1020,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
-  tools/cmake/scripts/IPC/Run.pm
-  tools/cmake/scripts/IPC/Run/Debug.pm
-  tools/cmake/scripts/IPC/Run/IO.pm
-  tools/cmake/scripts/IPC/Run/Timer.pm
-  tools/cmake/scripts/IPC/Run/Win32Helper.pm
-  tools/cmake/scripts/IPC/Run/Win32IO.pm
-  tools/cmake/scripts/IPC/Run/Win32Pump.pm
-  tools/cmake/scripts/Diff.pm
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake