[gjs] Revert "context: Add a context stack API"

[Jasper St. Pierre <jstpierre src gnome org>]

commit 191393c82a5cf5ebaecc74de1337b1256d9a62de
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Jan 15 08:25:01 2014 -0500

    Revert "context: Add a context stack API"
    
    This reverts commit cab6c35e426cc8e7ef58c6b2e875c2b24f88c801.
    
    This breaks tests (well, actually, our test suite is broken because
    it creates more than one JSRuntime on the same thread, but that's
    somewhat unavoidable), and we're going to look at reengineering
    the coverage tool to not use multiple contexts.

 gjs/context.cpp    |   42 ++++++++++--------------------------------
 gjs/context.h      |    2 --
 test/gjs-tests.cpp |   46 ----------------------------------------------
 3 files changed, 10 insertions(+), 80 deletions(-)
---
diff --git a/gjs/context.cpp b/gjs/context.cpp
index e5d2028..7fd11dd 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -101,7 +101,6 @@ enum {
 static GMutex gc_idle_lock;
 static GMutex contexts_lock;
 static GList *all_contexts = NULL;
-static GList *context_stack = NULL;
 
 
 static JSBool
@@ -278,7 +277,7 @@ gjs_printerr(JSContext *context,
 static void
 gjs_context_init(GjsContext *js_context)
 {
-    gjs_context_push(js_context);
+    gjs_context_make_current(js_context);
 }
 
 static void
@@ -410,8 +409,10 @@ gjs_context_finalize(GObject *object)
         js_context->program_name = NULL;
     }
 
+    if (gjs_context_get_current() == (GjsContext*)object)
+        gjs_context_make_current(NULL);
+
     g_mutex_lock(&contexts_lock);
-    context_stack = g_list_remove_all(context_stack, object);
     all_contexts = g_list_remove(all_contexts, object);
     g_mutex_unlock(&contexts_lock);
 
@@ -924,41 +925,18 @@ gjs_context_define_string_array(GjsContext  *js_context,
     return TRUE;
 }
 
+static GjsContext *current_context;
+
 GjsContext *
-gjs_context_get_current(void)
+gjs_context_get_current (void)
 {
-    GjsContext *current_context = NULL;
-    g_mutex_lock(&contexts_lock);
-    if (context_stack)
-        current_context = (GjsContext *) (g_list_last(context_stack))->data;
-    g_mutex_unlock(&contexts_lock);
     return current_context;
 }
 
 void
-gjs_context_push(GjsContext *context)
-{
-    g_mutex_lock(&contexts_lock);
-    context_stack = g_list_append(context_stack, context);
-    g_mutex_unlock(&contexts_lock);
-}
-
-GjsContext *
-gjs_context_pop(void)
+gjs_context_make_current (GjsContext *context)
 {
-    GjsContext *last = NULL;
-    g_mutex_lock(&contexts_lock);
-    GList *last_link = g_list_last(context_stack);
-    if (last_link) {
-        last = (GjsContext *) last_link->data;
-        context_stack = g_list_remove_link(context_stack, last_link);
-    }
-    g_mutex_unlock(&contexts_lock);
-    return last;
-}
+    g_assert (context == NULL || current_context == NULL);
 
-void
-gjs_context_make_current(GjsContext *context)
-{
-    gjs_context_push(context);
+    current_context = context;
 }
diff --git a/gjs/context.h b/gjs/context.h
index 372f309..ccd8bc6 100644
--- a/gjs/context.h
+++ b/gjs/context.h
@@ -66,8 +66,6 @@ GList*          gjs_context_get_all              (void);
 
 GjsContext     *gjs_context_get_current          (void);
 void            gjs_context_make_current         (GjsContext *js_context);
-void            gjs_context_push                 (GjsContext *js_context);
-GjsContext     *gjs_context_pop                  (void);
 
 void*           gjs_context_get_native_context   (GjsContext *js_context);
 
diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
index ce93d24..2dba2b2 100644
--- a/test/gjs-tests.cpp
+++ b/test/gjs-tests.cpp
@@ -350,48 +350,6 @@ gjstest_test_strip_shebang_return_null_for_just_shebang(void)
     g_assert(line_number == -1);
 }
 
-static void
-gjstest_test_context_pushed_on_creation(void)
-{
-    GjsContext *context = gjs_context_new();
-    g_assert(gjs_context_get_current() == context);
-    g_object_unref(context);
-}
-
-static void
-gjstest_test_context_removed_on_deletion(void)
-{
-    GjsContext *context = gjs_context_new();
-    g_object_unref(context);
-    g_assert(gjs_context_get_current() == NULL);
-}
-
-static void
-gjstest_test_all_instances_removed_on_deletion(void)
-{
-    GjsContext *context = gjs_context_new();
-    GjsContext *other = gjs_context_new();
-
-    gjs_context_push(context);
-    gjs_context_push(other);
-    gjs_context_push(context);
-    gjs_context_push(context);
-
-    g_object_unref(context);
-
-    g_assert(gjs_context_get_current() == other);
-    g_object_unref(other);
-}
-
-static void
-gjstest_test_pop_context(void)
-{
-    GjsContext *context = gjs_context_new();
-    gjs_context_pop();
-    g_assert(gjs_context_get_current() == NULL);
-    g_object_unref(context);
-}
-
 int
 main(int    argc,
      char **argv)
@@ -409,10 +367,6 @@ main(int    argc,
     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", 
gjstest_test_strip_shebang_no_advance_for_no_shebang);
     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", 
gjstest_test_strip_shebang_advance_for_shebang);
     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", 
gjstest_test_strip_shebang_return_null_for_just_shebang);
-    g_test_add_func("/gjs/context_stack/creation", gjstest_test_context_pushed_on_creation);
-    g_test_add_func("/gjs/context_stack/removed_on_deletion", gjstest_test_context_removed_on_deletion);
-    g_test_add_func("/gjs/context_stack/all_removed_on_deletion", 
gjstest_test_all_instances_removed_on_deletion);
-    g_test_add_func("/gjs/context_stack/pop_context", gjstest_test_pop_context);
     g_test_add_func("/gjs/stack/dump", gjstest_test_func_gjs_stack_dump);
     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);