/* deb.c
*
- * Copyright (c) 1991-1994, Larry Wall
+ * Copyright (c) 1991-1997, Larry Wall
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
#include "EXTERN.h"
#include "perl.h"
-#ifdef DEBUGGING
-#if !defined(I_STDARG) && !defined(I_VARARGS)
-
-/*
- * Fallback on the old hackers way of doing varargs
- */
-
-/*VARARGS1*/
void
-deb(pat,a1,a2,a3,a4,a5,a6,a7,a8)
- char *pat;
-{
- register I32 i;
- GV* gv = curcop->cop_filegv;
-
- fprintf(Perl_debug_log,"(%s:%ld)\t",
- SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
- (long)curcop->cop_line);
- for (i=0; i<dlevel; i++)
- fprintf(Perl_debug_log,"%c%c ",debname[i],debdelim[i]);
- fprintf(Perl_debug_log,pat,a1,a2,a3,a4,a5,a6,a7,a8);
-}
-
-#else /* !defined(I_STDARG) && !defined(I_VARARGS) */
-
-# ifdef I_STDARG
-void
-deb(char *pat, ...)
-# else
-/*VARARGS1*/
-void
-deb(pat, va_alist)
- char *pat;
- va_dcl
-# endif
+deb(const char *pat, ...)
{
+#ifdef DEBUGGING
+ dTHR;
va_list args;
register I32 i;
GV* gv = curcop->cop_filegv;
- fprintf(Perl_debug_log,"(%s:%ld)\t",
+#ifdef USE_THREADS
+ PerlIO_printf(Perl_debug_log, "0x%lx (%s:%ld)\t",
+ (unsigned long) thr,
+ SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
+ (long)curcop->cop_line);
+#else
+ PerlIO_printf(Perl_debug_log, "(%s:%ld)\t",
SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
(long)curcop->cop_line);
+#endif /* USE_THREADS */
for (i=0; i<dlevel; i++)
- fprintf(Perl_debug_log,"%c%c ",debname[i],debdelim[i]);
+ PerlIO_printf(Perl_debug_log, "%c%c ",debname[i],debdelim[i]);
-# ifdef I_STDARG
va_start(args, pat);
-# else
- va_start(args);
-# endif
- (void) vfprintf(Perl_debug_log,pat,args);
+ (void) PerlIO_vprintf(Perl_debug_log,pat,args);
va_end( args );
+#endif /* DEBUGGING */
}
-#endif /* !defined(I_STDARG) && !defined(I_VARARGS) */
void
-deb_growlevel()
+deb_growlevel(void)
{
+#ifdef DEBUGGING
dlmax += 128;
Renew(debname, dlmax, char);
Renew(debdelim, dlmax, char);
+#endif /* DEBUGGING */
}
I32
-debstackptrs()
+debstackptrs(void)
{
- fprintf(Perl_debug_log, "%8lx %8lx %8ld %8ld %8ld\n",
+#ifdef DEBUGGING
+ dTHR;
+ PerlIO_printf(Perl_debug_log, "%8lx %8lx %8ld %8ld %8ld\n",
(unsigned long)curstack, (unsigned long)stack_base,
(long)*markstack_ptr, (long)(stack_sp-stack_base),
(long)(stack_max-stack_base));
- fprintf(Perl_debug_log, "%8lx %8lx %8ld %8ld %8ld\n",
+ PerlIO_printf(Perl_debug_log, "%8lx %8lx %8ld %8ld %8ld\n",
(unsigned long)mainstack, (unsigned long)AvARRAY(curstack),
- (long)mainstack, (long)AvFILL(curstack), (long)AvMAX(curstack));
+ (long)mainstack, (long)AvFILLp(curstack), (long)AvMAX(curstack));
+#endif /* DEBUGGING */
return 0;
}
I32
-debstack()
+debstack(void)
{
+#ifdef DEBUGGING
+ dTHR;
I32 top = stack_sp - stack_base;
register I32 i = top - 30;
- I32 *markscan = markstack;
+ I32 *markscan = curstackinfo->si_markbase;
if (i < 0)
i = 0;
if (*markscan >= i)
break;
- fprintf(Perl_debug_log, i ? " => ... " : " => ");
+#ifdef USE_THREADS
+ PerlIO_printf(Perl_debug_log, i ? "0x%lx => ... " : "0x%lx => ",
+ (unsigned long) thr);
+#else
+ PerlIO_printf(Perl_debug_log, i ? " => ... " : " => ");
+#endif /* USE_THREADS */
if (stack_base[0] != &sv_undef || stack_sp < stack_base)
- fprintf(Perl_debug_log, " [STACK UNDERFLOW!!!]\n");
+ PerlIO_printf(Perl_debug_log, " [STACK UNDERFLOW!!!]\n");
do {
++i;
if (markscan <= markstack_ptr && *markscan < i) {
do {
++markscan;
- putc('*', Perl_debug_log);
+ PerlIO_putc(Perl_debug_log, '*');
}
while (markscan <= markstack_ptr && *markscan < i);
- fprintf(Perl_debug_log, " ");
+ PerlIO_printf(Perl_debug_log, " ");
}
if (i > top)
break;
- fprintf(Perl_debug_log, "%-4s ", SvPEEK(stack_base[i]));
+ PerlIO_printf(Perl_debug_log, "%-4s ", SvPEEK(stack_base[i]));
}
while (1);
- fprintf(Perl_debug_log, "\n");
+ PerlIO_printf(Perl_debug_log, "\n");
+#endif /* DEBUGGING */
return 0;
}
-#else
-static int dummy; /* avoid totally empty deb.o file */
-#endif /* DEBUGGING */