Also remove a crappy comment in trace.c
Signed-off-by: Tomek Grabiec <tgrab...@gmail.com>
---
include/jit/compiler.h | 1 -
vm/jato.c | 6 ------
vm/trace.c | 14 ++++----------
3 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/include/jit/compiler.h b/include/jit/compiler.h
index 087a795..18e32a8 100644
--- a/include/jit/compiler.h
+++ b/include/jit/compiler.h
@@ -102,7 +102,6 @@ extern bool opt_trace_invoke_verbose;
extern bool opt_trace_exceptions;
extern bool opt_trace_bytecode;
extern bool opt_trace_compile;
-extern bool opt_trace_threads;
void trace_magic_trampoline(struct compilation_unit *);
void trace_method(struct compilation_unit *);
diff --git a/vm/jato.c b/vm/jato.c
index d130b2d..4e47a07 100644
--- a/vm/jato.c
+++ b/vm/jato.c
@@ -814,11 +814,6 @@ static void handle_trace_bytecode(void)
opt_trace_compile = true;
}
-static void handle_trace_threads(void)
-{
- opt_trace_threads = true;
-}
-
static void handle_trace_trampoline(void)
{
opt_trace_magic_trampoline = true;
@@ -896,7 +891,6 @@ const struct option options[] = {
DEFINE_OPTION("Xtrace:invoke-verbose", handle_trace_invoke_verbose),
DEFINE_OPTION("Xtrace:itable", handle_trace_itable),
DEFINE_OPTION("Xtrace:jit", handle_trace_jit),
- DEFINE_OPTION("Xtrace:threads", handle_trace_threads),
DEFINE_OPTION("Xtrace:trampoline", handle_trace_trampoline),
};
diff --git a/vm/trace.c b/vm/trace.c
index 6e8fc02..e907a92 100644
--- a/vm/trace.c
+++ b/vm/trace.c
@@ -38,8 +38,6 @@
static pthread_mutex_t trace_mutex = PTHREAD_MUTEX_INITIALIZER;
-/* Holds the trace output. It it initialized in trace_begin() and
- printed in trace_end(). */
static __thread struct string *trace_buffer = NULL;
static void ensure_trace_buffer(void)
@@ -81,15 +79,11 @@ void trace_flush(void) {
pthread_mutex_lock(&trace_mutex);
- if (opt_trace_threads) {
- line = strtok_r(trace_buffer->value, "\n", &strtok_ptr);
- while (line) {
- fprintf(stderr, "[%s] %s\n", thread_name, line);
+ line = strtok_r(trace_buffer->value, "\n", &strtok_ptr);
+ while (line) {
+ fprintf(stderr, "[%s] %s\n", thread_name, line);
- line = strtok_r(NULL, "\n", &strtok_ptr);
- }
- } else {
- fprintf(stderr, "%s", trace_buffer->value);
+ line = strtok_r(NULL, "\n", &strtok_ptr);
}
pthread_mutex_unlock(&trace_mutex);
--
1.6.0.6
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
