[svn:parrot] r35464 - in branches/removing_stm/src: . gc

Author: Whiteknight
Date: Mon Jan 12 17:00:05 2009
New Revision: 35464

Modified:
   branches/removing_stm/src/gc/mark_sweep.c
   branches/removing_stm/src/inter_create.c

Log:
[remove_stm] remove code references to STM from core files

Modified: branches/removing_stm/src/gc/mark_sweep.c
==============================================================================
--- branches/removing_stm/src/gc/mark_sweep.c	(original)
+++ branches/removing_stm/src/gc/mark_sweep.c	Mon Jan 12 17:00:05 2009
@@ -343,11 +343,6 @@
     PARROT_ASSERT(interp->DOD_registry);
     pobject_lives(interp, (PObj *)interp->DOD_registry);
 
-    /* Mark the transaction log */
-    /* XXX do this more generically? */
-    if (interp->thread_data && interp->thread_data->stm_log)
-        Parrot_STM_mark_transaction(interp);
-
     /* Mark the MMD cache. */
     if (interp->op_mmd_cache)
         Parrot_mmd_cache_mark(interp, interp->op_mmd_cache);

Modified: branches/removing_stm/src/inter_create.c
==============================================================================
--- branches/removing_stm/src/inter_create.c	(original)
+++ branches/removing_stm/src/inter_create.c	Mon Jan 12 17:00:05 2009
@@ -349,13 +349,6 @@
 
     Parrot_do_dod_run(interp, GC_finish_FLAG);
 
-#if STM_PROFILE
-    if (interp->thread_data && interp->thread_data->stm_log
-    && !interp->parent_interpreter
-    &&  Interp_debug_TEST(interp, PARROT_THREAD_DEBUG_FLAG))
-        Parrot_STM_dump_profile(interp);
-#endif
-
     /*
      * that doesn't get rid of constant PMCs like these in vtable->data
      * so if such a PMC needs destroying, we get a memory leak, like for
@@ -387,22 +380,6 @@
                 Interp_flags_TEST(interp, PARROT_DESTROY_FLAG)))
         return;
 
-    if (interp->thread_data && interp->thread_data->stm_log) {
-        while (Parrot_STM_transaction_depth(interp) > 0) {
-            /* XXX */
-            fprintf(stderr, "interpreter %p had pending transaction on exit\n",
-                    (void *) interp);
-            Parrot_STM_abort(interp);
-        }
-#if STM_PROFILE
-        if (interp->parent_interpreter
-            && interp->thread_data->state & THREAD_STATE_JOINED)
-            Parrot_STM_merge_profile(interp->parent_interpreter,
-                                     interp);
-#endif
-        Parrot_STM_destroy(interp);
-    }
-
     if (interp->parent_interpreter
     &&  interp->thread_data
     && (interp->thread_data->state & THREAD_STATE_JOINED)) {

• [svn:parrot] r35464 - in branches/removing_stm/src: . gc by Whiteknight