[geos-commits] [SCM] GEOS branch main updated. 3e3f7205e743800d951f2e9e7e3cca3a033b7d61

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, main has been updated
       via  3e3f7205e743800d951f2e9e7e3cca3a033b7d61 (commit)
       via  20ca29f92f1602693ba82badb8ab2049a9da1e4c (commit)
      from  92f4303a0e83d5a5cf216d59e05a2dcc3527f07c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e3f7205e743800d951f2e9e7e3cca3a033b7d61
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu May 4 19:06:16 2023 +0200

    Reduce interrupt checks in MCIndexNoder::intersectChains
    
    Limit the check to once every 100000 iterations

diff --git a/src/noding/MCIndexNoder.cpp b/src/noding/MCIndexNoder.cpp
index 89fd67e1e..6cdd9a45b 100644
--- a/src/noding/MCIndexNoder.cpp
+++ b/src/noding/MCIndexNoder.cpp
@@ -71,7 +71,7 @@ MCIndexNoder::intersectChains()
     index.queryPairs([this, &overlapAction](const MonotoneChain* queryChain, const MonotoneChain* testChain) {
         queryChain->computeOverlaps(testChain, overlapTolerance, &overlapAction);
         nOverlaps++;
-        GEOS_CHECK_FOR_INTERRUPTS();
+        if ( nOverlaps % 100000 == 0 ) GEOS_CHECK_FOR_INTERRUPTS();
 
         return !segInt->isDone(); // abort early if segInt->isDone()
     });

commit 20ca29f92f1602693ba82badb8ab2049a9da1e4c
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu May 4 18:42:31 2023 +0200

    Make MCIndexNoder::intersectChains interruptible
    
    Improves interruptability of BufferBuilder::computeNodedEdges
    References GH-894 in main branch ( 3.12.0dev )

diff --git a/src/noding/MCIndexNoder.cpp b/src/noding/MCIndexNoder.cpp
index 47ffaa4b4..89fd67e1e 100644
--- a/src/noding/MCIndexNoder.cpp
+++ b/src/noding/MCIndexNoder.cpp
@@ -71,6 +71,7 @@ MCIndexNoder::intersectChains()
     index.queryPairs([this, &overlapAction](const MonotoneChain* queryChain, const MonotoneChain* testChain) {
         queryChain->computeOverlaps(testChain, overlapTolerance, &overlapAction);
         nOverlaps++;
+        GEOS_CHECK_FOR_INTERRUPTS();
 
         return !segInt->isDone(); // abort early if segInt->isDone()
     });

-----------------------------------------------------------------------

Summary of changes:
 src/noding/MCIndexNoder.cpp | 1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
GEOS