X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Ftrace_parser.cpp;h=a9cdd0fbc0586465be407522a0148146e05f283a;hb=dfd413a5f54bd450850b5e84886949bcdf85b1e7;hp=8ba9bdcdacd6b6003bda0380d5747d9796d8da80;hpb=aa1b2136cc72893e519ff73c47e2ecd29cafe1da;p=apitrace

diff --git a/common/trace_parser.cpp b/common/trace_parser.cpp
index 8ba9bdc..a9cdd0f 100644
--- a/common/trace_parser.cpp
+++ b/common/trace_parser.cpp
@@ -65,6 +65,8 @@ bool Parser::open(const char *filename) {
     version = read_uint();
     if (version > TRACE_VERSION) {
         std::cerr << "error: unsupported trace format version " << version << "\n";
+        delete file;
+        file = NULL;
         return false;
     }
     api = API_UNKNOWN;
@@ -241,7 +243,7 @@ Parser::parse_function_sig(void) {
         }
         sig->arg_names = arg_names;
         sig->flags = lookupCallFlags(sig->name);
-        sig->offset = file->currentOffset();
+        sig->fileOffset = file->currentOffset();
         functions[id] = sig;
 
         /**
@@ -279,7 +281,7 @@ Parser::parse_function_sig(void) {
             glGetErrorSig = sig;
         }
 
-    } else if (file->currentOffset() < sig->offset) {
+    } else if (file->currentOffset() < sig->fileOffset) {
         /* skip over the signature */
         skip_string(); /* name */
         unsigned num_args = read_uint();
@@ -309,9 +311,9 @@ StructSig *Parser::parse_struct_sig() {
             member_names[i] = read_string();
         }
         sig->member_names = member_names;
-        sig->offset = file->currentOffset();
+        sig->fileOffset = file->currentOffset();
         structs[id] = sig;
-    } else if (file->currentOffset() < sig->offset) {
+    } else if (file->currentOffset() < sig->fileOffset) {
         /* skip over the signature */
         skip_string(); /* name */
         unsigned num_members = read_uint();
@@ -345,9 +347,9 @@ EnumSig *Parser::parse_old_enum_sig() {
         values->name = read_string();
         values->value = read_sint();
         sig->values = values;
-        sig->offset = file->currentOffset();
+        sig->fileOffset = file->currentOffset();
         enums[id] = sig;
-    } else if (file->currentOffset() < sig->offset) {
+    } else if (file->currentOffset() < sig->fileOffset) {
         /* skip over the signature */
         skip_string(); /*name*/
         scan_value();
@@ -374,9 +376,9 @@ EnumSig *Parser::parse_enum_sig() {
             it->value = read_sint();
         }
         sig->values = values;
-        sig->offset = file->currentOffset();
+        sig->fileOffset = file->currentOffset();
         enums[id] = sig;
-    } else if (file->currentOffset() < sig->offset) {
+    } else if (file->currentOffset() < sig->fileOffset) {
         /* skip over the signature */
         int num_values = read_uint();
         for (int i = 0; i < num_values; ++i) {
@@ -409,9 +411,9 @@ BitmaskSig *Parser::parse_bitmask_sig() {
             }
         }
         sig->flags = flags;
-        sig->offset = file->currentOffset();
+        sig->fileOffset = file->currentOffset();
         bitmasks[id] = sig;
-    } else if (file->currentOffset() < sig->offset) {
+    } else if (file->currentOffset() < sig->fileOffset) {
         /* skip over the signature */
         int num_flags = read_uint();
         for (int i = 0; i < num_flags; ++i) {
@@ -463,7 +465,7 @@ Call *Parser::parse_leave(Mode mode) {
          * between two frames.  We won't return this call, but we still need to skip 
          * over its data.
          */
-        FunctionSig sig = {0, NULL, 0, NULL};
+        const FunctionSig sig = {0, NULL, 0, NULL};
         call = new Call(&sig, 0, 0);
         parse_call_details(call, SCAN);
         delete call;
@@ -517,46 +519,81 @@ bool Parser::parse_call_details(Call *call, Mode mode) {
 }
 
 bool Parser::parse_call_backtrace(Call *call, Mode mode) {
-    Backtrace* backtrace = new Backtrace();
-    StackFrame* frame = NULL;
-    do {
+    unsigned num_frames = read_uint();
+    Backtrace* backtrace = new Backtrace(num_frames);
+    for (unsigned i = 0; i < num_frames; ++i) {
+        (*backtrace)[i] = parse_backtrace_frame(mode);
+    }
+    call->backtrace = backtrace;
+    return true;
+}
+
+StackFrame * Parser::parse_backtrace_frame(Mode mode) {
+    size_t id = read_uint();
+
+    StackFrameState *frame = lookup(frames, id);
+
+    if (!frame) {
+        frame = new StackFrameState;
         int c = read_byte();
-        switch (c) {
-        case trace::CALL_BACKTRACE_FRAME:
-            if (frame != NULL) {
-                backtrace->addFrame(frame);
+        while (c != trace::BACKTRACE_END &&
+               c != -1) {
+            switch (c) {
+            case trace::BACKTRACE_MODULE:
+                frame->module = read_string();
+                break;
+            case trace::BACKTRACE_FUNCTION:
+                frame->function = read_string();
+                break;
+            case trace::BACKTRACE_FILENAME:
+                frame->filename = read_string();
+                break;
+            case trace::BACKTRACE_LINENUMBER:
+                frame->linenumber = read_uint();
+                break;
+            case trace::BACKTRACE_OFFSET:
+                frame->offset = read_uint();
+                break;
+            default:
+                std::cerr << "error: unknown backtrace detail "
+                          << c << "\n";
+                exit(1);
             }
-            frame = new StackFrame();
-            break;
-        case trace::CALL_BACKTRACE_END:
-            if (frame != NULL) {
-                backtrace->addFrame(frame);
+            c = read_byte();
+        }
+
+        frame->fileOffset = file->currentOffset();
+        frames[id] = frame;
+    } else if (file->currentOffset() < frame->fileOffset) {
+        int c = read_byte();
+        while (c != trace::BACKTRACE_END &&
+               c != -1) {
+            switch (c) {
+            case trace::BACKTRACE_MODULE:
+                scan_string();
+                break;
+            case trace::BACKTRACE_FUNCTION:
+                scan_string();
+                break;
+            case trace::BACKTRACE_FILENAME:
+                scan_string();
+                break;
+            case trace::BACKTRACE_LINENUMBER:
+                scan_uint();
+                break;
+            case trace::BACKTRACE_OFFSET:
+                scan_uint();
+                break;
+            default:
+                std::cerr << "error: unknown backtrace detail "
+                          << c << "\n";
+                exit(1);
             }
-            call->backtrace = backtrace;
-            return true;
-        case trace::CALL_BACKTRACE_MODULE:
-            frame->module = static_cast<String*>(parse_value(mode));
-            break;
-        case trace::CALL_BACKTRACE_FUNCTION:
-            frame->function = static_cast<String*>(parse_value(mode));
-            break;
-        case trace::CALL_BACKTRACE_FILENAME:
-            frame->filename = static_cast<String*>(parse_value(mode));
-            break;
-        case trace::CALL_BACKTRACE_LINENUMBER:
-            frame->linenumber = static_cast<String*>(parse_value(mode));
-            break;
-        case trace::CALL_BACKTRACE_OFFSET:
-            frame->offset = static_cast<String*>(parse_value(mode));
-            break;
-        default:
-            std::cerr << "error: ("<< call->name() << ") unknown call backtrace detail "
-                      << c << "\n";
-            exit(1);
-        case -1:
-            return false;
+            c = read_byte();
         }
-    } while(true);
+    }
+
+    return frame;
 }
 
 /**