dc7b1dda60
* java/lang/natThrowable.cc (printRawStackTrace): removed. (getStackTrace0): new method. * java/lang/Throwable.java (CPlusPlusDemangler): removed. (printStackTrace(PrintWriter)): replace with pure java implementation. (printRawStackTrace): removed. (getStackTrace0): new method. * java/lang/StackTraceElement.java (toString): add extra whitespace. * gcj/javaprims.h: regenerate class list. * include/name-finder.h (lookup): new returns StackTraceElement*. (method_name, file_name): fields removed. (pid2, f2_pipe, b2_pipe, b2_pipe_fd): new fields. (~_Jv_name_finder): close new descriptors. * name-finder.cc(_Jv_name_finder): setup c++filt helper process. (createStackTraceElement): new method. (lookup): returns StackTraceElement*, uses createStackTraceElement(). From-SVN: r55424
104 lines
2.2 KiB
C++
104 lines
2.2 KiB
C++
// name-finder.h - Convert addresses to names
|
|
|
|
/* Copyright (C) 2000, 2002 Free Software Foundation, Inc
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
/**
|
|
* @author Andrew Haley <aph@cygnus.com>
|
|
* @date Jan 6 2000
|
|
*/
|
|
|
|
#include <gcj/cni.h>
|
|
#include <jvm.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
#include <sys/wait.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include <java/lang/StackTraceElement.h>
|
|
|
|
/* _Jv_name_finder is a class wrapper around a mechanism that can
|
|
convert addresses of methods to their names and the names of files
|
|
in which they appear. */
|
|
|
|
class _Jv_name_finder
|
|
{
|
|
public:
|
|
_Jv_name_finder (char *executable);
|
|
~_Jv_name_finder ()
|
|
{
|
|
#if defined (HAVE_PIPE) && defined (HAVE_FORK)
|
|
myclose (f_pipe[0]);
|
|
myclose (f_pipe[1]);
|
|
myclose (b_pipe[0]);
|
|
myclose (b_pipe[1]);
|
|
if (b_pipe_fd != NULL)
|
|
fclose (b_pipe_fd);
|
|
|
|
myclose (f2_pipe[0]);
|
|
myclose (f2_pipe[1]);
|
|
myclose (b2_pipe[0]);
|
|
myclose (b2_pipe[1]);
|
|
if (b2_pipe_fd != NULL)
|
|
fclose (b2_pipe_fd);
|
|
|
|
if (pid >= 0)
|
|
{
|
|
int wstat;
|
|
// We don't care about errors here.
|
|
waitpid (pid, &wstat, 0);
|
|
}
|
|
|
|
if (pid2 >= 0)
|
|
{
|
|
int wstat;
|
|
// We don't care about errors here.
|
|
waitpid (pid2, &wstat, 0);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
/* Given a pointer to a function or method, try to convert it into a
|
|
name and the appropriate line and source file. The caller passes
|
|
the code pointer in p.
|
|
|
|
Returns NULL if the lookup fails. Even if this happens, the field
|
|
hex will have been correctly filled in with the pointer. */
|
|
|
|
java::lang::StackTraceElement* lookup (void *p);
|
|
|
|
char hex[sizeof (void *) * 2 + 5];
|
|
|
|
private:
|
|
void toHex (void *p);
|
|
java::lang::StackTraceElement* createStackTraceElement(char *s, char *f);
|
|
#if defined (HAVE_PIPE) && defined (HAVE_FORK)
|
|
pid_t pid, pid2;
|
|
int f_pipe[2], b_pipe[2], f2_pipe[2], b2_pipe[2];
|
|
FILE *b_pipe_fd, *b2_pipe_fd;
|
|
int demangling_error, lookup_error;
|
|
|
|
// Close a descriptor only if it has not been closed.
|
|
void myclose (int fd)
|
|
{
|
|
if (fd != -1)
|
|
close (fd);
|
|
}
|
|
|
|
#endif
|
|
};
|