From 3002b440a1b9729553d718b19c3192c625b2dce2 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 11 Mar 2026 10:42:30 +0100 Subject: [PATCH 1/3] [core] folder hierarchy: group os subdirs [cmake] add one more depth level in linkdef search To avoid compilation error with modules=OFF or windows of the type: In file included from .\etc\dictpch\allLinkDefs.h:86: .\etc\dictpch\core\base\inc\LinkDef.h:8:10: fatal error: '../../os/winnt/inc/LinkDef.h' file not found --- cmake/unix/makepchinput.py | 1 + core/CMakeLists.txt | 4 +--- core/base/inc/LinkDef.h | 8 ++++---- core/foundation/CMakeLists.txt | 2 +- core/metacling/src/CMakeLists.txt | 2 +- core/os/CMakeLists.txt | 3 +++ core/{ => os}/macosx/CMakeLists.txt | 2 +- core/{ => os}/macosx/inc/CocoaUtils.h | 0 core/{ => os}/macosx/inc/LinkDef.h | 0 core/{ => os}/macosx/inc/TMacOSXSystem.h | 0 core/{ => os}/macosx/src/CocoaUtils.mm | 0 core/{ => os}/macosx/src/TMacOSXSystem.mm | 0 core/{ => os}/unix/CMakeLists.txt | 2 +- core/{ => os}/unix/inc/LinkDef.h | 0 core/{ => os}/unix/inc/TUnixSystem.h | 0 core/{ => os}/unix/src/TUnixSystem.cxx | 0 core/{ => os}/winnt/CMakeLists.txt | 2 +- core/{ => os}/winnt/inc/LinkDef.h | 0 core/{ => os}/winnt/inc/TWin32SplashThread.h | 0 core/{ => os}/winnt/inc/TWinNTSystem.h | 0 core/{ => os}/winnt/inc/Win32Constants.h | 0 core/{ => os}/winnt/inc/Windows4Root.h | 0 core/{ => os}/winnt/src/TWin32SplashThread.cxx | 0 core/{ => os}/winnt/src/TWinNTSystem.cxx | 0 core/{ => os}/winnt/src/Win32Splash.cxx | 0 core/thread/CMakeLists.txt | 2 +- documentation/doxygen/makeinput.sh | 6 +++--- 27 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 core/os/CMakeLists.txt rename core/{ => os}/macosx/CMakeLists.txt (94%) rename core/{ => os}/macosx/inc/CocoaUtils.h (100%) rename core/{ => os}/macosx/inc/LinkDef.h (100%) rename core/{ => os}/macosx/inc/TMacOSXSystem.h (100%) rename core/{ => os}/macosx/src/CocoaUtils.mm (100%) rename core/{ => os}/macosx/src/TMacOSXSystem.mm (100%) rename core/{ => os}/unix/CMakeLists.txt (98%) rename core/{ => os}/unix/inc/LinkDef.h (100%) rename core/{ => os}/unix/inc/TUnixSystem.h (100%) rename core/{ => os}/unix/src/TUnixSystem.cxx (100%) rename core/{ => os}/winnt/CMakeLists.txt (92%) rename core/{ => os}/winnt/inc/LinkDef.h (100%) rename core/{ => os}/winnt/inc/TWin32SplashThread.h (100%) rename core/{ => os}/winnt/inc/TWinNTSystem.h (100%) rename core/{ => os}/winnt/inc/Win32Constants.h (100%) rename core/{ => os}/winnt/inc/Windows4Root.h (100%) rename core/{ => os}/winnt/src/TWin32SplashThread.cxx (100%) rename core/{ => os}/winnt/src/TWinNTSystem.cxx (100%) rename core/{ => os}/winnt/src/Win32Splash.cxx (100%) diff --git a/cmake/unix/makepchinput.py b/cmake/unix/makepchinput.py index ce04c0c7b014b..7969dd715c882 100755 --- a/cmake/unix/makepchinput.py +++ b/cmake/unix/makepchinput.py @@ -346,6 +346,7 @@ def copyLinkDefs(rootSrcDir, outdir): os.chdir(rootSrcDir) wildcards = (os.path.join("*", "inc", "*LinkDef*.h"), os.path.join("*", "*", "inc", "*LinkDef*.h"), + os.path.join("*", "*", "*", "inc", "*LinkDef*.h"), os.path.join("*", "*", "inc", "*" , "*LinkDef*.h")) linkDefNames = [] for wildcard in wildcards: diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 57a5284ef7e77..9351d8f684e34 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -86,9 +86,7 @@ add_subdirectory(lzma) add_subdirectory(lz4) add_subdirectory(zstd) -add_subdirectory(macosx) -add_subdirectory(unix) -add_subdirectory(winnt) +add_subdirectory(os) #------------------------------------------------------------------------------- diff --git a/core/base/inc/LinkDef.h b/core/base/inc/LinkDef.h index c0934dc8fe06d..33d964d612bf0 100644 --- a/core/base/inc/LinkDef.h +++ b/core/base/inc/LinkDef.h @@ -5,14 +5,14 @@ #include "../../meta/inc/LinkDef.h" #if defined(SYSTEM_TYPE_winnt) -#include "../../winnt/inc/LinkDef.h" +#include "../../os/winnt/inc/LinkDef.h" #elif defined(SYSTEM_TYPE_macosx) #if defined(R__HAS_COCOA) -#include "../../macosx/inc/LinkDef.h" +#include "../../os/macosx/inc/LinkDef.h" #endif -#include "../../unix/inc/LinkDef.h" +#include "../../os/unix/inc/LinkDef.h" #elif defined(SYSTEM_TYPE_unix) -#include "../../unix/inc/LinkDef.h" +#include "../../os/unix/inc/LinkDef.h" #else # error "Unsupported system type." #endif diff --git a/core/foundation/CMakeLists.txt b/core/foundation/CMakeLists.txt index c2d8b61a40fc6..06fe4b464dff0 100644 --- a/core/foundation/CMakeLists.txt +++ b/core/foundation/CMakeLists.txt @@ -52,7 +52,7 @@ target_include_directories(Foundation_Stage1 PUBLIC $ PRIVATE - $<$:${CMAKE_SOURCE_DIR}/core/winnt/inc> + $<$:${CMAKE_SOURCE_DIR}/core/os/winnt/inc> ${CMAKE_BINARY_DIR}/ginclude res ) diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt index 784827df869c8..67bba000e8887 100644 --- a/core/metacling/src/CMakeLists.txt +++ b/core/metacling/src/CMakeLists.txt @@ -76,7 +76,7 @@ set_target_properties(MetaCling PROPERTIES if(MSVC) target_include_directories(MetaCling PRIVATE - ${CMAKE_SOURCE_DIR}/core/winnt/inc + ${CMAKE_SOURCE_DIR}/core/os/winnt/inc ) set_source_files_properties(TCling.cxx COMPILE_FLAGS /bigobj) endif() diff --git a/core/os/CMakeLists.txt b/core/os/CMakeLists.txt new file mode 100644 index 0000000000000..06b77127eeb0e --- /dev/null +++ b/core/os/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(macosx) +add_subdirectory(unix) +add_subdirectory(winnt) diff --git a/core/macosx/CMakeLists.txt b/core/os/macosx/CMakeLists.txt similarity index 94% rename from core/macosx/CMakeLists.txt rename to core/os/macosx/CMakeLists.txt index e3e38e959316f..2d2b30710d0e3 100644 --- a/core/macosx/CMakeLists.txt +++ b/core/os/macosx/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT core/macosx package +# CMakeLists.txt file for building ROOT core/os/macosx package ############################################################################ if(NOT APPLE) diff --git a/core/macosx/inc/CocoaUtils.h b/core/os/macosx/inc/CocoaUtils.h similarity index 100% rename from core/macosx/inc/CocoaUtils.h rename to core/os/macosx/inc/CocoaUtils.h diff --git a/core/macosx/inc/LinkDef.h b/core/os/macosx/inc/LinkDef.h similarity index 100% rename from core/macosx/inc/LinkDef.h rename to core/os/macosx/inc/LinkDef.h diff --git a/core/macosx/inc/TMacOSXSystem.h b/core/os/macosx/inc/TMacOSXSystem.h similarity index 100% rename from core/macosx/inc/TMacOSXSystem.h rename to core/os/macosx/inc/TMacOSXSystem.h diff --git a/core/macosx/src/CocoaUtils.mm b/core/os/macosx/src/CocoaUtils.mm similarity index 100% rename from core/macosx/src/CocoaUtils.mm rename to core/os/macosx/src/CocoaUtils.mm diff --git a/core/macosx/src/TMacOSXSystem.mm b/core/os/macosx/src/TMacOSXSystem.mm similarity index 100% rename from core/macosx/src/TMacOSXSystem.mm rename to core/os/macosx/src/TMacOSXSystem.mm diff --git a/core/unix/CMakeLists.txt b/core/os/unix/CMakeLists.txt similarity index 98% rename from core/unix/CMakeLists.txt rename to core/os/unix/CMakeLists.txt index 9f76985a8c54a..e0bce9eb10326 100644 --- a/core/unix/CMakeLists.txt +++ b/core/os/unix/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT core/unix package +# CMakeLists.txt file for building ROOT core/os/unix package ############################################################################ if(NOT UNIX) diff --git a/core/unix/inc/LinkDef.h b/core/os/unix/inc/LinkDef.h similarity index 100% rename from core/unix/inc/LinkDef.h rename to core/os/unix/inc/LinkDef.h diff --git a/core/unix/inc/TUnixSystem.h b/core/os/unix/inc/TUnixSystem.h similarity index 100% rename from core/unix/inc/TUnixSystem.h rename to core/os/unix/inc/TUnixSystem.h diff --git a/core/unix/src/TUnixSystem.cxx b/core/os/unix/src/TUnixSystem.cxx similarity index 100% rename from core/unix/src/TUnixSystem.cxx rename to core/os/unix/src/TUnixSystem.cxx diff --git a/core/winnt/CMakeLists.txt b/core/os/winnt/CMakeLists.txt similarity index 92% rename from core/winnt/CMakeLists.txt rename to core/os/winnt/CMakeLists.txt index e5810ab8ecb4a..b839d6efb848a 100644 --- a/core/winnt/CMakeLists.txt +++ b/core/os/winnt/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT core/winnt package +# CMakeLists.txt file for building ROOT core/os/winnt package ############################################################################ if(NOT WIN32) diff --git a/core/winnt/inc/LinkDef.h b/core/os/winnt/inc/LinkDef.h similarity index 100% rename from core/winnt/inc/LinkDef.h rename to core/os/winnt/inc/LinkDef.h diff --git a/core/winnt/inc/TWin32SplashThread.h b/core/os/winnt/inc/TWin32SplashThread.h similarity index 100% rename from core/winnt/inc/TWin32SplashThread.h rename to core/os/winnt/inc/TWin32SplashThread.h diff --git a/core/winnt/inc/TWinNTSystem.h b/core/os/winnt/inc/TWinNTSystem.h similarity index 100% rename from core/winnt/inc/TWinNTSystem.h rename to core/os/winnt/inc/TWinNTSystem.h diff --git a/core/winnt/inc/Win32Constants.h b/core/os/winnt/inc/Win32Constants.h similarity index 100% rename from core/winnt/inc/Win32Constants.h rename to core/os/winnt/inc/Win32Constants.h diff --git a/core/winnt/inc/Windows4Root.h b/core/os/winnt/inc/Windows4Root.h similarity index 100% rename from core/winnt/inc/Windows4Root.h rename to core/os/winnt/inc/Windows4Root.h diff --git a/core/winnt/src/TWin32SplashThread.cxx b/core/os/winnt/src/TWin32SplashThread.cxx similarity index 100% rename from core/winnt/src/TWin32SplashThread.cxx rename to core/os/winnt/src/TWin32SplashThread.cxx diff --git a/core/winnt/src/TWinNTSystem.cxx b/core/os/winnt/src/TWinNTSystem.cxx similarity index 100% rename from core/winnt/src/TWinNTSystem.cxx rename to core/os/winnt/src/TWinNTSystem.cxx diff --git a/core/winnt/src/Win32Splash.cxx b/core/os/winnt/src/Win32Splash.cxx similarity index 100% rename from core/winnt/src/Win32Splash.cxx rename to core/os/winnt/src/Win32Splash.cxx diff --git a/core/thread/CMakeLists.txt b/core/thread/CMakeLists.txt index 32a8cde377437..b850dc48f6f52 100644 --- a/core/thread/CMakeLists.txt +++ b/core/thread/CMakeLists.txt @@ -91,7 +91,7 @@ if(WIN32) src/TWin32Thread.cxx src/TWin32ThreadFactory.cxx ) - target_include_directories(Thread PRIVATE ${CMAKE_SOURCE_DIR}/core/winnt/inc) + target_include_directories(Thread PRIVATE ${CMAKE_SOURCE_DIR}/core/os/winnt/inc) else() target_sources(Thread PRIVATE src/TPosixCondition.cxx diff --git a/documentation/doxygen/makeinput.sh b/documentation/doxygen/makeinput.sh index 607672652e981..b56bfbf3f791c 100755 --- a/documentation/doxygen/makeinput.sh +++ b/documentation/doxygen/makeinput.sh @@ -18,7 +18,7 @@ echo " ../../core/dictgen/ \\" >> Doxyfile_INPUT echo " ../../core/cont/ \\" >> Doxyfile_INPUT echo " ../../core/foundation/ \\" >> Doxyfile_INPUT echo " ../../core/gui/ \\" >> Doxyfile_INPUT -echo " ../../core/macosx/ \\" >> Doxyfile_INPUT +echo " ../../core/os/macosx/ \\" >> Doxyfile_INPUT echo " ../../core/meta/ \\" >> Doxyfile_INPUT echo " ../../core/metacling/ \\" >> Doxyfile_INPUT echo " ../../core/clingutils/ \\" >> Doxyfile_INPUT @@ -26,8 +26,8 @@ echo " ../../core/multiproc/ \\" >> Doxyfile_INPUT echo " ../../core/rint/ \\" >> Doxyfile_INPUT echo " ../../core/testsupport/ \\" >> Doxyfile_INPUT echo " ../../core/thread/ \\" >> Doxyfile_INPUT -echo " ../../core/unix/ \\" >> Doxyfile_INPUT -echo " ../../core/winnt/ \\" >> Doxyfile_INPUT +echo " ../../core/os/unix/ \\" >> Doxyfile_INPUT +echo " ../../core/os/winnt/ \\" >> Doxyfile_INPUT echo " ../../core/imt/ \\" >> Doxyfile_INPUT echo " ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT echo " ../../geom/ \\" >> Doxyfile_INPUT From c0d1c4268203c89e71167aa2f12fb706e7e0b608 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 11 Mar 2026 10:42:54 +0100 Subject: [PATCH 2/3] [core] folder hierarchy: group compression subdirs --- core/CMakeLists.txt | 5 +---- core/compression/CMakeLists.txt | 4 ++++ core/{ => compression}/lz4/CMakeLists.txt | 0 core/{ => compression}/lz4/inc/ZipLZ4.h | 0 core/{ => compression}/lz4/src/ZipLZ4.cxx | 0 core/{ => compression}/lzma/CMakeLists.txt | 2 +- core/{ => compression}/lzma/inc/ZipLZMA.h | 0 core/{ => compression}/lzma/src/ZipLZMA.c | 0 core/{ => compression}/zip/CMakeLists.txt | 0 core/{ => compression}/zip/inc/Compression.h | 0 core/{ => compression}/zip/inc/RZip.h | 0 core/{ => compression}/zip/src/Bits.c | 0 core/{ => compression}/zip/src/Bits.h | 0 core/{ => compression}/zip/src/Compression.cxx | 0 core/{ => compression}/zip/src/RZip.cxx | 0 core/{ => compression}/zip/src/Tailor.h | 0 core/{ => compression}/zip/src/ZDeflate.c | 0 core/{ => compression}/zip/src/ZIP.h | 0 core/{ => compression}/zip/src/ZInflate.c | 0 core/{ => compression}/zip/src/ZTrees.c | 0 core/{ => compression}/zip/test/CMakeLists.txt | 0 core/{ => compression}/zip/test/ZipTest.cxx | 0 core/{ => compression}/zstd/CMakeLists.txt | 2 +- core/{ => compression}/zstd/inc/ZipZSTD.h | 0 core/{ => compression}/zstd/src/ZipZSTD.cxx | 0 core/metacling/src/CMakeLists.txt | 2 +- documentation/doxygen/makeinput.sh | 4 ++-- io/rootpcm/CMakeLists.txt | 2 +- 28 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 core/compression/CMakeLists.txt rename core/{ => compression}/lz4/CMakeLists.txt (100%) rename core/{ => compression}/lz4/inc/ZipLZ4.h (100%) rename core/{ => compression}/lz4/src/ZipLZ4.cxx (100%) rename core/{ => compression}/lzma/CMakeLists.txt (88%) rename core/{ => compression}/lzma/inc/ZipLZMA.h (100%) rename core/{ => compression}/lzma/src/ZipLZMA.c (100%) rename core/{ => compression}/zip/CMakeLists.txt (100%) rename core/{ => compression}/zip/inc/Compression.h (100%) rename core/{ => compression}/zip/inc/RZip.h (100%) rename core/{ => compression}/zip/src/Bits.c (100%) rename core/{ => compression}/zip/src/Bits.h (100%) rename core/{ => compression}/zip/src/Compression.cxx (100%) rename core/{ => compression}/zip/src/RZip.cxx (100%) rename core/{ => compression}/zip/src/Tailor.h (100%) rename core/{ => compression}/zip/src/ZDeflate.c (100%) rename core/{ => compression}/zip/src/ZIP.h (100%) rename core/{ => compression}/zip/src/ZInflate.c (100%) rename core/{ => compression}/zip/src/ZTrees.c (100%) rename core/{ => compression}/zip/test/CMakeLists.txt (100%) rename core/{ => compression}/zip/test/ZipTest.cxx (100%) rename core/{ => compression}/zstd/CMakeLists.txt (89%) rename core/{ => compression}/zstd/inc/ZipZSTD.h (100%) rename core/{ => compression}/zstd/src/ZipZSTD.cxx (100%) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 9351d8f684e34..36f4f666cc9b4 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -81,10 +81,7 @@ add_subdirectory(rint) add_subdirectory(testsupport) add_subdirectory(textinput) add_subdirectory(thread) -add_subdirectory(zip) -add_subdirectory(lzma) -add_subdirectory(lz4) -add_subdirectory(zstd) +add_subdirectory(compression) add_subdirectory(os) diff --git a/core/compression/CMakeLists.txt b/core/compression/CMakeLists.txt new file mode 100644 index 0000000000000..59f93143904dc --- /dev/null +++ b/core/compression/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(zip) +add_subdirectory(lzma) +add_subdirectory(lz4) +add_subdirectory(zstd) diff --git a/core/lz4/CMakeLists.txt b/core/compression/lz4/CMakeLists.txt similarity index 100% rename from core/lz4/CMakeLists.txt rename to core/compression/lz4/CMakeLists.txt diff --git a/core/lz4/inc/ZipLZ4.h b/core/compression/lz4/inc/ZipLZ4.h similarity index 100% rename from core/lz4/inc/ZipLZ4.h rename to core/compression/lz4/inc/ZipLZ4.h diff --git a/core/lz4/src/ZipLZ4.cxx b/core/compression/lz4/src/ZipLZ4.cxx similarity index 100% rename from core/lz4/src/ZipLZ4.cxx rename to core/compression/lz4/src/ZipLZ4.cxx diff --git a/core/lzma/CMakeLists.txt b/core/compression/lzma/CMakeLists.txt similarity index 88% rename from core/lzma/CMakeLists.txt rename to core/compression/lzma/CMakeLists.txt index f19eec364cb8d..9db449cd561f3 100644 --- a/core/lzma/CMakeLists.txt +++ b/core/compression/lzma/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT core/lzma package +# CMakeLists.txt file for building ROOT core/compression/lzma package ############################################################################ target_sources(Core PRIVATE src/ZipLZMA.c) diff --git a/core/lzma/inc/ZipLZMA.h b/core/compression/lzma/inc/ZipLZMA.h similarity index 100% rename from core/lzma/inc/ZipLZMA.h rename to core/compression/lzma/inc/ZipLZMA.h diff --git a/core/lzma/src/ZipLZMA.c b/core/compression/lzma/src/ZipLZMA.c similarity index 100% rename from core/lzma/src/ZipLZMA.c rename to core/compression/lzma/src/ZipLZMA.c diff --git a/core/zip/CMakeLists.txt b/core/compression/zip/CMakeLists.txt similarity index 100% rename from core/zip/CMakeLists.txt rename to core/compression/zip/CMakeLists.txt diff --git a/core/zip/inc/Compression.h b/core/compression/zip/inc/Compression.h similarity index 100% rename from core/zip/inc/Compression.h rename to core/compression/zip/inc/Compression.h diff --git a/core/zip/inc/RZip.h b/core/compression/zip/inc/RZip.h similarity index 100% rename from core/zip/inc/RZip.h rename to core/compression/zip/inc/RZip.h diff --git a/core/zip/src/Bits.c b/core/compression/zip/src/Bits.c similarity index 100% rename from core/zip/src/Bits.c rename to core/compression/zip/src/Bits.c diff --git a/core/zip/src/Bits.h b/core/compression/zip/src/Bits.h similarity index 100% rename from core/zip/src/Bits.h rename to core/compression/zip/src/Bits.h diff --git a/core/zip/src/Compression.cxx b/core/compression/zip/src/Compression.cxx similarity index 100% rename from core/zip/src/Compression.cxx rename to core/compression/zip/src/Compression.cxx diff --git a/core/zip/src/RZip.cxx b/core/compression/zip/src/RZip.cxx similarity index 100% rename from core/zip/src/RZip.cxx rename to core/compression/zip/src/RZip.cxx diff --git a/core/zip/src/Tailor.h b/core/compression/zip/src/Tailor.h similarity index 100% rename from core/zip/src/Tailor.h rename to core/compression/zip/src/Tailor.h diff --git a/core/zip/src/ZDeflate.c b/core/compression/zip/src/ZDeflate.c similarity index 100% rename from core/zip/src/ZDeflate.c rename to core/compression/zip/src/ZDeflate.c diff --git a/core/zip/src/ZIP.h b/core/compression/zip/src/ZIP.h similarity index 100% rename from core/zip/src/ZIP.h rename to core/compression/zip/src/ZIP.h diff --git a/core/zip/src/ZInflate.c b/core/compression/zip/src/ZInflate.c similarity index 100% rename from core/zip/src/ZInflate.c rename to core/compression/zip/src/ZInflate.c diff --git a/core/zip/src/ZTrees.c b/core/compression/zip/src/ZTrees.c similarity index 100% rename from core/zip/src/ZTrees.c rename to core/compression/zip/src/ZTrees.c diff --git a/core/zip/test/CMakeLists.txt b/core/compression/zip/test/CMakeLists.txt similarity index 100% rename from core/zip/test/CMakeLists.txt rename to core/compression/zip/test/CMakeLists.txt diff --git a/core/zip/test/ZipTest.cxx b/core/compression/zip/test/ZipTest.cxx similarity index 100% rename from core/zip/test/ZipTest.cxx rename to core/compression/zip/test/ZipTest.cxx diff --git a/core/zstd/CMakeLists.txt b/core/compression/zstd/CMakeLists.txt similarity index 89% rename from core/zstd/CMakeLists.txt rename to core/compression/zstd/CMakeLists.txt index a4c6e0297610e..e7a98ee147fa6 100644 --- a/core/zstd/CMakeLists.txt +++ b/core/compression/zstd/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################ -# CMakeLists.txt file for building ROOT core/zstd package +# CMakeLists.txt file for building ROOT core/compression/zstd package ############################################################################ find_package(ZSTD REQUIRED) diff --git a/core/zstd/inc/ZipZSTD.h b/core/compression/zstd/inc/ZipZSTD.h similarity index 100% rename from core/zstd/inc/ZipZSTD.h rename to core/compression/zstd/inc/ZipZSTD.h diff --git a/core/zstd/src/ZipZSTD.cxx b/core/compression/zstd/src/ZipZSTD.cxx similarity index 100% rename from core/zstd/src/ZipZSTD.cxx rename to core/compression/zstd/src/ZipZSTD.cxx diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt index 67bba000e8887..5ec087e3c39f2 100644 --- a/core/metacling/src/CMakeLists.txt +++ b/core/metacling/src/CMakeLists.txt @@ -64,7 +64,7 @@ target_include_directories(MetaCling PRIVATE ${CMAKE_SOURCE_DIR}/core/meta/inc ${CMAKE_SOURCE_DIR}/core/metacling/res ${CMAKE_SOURCE_DIR}/core/thread/inc - ${CMAKE_SOURCE_DIR}/core/zip/inc + ${CMAKE_SOURCE_DIR}/core/compression/zip/inc ${CMAKE_SOURCE_DIR}/io/io/inc ${CMAKE_BINARY_DIR}/ginclude ) diff --git a/documentation/doxygen/makeinput.sh b/documentation/doxygen/makeinput.sh index b56bfbf3f791c..fba17202baa80 100755 --- a/documentation/doxygen/makeinput.sh +++ b/documentation/doxygen/makeinput.sh @@ -29,7 +29,7 @@ echo " ../../core/thread/ \\" >> Doxyfile_INPUT echo " ../../core/os/unix/ \\" >> Doxyfile_INPUT echo " ../../core/os/winnt/ \\" >> Doxyfile_INPUT echo " ../../core/imt/ \\" >> Doxyfile_INPUT -echo " ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT +echo " ../../core/compression/zip/inc/Compression.h \\" >> Doxyfile_INPUT echo " ../../geom/ \\" >> Doxyfile_INPUT echo " ../../graf2d/asimage/ \\" >> Doxyfile_INPUT echo " ../../graf2d/cocoa/ \\" >> Doxyfile_INPUT @@ -77,7 +77,7 @@ echo " ../../bindings/pyroot/pythonizations/python/ROOT/_pythonization/__ echo " ../../bindings/r/ \\" >> Doxyfile_INPUT # echo " ../../core/clib/ \\" >> Doxyfile_INPUT -# echo " ../../core/lzma/ \\" >> Doxyfile_INPUT +# echo " ../../core/compression/lzma/ \\" >> Doxyfile_INPUT # echo " ../../core/newdelete/ \\" >> Doxyfile_INPUT # echo " ../../core/textinput/ \\" >> Doxyfile_INPUT # echo " ../../graf2d/mathtext/ \\" >> Doxyfile_INPUT diff --git a/io/rootpcm/CMakeLists.txt b/io/rootpcm/CMakeLists.txt index c5f6a4351dd33..269f9c300d5d3 100644 --- a/io/rootpcm/CMakeLists.txt +++ b/io/rootpcm/CMakeLists.txt @@ -12,5 +12,5 @@ ROOT_OBJECT_LIBRARY(RootPcmObjs src/rootclingIO.cxx) target_include_directories(RootPcmObjs PRIVATE ${CMAKE_SOURCE_DIR}/io/io/inc - ${CMAKE_SOURCE_DIR}/core/zip/inc + ${CMAKE_SOURCE_DIR}/core/compression/zip/inc ) From 4c19574eef2973ebae98a81a2f4797993145c0fe Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 11 Mar 2026 10:52:23 +0100 Subject: [PATCH 3/3] [core] folder hierarchy: group parallelization subdirs --- core/CMakeLists.txt | 6 ++---- core/metacling/src/CMakeLists.txt | 2 +- core/parallel/CMakeLists.txt | 3 +++ core/{ => parallel}/imt/CMakeLists.txt | 2 +- core/{ => parallel}/imt/inc/LinkDef.h | 0 core/{ => parallel}/imt/inc/ROOT/RSlotStack.hxx | 0 core/{ => parallel}/imt/inc/ROOT/RTaskArena.hxx | 0 core/{ => parallel}/imt/inc/ROOT/TExecutor.hxx | 0 core/{ => parallel}/imt/inc/ROOT/TTaskGroup.hxx | 0 core/{ => parallel}/imt/inc/ROOT/TThreadExecutor.hxx | 0 core/{ => parallel}/imt/src/ROpaqueTaskArena.hxx | 0 core/{ => parallel}/imt/src/RSlotStack.cxx | 0 core/{ => parallel}/imt/src/RTaskArena.cxx | 0 core/{ => parallel}/imt/src/TExecutor.cxx | 0 core/{ => parallel}/imt/src/TImplicitMT.cxx | 0 core/{ => parallel}/imt/src/TTaskGroup.cxx | 0 core/{ => parallel}/imt/src/TThreadExecutor.cxx | 0 core/{ => parallel}/imt/src/base.cxx | 0 core/{ => parallel}/imt/test/CMakeLists.txt | 0 core/{ => parallel}/imt/test/testEnableImt.cxx | 0 core/{ => parallel}/imt/test/testRTaskArena.cxx | 0 core/{ => parallel}/imt/test/testTBBGlobalControl.cxx | 0 core/{ => parallel}/imt/test/testTTaskGroup.cxx | 0 core/{ => parallel}/multiproc/CMakeLists.txt | 2 +- core/{ => parallel}/multiproc/inc/LinkDef.h | 0 core/{ => parallel}/multiproc/inc/MPCode.h | 0 core/{ => parallel}/multiproc/inc/MPSendRecv.h | 0 core/{ => parallel}/multiproc/inc/PoolUtils.h | 0 core/{ => parallel}/multiproc/inc/ROOT/TProcessExecutor.hxx | 0 core/{ => parallel}/multiproc/inc/TMPClient.h | 0 core/{ => parallel}/multiproc/inc/TMPWorker.h | 0 core/{ => parallel}/multiproc/inc/TMPWorkerExecutor.h | 0 core/{ => parallel}/multiproc/inc/TProcPool.h | 0 core/{ => parallel}/multiproc/src/MPSendRecv.cxx | 0 core/{ => parallel}/multiproc/src/TMPClient.cxx | 0 core/{ => parallel}/multiproc/src/TMPWorker.cxx | 0 core/{ => parallel}/multiproc/src/TProcessExecutor.cxx | 0 core/{ => parallel}/thread/CMakeLists.txt | 2 +- core/{ => parallel}/thread/doc/index.txt | 0 core/{ => parallel}/thread/inc/LinkDef.h | 0 core/{ => parallel}/thread/inc/PosixThreadInc.h | 0 core/{ => parallel}/thread/inc/ROOT/TRWSpinLock.hxx | 0 core/{ => parallel}/thread/inc/ROOT/TSpinMutex.hxx | 0 core/{ => parallel}/thread/inc/ROOT/TThreadedObject.hxx | 0 core/{ => parallel}/thread/inc/TAtomicCount.h | 0 core/{ => parallel}/thread/inc/TAtomicCountGcc.h | 0 core/{ => parallel}/thread/inc/TAtomicCountPthread.h | 0 core/{ => parallel}/thread/inc/TCondition.h | 0 core/{ => parallel}/thread/inc/TConditionImp.h | 0 core/{ => parallel}/thread/inc/TMutex.h | 0 core/{ => parallel}/thread/inc/TMutexImp.h | 0 core/{ => parallel}/thread/inc/TPosixCondition.h | 0 core/{ => parallel}/thread/inc/TPosixMutex.h | 0 core/{ => parallel}/thread/inc/TPosixThread.h | 0 core/{ => parallel}/thread/inc/TPosixThreadFactory.h | 0 core/{ => parallel}/thread/inc/TRWLock.h | 0 core/{ => parallel}/thread/inc/TSemaphore.h | 0 core/{ => parallel}/thread/inc/TThread.h | 0 core/{ => parallel}/thread/inc/TThreadFactory.h | 0 core/{ => parallel}/thread/inc/TThreadImp.h | 0 core/{ => parallel}/thread/inc/TThreadPool.h | 0 core/{ => parallel}/thread/inc/TWin32AtomicCount.h | 0 core/{ => parallel}/thread/inc/TWin32Condition.h | 0 core/{ => parallel}/thread/inc/TWin32Mutex.h | 0 core/{ => parallel}/thread/inc/TWin32Thread.h | 0 core/{ => parallel}/thread/inc/TWin32ThreadFactory.h | 0 core/{ => parallel}/thread/src/TCondition.cxx | 0 core/{ => parallel}/thread/src/TConditionImp.cxx | 0 core/{ => parallel}/thread/src/TMutex.cxx | 0 core/{ => parallel}/thread/src/TMutexImp.cxx | 0 core/{ => parallel}/thread/src/TPosixCondition.cxx | 0 core/{ => parallel}/thread/src/TPosixMutex.cxx | 0 core/{ => parallel}/thread/src/TPosixThread.cxx | 0 core/{ => parallel}/thread/src/TPosixThreadFactory.cxx | 0 core/{ => parallel}/thread/src/TRWLock.cxx | 0 core/{ => parallel}/thread/src/TRWMutexImp.cxx | 0 core/{ => parallel}/thread/src/TRWMutexImp.h | 0 core/{ => parallel}/thread/src/TRWSpinLock.cxx | 0 core/{ => parallel}/thread/src/TReentrantRWLock.cxx | 0 core/{ => parallel}/thread/src/TReentrantRWLock.hxx | 0 core/{ => parallel}/thread/src/TSemaphore.cxx | 0 core/{ => parallel}/thread/src/TThread.cxx | 0 core/{ => parallel}/thread/src/TThreadFactory.cxx | 0 core/{ => parallel}/thread/src/TThreadImp.cxx | 0 core/{ => parallel}/thread/src/TWin32Condition.cxx | 0 core/{ => parallel}/thread/src/TWin32Mutex.cxx | 0 core/{ => parallel}/thread/src/TWin32Thread.cxx | 0 core/{ => parallel}/thread/src/TWin32ThreadFactory.cxx | 0 core/{ => parallel}/thread/test/CMakeLists.txt | 0 core/{ => parallel}/thread/test/testInterpreterLock.cxx | 0 core/{ => parallel}/thread/test/testRWLock.cxx | 0 core/{ => parallel}/thread/test/testTThreadedObject.cxx | 0 documentation/doxygen/makeinput.sh | 6 +++--- tree/readspeed/CMakeLists.txt | 2 +- 94 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 core/parallel/CMakeLists.txt rename core/{ => parallel}/imt/CMakeLists.txt (95%) rename core/{ => parallel}/imt/inc/LinkDef.h (100%) rename core/{ => parallel}/imt/inc/ROOT/RSlotStack.hxx (100%) rename core/{ => parallel}/imt/inc/ROOT/RTaskArena.hxx (100%) rename core/{ => parallel}/imt/inc/ROOT/TExecutor.hxx (100%) rename core/{ => parallel}/imt/inc/ROOT/TTaskGroup.hxx (100%) rename core/{ => parallel}/imt/inc/ROOT/TThreadExecutor.hxx (100%) rename core/{ => parallel}/imt/src/ROpaqueTaskArena.hxx (100%) rename core/{ => parallel}/imt/src/RSlotStack.cxx (100%) rename core/{ => parallel}/imt/src/RTaskArena.cxx (100%) rename core/{ => parallel}/imt/src/TExecutor.cxx (100%) rename core/{ => parallel}/imt/src/TImplicitMT.cxx (100%) rename core/{ => parallel}/imt/src/TTaskGroup.cxx (100%) rename core/{ => parallel}/imt/src/TThreadExecutor.cxx (100%) rename core/{ => parallel}/imt/src/base.cxx (100%) rename core/{ => parallel}/imt/test/CMakeLists.txt (100%) rename core/{ => parallel}/imt/test/testEnableImt.cxx (100%) rename core/{ => parallel}/imt/test/testRTaskArena.cxx (100%) rename core/{ => parallel}/imt/test/testTBBGlobalControl.cxx (100%) rename core/{ => parallel}/imt/test/testTTaskGroup.cxx (100%) rename core/{ => parallel}/multiproc/CMakeLists.txt (91%) rename core/{ => parallel}/multiproc/inc/LinkDef.h (100%) rename core/{ => parallel}/multiproc/inc/MPCode.h (100%) rename core/{ => parallel}/multiproc/inc/MPSendRecv.h (100%) rename core/{ => parallel}/multiproc/inc/PoolUtils.h (100%) rename core/{ => parallel}/multiproc/inc/ROOT/TProcessExecutor.hxx (100%) rename core/{ => parallel}/multiproc/inc/TMPClient.h (100%) rename core/{ => parallel}/multiproc/inc/TMPWorker.h (100%) rename core/{ => parallel}/multiproc/inc/TMPWorkerExecutor.h (100%) rename core/{ => parallel}/multiproc/inc/TProcPool.h (100%) rename core/{ => parallel}/multiproc/src/MPSendRecv.cxx (100%) rename core/{ => parallel}/multiproc/src/TMPClient.cxx (100%) rename core/{ => parallel}/multiproc/src/TMPWorker.cxx (100%) rename core/{ => parallel}/multiproc/src/TProcessExecutor.cxx (100%) rename core/{ => parallel}/thread/CMakeLists.txt (97%) rename core/{ => parallel}/thread/doc/index.txt (100%) rename core/{ => parallel}/thread/inc/LinkDef.h (100%) rename core/{ => parallel}/thread/inc/PosixThreadInc.h (100%) rename core/{ => parallel}/thread/inc/ROOT/TRWSpinLock.hxx (100%) rename core/{ => parallel}/thread/inc/ROOT/TSpinMutex.hxx (100%) rename core/{ => parallel}/thread/inc/ROOT/TThreadedObject.hxx (100%) rename core/{ => parallel}/thread/inc/TAtomicCount.h (100%) rename core/{ => parallel}/thread/inc/TAtomicCountGcc.h (100%) rename core/{ => parallel}/thread/inc/TAtomicCountPthread.h (100%) rename core/{ => parallel}/thread/inc/TCondition.h (100%) rename core/{ => parallel}/thread/inc/TConditionImp.h (100%) rename core/{ => parallel}/thread/inc/TMutex.h (100%) rename core/{ => parallel}/thread/inc/TMutexImp.h (100%) rename core/{ => parallel}/thread/inc/TPosixCondition.h (100%) rename core/{ => parallel}/thread/inc/TPosixMutex.h (100%) rename core/{ => parallel}/thread/inc/TPosixThread.h (100%) rename core/{ => parallel}/thread/inc/TPosixThreadFactory.h (100%) rename core/{ => parallel}/thread/inc/TRWLock.h (100%) rename core/{ => parallel}/thread/inc/TSemaphore.h (100%) rename core/{ => parallel}/thread/inc/TThread.h (100%) rename core/{ => parallel}/thread/inc/TThreadFactory.h (100%) rename core/{ => parallel}/thread/inc/TThreadImp.h (100%) rename core/{ => parallel}/thread/inc/TThreadPool.h (100%) rename core/{ => parallel}/thread/inc/TWin32AtomicCount.h (100%) rename core/{ => parallel}/thread/inc/TWin32Condition.h (100%) rename core/{ => parallel}/thread/inc/TWin32Mutex.h (100%) rename core/{ => parallel}/thread/inc/TWin32Thread.h (100%) rename core/{ => parallel}/thread/inc/TWin32ThreadFactory.h (100%) rename core/{ => parallel}/thread/src/TCondition.cxx (100%) rename core/{ => parallel}/thread/src/TConditionImp.cxx (100%) rename core/{ => parallel}/thread/src/TMutex.cxx (100%) rename core/{ => parallel}/thread/src/TMutexImp.cxx (100%) rename core/{ => parallel}/thread/src/TPosixCondition.cxx (100%) rename core/{ => parallel}/thread/src/TPosixMutex.cxx (100%) rename core/{ => parallel}/thread/src/TPosixThread.cxx (100%) rename core/{ => parallel}/thread/src/TPosixThreadFactory.cxx (100%) rename core/{ => parallel}/thread/src/TRWLock.cxx (100%) rename core/{ => parallel}/thread/src/TRWMutexImp.cxx (100%) rename core/{ => parallel}/thread/src/TRWMutexImp.h (100%) rename core/{ => parallel}/thread/src/TRWSpinLock.cxx (100%) rename core/{ => parallel}/thread/src/TReentrantRWLock.cxx (100%) rename core/{ => parallel}/thread/src/TReentrantRWLock.hxx (100%) rename core/{ => parallel}/thread/src/TSemaphore.cxx (100%) rename core/{ => parallel}/thread/src/TThread.cxx (100%) rename core/{ => parallel}/thread/src/TThreadFactory.cxx (100%) rename core/{ => parallel}/thread/src/TThreadImp.cxx (100%) rename core/{ => parallel}/thread/src/TWin32Condition.cxx (100%) rename core/{ => parallel}/thread/src/TWin32Mutex.cxx (100%) rename core/{ => parallel}/thread/src/TWin32Thread.cxx (100%) rename core/{ => parallel}/thread/src/TWin32ThreadFactory.cxx (100%) rename core/{ => parallel}/thread/test/CMakeLists.txt (100%) rename core/{ => parallel}/thread/test/testInterpreterLock.cxx (100%) rename core/{ => parallel}/thread/test/testRWLock.cxx (100%) rename core/{ => parallel}/thread/test/testTThreadedObject.cxx (100%) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 36f4f666cc9b4..797f8322d3fd0 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -72,18 +72,16 @@ add_subdirectory(cont) add_subdirectory(dictgen) add_subdirectory(foundation) add_subdirectory(gui) -add_subdirectory(imt) add_subdirectory(meta) add_subdirectory(metacling) -add_subdirectory(multiproc) add_subdirectory(newdelete) add_subdirectory(rint) add_subdirectory(testsupport) add_subdirectory(textinput) -add_subdirectory(thread) -add_subdirectory(compression) +add_subdirectory(compression) add_subdirectory(os) +add_subdirectory(parallel) #------------------------------------------------------------------------------- diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt index 5ec087e3c39f2..3855ee9479208 100644 --- a/core/metacling/src/CMakeLists.txt +++ b/core/metacling/src/CMakeLists.txt @@ -63,7 +63,7 @@ target_include_directories(MetaCling PRIVATE ${CMAKE_SOURCE_DIR}/core/foundation/res ${CMAKE_SOURCE_DIR}/core/meta/inc ${CMAKE_SOURCE_DIR}/core/metacling/res - ${CMAKE_SOURCE_DIR}/core/thread/inc + ${CMAKE_SOURCE_DIR}/core/parallel/thread/inc ${CMAKE_SOURCE_DIR}/core/compression/zip/inc ${CMAKE_SOURCE_DIR}/io/io/inc ${CMAKE_BINARY_DIR}/ginclude diff --git a/core/parallel/CMakeLists.txt b/core/parallel/CMakeLists.txt new file mode 100644 index 0000000000000..299fba1b4335d --- /dev/null +++ b/core/parallel/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(imt) +add_subdirectory(multiproc) +add_subdirectory(thread) diff --git a/core/imt/CMakeLists.txt b/core/parallel/imt/CMakeLists.txt similarity index 95% rename from core/imt/CMakeLists.txt rename to core/parallel/imt/CMakeLists.txt index edb9a758c4df9..0a9d55f56353d 100644 --- a/core/imt/CMakeLists.txt +++ b/core/parallel/imt/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT core/imt package +# CMakeLists.txt file for building ROOT core/parallel/imt package ############################################################################ if(NOT WIN32) diff --git a/core/imt/inc/LinkDef.h b/core/parallel/imt/inc/LinkDef.h similarity index 100% rename from core/imt/inc/LinkDef.h rename to core/parallel/imt/inc/LinkDef.h diff --git a/core/imt/inc/ROOT/RSlotStack.hxx b/core/parallel/imt/inc/ROOT/RSlotStack.hxx similarity index 100% rename from core/imt/inc/ROOT/RSlotStack.hxx rename to core/parallel/imt/inc/ROOT/RSlotStack.hxx diff --git a/core/imt/inc/ROOT/RTaskArena.hxx b/core/parallel/imt/inc/ROOT/RTaskArena.hxx similarity index 100% rename from core/imt/inc/ROOT/RTaskArena.hxx rename to core/parallel/imt/inc/ROOT/RTaskArena.hxx diff --git a/core/imt/inc/ROOT/TExecutor.hxx b/core/parallel/imt/inc/ROOT/TExecutor.hxx similarity index 100% rename from core/imt/inc/ROOT/TExecutor.hxx rename to core/parallel/imt/inc/ROOT/TExecutor.hxx diff --git a/core/imt/inc/ROOT/TTaskGroup.hxx b/core/parallel/imt/inc/ROOT/TTaskGroup.hxx similarity index 100% rename from core/imt/inc/ROOT/TTaskGroup.hxx rename to core/parallel/imt/inc/ROOT/TTaskGroup.hxx diff --git a/core/imt/inc/ROOT/TThreadExecutor.hxx b/core/parallel/imt/inc/ROOT/TThreadExecutor.hxx similarity index 100% rename from core/imt/inc/ROOT/TThreadExecutor.hxx rename to core/parallel/imt/inc/ROOT/TThreadExecutor.hxx diff --git a/core/imt/src/ROpaqueTaskArena.hxx b/core/parallel/imt/src/ROpaqueTaskArena.hxx similarity index 100% rename from core/imt/src/ROpaqueTaskArena.hxx rename to core/parallel/imt/src/ROpaqueTaskArena.hxx diff --git a/core/imt/src/RSlotStack.cxx b/core/parallel/imt/src/RSlotStack.cxx similarity index 100% rename from core/imt/src/RSlotStack.cxx rename to core/parallel/imt/src/RSlotStack.cxx diff --git a/core/imt/src/RTaskArena.cxx b/core/parallel/imt/src/RTaskArena.cxx similarity index 100% rename from core/imt/src/RTaskArena.cxx rename to core/parallel/imt/src/RTaskArena.cxx diff --git a/core/imt/src/TExecutor.cxx b/core/parallel/imt/src/TExecutor.cxx similarity index 100% rename from core/imt/src/TExecutor.cxx rename to core/parallel/imt/src/TExecutor.cxx diff --git a/core/imt/src/TImplicitMT.cxx b/core/parallel/imt/src/TImplicitMT.cxx similarity index 100% rename from core/imt/src/TImplicitMT.cxx rename to core/parallel/imt/src/TImplicitMT.cxx diff --git a/core/imt/src/TTaskGroup.cxx b/core/parallel/imt/src/TTaskGroup.cxx similarity index 100% rename from core/imt/src/TTaskGroup.cxx rename to core/parallel/imt/src/TTaskGroup.cxx diff --git a/core/imt/src/TThreadExecutor.cxx b/core/parallel/imt/src/TThreadExecutor.cxx similarity index 100% rename from core/imt/src/TThreadExecutor.cxx rename to core/parallel/imt/src/TThreadExecutor.cxx diff --git a/core/imt/src/base.cxx b/core/parallel/imt/src/base.cxx similarity index 100% rename from core/imt/src/base.cxx rename to core/parallel/imt/src/base.cxx diff --git a/core/imt/test/CMakeLists.txt b/core/parallel/imt/test/CMakeLists.txt similarity index 100% rename from core/imt/test/CMakeLists.txt rename to core/parallel/imt/test/CMakeLists.txt diff --git a/core/imt/test/testEnableImt.cxx b/core/parallel/imt/test/testEnableImt.cxx similarity index 100% rename from core/imt/test/testEnableImt.cxx rename to core/parallel/imt/test/testEnableImt.cxx diff --git a/core/imt/test/testRTaskArena.cxx b/core/parallel/imt/test/testRTaskArena.cxx similarity index 100% rename from core/imt/test/testRTaskArena.cxx rename to core/parallel/imt/test/testRTaskArena.cxx diff --git a/core/imt/test/testTBBGlobalControl.cxx b/core/parallel/imt/test/testTBBGlobalControl.cxx similarity index 100% rename from core/imt/test/testTBBGlobalControl.cxx rename to core/parallel/imt/test/testTBBGlobalControl.cxx diff --git a/core/imt/test/testTTaskGroup.cxx b/core/parallel/imt/test/testTTaskGroup.cxx similarity index 100% rename from core/imt/test/testTTaskGroup.cxx rename to core/parallel/imt/test/testTTaskGroup.cxx diff --git a/core/multiproc/CMakeLists.txt b/core/parallel/multiproc/CMakeLists.txt similarity index 91% rename from core/multiproc/CMakeLists.txt rename to core/parallel/multiproc/CMakeLists.txt index b506d8de530e4..bf0c85c117815 100644 --- a/core/multiproc/CMakeLists.txt +++ b/core/parallel/multiproc/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT core/multiproc package +# CMakeLists.txt file for building ROOT core/parallel/multiproc package ############################################################################ if(WIN32) diff --git a/core/multiproc/inc/LinkDef.h b/core/parallel/multiproc/inc/LinkDef.h similarity index 100% rename from core/multiproc/inc/LinkDef.h rename to core/parallel/multiproc/inc/LinkDef.h diff --git a/core/multiproc/inc/MPCode.h b/core/parallel/multiproc/inc/MPCode.h similarity index 100% rename from core/multiproc/inc/MPCode.h rename to core/parallel/multiproc/inc/MPCode.h diff --git a/core/multiproc/inc/MPSendRecv.h b/core/parallel/multiproc/inc/MPSendRecv.h similarity index 100% rename from core/multiproc/inc/MPSendRecv.h rename to core/parallel/multiproc/inc/MPSendRecv.h diff --git a/core/multiproc/inc/PoolUtils.h b/core/parallel/multiproc/inc/PoolUtils.h similarity index 100% rename from core/multiproc/inc/PoolUtils.h rename to core/parallel/multiproc/inc/PoolUtils.h diff --git a/core/multiproc/inc/ROOT/TProcessExecutor.hxx b/core/parallel/multiproc/inc/ROOT/TProcessExecutor.hxx similarity index 100% rename from core/multiproc/inc/ROOT/TProcessExecutor.hxx rename to core/parallel/multiproc/inc/ROOT/TProcessExecutor.hxx diff --git a/core/multiproc/inc/TMPClient.h b/core/parallel/multiproc/inc/TMPClient.h similarity index 100% rename from core/multiproc/inc/TMPClient.h rename to core/parallel/multiproc/inc/TMPClient.h diff --git a/core/multiproc/inc/TMPWorker.h b/core/parallel/multiproc/inc/TMPWorker.h similarity index 100% rename from core/multiproc/inc/TMPWorker.h rename to core/parallel/multiproc/inc/TMPWorker.h diff --git a/core/multiproc/inc/TMPWorkerExecutor.h b/core/parallel/multiproc/inc/TMPWorkerExecutor.h similarity index 100% rename from core/multiproc/inc/TMPWorkerExecutor.h rename to core/parallel/multiproc/inc/TMPWorkerExecutor.h diff --git a/core/multiproc/inc/TProcPool.h b/core/parallel/multiproc/inc/TProcPool.h similarity index 100% rename from core/multiproc/inc/TProcPool.h rename to core/parallel/multiproc/inc/TProcPool.h diff --git a/core/multiproc/src/MPSendRecv.cxx b/core/parallel/multiproc/src/MPSendRecv.cxx similarity index 100% rename from core/multiproc/src/MPSendRecv.cxx rename to core/parallel/multiproc/src/MPSendRecv.cxx diff --git a/core/multiproc/src/TMPClient.cxx b/core/parallel/multiproc/src/TMPClient.cxx similarity index 100% rename from core/multiproc/src/TMPClient.cxx rename to core/parallel/multiproc/src/TMPClient.cxx diff --git a/core/multiproc/src/TMPWorker.cxx b/core/parallel/multiproc/src/TMPWorker.cxx similarity index 100% rename from core/multiproc/src/TMPWorker.cxx rename to core/parallel/multiproc/src/TMPWorker.cxx diff --git a/core/multiproc/src/TProcessExecutor.cxx b/core/parallel/multiproc/src/TProcessExecutor.cxx similarity index 100% rename from core/multiproc/src/TProcessExecutor.cxx rename to core/parallel/multiproc/src/TProcessExecutor.cxx diff --git a/core/thread/CMakeLists.txt b/core/parallel/thread/CMakeLists.txt similarity index 97% rename from core/thread/CMakeLists.txt rename to core/parallel/thread/CMakeLists.txt index b850dc48f6f52..e62a5a04f85ea 100644 --- a/core/thread/CMakeLists.txt +++ b/core/parallel/thread/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT core/thread package +# CMakeLists.txt file for building ROOT core/parallel/thread package ############################################################################ if(WIN32) diff --git a/core/thread/doc/index.txt b/core/parallel/thread/doc/index.txt similarity index 100% rename from core/thread/doc/index.txt rename to core/parallel/thread/doc/index.txt diff --git a/core/thread/inc/LinkDef.h b/core/parallel/thread/inc/LinkDef.h similarity index 100% rename from core/thread/inc/LinkDef.h rename to core/parallel/thread/inc/LinkDef.h diff --git a/core/thread/inc/PosixThreadInc.h b/core/parallel/thread/inc/PosixThreadInc.h similarity index 100% rename from core/thread/inc/PosixThreadInc.h rename to core/parallel/thread/inc/PosixThreadInc.h diff --git a/core/thread/inc/ROOT/TRWSpinLock.hxx b/core/parallel/thread/inc/ROOT/TRWSpinLock.hxx similarity index 100% rename from core/thread/inc/ROOT/TRWSpinLock.hxx rename to core/parallel/thread/inc/ROOT/TRWSpinLock.hxx diff --git a/core/thread/inc/ROOT/TSpinMutex.hxx b/core/parallel/thread/inc/ROOT/TSpinMutex.hxx similarity index 100% rename from core/thread/inc/ROOT/TSpinMutex.hxx rename to core/parallel/thread/inc/ROOT/TSpinMutex.hxx diff --git a/core/thread/inc/ROOT/TThreadedObject.hxx b/core/parallel/thread/inc/ROOT/TThreadedObject.hxx similarity index 100% rename from core/thread/inc/ROOT/TThreadedObject.hxx rename to core/parallel/thread/inc/ROOT/TThreadedObject.hxx diff --git a/core/thread/inc/TAtomicCount.h b/core/parallel/thread/inc/TAtomicCount.h similarity index 100% rename from core/thread/inc/TAtomicCount.h rename to core/parallel/thread/inc/TAtomicCount.h diff --git a/core/thread/inc/TAtomicCountGcc.h b/core/parallel/thread/inc/TAtomicCountGcc.h similarity index 100% rename from core/thread/inc/TAtomicCountGcc.h rename to core/parallel/thread/inc/TAtomicCountGcc.h diff --git a/core/thread/inc/TAtomicCountPthread.h b/core/parallel/thread/inc/TAtomicCountPthread.h similarity index 100% rename from core/thread/inc/TAtomicCountPthread.h rename to core/parallel/thread/inc/TAtomicCountPthread.h diff --git a/core/thread/inc/TCondition.h b/core/parallel/thread/inc/TCondition.h similarity index 100% rename from core/thread/inc/TCondition.h rename to core/parallel/thread/inc/TCondition.h diff --git a/core/thread/inc/TConditionImp.h b/core/parallel/thread/inc/TConditionImp.h similarity index 100% rename from core/thread/inc/TConditionImp.h rename to core/parallel/thread/inc/TConditionImp.h diff --git a/core/thread/inc/TMutex.h b/core/parallel/thread/inc/TMutex.h similarity index 100% rename from core/thread/inc/TMutex.h rename to core/parallel/thread/inc/TMutex.h diff --git a/core/thread/inc/TMutexImp.h b/core/parallel/thread/inc/TMutexImp.h similarity index 100% rename from core/thread/inc/TMutexImp.h rename to core/parallel/thread/inc/TMutexImp.h diff --git a/core/thread/inc/TPosixCondition.h b/core/parallel/thread/inc/TPosixCondition.h similarity index 100% rename from core/thread/inc/TPosixCondition.h rename to core/parallel/thread/inc/TPosixCondition.h diff --git a/core/thread/inc/TPosixMutex.h b/core/parallel/thread/inc/TPosixMutex.h similarity index 100% rename from core/thread/inc/TPosixMutex.h rename to core/parallel/thread/inc/TPosixMutex.h diff --git a/core/thread/inc/TPosixThread.h b/core/parallel/thread/inc/TPosixThread.h similarity index 100% rename from core/thread/inc/TPosixThread.h rename to core/parallel/thread/inc/TPosixThread.h diff --git a/core/thread/inc/TPosixThreadFactory.h b/core/parallel/thread/inc/TPosixThreadFactory.h similarity index 100% rename from core/thread/inc/TPosixThreadFactory.h rename to core/parallel/thread/inc/TPosixThreadFactory.h diff --git a/core/thread/inc/TRWLock.h b/core/parallel/thread/inc/TRWLock.h similarity index 100% rename from core/thread/inc/TRWLock.h rename to core/parallel/thread/inc/TRWLock.h diff --git a/core/thread/inc/TSemaphore.h b/core/parallel/thread/inc/TSemaphore.h similarity index 100% rename from core/thread/inc/TSemaphore.h rename to core/parallel/thread/inc/TSemaphore.h diff --git a/core/thread/inc/TThread.h b/core/parallel/thread/inc/TThread.h similarity index 100% rename from core/thread/inc/TThread.h rename to core/parallel/thread/inc/TThread.h diff --git a/core/thread/inc/TThreadFactory.h b/core/parallel/thread/inc/TThreadFactory.h similarity index 100% rename from core/thread/inc/TThreadFactory.h rename to core/parallel/thread/inc/TThreadFactory.h diff --git a/core/thread/inc/TThreadImp.h b/core/parallel/thread/inc/TThreadImp.h similarity index 100% rename from core/thread/inc/TThreadImp.h rename to core/parallel/thread/inc/TThreadImp.h diff --git a/core/thread/inc/TThreadPool.h b/core/parallel/thread/inc/TThreadPool.h similarity index 100% rename from core/thread/inc/TThreadPool.h rename to core/parallel/thread/inc/TThreadPool.h diff --git a/core/thread/inc/TWin32AtomicCount.h b/core/parallel/thread/inc/TWin32AtomicCount.h similarity index 100% rename from core/thread/inc/TWin32AtomicCount.h rename to core/parallel/thread/inc/TWin32AtomicCount.h diff --git a/core/thread/inc/TWin32Condition.h b/core/parallel/thread/inc/TWin32Condition.h similarity index 100% rename from core/thread/inc/TWin32Condition.h rename to core/parallel/thread/inc/TWin32Condition.h diff --git a/core/thread/inc/TWin32Mutex.h b/core/parallel/thread/inc/TWin32Mutex.h similarity index 100% rename from core/thread/inc/TWin32Mutex.h rename to core/parallel/thread/inc/TWin32Mutex.h diff --git a/core/thread/inc/TWin32Thread.h b/core/parallel/thread/inc/TWin32Thread.h similarity index 100% rename from core/thread/inc/TWin32Thread.h rename to core/parallel/thread/inc/TWin32Thread.h diff --git a/core/thread/inc/TWin32ThreadFactory.h b/core/parallel/thread/inc/TWin32ThreadFactory.h similarity index 100% rename from core/thread/inc/TWin32ThreadFactory.h rename to core/parallel/thread/inc/TWin32ThreadFactory.h diff --git a/core/thread/src/TCondition.cxx b/core/parallel/thread/src/TCondition.cxx similarity index 100% rename from core/thread/src/TCondition.cxx rename to core/parallel/thread/src/TCondition.cxx diff --git a/core/thread/src/TConditionImp.cxx b/core/parallel/thread/src/TConditionImp.cxx similarity index 100% rename from core/thread/src/TConditionImp.cxx rename to core/parallel/thread/src/TConditionImp.cxx diff --git a/core/thread/src/TMutex.cxx b/core/parallel/thread/src/TMutex.cxx similarity index 100% rename from core/thread/src/TMutex.cxx rename to core/parallel/thread/src/TMutex.cxx diff --git a/core/thread/src/TMutexImp.cxx b/core/parallel/thread/src/TMutexImp.cxx similarity index 100% rename from core/thread/src/TMutexImp.cxx rename to core/parallel/thread/src/TMutexImp.cxx diff --git a/core/thread/src/TPosixCondition.cxx b/core/parallel/thread/src/TPosixCondition.cxx similarity index 100% rename from core/thread/src/TPosixCondition.cxx rename to core/parallel/thread/src/TPosixCondition.cxx diff --git a/core/thread/src/TPosixMutex.cxx b/core/parallel/thread/src/TPosixMutex.cxx similarity index 100% rename from core/thread/src/TPosixMutex.cxx rename to core/parallel/thread/src/TPosixMutex.cxx diff --git a/core/thread/src/TPosixThread.cxx b/core/parallel/thread/src/TPosixThread.cxx similarity index 100% rename from core/thread/src/TPosixThread.cxx rename to core/parallel/thread/src/TPosixThread.cxx diff --git a/core/thread/src/TPosixThreadFactory.cxx b/core/parallel/thread/src/TPosixThreadFactory.cxx similarity index 100% rename from core/thread/src/TPosixThreadFactory.cxx rename to core/parallel/thread/src/TPosixThreadFactory.cxx diff --git a/core/thread/src/TRWLock.cxx b/core/parallel/thread/src/TRWLock.cxx similarity index 100% rename from core/thread/src/TRWLock.cxx rename to core/parallel/thread/src/TRWLock.cxx diff --git a/core/thread/src/TRWMutexImp.cxx b/core/parallel/thread/src/TRWMutexImp.cxx similarity index 100% rename from core/thread/src/TRWMutexImp.cxx rename to core/parallel/thread/src/TRWMutexImp.cxx diff --git a/core/thread/src/TRWMutexImp.h b/core/parallel/thread/src/TRWMutexImp.h similarity index 100% rename from core/thread/src/TRWMutexImp.h rename to core/parallel/thread/src/TRWMutexImp.h diff --git a/core/thread/src/TRWSpinLock.cxx b/core/parallel/thread/src/TRWSpinLock.cxx similarity index 100% rename from core/thread/src/TRWSpinLock.cxx rename to core/parallel/thread/src/TRWSpinLock.cxx diff --git a/core/thread/src/TReentrantRWLock.cxx b/core/parallel/thread/src/TReentrantRWLock.cxx similarity index 100% rename from core/thread/src/TReentrantRWLock.cxx rename to core/parallel/thread/src/TReentrantRWLock.cxx diff --git a/core/thread/src/TReentrantRWLock.hxx b/core/parallel/thread/src/TReentrantRWLock.hxx similarity index 100% rename from core/thread/src/TReentrantRWLock.hxx rename to core/parallel/thread/src/TReentrantRWLock.hxx diff --git a/core/thread/src/TSemaphore.cxx b/core/parallel/thread/src/TSemaphore.cxx similarity index 100% rename from core/thread/src/TSemaphore.cxx rename to core/parallel/thread/src/TSemaphore.cxx diff --git a/core/thread/src/TThread.cxx b/core/parallel/thread/src/TThread.cxx similarity index 100% rename from core/thread/src/TThread.cxx rename to core/parallel/thread/src/TThread.cxx diff --git a/core/thread/src/TThreadFactory.cxx b/core/parallel/thread/src/TThreadFactory.cxx similarity index 100% rename from core/thread/src/TThreadFactory.cxx rename to core/parallel/thread/src/TThreadFactory.cxx diff --git a/core/thread/src/TThreadImp.cxx b/core/parallel/thread/src/TThreadImp.cxx similarity index 100% rename from core/thread/src/TThreadImp.cxx rename to core/parallel/thread/src/TThreadImp.cxx diff --git a/core/thread/src/TWin32Condition.cxx b/core/parallel/thread/src/TWin32Condition.cxx similarity index 100% rename from core/thread/src/TWin32Condition.cxx rename to core/parallel/thread/src/TWin32Condition.cxx diff --git a/core/thread/src/TWin32Mutex.cxx b/core/parallel/thread/src/TWin32Mutex.cxx similarity index 100% rename from core/thread/src/TWin32Mutex.cxx rename to core/parallel/thread/src/TWin32Mutex.cxx diff --git a/core/thread/src/TWin32Thread.cxx b/core/parallel/thread/src/TWin32Thread.cxx similarity index 100% rename from core/thread/src/TWin32Thread.cxx rename to core/parallel/thread/src/TWin32Thread.cxx diff --git a/core/thread/src/TWin32ThreadFactory.cxx b/core/parallel/thread/src/TWin32ThreadFactory.cxx similarity index 100% rename from core/thread/src/TWin32ThreadFactory.cxx rename to core/parallel/thread/src/TWin32ThreadFactory.cxx diff --git a/core/thread/test/CMakeLists.txt b/core/parallel/thread/test/CMakeLists.txt similarity index 100% rename from core/thread/test/CMakeLists.txt rename to core/parallel/thread/test/CMakeLists.txt diff --git a/core/thread/test/testInterpreterLock.cxx b/core/parallel/thread/test/testInterpreterLock.cxx similarity index 100% rename from core/thread/test/testInterpreterLock.cxx rename to core/parallel/thread/test/testInterpreterLock.cxx diff --git a/core/thread/test/testRWLock.cxx b/core/parallel/thread/test/testRWLock.cxx similarity index 100% rename from core/thread/test/testRWLock.cxx rename to core/parallel/thread/test/testRWLock.cxx diff --git a/core/thread/test/testTThreadedObject.cxx b/core/parallel/thread/test/testTThreadedObject.cxx similarity index 100% rename from core/thread/test/testTThreadedObject.cxx rename to core/parallel/thread/test/testTThreadedObject.cxx diff --git a/documentation/doxygen/makeinput.sh b/documentation/doxygen/makeinput.sh index fba17202baa80..ea4b4f7f37173 100755 --- a/documentation/doxygen/makeinput.sh +++ b/documentation/doxygen/makeinput.sh @@ -22,13 +22,13 @@ echo " ../../core/os/macosx/ \\" >> Doxyfile_INPUT echo " ../../core/meta/ \\" >> Doxyfile_INPUT echo " ../../core/metacling/ \\" >> Doxyfile_INPUT echo " ../../core/clingutils/ \\" >> Doxyfile_INPUT -echo " ../../core/multiproc/ \\" >> Doxyfile_INPUT +echo " ../../core/parallel/multiproc/ \\" >> Doxyfile_INPUT echo " ../../core/rint/ \\" >> Doxyfile_INPUT echo " ../../core/testsupport/ \\" >> Doxyfile_INPUT -echo " ../../core/thread/ \\" >> Doxyfile_INPUT +echo " ../../core/parallel/thread/ \\" >> Doxyfile_INPUT echo " ../../core/os/unix/ \\" >> Doxyfile_INPUT echo " ../../core/os/winnt/ \\" >> Doxyfile_INPUT -echo " ../../core/imt/ \\" >> Doxyfile_INPUT +echo " ../../core/parallel/imt/ \\" >> Doxyfile_INPUT echo " ../../core/compression/zip/inc/Compression.h \\" >> Doxyfile_INPUT echo " ../../geom/ \\" >> Doxyfile_INPUT echo " ../../graf2d/asimage/ \\" >> Doxyfile_INPUT diff --git a/tree/readspeed/CMakeLists.txt b/tree/readspeed/CMakeLists.txt index 123957246b447..2b1419cad3af0 100644 --- a/tree/readspeed/CMakeLists.txt +++ b/tree/readspeed/CMakeLists.txt @@ -18,7 +18,7 @@ target_include_directories(ReadSpeed PRIVATE ${CMAKE_SOURCE_DIR}/io/io/inc ${CMAKE_SOURCE_DIR}/tree/tree/inc ${CMAKE_SOURCE_DIR}/tree/treeplayer/inc - ${CMAKE_SOURCE_DIR}/core/imt/inc + ${CMAKE_SOURCE_DIR}/core/parallel/imt/inc ) ROOT_ADD_TEST_SUBDIRECTORY(test)