X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cv.h;h=c7c7a73cc5a57d2ee9de26ce8bf5e2aed6622129;hb=108ed793354cb72d90a06de859702b8d730ce020;hp=97dfeb6f6d9e0ecd0b257ab0a93e76526b586172;hpb=5dc0d6134ebb76636f69238201dde15cec972fd0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/cv.h b/cv.h
index 97dfeb6..c7c7a73 100644
--- a/cv.h
+++ b/cv.h
@@ -21,7 +21,7 @@ struct xpvcv {
     HV *	xcv_stash;
     OP *	xcv_start;
     OP *	xcv_root;
-    void      (*xcv_xsub) _((CV*));
+    void      (*xcv_xsub) _((CV* _CPERLproto));
     ANY		xcv_xsubany;
     GV *	xcv_gv;
     GV *	xcv_filegv;
@@ -29,11 +29,10 @@ struct xpvcv {
     AV *	xcv_padlist;
     CV *	xcv_outside;
 #ifdef USE_THREADS
-    pthread_mutex_t *	xcv_mutexp;
-    pthread_cond_t *	xcv_condp;	/* signalled when owner leaves CV */
-    struct thread *	xcv_owner;	/* current owner thread */
+    perl_mutex *xcv_mutexp;
+    struct perl_thread *xcv_owner;	/* current owner thread */
 #endif /* USE_THREADS */
-    U8		xcv_flags;
+    cv_flags_t	xcv_flags;
 };
 
 #define Nullcv Null(CV*)
@@ -50,18 +49,19 @@ struct xpvcv {
 #define CvOUTSIDE(sv)	((XPVCV*)SvANY(sv))->xcv_outside
 #ifdef USE_THREADS
 #define CvMUTEXP(sv)	((XPVCV*)SvANY(sv))->xcv_mutexp
-#define CvCONDP(sv)	((XPVCV*)SvANY(sv))->xcv_condp
 #define CvOWNER(sv)	((XPVCV*)SvANY(sv))->xcv_owner
 #endif /* USE_THREADS */
 #define CvFLAGS(sv)	((XPVCV*)SvANY(sv))->xcv_flags
 
-#define CVf_CLONE	0x01	/* anon CV uses external lexicals */
-#define CVf_CLONED	0x02	/* a clone of one of those */
-#define CVf_ANON	0x04	/* CvGV() can't be trusted */
-#define CVf_OLDSTYLE	0x08
-#define CVf_UNIQUE	0x10	/* can't be cloned */
-#define CVf_NODEBUG	0x20	/* no DB::sub indirection for this CV
+#define CVf_CLONE	0x0001	/* anon CV uses external lexicals */
+#define CVf_CLONED	0x0002	/* a clone of one of those */
+#define CVf_ANON	0x0004	/* CvGV() can't be trusted */
+#define CVf_OLDSTYLE	0x0008
+#define CVf_UNIQUE	0x0010	/* can't be cloned */
+#define CVf_NODEBUG	0x0020	/* no DB::sub indirection for this CV
 				   (esp. useful for special XSUBs) */
+#define CVf_METHOD	0x0040	/* CV is explicitly marked as a method */
+#define CVf_LOCKED	0x0080	/* CV locks itself or first arg on entry */
 
 #define CvCLONE(cv)		(CvFLAGS(cv) & CVf_CLONE)
 #define CvCLONE_on(cv)		(CvFLAGS(cv) |= CVf_CLONE)
@@ -86,3 +86,11 @@ struct xpvcv {
 #define CvNODEBUG(cv)		(CvFLAGS(cv) & CVf_NODEBUG)
 #define CvNODEBUG_on(cv)	(CvFLAGS(cv) |= CVf_NODEBUG)
 #define CvNODEBUG_off(cv)	(CvFLAGS(cv) &= ~CVf_NODEBUG)
+
+#define CvMETHOD(cv)		(CvFLAGS(cv) & CVf_METHOD)
+#define CvMETHOD_on(cv)		(CvFLAGS(cv) |= CVf_METHOD)
+#define CvMETHOD_off(cv)	(CvFLAGS(cv) &= ~CVf_METHOD)
+
+#define CvLOCKED(cv)		(CvFLAGS(cv) & CVf_LOCKED)
+#define CvLOCKED_on(cv)		(CvFLAGS(cv) |= CVf_LOCKED)
+#define CvLOCKED_off(cv)	(CvFLAGS(cv) &= ~CVf_LOCKED)