diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp
index a3c7b0430074b471593e3d658f927a5fcd9cce77..fc83e89df006878579182213364194d9f0f34534 100644 (file)
--- a/src/debug/logger.cpp
+++ b/src/debug/logger.cpp
namespace {
-static void write_escaped_value(std::ostream &os, Util::SharedCStringPtr value) {
+static void write_escaped_value(std::ostream &os, Util::ptr_shared<char> value) {
for ( char const *current=value ; *current ; ++current ) {
switch (*current) {
case '&':
static std::ofstream log_stream;
static bool empty_tag=false;
-typedef std::vector<Util::SharedCStringPtr, GC::Alloc<Util::SharedCStringPtr, GC::MANUAL> > TagStack;
+typedef std::vector<Util::ptr_shared<char>, GC::Alloc<Util::ptr_shared<char>, GC::MANUAL> > TagStack;
static TagStack &tag_stack() {
static TagStack stack;
return stack;
while (*end) {
while ( *end && *end != ',' ) { end++; }
if ( start != end ) {
- if (equal_range("CORE", start, end)) {
- mask[Event::CORE] = true;
- } else if (equal_range("XML", start, end)) {
- mask[Event::XML] = true;
- } else if (equal_range("SPOBJECT", start, end)) {
- mask[Event::SPOBJECT] = true;
- } else if (equal_range("DOCUMENT", start, end)) {
- mask[Event::DOCUMENT] = true;
- } else if (equal_range("REFCOUNT", start, end)) {
- mask[Event::REFCOUNT] = true;
- } else if (equal_range("EXTENSION", start, end)) {
- mask[Event::EXTENSION] = true;
- } else {
+ struct CategoryName {
+ char const *name;
+ Event::Category category;
+ };
+ static const CategoryName category_names[] = {
+ { "CORE", Event::CORE },
+ { "XML", Event::XML },
+ { "SPOBJECT", Event::SPOBJECT },
+ { "DOCUMENT", Event::DOCUMENT },
+ { "REFCOUNT", Event::REFCOUNT },
+ { "EXTENSION", Event::EXTENSION },
+ { "FINALIZERS", Event::FINALIZERS },
+ { "OTHER", Event::OTHER },
+ { NULL, Event::OTHER }
+ };
+ CategoryName const *iter;
+ for ( iter = category_names ; iter->name ; iter++ ) {
+ if (equal_range(iter->name, start, end)) {
+ mask[iter->category] = true;
+ break;
+ }
+ }
+ if (!iter->name) {
g_warning("Unknown debugging category %*s", end - start, start);
}
}
log_stream << "<?xml version=\"1.0\"?>\n";
log_stream.flush();
_enabled = true;
- start<SimpleEvent<Event::CORE> >(Util::SharedCStringPtr::coerce("session"));
+ start<SimpleEvent<Event::CORE> >(Util::share_static_string("session"));
std::atexit(&do_shutdown);
}
}
}
void Logger::_start(Event const &event) {
- Util::SharedCStringPtr name=event.name();
+ Util::ptr_shared<char> name=event.name();
if (empty_tag) {
log_stream << ">\n";
write_indent(log_stream, tag_stack().size());
- log_stream << "<" << name.cString();
+ log_stream << "<" << name.pointer();
unsigned property_count=event.propertyCount();
for ( unsigned i = 0 ; i < property_count ; i++ ) {
Event::PropertyPair property=event.property(i);
- log_stream << " " << property.name.cString() << "=\"";
+ log_stream << " " << property.name.pointer() << "=\"";
write_escaped_value(log_stream, property.value);
log_stream << "\"";
}
}
void Logger::_skip() {
- tag_stack().push_back(Util::SharedCStringPtr());
+ tag_stack().push_back(Util::ptr_shared<char>());
}
void Logger::_finish() {
log_stream << "/>\n";
} else {
write_indent(log_stream, tag_stack().size() - 1);
- log_stream << "</" << tag_stack().back().cString() << ">\n";
+ log_stream << "</" << tag_stack().back().pointer() << ">\n";
}
log_stream.flush();