This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
https://perl5.git.perl.org / perl5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1896a75)
Integrate:
authorNicholas Clark <nick@ccl4.org>
Sun, 7 Mar 2004 18:25:56 +0000 (18:25 +0000)
committerNicholas Clark <nick@ccl4.org>
Sun, 7 Mar 2004 18:25:56 +0000 (18:25 +0000)
[ 22417]
Make panics a bit more verbose to ease debugging.

[ 22436]
Subject: [PATCH] Re: [perl #25270] 5.8.3 - POSIX::ctermid() on Solaris
From: Andrew Dougherty <doughera@lafayette.edu>
Date: Thu, 4 Mar 2004 14:41:07 -0500 (EST)
Message-ID: <Pine.SOL.4.58.0403041438350.5863@maxwell.phys.lafayette.edu>

[ 22441]
Change 22436 broke the Windows build.
Fix by Steve Hay.

[ 22451]
Allow syslog() to use numeric constants in addition to strings for
facility names and priorities.

Subject: Patch for Sys::Syslog
From: Jim Schneider <jschneid@netilla.com>
Date: Fri, 5 Mar 2004 14:03:10 -0500
Message-Id: <200403051403.10674.jschneid@netilla.com>
p4raw-link: @22451 on //depot/perl: b9f13614400d2300b9be70f1589bc5e1a203e67b
p4raw-link: @22441 on //depot/perl: 3ab23a19ef2035506d06b40c16360f845e997742
p4raw-link: @22436 on //depot/perl: d1fd7089baf415d5617365e9170dad30adc0908e
p4raw-link: @22417 on //depot/perl: 28a8002413ccedcfa8e94526c4bee315c7196d59

p4raw-id: //depot/maint-5.8/perl@22458
p4raw-integrated: from //depot/perl@22457 'copy in'
ext/Sys/Syslog/Syslog.pm (@21227..) ext/POSIX/POSIX.xs
(@22436..) 'merge in' thread.h (@19767..)

ext/POSIX/POSIX.xs patch | blob | blame | history
ext/Sys/Syslog/Syslog.pm patch | blob | blame | history
thread.h patch | blob | blame | history

diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs
index 8a0188d..0919905 100644 (file)
--- a/ext/POSIX/POSIX.xs
+++ b/ext/POSIX/POSIX.xs
@@ -1806,7 +1806,18 @@ access(filename, mode)
 
 char *
 ctermid(s = 0)
-       char *          s = 0;
+       char *          s = 0;
+    CODE:
+#ifdef HAS_CTERMID_R
+       s = safemalloc((size_t) L_ctermid);
+#endif
+       RETVAL = ctermid(s);
+    OUTPUT:
+       RETVAL
+    CLEANUP:
+#ifdef HAS_CTERMID_R
+       Safefree(s);
+#endif
 
 char *
 cuserid(s = 0)
diff --git a/ext/Sys/Syslog/Syslog.pm b/ext/Sys/Syslog/Syslog.pm
index 13598e7..244157f 100644 (file)
--- a/ext/Sys/Syslog/Syslog.pm
+++ b/ext/Sys/Syslog/Syslog.pm
@@ -7,7 +7,7 @@ use Carp;
 @ISA = qw(Exporter DynaLoader);
 @EXPORT = qw(openlog closelog setlogmask syslog);
 @EXPORT_OK = qw(setlogsock);
-$VERSION = '0.04';
+$VERSION = '0.05';
 
 # it would be nice to try stream/unix first, since that will be
 # most efficient. However streams are dodgy - see _syslog_send_stream
@@ -394,6 +394,7 @@ sub _syslog_send_socket {
 
 sub xlate {
     local($name) = @_;
+    return $name+0 if $name =~ /^\s*\d+\s*$/;
     $name = uc $name;
     $name = "LOG_$name" unless $name =~ /^LOG_/;
     $name = "Sys::Syslog::$name";
diff --git a/thread.h b/thread.h
index 7531f5b..442c412 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -22,9 +22,11 @@
 #  ifdef OLD_PTHREADS_API /* Here be dragons. */
 #    define DETACH(t) \
     STMT_START {                                               \
-       if (pthread_detach(&(t)->self)) {                       \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_detach(&(t)->self))) {              \
            MUTEX_UNLOCK(&(t)->mutex);                          \
-           Perl_croak_nocontext("panic: DETACH");              \
+           Perl_croak_nocontext("panic: DETACH (%d) [%s:%d]",  \
+                                _eC_, __FILE__, __LINE__);     \
        }                                                       \
     } STMT_END
 
@@ -107,7 +109,8 @@
        if (*m) {                                               \
            mutex_init(*m);                                     \
        } else {                                                \
-           Perl_croak_nocontext("panic: MUTEX_INIT");          \
+           Perl_croak_nocontext("panic: MUTEX_INIT [%s:%d]",   \
+                                __FILE__, __LINE__);           \
        }                                                       \
     } STMT_END
 
@@ -126,7 +129,8 @@
            condition_init(*c);                                 \
        }                                                       \
        else {                                                  \
-           Perl_croak_nocontext("panic: COND_INIT");           \
+           Perl_croak_nocontext("panic: COND_INIT [%s:%d]",    \
+                                __FILE__, __LINE__);           \
        }                                                       \
     } STMT_END
 
@@ -185,66 +189,86 @@
     /* Temporary workaround, true bug is deeper. --jhi 1999-02-25 */
 #    define MUTEX_INIT(m) \
     STMT_START {                                               \
+       int _eC_;                                               \
        Zero((m), 1, perl_mutex);                               \
-       if (pthread_mutex_init((m), pthread_mutexattr_default)) \
-           Perl_croak_nocontext("panic: MUTEX_INIT");          \
+       if ((_eC_ = pthread_mutex_init((m), pthread_mutexattr_default)))        \
+           Perl_croak_nocontext("panic: MUTEX_INIT (%d) [%s:%d]",      \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #  else
 #    define MUTEX_INIT(m) \
     STMT_START {                                               \
-       if (pthread_mutex_init((m), pthread_mutexattr_default)) \
-           Perl_croak_nocontext("panic: MUTEX_INIT");          \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_init((m), pthread_mutexattr_default)))        \
+           Perl_croak_nocontext("panic: MUTEX_INIT (%d) [%s:%d]",      \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #  endif
 
 #  define MUTEX_LOCK(m) \
     STMT_START {                                               \
-       if (pthread_mutex_lock((m)))                            \
-           Perl_croak_nocontext("panic: MUTEX_LOCK");          \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_lock((m))))                   \
+           Perl_croak_nocontext("panic: MUTEX_LOCK (%d) [%s:%d]",      \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define MUTEX_UNLOCK(m) \
     STMT_START {                                               \
-       if (pthread_mutex_unlock((m)))                          \
-           Perl_croak_nocontext("panic: MUTEX_UNLOCK");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_unlock((m))))                 \
+           Perl_croak_nocontext("panic: MUTEX_UNLOCK (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define MUTEX_DESTROY(m) \
     STMT_START {                                               \
-       if (pthread_mutex_destroy((m)))                         \
-           Perl_croak_nocontext("panic: MUTEX_DESTROY");       \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_destroy((m))))                \
+           Perl_croak_nocontext("panic: MUTEX_DESTROY (%d) [%s:%d]",   \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* MUTEX_INIT */
 
 #ifndef COND_INIT
 #  define COND_INIT(c) \
     STMT_START {                                               \
-       if (pthread_cond_init((c), pthread_condattr_default))   \
-           Perl_croak_nocontext("panic: COND_INIT");           \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_init((c), pthread_condattr_default)))  \
+           Perl_croak_nocontext("panic: COND_INIT (%d) [%s:%d]",       \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_SIGNAL(c) \
     STMT_START {                                               \
-       if (pthread_cond_signal((c)))                           \
-           Perl_croak_nocontext("panic: COND_SIGNAL");         \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_signal((c))))                  \
+           Perl_croak_nocontext("panic: COND_SIGNAL (%d) [%s:%d]",     \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_BROADCAST(c) \
     STMT_START {                                               \
-       if (pthread_cond_broadcast((c)))                        \
-           Perl_croak_nocontext("panic: COND_BROADCAST");      \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_broadcast((c))))               \
+           Perl_croak_nocontext("panic: COND_BROADCAST (%d) [%s:%d]",  \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_WAIT(c, m) \
     STMT_START {                                               \
-       if (pthread_cond_wait((c), (m)))                        \
-           Perl_croak_nocontext("panic: COND_WAIT");           \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_wait((c), (m))))               \
+           Perl_croak_nocontext("panic: COND_WAIT (%d) [%s:%d]",       \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_DESTROY(c) \
     STMT_START {                                               \
-       if (pthread_cond_destroy((c)))                          \
-           Perl_croak_nocontext("panic: COND_DESTROY");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_destroy((c))))                 \
+           Perl_croak_nocontext("panic: COND_DESTROY (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* COND_INIT */
 
@@ -252,9 +276,11 @@
 #ifndef DETACH
 #  define DETACH(t) \
     STMT_START {                                               \
-       if (pthread_detach((t)->self)) {                        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_detach((t)->self))) {               \
            MUTEX_UNLOCK(&(t)->mutex);                          \
-           Perl_croak_nocontext("panic: DETACH");              \
+           Perl_croak_nocontext("panic: DETACH (%d) [%s:%d]",  \
+                                _eC_, __FILE__, __LINE__);     \
        }                                                       \
     } STMT_END
 #endif /* DETACH */
@@ -262,8 +288,10 @@
 #ifndef JOIN
 #  define JOIN(t, avp) \
     STMT_START {                                               \
-       if (pthread_join((t)->self, (void**)(avp)))             \
-           Perl_croak_nocontext("panic: pthread_join");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_join((t)->self, (void**)(avp))))    \
+           Perl_croak_nocontext("panic: pthread_join (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* JOIN */
 
@@ -288,8 +316,10 @@
 #ifndef PERL_SET_CONTEXT
 #  define PERL_SET_CONTEXT(t) \
     STMT_START {                                               \
-       if (pthread_setspecific(PL_thr_key, (void *)(t)))       \
-           Perl_croak_nocontext("panic: pthread_setspecific"); \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_setspecific(PL_thr_key, (void *)(t))))      \
+           Perl_croak_nocontext("panic: pthread_setspecific (%d) [%s:%d]",     \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* PERL_SET_CONTEXT */
 
@@ -302,8 +332,10 @@
 #ifndef ALLOC_THREAD_KEY
 #  define ALLOC_THREAD_KEY \
     STMT_START {                                               \
-       if (pthread_key_create(&PL_thr_key, 0)) {               \
-           PerlIO_printf(PerlIO_stderr(), "panic: pthread_key_create");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_key_create(&PL_thr_key, 0))) {      \
+           PerlIO_printf(PerlIO_stderr(), "panic: pthread_key_create (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
            exit(1);                                            \
        }                                                       \
     } STMT_END
Unnamed repository; edit this file 'description' to name the repository.