[brlcad-commits] SF.net SVN: brlcad:[71957] brlcad/trunk/src

[starseeker--- via brlcad-commits]

Revision: 71957
          http://sourceforge.net/p/brlcad/code/71957
Author:   starseeker
Date:     2018-10-11 00:52:25 +0000 (Thu, 11 Oct 2018)
Log Message:
-----------
return a different error for out of memory.

Modified Paths:
--------------
    brlcad/trunk/src/libanalyze/polygonizer.c
    brlcad/trunk/src/libged/facetize.c

Modified: brlcad/trunk/src/libanalyze/polygonizer.c
===================================================================
--- brlcad/trunk/src/libanalyze/polygonizer.c   2018-10-11 00:20:49 UTC (rev 
71956)
+++ brlcad/trunk/src/libanalyze/polygonizer.c   2018-10-11 00:52:25 UTC (rev 
71957)
@@ -860,7 +860,7 @@
            avail_mem = bu_avail_mem();
            if (avail_mem >= 0 && avail_mem < params->minimum_free_mem) {
                /* memory too tight, bail */
-               ret = 2;
+               ret = 3;
                goto analyze_polygonizer_memfree;
            }
        }

Modified: brlcad/trunk/src/libged/facetize.c
===================================================================
--- brlcad/trunk/src/libged/facetize.c  2018-10-11 00:20:49 UTC (rev 71956)
+++ brlcad/trunk/src/libged/facetize.c  2018-10-11 00:52:25 UTC (rev 71957)
@@ -1340,6 +1340,11 @@
                    feature_size, pn->v, objname, gedp->ged_wdbp->dbip, 
&params);
        delta = (int)((bu_gettime() - timestamp)/1e6);
        if (polygonize_failure || bot->num_faces < successful_bot_count || 
delta < 2) {
+           if (polygonize_failure == 3) {
+               bu_log("CM: Too little available memory to continue, 
aborting\n");
+               ret = GED_FACETIZE_FAILURE;
+               goto ged_facetize_continuation_memfree;
+           } 
            if (polygonize_failure == 2) {
                if (!opts->quiet) {
                    bu_log("CM: timed out after %d seconds with size %g\n", 
opts->max_time, feature_size);

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits