Revert "Erase any dangling error messages when objects that report er…

…rors are destroyed." This reverts commit d7e1afe. Signed-off-by: Chris Kulla <[email protected]>
fpsunflower · Apr 12, 2024 · fd2db6e · fd2db6e
1 parent ab60908
commit fd2db6e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 25 deletions.
diff --git a/src/libOpenImageIO/imageinput.cpp b/src/libOpenImageIO/imageinput.cpp
@@ -81,12 +81,7 @@ ImageInput::ImageInput()
 
 
 
-ImageInput::~ImageInput()
-{
-    // Erase any leftover errors from this thread
-    // TODO: can we clear other threads' errors?
-    input_error_messages.erase(this);
-}
+ImageInput::~ImageInput() {}
 
 
 

diff --git a/src/libOpenImageIO/imageoutput.cpp b/src/libOpenImageIO/imageoutput.cpp
@@ -84,12 +84,7 @@ ImageOutput::ImageOutput()
 
 
 
-ImageOutput::~ImageOutput()
-{
-    // Erase any leftover errors from this thread
-    // TODO: can we clear other threads' errors?
-    output_error_messages.erase(this);
-}
+ImageOutput::~ImageOutput() {}
 
 
 

diff --git a/src/libtexture/imagecache.cpp b/src/libtexture/imagecache.cpp
@@ -1722,9 +1722,6 @@ ImageCacheImpl::~ImageCacheImpl()
         spin_lock lock(m_perthread_info_mutex);
         m_all_perthread_info.clear();
     }
-    // Erase any leftover errors from this thread
-    // TODO: can we clear other threads' errors?
-    imcache_error_messages.erase(this);
 }
 
 

diff --git a/src/libtexture/texturesys.cpp b/src/libtexture/texturesys.cpp
@@ -351,17 +351,8 @@ TextureSystemImpl::init()
 }
 
 
-static thread_local tsl::robin_map<const TextureSystemImpl*, std::string>
-    txsys_error_messages;
 
-
-TextureSystemImpl::~TextureSystemImpl()
-{
-    printstats();
-    // Erase any leftover errors from this thread
-    // TODO: can we clear other threads' errors?
-    txsys_error_messages.erase(this);
-}
+TextureSystemImpl::~TextureSystemImpl() { printstats(); }
 
 
 
@@ -902,6 +893,9 @@ TextureSystemImpl::get_texels(TextureHandle* texture_handle_,
     return ok;
 }
 
+static thread_local tsl::robin_map<const TextureSystemImpl*, std::string>
+    txsys_error_messages;
+
 bool
 TextureSystemImpl::has_error() const
 {