X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=context.c;h=892c696d8db49891d5438c64cbf4ea5a220d9b19;hb=3d421696b9e6cc28f590204fb290f775330e78e8;hp=6fbd7f2228ea2bfc2ff3b4b1d2d933f24f4ed27a;hpb=bc106316b96ce7bfdbec3ee54ba37e49f156dea5;p=fips

diff --git a/context.c b/context.c
index 6fbd7f2..892c696 100644
--- 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);
+	ctx->metrics = metrics_create ();
+
+	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_destroy (ctx->metrics);
+}
+
+context_t *
+context_get_current (void)
+{
+	return current_context;
 }