slurping an empty file should return '' rather than undef, with

[p5sagit/p5-mst-13.2.git] / thread.h

diff --git a/thread.h b/thread.h
index bca5f83..695f288 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -11,13 +11,13 @@
            croak("panic: DETACH");             \
        }                                       \
     } STMT_END
-#    define THR getTHR
+#    define THR getTHR()
 struct perl_thread *getTHR _((void));
 #    define PTHREAD_GETSPECIFIC_INT
 #    ifdef DJGPP
 #      define pthread_addr_t any_t
 #      define NEED_PTHREAD_INIT
-#      define PTHREAD_CREATE_JOINABLE (&err)
+#      define PTHREAD_CREATE_JOINABLE (1)
 #    endif
 #    ifdef __OPEN_VM
 #      define pthread_addr_t void *
@@ -25,19 +25,15 @@ struct perl_thread *getTHR _((void));
 #    ifdef VMS
 #      define pthread_attr_init(a) pthread_attr_create(a)
 #      define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_setdetach_np(a,s)
+#      define PTHREAD_CREATE(t,a,s,d) pthread_create(t,a,s,d)
 #      define pthread_key_create(k,d) pthread_keycreate(k,(pthread_destructor_t)(d))
 #      define pthread_mutexattr_init(a) pthread_mutexattr_create(a)
+#      define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
 #    endif
 #    if defined(DJGPP) || defined(__OPEN_VM)
 #      define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,&(s))
 #      define YIELD pthread_yield(NULL)
 #    endif
-#    if defined(DJGPP) || defined(VMS)
-#      define PTHREAD_CREATE(t,a,s,d) pthread_create(t,a,s,d)
-#    endif
-#    if defined(__OPEN_VM) || defined(VMS)
-#      define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
-#    endif
 #  endif
 #  ifndef VMS
 #    define pthread_mutexattr_default NULL
@@ -54,6 +50,76 @@ struct perl_thread *getTHR _((void));
 #  define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,s)
 #endif
 
+#ifndef PTHREAD_CREATE_JOINABLE
+#  ifdef OLD_PTHREAD_CREATE_JOINABLE
+#    define PTHREAD_CREATE_JOINABLE OLD_PTHREAD_CREATE_JOINABLE
+#  else
+#    define PTHREAD_CREATE_JOINABLE 0 /* Panic?  No, guess. */
+#  endif
+#endif
+
+#ifdef I_MACH_CTHREADS
+
+/* cthreads interface */
+
+/* #include <mach/cthreads.h> is in perl.h #ifdef I_MACH_CTHREADS */
+
+#define MUTEX_INIT(m)                                  \
+       STMT_START {                                    \
+               *m = mutex_alloc();                     \
+               if (*m) {                               \
+                       mutex_init(*m);                 \
+               } else {                                \
+                       croak("panic: MUTEX_INIT");     \
+               }                                       \
+       } STMT_END
+
+#define MUTEX_LOCK(m)          mutex_lock(*m)
+#define MUTEX_UNLOCK(m)                mutex_unlock(*m)
+#define MUTEX_DESTROY(m)                               \
+       STMT_START {                                    \
+               mutex_free(*m);                         \
+               *m = 0;                                 \
+       } STMT_END
+
+#define COND_INIT(c)                                   \
+       STMT_START {                                    \
+               *c = condition_alloc();                 \
+               if (*c) {                               \
+                       condition_init(*c);             \
+               } else {                                \
+                       croak("panic: COND_INIT");      \
+               }                                       \
+       } STMT_END
+
+#define COND_SIGNAL(c)         condition_signal(*c)
+#define COND_BROADCAST(c)      condition_broadcast(*c)
+#define COND_WAIT(c, m)                condition_wait(*c, *m)
+#define COND_DESTROY(c)                                \
+       STMT_START {                            \
+               condition_free(*c);             \
+               *c = 0;                         \
+       } STMT_END
+
+#define THREAD_CREATE(thr, f)  (thr->self = cthread_fork(f, thr), 0)
+#define THREAD_POST_CREATE(thr)
+
+#define THREAD_RET_TYPE                any_t
+#define THREAD_RET_CAST(x)     ((any_t) x)
+
+#define DETACH(t)              cthread_detach(t->self)
+#define JOIN(t, avp)           (*(avp) = (AV *)cthread_join(t->self))
+
+#define SET_THR(thr)           cthread_set_data(cthread_self(), thr)
+#define THR                    cthread_data(cthread_self())
+
+#define INIT_THREADS           cthread_init()
+#define YIELD                  cthread_yield()
+#define ALLOC_THREAD_KEY
+#define SET_THREAD_SELF(thr)   (thr->self = cthread_self())
+
+#endif /* I_MACH_CTHREADS */
+
 #ifndef YIELD
 #  ifdef SCHED_YIELD
 #    define YIELD SCHED_YIELD
@@ -70,18 +136,6 @@ struct perl_thread *getTHR _((void));
 #  endif
 #endif
 
-#ifdef PTHREADS_CREATED_JOINABLE
-#  define ATTR_JOINABLE PTHREAD_CREATE_JOINABLE
-#else
-#  ifdef PTHREAD_CREATE_UNDETACHED
-#    define ATTR_JOINABLE PTHREAD_CREATE_UNDETACHED
-#  else
-#    ifdef __UNDETACHED
-#      define ATTR_JOINABLE __UNDETACHED
-#    endif
-#  endif
-#endif
-
 #ifndef MUTEX_INIT
 #define MUTEX_INIT(m)                                          \
     STMT_START {                                               \
@@ -170,6 +224,8 @@ struct perl_thread *getTHR _((void));
  * from thrsv which is cached in the per-interpreter structure.
  * Systems with very fast pthread_get_specific (which should be all systems
  * but unfortunately isn't) may wish to simplify to "...*thr = THR".
+ *
+ * The use of PL_threadnum should be safe here.
  */
 #ifndef dTHR
 #  define dTHR \
@@ -192,30 +248,27 @@ struct perl_thread *getTHR _((void));
  * try only locking them if there may be more than one thread in existence.
  * Systems with very fast mutexes (and/or slow conditionals) may wish to
  * remove the "if (threadnum) ..." test.
+ * XXX do NOT use C<if (PL_threadnum) ...> -- it sets up race conditions!
  */
 #define LOCK_SV_MUTEX                          \
     STMT_START {                               \
-       if (PL_threadnum)                       \
-           MUTEX_LOCK(&PL_sv_mutex);           \
+       MUTEX_LOCK(&PL_sv_mutex);               \
     } STMT_END
 
 #define UNLOCK_SV_MUTEX                                \
     STMT_START {                               \
-       if (PL_threadnum)                       \
-           MUTEX_UNLOCK(&PL_sv_mutex);         \
+       MUTEX_UNLOCK(&PL_sv_mutex);             \
     } STMT_END
 
 /* Likewise for strtab_mutex */
 #define LOCK_STRTAB_MUTEX                      \
     STMT_START {                               \
-       if (PL_threadnum)                       \
-           MUTEX_LOCK(&PL_strtab_mutex);       \
+       MUTEX_LOCK(&PL_strtab_mutex);           \
     } STMT_END
 
 #define UNLOCK_STRTAB_MUTEX                    \
     STMT_START {                               \
-       if (PL_threadnum)                       \
-           MUTEX_UNLOCK(&PL_strtab_mutex);     \
+       MUTEX_UNLOCK(&PL_strtab_mutex);         \
     } STMT_END
 
 #ifndef THREAD_RET_TYPE