Use libsandglass 0.2 API.

4 files changed, 5 insertions, 8 deletions

diff --git a/bench/libdimension/Makefile.am b/bench/libdimension/Makefile.am
index 4937e5d..9446f5e 100644
--- a/bench/libdimension/Makefile.am
+++ b/bench/libdimension/Makefile.am
@@ -21,8 +21,8 @@ INCLUDES = -I$(top_srcdir)/libdimension
 
 EXTRA_PROGRAMS = bench-array bench-geometry bench-bvst
 
-AM_CFLAGS = $(SANDGLASS_CFLAGS)
-AM_LDFLAGS = $(SANDGLASS_LIBS) $(top_builddir)/libdimension/libdimension.la
+AM_CFLAGS = $(libsandglass_CFLAGS)
+AM_LDFLAGS = $(libsandglass_LIBS) $(top_builddir)/libdimension/libdimension.la
 
 bench_array_SOURCES    = array.c
 bench_geometry_SOURCES = geometry.c
diff --git a/bench/libdimension/array.c b/bench/libdimension/array.c
index 972fff6..dae7c98 100644
--- a/bench/libdimension/array.c
+++ b/bench/libdimension/array.c
@@ -33,9 +33,8 @@ main()
   const unsigned int count = 32;
 
   sandglass_t sandglass;
-  sandglass_attributes_t attr = { SANDGLASS_MONOTONIC, SANDGLASS_CPUTIME };
 
-  if (sandglass_create(&sandglass, &attr, &attr) != 0) {
+  if (sandglass_init_monotonic(&sandglass, SANDGLASS_CPUTIME) != 0) {
     perror("sandglass_create()");
     return EXIT_FAILURE;
   }
diff --git a/bench/libdimension/bvst.c b/bench/libdimension/bvst.c
index a33a8ba..f08989f 100644
--- a/bench/libdimension/bvst.c
+++ b/bench/libdimension/bvst.c
@@ -112,9 +112,8 @@ main()
   long grains;
 
   sandglass_t sandglass;
-  sandglass_attributes_t attr = { SANDGLASS_MONOTONIC, SANDGLASS_CPUTIME };
 
-  if (sandglass_create(&sandglass, &attr, &attr) != 0) {
+  if (sandglass_init_monotonic(&sandglass, SANDGLASS_CPUTIME) != 0) {
     perror("sandglass_create()");
     return EXIT_FAILURE;
   }
diff --git a/bench/libdimension/geometry.c b/bench/libdimension/geometry.c
index a2523b7..282d3eb 100644
--- a/bench/libdimension/geometry.c
+++ b/bench/libdimension/geometry.c
@@ -30,9 +30,8 @@ main()
   double result;
 
   sandglass_t sandglass;
-  sandglass_attributes_t attr = { SANDGLASS_MONOTONIC, SANDGLASS_CPUTIME };
 
-  if (sandglass_create(&sandglass, &attr, &attr) != 0) {
+  if (sandglass_init_monotonic(&sandglass, SANDGLASS_CPUTIME) != 0) {
     perror("sandglass_create()");
     return EXIT_FAILURE;
   }