Fix stop tile render, remove log noise

Author: chase

VERSION

@@ -1 +1 @@
-v0.1.8
+v0.1.9

libreoffice-core/chart2/source/tools/WrappedPropertySet.cxx

@@ -89,7 +89,9 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
             xInnerPropertySet->setPropertyValue( rPropertyName, rValue );
         else
         {
-            SAL_WARN("chart2.tools", "found no inner property set to map to");
+            // MACRO: Noisy common case {
+            // SAL_WARN("chart2.tools", "found no inner property set to map to");
+            // MACRO: }
         }
     }
     catch( const beans::UnknownPropertyException& )
@@ -134,7 +136,9 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
             aRet = xInnerPropertySet->getPropertyValue( rPropertyName );
         else
         {
-            SAL_WARN("chart2.tools", "found no inner property set to map to");
+            // MACRO: Noisy common case {
+            // SAL_WARN("chart2.tools", "found no inner property set to map to");
+            // MACRO: }
         }
     }
     catch( const beans::UnknownPropertyException& )

libreoffice-core/desktop/inc/lib/wasm_extensions.hxx

@@ -33,7 +33,7 @@ struct TileRendererData
     const int32_t viewId;
     const int32_t tileSize;
     const int32_t paintedTileAllocSize;
-    pthread_t threadId;
+    const int32_t threadId;
 
     // individual tile paint
     _Atomic RenderState state = RenderState::IDLE;
@@ -54,7 +54,7 @@ struct TileRendererData
     LibreOfficeKitDocument* doc;
 
     TileRendererData(LibreOfficeKitDocument* doc_, int32_t viewId_, int32_t tileSize_,
-                     uint32_t docWidthTwips_, uint32_t docHeightTwips_, pthread_t threadId_)
+                     uint32_t docWidthTwips_, uint32_t docHeightTwips_, int32_t threadId_)
         : viewId(viewId_)
         , tileSize(tileSize_)
         , paintedTileAllocSize(tileSize_ * tileSize_ * 4)
@@ -78,14 +78,14 @@ struct ExpandedPart
 
     ExpandedPart(std::string path_, std::string content_)
         : path(std::move(path_))
-        , content(std::move(content_)){};
+        , content(std::move(content_)) {};
 };
 
 struct ExpandedDocument
 {
     std::vector<ExpandedPart> parts;
 
-    ExpandedDocument(){};
+    ExpandedDocument() {};
 
 public:
     void addPart(std::string path, std::string content);

libreoffice-core/desktop/source/lib/wasm_extensions.cxx

@@ -97,9 +97,11 @@ static void* tileRendererWorker(void* data_)
                 break;
             }
             case RenderState::QUIT:
+                pthread_exit(nullptr);
                 return nullptr;
         }
     }
+    pthread_exit(nullptr);
     return nullptr;
 }
 
@@ -112,14 +114,14 @@ TileRendererData& WasmDocumentExtension::startTileRenderer(int32_t viewId_, int3
 {
     long w, h;
     pClass->getDocumentSize(this, &w, &h);
-    pthread_t& threadId = tileRendererThreads_.emplace_back();
-    TileRendererData& data
-        = tileRendererData_.emplace_back(this, viewId_, tileSize_, w, h, threadId);
-    if (pthread_create(&threadId, nullptr, tileRendererWorker, &data))
+    pthread_t& thread = tileRendererThreads_.emplace_back();
+    TileRendererData& data = tileRendererData_.emplace_back(this, viewId_, tileSize_, w, h,
+                                                            tileRendererThreads_.size());
+    if (pthread_create(&thread, nullptr, tileRendererWorker, &data))
     {
         std::abort();
     }
-    pthread_detach(threadId);
+    pthread_detach(thread);
 
     return data;
 }
@@ -135,18 +137,18 @@ void WasmDocumentExtension::stopTileRenderer(int32_t viewId)
         TileRendererData* data = &*it;
         changeState(data, RenderState::QUIT);
 
-        auto threadIt = std::find_if(tileRendererThreads_.begin(), tileRendererThreads_.end(),
-                                     [data](const pthread_t& threadId)
-                                     { return pthread_equal(threadId, data->threadId); });
+        auto threadIt = tileRendererThreads_[data->threadId];
 
-        if (threadIt != tileRendererThreads_.end())
-        {
-            pthread_join(*threadIt, nullptr);
-            tileRendererThreads_.erase(threadIt);
-        }
+        pthread_join(threadIt, nullptr);
+        // Don't erase it, since the position is used as an ID now
+        // tileRendererThreads_.erase(threadIt);
         delete[] data->paintedTile;
         delete data;
     }
+    else
+    {
+        SAL_WARN("tile", "missing tile render data");
+    }
 }
 
 void TileRendererData::pushInvalidation(uint32_t invalidation[4])
@@ -297,12 +299,11 @@ WasmDocumentExtension::loadFromExpanded(LibreOfficeKit* pThis,
     comphelper::OStorageHelper::SetIsExpandedStorage(true);
     comphelper::OStorageHelper::SetExpandedStorage(xStorage);
 
-
     /*
         storage instance MUST be set before storage base
         instance and base are the same objects, just casted differently
         instance is stored in an uno::Reference while base is stored in a shared_ptr
-        
+
         if the base is released first (as the shared_ptr is set), the uno reference
         has a bad time when it tries to access a null object at with it's pointer
     */

libreoffice-core/include/osl/diagnose.h

@@ -66,12 +66,13 @@
 */
 #define OSL_LOG_PREFIX SAL_DETAIL_WHERE
 
+
 /** Prints trace message.
 
     The arguments have the same meaning as the arguments of printf.
 */
 #define OSL_TRACE(...) \
-    SAL_DETAIL_INFO_IF_FORMAT(OSL_DEBUG_LEVEL > 0, "legacy.osl", __VA_ARGS__)
+    ((void)0)
 
 /** @defgroup assert Assertions
 
@@ -82,11 +83,11 @@
 
 /** If cond is false, reports an error. */
 #define OSL_ASSERT(c) \
-    SAL_DETAIL_WARN_IF_FORMAT(!(c), "legacy.osl", "OSL_ASSERT: %s", #c)
+    ((void)0)
 /** If cond is false, reports an error with message msg. */
-#define OSL_ENSURE(c, m) SAL_DETAIL_WARN_IF_FORMAT(!(c), "legacy.osl", "%s", m)
+#define OSL_ENSURE(c, m) ((void)0)
 /** Reports an error with message msg unconditionally. */
-#define OSL_FAIL(m) SAL_DETAIL_WARN_IF_FORMAT(sal_True, "legacy.osl", "%s", m)
+#define OSL_FAIL(m) ((void)0)
 
 /** Evaluates the expression and if it is false, reports an error. The
     expression is evaluated once without regard of the value of
@@ -104,6 +105,7 @@
     @endcode
 */
 #define OSL_VERIFY(c) do { if (!(c)) OSL_ASSERT(0); } while (0)
+// MACRO: }
 
 /** Check the precondition of functions.
 

libreoffice-core/oox/source/helper/expandedstorage.cxx

@@ -769,8 +769,11 @@ void ExpandedStorage::readRelationshipInfo()
 
     if (relFilePaths.empty())
     {
-        SAL_WARN("expandedstorage",
-                 "no relationship info found for base path" << m_basePath.value());
+        // FIXME: This shouldn't be used for the Configurations2 directory, probably need to pre-init
+        // writer outside of the document load to prevent this
+
+        // SAL_WARN("expandedstorage",
+        //          "no relationship info found for base path" << m_basePath.value());
 
         return;
     }

libreoffice-core/sfx2/source/appl/appserv.cxx

@@ -336,7 +336,9 @@ weld::Window* SfxRequest::GetFrameWeld() const
         xFrame = GetDocFrame(*this);
     if (!xFrame)
     {
-        SAL_WARN("sfx.appl", "no parent for dialogs");
+        // MACRO: Noisy common case {
+        // SAL_WARN("sfx.appl", "no parent for dialogs");
+        // MACRO: }
         return nullptr;
     }
     return Application::GetFrameWeld(xFrame->getContainerWindow());

libreoffice-core/sot/source/sdstor/storage.cxx

@@ -721,6 +721,10 @@ SotClipboardFormatId SotStorage::GetFormatID( const css::uno::Reference < css::e
 
 sal_Int32 SotStorage::GetVersion( const css::uno::Reference < css::embed::XStorage >& xStorage )
 {
+    // MACRO: Prevents a common crash. We don't support legacy formats, this will always be 0 {
+    return 0;
+    // MACRO: }
+
     SotClipboardFormatId nSotFormatID = SotStorage::GetFormatID( xStorage );
     switch( nSotFormatID )
     {

libreoffice-core/xmloff/source/chart/SchXMLExport.cxx

@@ -3975,7 +3975,9 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
     try
     {
         Reference< chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider() );
-        SAL_WARN_IF( !xDataProvider.is(), "xmloff.chart", "No DataProvider" );
+        // FIXME: MACRO: macro common error, but seems like expanded storage related {
+        // SAL_WARN_IF( !xDataProvider.is(), "xmloff.chart", "No DataProvider" );
+        // FIXME MACRO: }
         if( xDataProvider.is())
         {
             Reference< chart2::data::XDataSource > xDataSource( lcl_pressUsedDataIntoRectangularFormat( xChartDoc, mbHasCategoryLabels ));

libreoffice-core/xmloff/source/text/XMLTextListAutoStylePool.cxx

@@ -160,7 +160,9 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
         m_sPrefix = "ML";
 
     Reference<XStyleFamiliesSupplier> xFamiliesSupp(m_rExport.GetModel(), UNO_QUERY);
-    SAL_WARN_IF(!xFamiliesSupp.is(), "xmloff", "getStyleFamilies() from XModel failed for export!");
+    // MACRO: Noisy common case {
+    // SAL_WARN_IF(!xFamiliesSupp.is(), "xmloff", "getStyleFamilies() from XModel failed for export!");
+    // MACRO: }
     Reference< XNameAccess > xFamilies;
     if (xFamiliesSupp.is())
         xFamilies = xFamiliesSupp->getStyleFamilies();