Move foundation hash and log related files to their own directories

appleseedhq · Mar 7, 2020 · 8120875 · 8120875
1 parent 0c01e1e
commit 8120875
Show file tree

Hide file tree

Showing 96 changed files with 149 additions and 140 deletions.
diff --git a/sandbox/examples/cpp/distancefieldobject/distancefieldobject.cpp b/sandbox/examples/cpp/distancefieldobject/distancefieldobject.cpp
@@ -37,7 +37,7 @@
 #include "renderer/kernel/shading/shadingray.h"
 
 // appleseed.foundation headers.
-#include "foundation/math/hash.h"
+#include "foundation/hash/hash.h"
 #include "foundation/math/intersection/rayaabb.h"
 #include "foundation/math/ray.h"
 #include "foundation/math/rng/distribution.h"

diff --git a/sandbox/examples/cpp/heightfield/heightfield.cpp b/sandbox/examples/cpp/heightfield/heightfield.cpp
@@ -56,7 +56,7 @@
 #include "foundation/platform/compiler.h"
 #include "foundation/platform/types.h"
 #include "foundation/containers/dictionary.h"
-#include "foundation/utility/log/consolelogtarget.h"
+#include "foundation/log/consolelogtarget.h"
 #include "foundation/utility/searchpaths.h"
 #include "foundation/utility/string.h"
 

diff --git a/sandbox/examples/cpp/helloworld/helloworld.cpp b/sandbox/examples/cpp/helloworld/helloworld.cpp
@@ -53,7 +53,7 @@
 #include "foundation/math/vector.h"
 #include "foundation/memory/autoreleaseptr.h"
 #include "foundation/containers/dictionary.h"
-#include "foundation/utility/log/consolelogtarget.h"
+#include "foundation/log/consolelogtarget.h"
 #include "foundation/utility/searchpaths.h"
 
 // Standard headers.
@@ -282,7 +282,7 @@ int main()
 {
     // Create a log target that outputs to stderr, and binds it to the renderer's global logger.
     // Eventually you will probably want to redirect log messages to your own target. For this
-    // you will need to implement foundation::ILogTarget (foundation/utility/log/ilogtarget.h).
+    // you will need to implement foundation::ILogTarget (foundation/log/ilogtarget.h).
     std::unique_ptr<asf::ILogTarget> log_target(asf::create_console_log_target(stderr));
     asr::global_logger().add_target(log_target.get());
 

diff --git a/src/appleseed.bench/main/main.cpp b/src/appleseed.bench/main/main.cpp
@@ -40,8 +40,8 @@
 
 // appleseed.foundation headers.
 #include "foundation/core/appleseed.h"
+#include "foundation/log/log.h"
 #include "foundation/platform/path.h"
-#include "foundation/utility/log.h"
 #include "foundation/utility/preprocessor.h"
 
 // appleseed.main headers.

diff --git a/src/appleseed.bench/mainwindow/applicationsettingswindow.cpp b/src/appleseed.bench/mainwindow/applicationsettingswindow.cpp
@@ -42,8 +42,8 @@
 #include "renderer/api/utility.h"
 
 // appleseed.foundation headers.
+#include "foundation/log/logmessage.h"
 #include "foundation/platform/system.h"
-#include "foundation/utility/log/logmessage.h"
 #include "foundation/utility/string.h"
 
 // Qt headers.

diff --git a/src/appleseed.bench/mainwindow/mainwindow.cpp b/src/appleseed.bench/mainwindow/mainwindow.cpp
@@ -58,10 +58,10 @@
 // appleseed.foundation headers.
 #include "foundation/containers/dictionary.h"
 #include "foundation/core/appleseed.h"
+#include "foundation/log/logmessage.h"
 #include "foundation/platform/compiler.h"
 #include "foundation/platform/path.h"
 #include "foundation/platform/system.h"
-#include "foundation/utility/log/logmessage.h"
 #include "foundation/utility/string.h"
 
 // Qt headers.

diff --git a/src/appleseed.cli/commandlinehandler.cpp b/src/appleseed.cli/commandlinehandler.cpp
@@ -34,7 +34,7 @@
 #include "application/superlogger.h"
 
 // appleseed.foundation headers.
-#include "foundation/utility/log.h"
+#include "foundation/log/log.h"
 
 using namespace appleseed::common;
 using namespace foundation;

diff --git a/src/appleseed.cli/main.cpp b/src/appleseed.cli/main.cpp
@@ -48,13 +48,13 @@
 #include "renderer/api/utility.h"
 
 // appleseed.foundation headers.
+#include "foundation/log/log.h"
 #include "foundation/memory/autoreleaseptr.h"
 #include "foundation/platform/console.h"
 #include "foundation/platform/debugger.h"
 #include "foundation/platform/thread.h"
 #include "foundation/utility/benchmark.h"
 #include "foundation/utility/filter.h"
-#include "foundation/utility/log.h"
 #include "foundation/utility/searchpaths.h"
 #include "foundation/utility/string.h"
 #include "foundation/utility/test.h"

diff --git a/src/appleseed.common/application/application.cpp b/src/appleseed.common/application/application.cpp
@@ -32,9 +32,9 @@
 
 // appleseed.foundation headers.
 #include "foundation/containers/dictionary.h"
+#include "foundation/log/log.h"
 #include "foundation/platform/path.h"
 #include "foundation/platform/system.h"
-#include "foundation/utility/log.h"
 #include "foundation/utility/searchpaths.h"
 #include "foundation/utility/settings.h"
 #include "foundation/utility/string.h"

diff --git a/src/appleseed.common/application/application.h b/src/appleseed.common/application/application.h
@@ -30,7 +30,7 @@
 #pragma once
 
 // appleseed.foundation headers.
-#include "foundation/utility/log/logmessage.h"
+#include "foundation/log/logmessage.h"
 
 // Boost headers.
 #include "boost/filesystem/operations.hpp"

diff --git a/src/appleseed.common/application/commandlinehandlerbase.cpp b/src/appleseed.common/application/commandlinehandlerbase.cpp
@@ -36,14 +36,14 @@
 // appleseed.foundation headers.
 #include "foundation/core/appleseed.h"
 #include "foundation/core/thirdparties.h"
+#include "foundation/log/log.h"
 #include "foundation/platform/compiler.h"
 #include "foundation/platform/system.h"
 #include "foundation/platform/types.h"
 #ifdef _WIN32
 #include "foundation/platform/windows.h"
 #endif
 #include "foundation/utility/commandlineparser.h"
-#include "foundation/utility/log.h"
 
 // Boost headers.
 #include "boost/filesystem/path.hpp"

diff --git a/src/appleseed.common/application/progresstilecallback.cpp b/src/appleseed.common/application/progresstilecallback.cpp
@@ -37,9 +37,9 @@
 #include "foundation/image/canvasproperties.h"
 #include "foundation/image/image.h"
 #include "foundation/image/tile.h"
+#include "foundation/log/log.h"
 #include "foundation/platform/defaulttimers.h"
 #include "foundation/platform/thread.h"
-#include "foundation/utility/log.h"
 #include "foundation/utility/stopwatch.h"
 #include "foundation/utility/string.h"
 
@@ -117,7 +117,7 @@ namespace
                     "rendering, %s done; about %s remaining...",
                     pretty_percent(m_rendered_pixels, total_pixels).c_str(),
                     pretty_time(remaining_time).c_str());
-            }   
+            }
         }
 
       private:

diff --git a/src/appleseed.common/application/superlogger.h b/src/appleseed.common/application/superlogger.h
@@ -30,7 +30,7 @@
 #pragma once
 
 // appleseed.foundation headers.
-#include "foundation/utility/log.h"
+#include "foundation/log/log.h"
 
 // Forward declarations.
 namespace foundation { class Dictionary; }

diff --git a/src/appleseed.python/bindlogger.cpp b/src/appleseed.python/bindlogger.cpp
@@ -34,9 +34,9 @@
 #include "renderer/global/globallogger.h"
 
 // appleseed.foundation headers.
+#include "foundation/log/log.h"
 #include "foundation/platform/compiler.h"
 #include "foundation/platform/python.h"
-#include "foundation/utility/log.h"
 
 // Standard headers.
 #include <cstddef>

diff --git a/src/appleseed.python/bindmeshobject.cpp b/src/appleseed.python/bindmeshobject.cpp
@@ -35,8 +35,8 @@
 #include "renderer/api/object.h"
 
 // appleseed.foundation headers.
+#include "foundation/hash/murmurhash.h"
 #include "foundation/platform/python.h"
-#include "foundation/utility/murmurhash.h"
 #include "foundation/utility/searchpaths.h"
 
 // Standard headers.

diff --git a/src/appleseed.python/bindmurmurhash.cpp b/src/appleseed.python/bindmurmurhash.cpp
@@ -27,8 +27,8 @@
 //
 
 // appleseed.foundation headers.
+#include "foundation/hash/murmurhash.h"
 #include "foundation/platform/python.h"
-#include "foundation/utility/murmurhash.h"
 
 // Standard headers.
 #include <string>

diff --git a/src/appleseed.qtcommon/widgets/qtlogtarget.h b/src/appleseed.qtcommon/widgets/qtlogtarget.h
@@ -30,7 +30,7 @@
 #pragma once
 
 // appleseed.foundation headers.
-#include "foundation/utility/log.h"
+#include "foundation/log/log.h"
 
 // Qt headers.
 #include <QObject>

diff --git a/src/appleseed.studio/main/commandlinehandler.cpp b/src/appleseed.studio/main/commandlinehandler.cpp
@@ -34,7 +34,7 @@
 #include "application/superlogger.h"
 
 // appleseed.foundation headers.
-#include "foundation/utility/log.h"
+#include "foundation/log/log.h"
 
 // Qt headers.
 #include <QMessageBox>

diff --git a/src/appleseed.studio/main/main.cpp b/src/appleseed.studio/main/main.cpp
@@ -41,9 +41,9 @@
 
 // appleseed.foundation headers.
 #include "foundation/core/appleseed.h"
+#include "foundation/log/log.h"
 #include "foundation/platform/path.h"
 #include "foundation/platform/python.h"
-#include "foundation/utility/log.h"
 #include "foundation/utility/preprocessor.h"
 
 // appleseed.main headers.

diff --git a/src/appleseed.studio/mainwindow/applicationsettingswindow.cpp b/src/appleseed.studio/mainwindow/applicationsettingswindow.cpp
@@ -42,8 +42,8 @@
 #include "renderer/api/utility.h"
 
 // appleseed.foundation headers.
+#include "foundation/log/logmessage.h"
 #include "foundation/platform/system.h"
-#include "foundation/utility/log/logmessage.h"
 #include "foundation/utility/string.h"
 
 // Qt headers.

diff --git a/src/appleseed.studio/mainwindow/mainwindow.cpp b/src/appleseed.studio/mainwindow/mainwindow.cpp
@@ -64,14 +64,14 @@
 // appleseed.foundation headers.
 #include "foundation/containers/dictionary.h"
 #include "foundation/core/appleseed.h"
+#include "foundation/log/logmessage.h"
 #include "foundation/math/aabb.h"
 #include "foundation/math/vector.h"
 #include "foundation/platform/compiler.h"
 #include "foundation/platform/path.h"
 #include "foundation/platform/python.h"
 #include "foundation/platform/system.h"
 #include "foundation/utility/foreach.h"
-#include "foundation/utility/log/logmessage.h"
 
 // Qt headers.
 #include <QAction>

diff --git a/src/appleseed/CMakeLists.txt b/src/appleseed/CMakeLists.txt
@@ -167,6 +167,20 @@ source_group ("foundation\\curve" FILES
     ${foundation_curve_sources}
 )
 
+set (foundation_hash_sources
+    foundation/hash/hash.h
+    foundation/hash/murmurhash.cpp
+    foundation/hash/murmurhash.h
+    foundation/hash/siphash.cpp
+    foundation/hash/siphash.h
+)
+list (APPEND appleseed_sources
+    ${foundation_hash_sources}
+)
+source_group ("foundation\\hash" FILES
+    ${foundation_hash_sources}
+)
+
 set (foundation_image_text_sources
     foundation/image/text/stb_truetype.cpp
     foundation/image/text/stb_truetype.h
@@ -227,6 +241,34 @@ source_group ("foundation\\image" FILES
     ${foundation_image_sources}
 )
 
+set (foundation_log_sources
+    foundation/log/consolelogtarget.cpp
+    foundation/log/consolelogtarget.h
+    foundation/log/filelogtarget.cpp
+    foundation/log/filelogtarget.h
+    foundation/log/filelogtargetbase.cpp
+    foundation/log/filelogtargetbase.h
+    foundation/log/helpers.h
+    foundation/log/ilogtarget.h
+    foundation/log/log.h
+    foundation/log/logformatter.cpp
+    foundation/log/logformatter.h
+    foundation/log/logger.cpp
+    foundation/log/logger.h
+    foundation/log/logmessage.cpp
+    foundation/log/logmessage.h
+    foundation/log/openfilelogtarget.cpp
+    foundation/log/openfilelogtarget.h
+    foundation/log/stringlogtarget.cpp
+    foundation/log/stringlogtarget.h
+)
+list (APPEND appleseed_sources
+    ${foundation_log_sources}
+)
+source_group ("foundation\\log" FILES
+    ${foundation_log_sources}
+)
+
 set (foundation_math_bsp_sources
     foundation/math/bsp/bsp_builder.h
     foundation/math/bsp/bsp_intersector.h
@@ -379,7 +421,6 @@ set (foundation_math_sources
     foundation/math/frustum.h
     foundation/math/half.cpp
     foundation/math/half.h
-    foundation/math/hash.h
     foundation/math/knn.h
     foundation/math/matrix.h
     foundation/math/microfacet.cpp
@@ -815,33 +856,6 @@ source_group ("foundation\\utility\\job" FILES
     ${foundation_utility_job_sources}
 )
 
-set (foundation_utility_log_sources
-    foundation/utility/log/consolelogtarget.cpp
-    foundation/utility/log/consolelogtarget.h
-    foundation/utility/log/filelogtarget.cpp
-    foundation/utility/log/filelogtarget.h
-    foundation/utility/log/filelogtargetbase.cpp
-    foundation/utility/log/filelogtargetbase.h
-    foundation/utility/log/helpers.h
-    foundation/utility/log/ilogtarget.h
-    foundation/utility/log/logformatter.cpp
-    foundation/utility/log/logformatter.h
-    foundation/utility/log/logger.cpp
-    foundation/utility/log/logger.h
-    foundation/utility/log/logmessage.cpp
-    foundation/utility/log/logmessage.h
-    foundation/utility/log/openfilelogtarget.cpp
-    foundation/utility/log/openfilelogtarget.h
-    foundation/utility/log/stringlogtarget.cpp
-    foundation/utility/log/stringlogtarget.h
-)
-list (APPEND appleseed_sources
-    ${foundation_utility_log_sources}
-)
-source_group ("foundation\\utility\\log" FILES
-    ${foundation_utility_log_sources}
-)
-
 set (foundation_utility_minizip_sources
     foundation/utility/minizip/crypt.h
     foundation/utility/minizip/ioapi.c
@@ -938,10 +952,7 @@ set (foundation_utility_sources
     foundation/utility/job.h
     foundation/utility/kvpair.h
     foundation/utility/lazy.h
-    foundation/utility/log.h
     foundation/utility/makevector.h
-    foundation/utility/murmurhash.cpp
-    foundation/utility/murmurhash.h
     foundation/utility/numerictype.h
     foundation/utility/otherwise.h
     foundation/utility/poison.h
@@ -951,8 +962,6 @@ set (foundation_utility_sources
     foundation/utility/searchpaths.cpp
     foundation/utility/searchpaths.h
     foundation/utility/settings.h
-    foundation/utility/siphash.cpp
-    foundation/utility/siphash.h
     foundation/utility/statistics.cpp
     foundation/utility/statistics.h
     foundation/utility/stopwatch.h

diff --git a/src/appleseed/foundation/math/hash.h → src/appleseed/foundation/hash/hash.h b/src/appleseed/foundation/math/hash.h → src/appleseed/foundation/hash/hash.h
diff --git a/...pleseed/foundation/utility/murmurhash.cpp → src/appleseed/foundation/hash/murmurhash.cpp b/...pleseed/foundation/utility/murmurhash.cpp → src/appleseed/foundation/hash/murmurhash.cpp
diff --git a/...appleseed/foundation/utility/murmurhash.h → src/appleseed/foundation/hash/murmurhash.h b/...appleseed/foundation/utility/murmurhash.h → src/appleseed/foundation/hash/murmurhash.h
diff --git a/src/appleseed/foundation/utility/siphash.cpp → src/appleseed/foundation/hash/siphash.cpp b/src/appleseed/foundation/utility/siphash.cpp → src/appleseed/foundation/hash/siphash.cpp
diff --git a/src/appleseed/foundation/utility/siphash.h → src/appleseed/foundation/hash/siphash.h b/src/appleseed/foundation/utility/siphash.h → src/appleseed/foundation/hash/siphash.h
diff --git a/src/appleseed/foundation/image/color.h b/src/appleseed/foundation/image/color.h
@@ -30,8 +30,8 @@
 #pragma once
 
 // appleseed.foundation headers.
+#include "foundation/hash/hash.h"
 #include "foundation/math/fp.h"
-#include "foundation/math/hash.h"
 #include "foundation/math/matrix.h"
 #include "foundation/math/scalar.h"
 #include "foundation/utility/poison.h"

diff --git a/...undation/utility/log/consolelogtarget.cpp → ...eseed/foundation/log/consolelogtarget.cpp b/...undation/utility/log/consolelogtarget.cpp → ...eseed/foundation/log/consolelogtarget.cpp
@@ -31,10 +31,10 @@
 #include "consolelogtarget.h"
 
 // appleseed.foundation headers.
+#include "foundation/log/filelogtargetbase.h"
+#include "foundation/log/logmessage.h"
 #include "foundation/platform/compiler.h"
 #include "foundation/platform/console.h"
-#include "foundation/utility/log/filelogtargetbase.h"
-#include "foundation/utility/log/logmessage.h"
 
 // Standard headers.
 #include <cstddef>

diff --git a/...foundation/utility/log/consolelogtarget.h → ...pleseed/foundation/log/consolelogtarget.h b/...foundation/utility/log/consolelogtarget.h → ...pleseed/foundation/log/consolelogtarget.h
diff --git a/.../foundation/utility/log/filelogtarget.cpp → ...ppleseed/foundation/log/filelogtarget.cpp b/.../foundation/utility/log/filelogtarget.cpp → ...ppleseed/foundation/log/filelogtarget.cpp
diff --git a/...ed/foundation/utility/log/filelogtarget.h → src/appleseed/foundation/log/filelogtarget.h b/...ed/foundation/utility/log/filelogtarget.h → src/appleseed/foundation/log/filelogtarget.h
@@ -30,9 +30,9 @@
 #pragma once
 
 // appleseed.foundation headers.
+#include "foundation/log/filelogtargetbase.h"
+#include "foundation/log/logmessage.h"
 #include "foundation/platform/compiler.h"
-#include "foundation/utility/log/filelogtargetbase.h"
-#include "foundation/utility/log/logmessage.h"
 
 // appleseed.main headers.
 #include "main/dllsymbol.h"

diff --git a/...ndation/utility/log/filelogtargetbase.cpp → ...seed/foundation/log/filelogtargetbase.cpp b/...ndation/utility/log/filelogtargetbase.cpp → ...seed/foundation/log/filelogtargetbase.cpp