bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove rustboot-related logging hacks

Browse source 
(Also, feel free to start adding logging to your code. Really. It's fast.)
This commit is contained in:
Marijn Haverbeke 2011-05-19 19:33:32 +02:00
parent df90934bf7
commit c750c520e3
4 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rt/rust_log.cpp
View file

@ -217,8 +217,6 @@ size_t log_rt_gc;
size_t log_rt_stdlib; size_t log_rt_stdlib;
size_t log_rt_kern; size_t log_rt_kern;
size_t log_rt_backtrace; size_t log_rt_backtrace;
// Used to turn logging for rustboot-compiled code on and off
size_t log_rustboot;
static const mod_entry _rt_module_map[] = static const mod_entry _rt_module_map[] =
{{"rt.mem", &log_rt_mem}, {{"rt.mem", &log_rt_mem},
@ -234,7 +232,6 @@ static const mod_entry _rt_module_map[] =
{"rt.stdlib", &log_rt_stdlib}, {"rt.stdlib", &log_rt_stdlib},
{"rt.kern", &log_rt_kern}, {"rt.kern", &log_rt_kern},
{"rt.backtrace", &log_rt_backtrace}, {"rt.backtrace", &log_rt_backtrace},
{"rustboot", &log_rustboot},
{NULL, NULL}}; {NULL, NULL}};
void update_log_settings(void* crate_map, char* settings) { void update_log_settings(void* crate_map, char* settings) {
@ -249,8 +246,6 @@ void update_log_settings(void* crate_map, char* settings) {
} }
update_module_map(_rt_module_map, &dirs[0], n_dirs); update_module_map(_rt_module_map, &dirs[0], n_dirs);
// FIXME check can be dropped when rustboot is gone
if (crate_map)
update_crate_map((const cratemap*)crate_map, &dirs[0], n_dirs); update_crate_map((const cratemap*)crate_map, &dirs[0], n_dirs);
free(buffer); free(buffer);

1
src/rt/rust_log.h
View file

@ -74,6 +74,5 @@ extern size_t log_rt_gc;
extern size_t log_rt_stdlib; extern size_t log_rt_stdlib;
extern size_t log_rt_kern; extern size_t log_rt_kern;
extern size_t log_rt_backtrace; extern size_t log_rt_backtrace;
extern size_t log_rustboot;
#endif /* RUST_LOG_H */ #endif /* RUST_LOG_H */

17
src/rt/rust_upcall.cpp
View file

@ -35,14 +35,6 @@ void upcall_log_int(rust_task *task, uint32_t level, int32_t i) {
i, i); i, i);
} }
extern "C" CDECL
void upcall_log_int_rustboot(rust_task *task, uint32_t level, int32_t i) {
LOG_UPCALL_ENTRY(task);
if (task->dom->log_lvl >= level && log_rustboot >= level)
task->dom->log(task, level, "rust: %" PRId32 " (0x%" PRIx32 ")",
i, i);
}
extern "C" CDECL extern "C" CDECL
void upcall_log_float(rust_task *task, uint32_t level, float f) { void upcall_log_float(rust_task *task, uint32_t level, float f) {
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
@ -57,15 +49,6 @@ void upcall_log_double(rust_task *task, uint32_t level, double *f) {
task->dom->log(task, level, "rust: %12.12f", *f); task->dom->log(task, level, "rust: %12.12f", *f);
} }
extern "C" CDECL void
upcall_log_str_rustboot(rust_task *task, uint32_t level, rust_str *str) {
LOG_UPCALL_ENTRY(task);
if (task->dom->log_lvl >= level && log_rustboot >= level) {
const char *c = str_buf(task, str);
task->dom->log(task, level, "rust: %s", c);
}
}
extern "C" CDECL void extern "C" CDECL void
upcall_log_str(rust_task *task, uint32_t level, rust_str *str) { upcall_log_str(rust_task *task, uint32_t level, rust_str *str) {
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);

2
src/rt/rustrt.def.in
View file

@ -51,9 +51,7 @@ upcall_kill
upcall_log_double upcall_log_double
upcall_log_float upcall_log_float
upcall_log_int upcall_log_int
upcall_log_int_rustboot
upcall_log_str upcall_log_str
upcall_log_str_rustboot
upcall_malloc upcall_malloc
upcall_mark upcall_mark
upcall_new_chan upcall_new_chan