[svn:parrot] r46167 - in trunk: docs include/parrot src

tewk at svn.parrot.org tewk at svn.parrot.org
Fri Apr 30 03:48:21 UTC 2010


Author: tewk
Date: Fri Apr 30 03:48:21 2010
New Revision: 46167
URL: https://trac.parrot.org/parrot/changeset/46167

Log:
Remove thread types PARROT_THR_TYPE_1 ...

Modified:
   trunk/docs/embed.pod
   trunk/include/parrot/interpreter.h
   trunk/include/parrot/thread.h
   trunk/src/embed.c
   trunk/src/thread.c

Modified: trunk/docs/embed.pod
==============================================================================
--- trunk/docs/embed.pod	Fri Apr 30 03:48:13 2010	(r46166)
+++ trunk/docs/embed.pod	Fri Apr 30 03:48:21 2010	(r46167)
@@ -121,12 +121,6 @@
 
 =item PARROT_THR_THREAD_POOL
 
-=item PARROT_THR_TYPE_1
-
-=item PARROT_THR_TYPE_2
-
-=item PARROT_THR_TYPE_3
-
 =back
 
 See F<interpreter.h> for the definition of these flags (TODO: document flag

Modified: trunk/include/parrot/interpreter.h
==============================================================================
--- trunk/include/parrot/interpreter.h	Fri Apr 30 03:48:13 2010	(r46166)
+++ trunk/include/parrot/interpreter.h	Fri Apr 30 03:48:21 2010	(r46167)
@@ -26,11 +26,6 @@
     PARROT_THR_COPY_INTERP  = 0x2000, /* thread start copies interp state */
     PARROT_THR_THREAD_POOL  = 0x4000, /* type3 threads */
 
-    PARROT_THR_TYPE_1       = PARROT_IS_THREAD,
-    PARROT_THR_TYPE_2       = PARROT_IS_THREAD | PARROT_THR_COPY_INTERP,
-    PARROT_THR_TYPE_3       = PARROT_IS_THREAD | PARROT_THR_COPY_INTERP |
-                              PARROT_THR_THREAD_POOL
-
 } Parrot_Interp_flag;
 /* &end_gen */
 

Modified: trunk/include/parrot/thread.h
==============================================================================
--- trunk/include/parrot/thread.h	Fri Apr 30 03:48:13 2010	(r46166)
+++ trunk/include/parrot/thread.h	Fri Apr 30 03:48:21 2010	(r46167)
@@ -210,36 +210,6 @@
         __attribute__nonnull__(3)
         FUNC_MODIFIES(*dest_interp);
 
-int pt_thread_run_1(PARROT_INTERP,
-    ARGOUT(PMC* dest_interp),
-    ARGIN(PMC* sub),
-    ARGIN(PMC *arg))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        __attribute__nonnull__(4)
-        FUNC_MODIFIES(* dest_interp);
-
-int pt_thread_run_2(PARROT_INTERP,
-    ARGOUT(PMC* dest_interp),
-    ARGIN(PMC* sub),
-    ARGIN(PMC *arg))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        __attribute__nonnull__(4)
-        FUNC_MODIFIES(* dest_interp);
-
-int pt_thread_run_3(PARROT_INTERP,
-    ARGOUT(PMC* dest_interp),
-    ARGIN(PMC* sub),
-    ARGIN(PMC *arg))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        __attribute__nonnull__(4)
-        FUNC_MODIFIES(* dest_interp);
-
 void pt_thread_wait_with(PARROT_INTERP, ARGMOD(Parrot_mutex *mutex))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
@@ -288,21 +258,6 @@
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(dest_interp) \
     , PARROT_ASSERT_ARG(sub))
-#define ASSERT_ARGS_pt_thread_run_1 __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(dest_interp) \
-    , PARROT_ASSERT_ARG(sub) \
-    , PARROT_ASSERT_ARG(arg))
-#define ASSERT_ARGS_pt_thread_run_2 __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(dest_interp) \
-    , PARROT_ASSERT_ARG(sub) \
-    , PARROT_ASSERT_ARG(arg))
-#define ASSERT_ARGS_pt_thread_run_3 __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(dest_interp) \
-    , PARROT_ASSERT_ARG(sub) \
-    , PARROT_ASSERT_ARG(arg))
 #define ASSERT_ARGS_pt_thread_wait_with __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(mutex))

Modified: trunk/src/embed.c
==============================================================================
--- trunk/src/embed.c	Fri Apr 30 03:48:13 2010	(r46166)
+++ trunk/src/embed.c	Fri Apr 30 03:48:21 2010	(r46167)
@@ -122,9 +122,6 @@
 Flag                    Effect
 C<PARROT_BOUNDS_FLAG>   enable bounds checking
 C<PARROT_PROFILE_FLAG>  enable profiling,
-C<PARROT_THR_TYPE_1>    disable variable sharing and thread communication
-C<PARROT_THR_TYPE_2>    disable variable sharing but enable thread communication
-C<PARROT_THR_TYPE_3>    enable variable sharing.
 
 =cut
 

Modified: trunk/src/thread.c
==============================================================================
--- trunk/src/thread.c	Fri Apr 30 03:48:13 2010	(r46166)
+++ trunk/src/thread.c	Fri Apr 30 03:48:21 2010	(r46167)
@@ -793,66 +793,6 @@
 
 /*
 
-=item C<int pt_thread_run_1(PARROT_INTERP, PMC* dest_interp, PMC* sub, PMC
-*arg)>
-
-Runs a thread that shares nothing and does not communicate with the other
-interpreter.
-
-=cut
-
-*/
-
-int
-pt_thread_run_1(PARROT_INTERP, ARGOUT(PMC* dest_interp), ARGIN(PMC* sub), ARGIN(PMC *arg))
-{
-    ASSERT_ARGS(pt_thread_run_1)
-    interp->flags |= PARROT_THR_TYPE_1;
-    return pt_thread_run(interp, dest_interp, sub, arg);
-}
-
-/*
-
-=item C<int pt_thread_run_2(PARROT_INTERP, PMC* dest_interp, PMC* sub, PMC
-*arg)>
-
-Runs an interpreter in a thread with no shared variables, but which
-communicates by sending messages.
-
-=cut
-
-*/
-
-int
-pt_thread_run_2(PARROT_INTERP, ARGOUT(PMC* dest_interp), ARGIN(PMC* sub), ARGIN(PMC *arg))
-{
-    ASSERT_ARGS(pt_thread_run_2)
-    interp->flags |= PARROT_THR_TYPE_2;
-    return pt_thread_run(interp, dest_interp, sub, arg);
-}
-
-/*
-
-=item C<int pt_thread_run_3(PARROT_INTERP, PMC* dest_interp, PMC* sub, PMC
-*arg)>
-
-Runs an interpreter in a thread, allowing shared variables and using a thread
-pool.
-
-=cut
-
-*/
-
-int
-pt_thread_run_3(PARROT_INTERP, ARGOUT(PMC* dest_interp), ARGIN(PMC* sub), ARGIN(PMC *arg))
-{
-    ASSERT_ARGS(pt_thread_run_3)
-    interp->flags |= PARROT_THR_TYPE_3;
-    return pt_thread_run(interp, dest_interp, sub, arg);
-}
-
-/*
-
 =item C<void pt_thread_yield(void)>
 
 Relinquishes hold on the processor.


More information about the parrot-commits mailing list