diff --git a/benchs/bench_libstl/bench_libstl.pro b/benchs/bench_libstl/bench_libstl.pro index d83a043..c4344b9 100644 --- a/benchs/bench_libstl/bench_libstl.pro +++ b/benchs/bench_libstl/bench_libstl.pro @@ -1,5 +1,7 @@ include(../../qmake/config.pri) +CONFIG -= build_all + *-g++*:QMAKE_CFLAGS += -ansi -pedantic-errors TEMPLATE = app diff --git a/benchs/bench_libstl/main.c b/benchs/bench_libstl/main.c index e2b8b18..f61570f 100644 --- a/benchs/bench_libstl/main.c +++ b/benchs/bench_libstl/main.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include +#include #include "../commons/bench_tools.h" #include @@ -22,9 +21,11 @@ static void dummy_process_triangle(void* cookie, static void libstl_foug_stlb_read(const char* filepath) { + /* uint8_t stack_buff[30 * 1024]; */ + my_igeom_t cookie; foug_transfer_t trsf; - foug_stlb_geom_input_t geom; + foug_stl_geom_creator_t geom_creator; int result; FILE* file = fopen(filepath, "rb"); @@ -34,16 +35,18 @@ static void libstl_foug_stlb_read(const char* filepath) } cookie.facet_count = 0; - memset(&geom, 0, sizeof(foug_stlb_geom_input_t)); - geom.cookie = &cookie; - geom.process_triangle_func = (foug_stlb_process_triangle_func_t)dummy_process_triangle; + memset(&geom_creator, 0, sizeof(foug_stl_geom_creator_t)); + geom_creator.cookie = &cookie; + geom_creator.add_triangle_func = dummy_process_triangle; memset(&trsf, 0, sizeof(foug_transfer_t)); foug_stream_set_stdio(&trsf.stream, file); trsf.buffer = (uint8_t*)malloc(512 * 1024); trsf.buffer_size = 512 * 1024; + /* trsf.buffer = stack_buff; + trsf.buffer_size = 24 * 1024; */ - result = foug_stlb_read(&geom, &trsf, FOUG_LITTLE_ENDIAN); + result = foug_stlb_read(&geom_creator, &trsf, FOUG_LITTLE_ENDIAN); if (foug_datax_error(result)) fprintf(stderr, "foug_stlb_read() error %i", result);