diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h index 94220c276e6..305ce98a91d 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h @@ -460,7 +460,7 @@ refine_mesh(std::string dump_after_refine_surface_prefix) // If it's parallel but the refinement is forced to sequential, we don't // output the value # ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT - CGAL_MESH_3_SET_PERFORMANCE_DATA("Facets_time", facet_ref_time); + CGAL_MESH_3_SET_PERFORMANCE_DATA("Facets_refine_time", facet_ref_time); # endif # endif #endif @@ -503,7 +503,7 @@ refine_mesh(std::string dump_after_refine_surface_prefix) // If it's parallel but the refinement is forced to sequential, we don't // output the value # ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT - CGAL_MESH_3_SET_PERFORMANCE_DATA("Cells_refin_time", cell_ref_time); + CGAL_MESH_3_SET_PERFORMANCE_DATA("Cells_refine_time", cell_ref_time); # endif # endif #endif diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h index 88a6e8ef555..925f7b92d92 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h @@ -1029,8 +1029,17 @@ scan_triangulation_impl() } #ifdef CGAL_MESH_3_PROFILING - std::cerr << "==== Facet scan: " << t.elapsed() << " seconds ====" + double facet_scan_time = t.elapsed(); + std::cerr << "==== Facet scan: " << facet_scan_time << " seconds ====" << std::endl << std::endl; + + # ifdef CGAL_MESH_3_EXPORT_PERFORMANCE_DATA + // If it's parallel but the refinement is forced to sequential, we don't + // output the value + # ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT + CGAL_MESH_3_SET_PERFORMANCE_DATA("Facets_scan_time", facet_scan_time); + # endif + # endif #endif #if defined(CGAL_MESH_3_VERBOSE) || defined(CGAL_MESH_3_PROFILING) diff --git a/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h b/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h index 876d2079ce8..9e0e045350b 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h +++ b/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h @@ -855,16 +855,7 @@ operator()(Visitor visitor) #if defined(CGAL_MESH_3_EXPORT_PERFORMANCE_DATA) \ && defined(CGAL_MESH_3_PROFILING) - if (ret == BOUND_REACHED) - { - CGAL_MESH_3_SET_PERFORMANCE_DATA("Perturber_optim_time", perturbation_time); - } - else - { - CGAL_MESH_3_SET_PERFORMANCE_DATA("Perturber_optim_time", - (ret == CANT_IMPROVE_ANYMORE ? - "CANT_IMPROVE_ANYMORE" : "TIME_LIMIT_REACHED")); - } + CGAL_MESH_3_SET_PERFORMANCE_DATA("Perturber_optim_time", perturbation_time); #endif return ret; diff --git a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h index bcf2ff2fea2..e4f19eaa956 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h +++ b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h @@ -427,17 +427,9 @@ public: // methods << exudation_time << "s ====" << std::endl; #endif -#ifdef CGAL_MESH_3_EXPORT_PERFORMANCE_DATA - if (ret == BOUND_REACHED) - { - CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time", exudation_time); - } - else - { - CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time", - (ret == CANT_IMPROVE_ANYMORE ? - "CANT_IMPROVE_ANYMORE" : "TIME_LIMIT_REACHED")); - } +#if defined(CGAL_MESH_3_EXPORT_PERFORMANCE_DATA) \ + && defined(CGAL_MESH_3_PROFILING) + CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time", exudation_time); #endif return ret;