[SATYR PATCH 3/6] python: remove unused code from the java class
Martin Milata
mmilata at redhat.com
Wed Aug 7 15:53:22 UTC 2013
Signed-off-by: Martin Milata <mmilata at redhat.com>
---
python/py_java_stacktrace.c | 39 ---------------------------------------
python/py_java_thread.c | 6 +-----
tests/python/java.py | 4 ----
3 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/python/py_java_stacktrace.c b/python/py_java_stacktrace.c
index 2686912..fc5bde9 100644
--- a/python/py_java_stacktrace.c
+++ b/python/py_java_stacktrace.c
@@ -6,7 +6,6 @@
#include "java/stacktrace.h"
#include "java/thread.h"
#include "location.h"
-#include "normalize.h"
#include "stacktrace.h"
#define stacktrace_doc "satyr.JavaStacktrace - class representing a java stacktrace\n" \
@@ -19,19 +18,11 @@
"Clones the stacktrace object. All new structures are independent " \
"on the original object."
-#define b_to_short_text "Usage: stacktrace.to_short_text([max_frames])\n" \
- "Returns short text representation of the stacktrace. If max_frames is\n" \
- "specified, the result includes only that much topmost frames.\n"
-
-#define b_normalize_doc "Usage: stacktrace.normalize()\n" \
- "Normalizes all threads in the stacktrace."
-
static PyMethodDef
java_stacktrace_methods[] =
{
/* methods */
{ "dup", sr_py_java_stacktrace_dup, METH_NOARGS, b_dup_doc },
-// { "normalize", sr_py_java_stacktrace_normalize, METH_NOARGS, b_normalize_doc },
{ NULL },
};
@@ -185,33 +176,3 @@ sr_py_java_stacktrace_dup(PyObject *self, PyObject *args)
return (PyObject*)bo;
}
-
-/*
- * Normalization not yet implemente for java stacktraces
- *
-PyObject *
-sr_py_java_stacktrace_normalize(PyObject *self, PyObject *args)
-{
- struct sr_py_java_stacktrace *this = (struct sr_py_java_stacktrace*)self;
- if (threads_prepare_linked_list((struct sr_py_multi_stacktrace *)this) < 0)
- return NULL;
-
- struct sr_java_stacktrace *tmp = sr_java_stacktrace_dup(this->stacktrace);
- sr_normalize_java_stacktrace(tmp);
- if (java_stacktrace_free_thread_python_list(this) < 0)
- {
- sr_java_stacktrace_free(tmp);
- return NULL;
- }
-
- this->stacktrace->threads = tmp->threads;
- tmp->threads = NULL;
- sr_java_stacktrace_free(tmp);
-
- this->threads = java_thread_linked_list_to_python_list(this->stacktrace);
- if (!this->threads)
- return NULL;
-
- Py_RETURN_NONE;
-}
-*/
diff --git a/python/py_java_thread.c b/python/py_java_thread.c
index 7869fef..73d17ab 100644
--- a/python/py_java_thread.c
+++ b/python/py_java_thread.c
@@ -11,8 +11,7 @@
#define thread_doc "satyr.JavaThread - class representing a thread in a stacktrace\n" \
"Usage:\n" \
"satyr.JavaThread() - creates an empty thread\n" \
- "satyr.JavaThread(str) - parses str and fills the thread object\n" \
- "satyr.JavaThread(str, only_funs=True) - parses list of function names"
+ "satyr.JavaThread(str) - parses str and fills the thread object"
#define t_dup_doc "Usage: thread.dup()\n" \
"Returns: satyr.JavaThread - a new clone of thread\n" \
@@ -32,9 +31,6 @@
#define t_format_funs_doc "Usage: thread.format_funs()\n" \
"Returns: string"
-#define t_frames_doc (char *)"A list containing satyr.JavaFrame objects representing " \
- "frames in a thread."
-
static PyMethodDef
java_thread_methods[] =
{
diff --git a/tests/python/java.py b/tests/python/java.py
index 0bed791..6a9a227 100755
--- a/tests/python/java.py
+++ b/tests/python/java.py
@@ -75,10 +75,6 @@ org.hibernate.exception.JDBCExceptionHelper.convert
self.assertEqual(self.thread.get_duphash(flags=satyr.DUPHASH_NOHASH, frames=3), expected_plain)
self.assertEqual(self.thread.get_duphash(), '81450a80a9d9307624b08e80dc244beb63d91138')
-class TestJavaSharedlib(BindingsTestCase):
- def setUp(self):
- self.shlib = satyr.JavaStacktrace(contents).libs[0]
-
class TestJavaFrame(BindingsTestCase):
def setUp(self):
self.frame = satyr.JavaStacktrace(contents).threads[0].frames[0]
--
1.8.3.1
More information about the Crash-catcher
mailing list