[svn:parrot] r46205 - in trunk: include/parrot src/pmc

plobsing at svn.parrot.org plobsing at svn.parrot.org
Sat May 1 17:12:03 UTC 2010


Author: plobsing
Date: Sat May  1 17:12:02 2010
New Revision: 46205
URL: https://trac.parrot.org/parrot/changeset/46205

Log:
headerizer

Modified:
   trunk/include/parrot/thread.h
   trunk/src/pmc/parrotthread.pmc
   trunk/src/pmc/threadinterpreter.pmc

Modified: trunk/include/parrot/thread.h
==============================================================================
--- trunk/include/parrot/thread.h	Sat May  1 15:48:45 2010	(r46204)
+++ trunk/include/parrot/thread.h	Sat May  1 17:12:02 2010	(r46205)
@@ -194,16 +194,7 @@
 void pt_suspend_self_for_gc(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-void pt_thread_detach(UINTVAL tid);
-PARROT_CAN_RETURN_NULL
-PMC* pt_thread_join(ARGIN(Parrot_Interp parent), UINTVAL tid)
-        __attribute__nonnull__(1);
-
-void pt_thread_kill(UINTVAL tid);
-void pt_thread_prepare_for_run(Parrot_Interp d, NULLOK(Parrot_Interp s));
-PMC* pt_thread_create(PARROT_INTERP,
-    INTVAL type,
-    INTVAL clone_flags)
+PMC * pt_thread_create(PARROT_INTERP, INTVAL type, INTVAL clone_flags)
         __attribute__nonnull__(1);
 
 int pt_thread_create_run(PARROT_INTERP,
@@ -212,17 +203,21 @@
     ARGIN(PMC *sub),
     ARGIN_NULLOK(PMC *arg))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(4)
-        __attribute__nonnull__(5);
+        __attribute__nonnull__(4);
+
+void pt_thread_detach(UINTVAL tid);
+PARROT_CAN_RETURN_NULL
+PMC* pt_thread_join(ARGIN(Parrot_Interp parent), UINTVAL tid)
+        __attribute__nonnull__(1);
 
+void pt_thread_kill(UINTVAL tid);
+void pt_thread_prepare_for_run(Parrot_Interp d, NULLOK(Parrot_Interp s));
 int pt_thread_run(PARROT_INTERP,
-    ARGOUT(PMC *thread_interp_pmc),
+    PMC *thread_interp_pmc,
     ARGIN(PMC *sub),
     ARGIN_NULLOK(PMC *arg))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        FUNC_MODIFIES(*thread_interp_pmc);
+        __attribute__nonnull__(3);
 
 void pt_thread_wait_with(PARROT_INTERP, ARGMOD(Parrot_mutex *mutex))
         __attribute__nonnull__(1)
@@ -263,20 +258,18 @@
     , PARROT_ASSERT_ARG(pmc))
 #define ASSERT_ARGS_pt_suspend_self_for_gc __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
+#define ASSERT_ARGS_pt_thread_create __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+       PARROT_ASSERT_ARG(interp))
+#define ASSERT_ARGS_pt_thread_create_run __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+       PARROT_ASSERT_ARG(interp) \
+    , PARROT_ASSERT_ARG(sub))
 #define ASSERT_ARGS_pt_thread_detach __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
 #define ASSERT_ARGS_pt_thread_join __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(parent))
 #define ASSERT_ARGS_pt_thread_kill __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
 #define ASSERT_ARGS_pt_thread_prepare_for_run __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
-#define ASSERT_ARGS_pt_thread_create __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_pt_thread_create_run __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(sub) \
-    , PARROT_ASSERT_ARG(arg))
 #define ASSERT_ARGS_pt_thread_run __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(thread_interp_pmc) \
     , PARROT_ASSERT_ARG(sub))
 #define ASSERT_ARGS_pt_thread_wait_with __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \

Modified: trunk/src/pmc/parrotthread.pmc
==============================================================================
--- trunk/src/pmc/parrotthread.pmc	Sat May  1 15:48:45 2010	(r46204)
+++ trunk/src/pmc/parrotthread.pmc	Sat May  1 17:12:02 2010	(r46205)
@@ -32,31 +32,6 @@
 
 /* HEADERIZER HFILE: none */
 /* HEADERIZER BEGIN: static */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
-
-static INTVAL do_thread_run(PARROT_INTERP,
-    ARGIN(PMC *thread),
-    INTVAL clone_flags,
-    ARGIN(PMC *sub),
-    ARGIN(PMC *args))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(4)
-        __attribute__nonnull__(5);
-
-static void stop_GC(ARGIN(Interp *parent), ARGIN(Interp *thread))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
-
-#define ASSERT_ARGS_do_thread_run __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(thread) \
-    , PARROT_ASSERT_ARG(sub) \
-    , PARROT_ASSERT_ARG(args))
-#define ASSERT_ARGS_stop_GC __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(parent) \
-    , PARROT_ASSERT_ARG(thread))
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: static */
 
 /*

Modified: trunk/src/pmc/threadinterpreter.pmc
==============================================================================
--- trunk/src/pmc/threadinterpreter.pmc	Sat May  1 15:48:45 2010	(r46204)
+++ trunk/src/pmc/threadinterpreter.pmc	Sat May  1 17:12:02 2010	(r46205)
@@ -22,6 +22,15 @@
 
 #include "parrot/embed.h"
 
+/* HEADERIZER HFILE: none */
+/* HEADERIZER BEGIN: static */
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
+
+static void stop_GC(Interp *parent, Interp *thread);
+#define ASSERT_ARGS_stop_GC __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
+/* HEADERIZER END: static */
+
 #define PMC_interp(x) ((Parrot_ParrotInterpreter_attributes *)PMC_data(x))->interp
 
 /*
@@ -31,6 +40,7 @@
 static void
 stop_GC(Interp *parent, Interp *thread)
 {
+    ASSERT_ARGS(stop_GC)
     Parrot_block_GC_mark(parent);
     Parrot_block_GC_mark(thread);
     Parrot_block_GC_sweep(parent);


More information about the parrot-commits mailing list