X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=metrics.c;h=19d5df09b0861149310917981a1d7144e64df561;hb=ce27513d12ab21ecef7cf92015de7885e870f2c7;hp=7298fa82bb093ba225371132e03abb1339df3077;hpb=6475596e655063624dbf54359bd2a45de6a17dd1;p=fips

diff --git a/metrics.c b/metrics.c
index 7298fa8..19d5df0 100644
--- a/metrics.c
+++ b/metrics.c
@@ -57,8 +57,11 @@ typedef struct context
 
 context_t current_context;
 
+int frames;
+int verbose;
+
 unsigned
-metrics_add_counter (void)
+metrics_counter_new (void)
 {
 	counter_t *counter;
 
@@ -84,6 +87,18 @@ metrics_add_counter (void)
 	return counter->id;
 }
 
+void
+metrics_counter_start (unsigned counter)
+{
+	glBeginQuery (GL_TIME_ELAPSED, counter);
+}
+
+void
+metrics_counter_stop (void)
+{
+	glEndQuery (GL_TIME_ELAPSED);
+}
+
 void
 metrics_set_current_program (unsigned program)
 {
@@ -120,24 +135,36 @@ print_program_metrics (void)
 	for (i = 0; i < ctx->num_program_metrics; i++) {
 		if (ctx->program_metrics[i].ticks == 0.0)
 			continue;
-		printf ("Program %d:\t%7.2f mega-ticks\n",
+		printf ("Program %d:\t%7.2f ms\n",
 			i, ctx->program_metrics[i].ticks / 1e6);
 	}
 }
 
+/* Called at program exit */
+static void
+metrics_exit (void)
+{
+	if (verbose)
+		printf ("fips: terminating\n");
+}
+
+
 void
 metrics_end_frame (void)
 {
 	static int initialized = 0;
-	static int frames;
 	static struct timeval tv_start, tv_now;
 
 	if (! initialized) {
-		frames = 0;
 		gettimeofday (&tv_start, NULL);
+		atexit (metrics_exit);
+		if (getenv ("FIPS_VERBOSE"))
+			verbose = 1;
 		initialized = 1;
 	}
 
+	if (verbose)
+		printf ("fips: frame %d complete\n", frames);
 
 	frames++;
 	gettimeofday (&tv_now, NULL);