Push oustanding-counter data down from context.c into metrics.c

[fips] / context.c

diff --git a/context.c b/context.c
index 6fbd7f2228ea2bfc2ff3b4b1d2d933f24f4ed27a..9e4979fd1b6191e98d8d50f5a89f1ca37783b640 100644 (file)
--- a/context.c
+++ b/context.c
@@ -20,15 +20,46 @@
  */
 
 #include "context.h"
-
 #include "metrics.h"
+#include "xmalloc.h"
 
-void
-context_enter (fips_api_t api, void *system_context_id unused)
+context_t *current_context;
+
+static context_t *
+context_create (fips_api_t api, void *system_context_id)
 {
+       context_t *ctx;
+
+       ctx = xcalloc (1, sizeof (*ctx));
+
+       ctx->system_id = system_context_id;
+
        fips_dispatch_init (api);
 
-       metrics_info_init ();
+       metrics_info_init (&ctx->metrics_info);
+       metrics_init (&ctx->metrics);
+
+       return ctx;
+}
+
+static void
+context_destroy (context_t *ctx)
+{
+       metrics_info_fini (&ctx->metrics_info);
+}
+
+void
+context_enter (fips_api_t api, void *system_context_id)
+{
+       /* Do nothing if the application is setting the same context
+        * as is already current. */
+       if (current_context && current_context->system_id == system_context_id)
+               return;
+
+       if (current_context)
+               context_destroy (current_context);
+
+       current_context = context_create (api, system_context_id);
 
        metrics_set_current_op (METRICS_OP_SHADER + 0);
        metrics_counter_start ();
@@ -37,5 +68,16 @@ context_enter (fips_api_t api, void *system_context_id unused)
 void
 context_leave (void)
 {
-       metrics_info_fini ();
+       context_t *ctx = current_context;
+
+       if (ctx == NULL)
+               return;
+
+       metrics_fini (&ctx->metrics);
+}
+
+context_t *
+context_get_current (void)
+{
+       return current_context;
 }