Invert control flow to satisfy glut.

diff --git a/dump.cpp b/dump.cpp
index 09d74c4ec48d450255795102b005029cc5fa3527..8c757ebf3e07776525a52721f4e4b4be2964a403 100644 (file)
--- a/dump.cpp
+++ b/dump.cpp
@@ -31,7 +31,12 @@ int main(int argc, char **argv)
 {
    for (int i = 1; i < argc; ++i) {
       Trace::Parser p;
-      p.parse(argv[i]);
+      if (p.open(argv[i])) {
+          Trace::Call *call;
+          while ((call = p.parse_call())) {
+              std::cout << *call;
+          }
+      }
    }
    return 0;
 }

diff --git a/glretrace.py b/glretrace.py
index 54b8e0e5f1f7c49920dbeeccf8bbca566848da86..e73561ddd8bbeb87626672b6e9f70306e72e3162 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -142,31 +142,81 @@ if __name__ == '__main__':
 
     print '''
 
-class Retracer : public Trace::Parser
-{
-    void handle_call(Trace::Call &call) {
-        if (call.name == "wglSwapBuffers" ||
-            call.name == "glXSwapBuffers") {
-            glFlush();
-            return;
-        }
-        retrace_call(call);
-    }
-};
+Trace::Parser parser;
+
+static void display(void) {
+   Trace::Call *call;
+
+   while ((call = parser.parse_call())) {
+      if (call->name == "glFlush()" ||
+          call->name == "glXSwapBuffers" ||
+          call->name == "wglSwapBuffers") {
+         glFlush();
+         return;
+      }
+      
+      retrace_call(*call);
+
+      GLenum error = glGetError();
+      if (error != GL_NO_ERROR) {
+         std::cerr << "warning: glGetError() = ";
+         switch (error) {
+         case GL_INVALID_ENUM:
+            std::cerr << "GL_INVALID_ENUM";
+            break;
+         case GL_INVALID_VALUE:
+            std::cerr << "GL_INVALID_VALUE";
+            break;
+         case GL_INVALID_OPERATION:
+            std::cerr << "GL_INVALID_OPERATION";
+            break;
+         case GL_STACK_OVERFLOW:
+            std::cerr << "GL_STACK_OVERFLOW";
+            break;
+         case GL_STACK_UNDERFLOW:
+            std::cerr << "GL_STACK_UNDERFLOW";
+            break;
+         case GL_OUT_OF_MEMORY:
+            std::cerr << "GL_OUT_OF_MEMORY";
+            break;
+         case GL_TABLE_TOO_LARGE:
+            std::cerr << "GL_TABLE_TOO_LARGE";
+            break;
+         default:
+            std::cerr << error;
+            break;
+         }
+         std::cerr << "\\n";
+      }
+   }
+
+   glFlush();
+   glutIdleFunc(NULL);
+}
+
+static void idle(void) {
+   glutPostRedisplay();
+}
 
 int main(int argc, char **argv)
 {
    glutInit(&argc, argv);
-   glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( 800, 600 );
-   glutInitDisplayMode( GLUT_DEPTH | GLUT_RGB | GLUT_SINGLE );
+   glutInitWindowPosition(0, 0);
+   glutInitWindowSize(800, 600);
+   glutInitDisplayMode(GLUT_DEPTH | GLUT_RGB | GLUT_SINGLE);
    glutCreateWindow(argv[0]);
    glewInit();
+
+   glutDisplayFunc(&display);
+   glutIdleFunc(&idle);
+
    for (int i = 1; i < argc; ++i) {
-      Retracer p;
-      p.parse(argv[i]);
-      glutMainLoop();
+      if (parser.open(argv[i])) {
+         glutMainLoop();
+         parser.close();
+      }
    }
+
    return 0;
 }
 

diff --git a/trace_parser.hpp b/trace_parser.hpp
index ea6c746d9ee0f6cbe2d05be804b1301ebc73fc90..dc7b8d672abc1af80d79d2959863897cbc37f93b 100644 (file)
--- a/trace_parser.hpp
+++ b/trace_parser.hpp
@@ -49,7 +49,11 @@ public:
       file = NULL;
    }
 
-   bool parse(const char *filename) {
+   ~Parser() {
+      close();
+   }
+
+   bool open(const char *filename) {
       unsigned long long version;
 
       file = gzopen(filename, "rb");
@@ -63,44 +67,41 @@ public:
          return false;
       }
 
-      while (!gzeof(file)) {
-         parse_call();
-      }
-
       return true;
    }
 
-   void parse_call(void) {
-      Call call;
-      call.name = read_string();
-      int c;
+   void close(void) {
+      if (file) {
+         gzclose(file);
+         file = NULL;
+      }
+   }
+
+   Call *parse_call(void) {
+      Call *call = new Call;
+      call->name = read_string();
       do {
-         c = read_byte();
-         if (c == Trace::CALL_END || c == -1) {
-            break;
-         }
+         int c = read_byte();
          switch(c) {
          case Trace::CALL_END:
-            return;
+            return call;
          case Trace::CALL_ARG:
-            call.args.push_back(parse_arg());
+            call->args.push_back(parse_arg());
             break;
          case Trace::CALL_RET:
-            call.ret = parse_value();
+            call->ret = parse_value();
             break;
          default:
             std::cerr << "error: unknown call detail " << c << "\n";
             assert(0);
-            break;
+            /* fallthrough */
+         case -1:
+            delete call;
+            return NULL;
          }
       } while(true);
-      handle_call(call);
    }
    
-   virtual void handle_call(Call &call) {
-      std::cout << call;
-   }
-
    Arg parse_arg(void) {
       std::string name = read_string();
       Value *value = parse_value();