* added timer for profiling the editor

diff --git a/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLTDiff.cc b/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLTDiff.cc
index 7893fcb46972661a6390aba22ede83642dc8d7c8..d3ac3f1f05f7c009415da9e41a24b65d38271800 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLTDiff.cc
+++ b/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLTDiff.cc
@@ -23,13 +23,16 @@
  * or send an email to <lpadovan@cs.unibo.it>
  */
 
+#include <config.h>
+#include <cassert>
+
 #include "dom.hh"
+#include "timer.hh"
 #include "Diff.hh"
 #include "TNode.hh"
 #include "TDocument.hh"
 #include "CMathMLFactoryXSLTDiff.hh"
 #include "AMathMLConsumer.hh"
-#include <cassert>
 
 CMathMLFactoryXSLTDiff::CMathMLFactoryXSLTDiff(ALogger& l, const DOMX::XSLTStylesheet& s)
   : AMathMLFactory(l), style(s)
@@ -49,18 +52,24 @@ CMathMLFactoryXSLTDiff::documentModified(TDocument& doc)
       dirtyId.push_back(std::make_pair(DOM::GdomeString("id"),
                                       DOM::GdomeString("'" + std::string(dirty["id"]) + "'")));
 #endif
+  long t0 = getTimer();
   DOM::Document res = style.apply(doc.document());
+  long t1 = getTimer();
   assert(res);
   //cout << "*** THE TEX DOCUMENT" << endl;
   //style.save(doc.document(), stdout);
   std::cout << "*** THE CURRENT DOCUMENT:" << std::endl;
-  if (result) style.save(result, stdout);
+  //if (result) style.save(result, stdout);
   std::cout << "*** THE NEW DOCUMENT:" << std::endl;
-  style.save(res, stdout);
+  //style.save(res, stdout);
   std::cout << "*** THE DIFF:" << std::endl;
   DOMX::Diff diff = DOMX::Diff::diff(result, res);
-  style.save(diff.document(), stdout);
+  //style.save(diff.document(), stdout);
+  long t2 = getTimer();
   diff.patch();
+  long t3 = getTimer();
+
+  std::cout << "=== APPLY = " << (t1 - t0) / 1000 << " DIFF = " << (t2 - t1) / 1000 << " PATCH = " << (t3 - t2) / 1000 << std::endl;
 
   doc.clearDirty();
 }
@@ -73,7 +82,7 @@ CMathMLFactoryXSLTDiff::subst(const DOM::Element& e1, const DOM::GdomeString& id
   if (e1.getAttribute("xref") == id)
     {
       DOMX::Diff diff = DOMX::Diff::diff(e1, e2);
-      style.save(diff.document(), stdout);
+      //style.save(diff.document(), stdout);
       diff.patch();
       return true;
     }

diff --git a/helm/DEVEL/mathml_editor/src/Makefile.am b/helm/DEVEL/mathml_editor/src/Makefile.am
index fd3ef54111d49bedd3804370c390700f3f718ce9..1f3a12ddf6070603ceb5b86a9e82720a04e95142 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/Makefile.am
+++ b/helm/DEVEL/mathml_editor/src/Makefile.am
@@ -23,7 +23,8 @@ libeditex_la_SOURCES = \
   TDictionary.cc \
   TDocument.cc \
   TNode.cc \
-  TTokenizer.cc
+  TTokenizer.cc \
+  timer.cc
 
 pkginclude_HEADERS = \
   Diff.hh \
@@ -47,7 +48,8 @@ pkginclude_HEADERS = \
   TListener.hh \
   TToken.hh \
   globals.hh \
-  dom.hh
+  dom.hh \
+  timer.hh
 
 INCLUDES = \
   $(GMETADOM_CFLAGS) \

diff --git a/helm/DEVEL/mathml_editor/src/timer.cc b/helm/DEVEL/mathml_editor/src/timer.cc
new file mode 100644 (file)
index 0000000..d8b6119
--- /dev/null
+++ b/helm/DEVEL/mathml_editor/src/timer.cc
@@ -0,0 +1,38 @@
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
+ * 
+ * Copyright (C) 2002-2003 Luca Padovani <lpadovan@cs.unibo.it>,
+ *                    2003 Paolo Marinelli <pmarinel@cs.unibo.it>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For more information, please visit the project's home page
+ * http://helm.cs.unibo.it/editex/
+ * or send an email to <lpadovan@cs.unibo.it>
+ */
+
+#include <config.h>
+
+#include <sys/time.h>
+
+#include "timer.hh"
+
+long
+getTimer()
+{
+  struct timeval time;
+  gettimeofday(&time, 0);
+  return time.tv_sec * 1000000 + time.tv_usec;
+}

diff --git a/helm/DEVEL/mathml_editor/src/timer.hh b/helm/DEVEL/mathml_editor/src/timer.hh
new file mode 100644 (file)
index 0000000..8737422
--- /dev/null
+++ b/helm/DEVEL/mathml_editor/src/timer.hh
@@ -0,0 +1,31 @@
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
+ * 
+ * Copyright (C) 2002-2003 Luca Padovani <lpadovan@cs.unibo.it>,
+ *                    2003 Paolo Marinelli <pmarinel@cs.unibo.it>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For more information, please visit the project's home page
+ * http://helm.cs.unibo.it/editex/
+ * or send an email to <lpadovan@cs.unibo.it>
+ */
+
+#ifndef __timer_hh__
+#define __timer_hh__
+
+long getTimer(void);
+
+#endif // __timer_hh__

diff --git a/helm/DEVEL/mathml_editor/test/editor.cc b/helm/DEVEL/mathml_editor/test/editor.cc
index 6723debb3872ca04a2bc142d51cedb8e1e7ca501..cfb0ade29df133ece954dca328a30131a247e2e8 100644 (file)
--- a/helm/DEVEL/mathml_editor/test/editor.cc
+++ b/helm/DEVEL/mathml_editor/test/editor.cc
@@ -27,6 +27,7 @@
 
 #include "dom.hh"
 #include "TPushParser.hh"
+#include "timer.hh"
 
 #include "ILPushLexer.hh"
 #include "TDictionary.hh"
@@ -69,7 +70,7 @@ edit_output_tex(Context* data)
   DOM::Node c = res.get_firstChild();
   if (c) std::cout << "HEY, there is a child! " << c.get_nodeName() << " " << c.get_nodeValue() << std::endl;
 #endif
-  data->texStyle.save(res, stdout);
+  //data->texStyle.save(res, stdout);
 }
 
 extern "C" int
@@ -86,10 +87,13 @@ extern "C" void
 edit_push_char(Context* context, gchar ch)
 {
   assert(context != NULL);
+  long t0 = getTimer();
   GUI_freeze();
   std::cout << "*** SENDING " << ch << std::endl;
   context->lexer.push(ch);
   GUI_thaw();
+  long t1 = getTimer();
+  std::cout << "=== OVERALL TIME = " << (t1 - t0) / 1000 << std::endl;
 }
 
 #include <unistd.h>