Changeset 8addb71 in tol

Timestamp:

Feb 3, 2011, 2:22:31 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

5d9a224

Parents:

1b945e9

Message:

Memory traces are written in SQL format

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3116 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/bgrammar/syn.cpp (modified) (5 diffs)

tol/btol/bgrammar/syn.cpp

@@ -53 +53 @@
   Std(BText("InitTraceMemHist saved at ")+GetAbsolutePath(path)+"\n");
   traceMemHist = fopen(path,"w");
+/*
   BText title = BText()+
    "Address\t"+
@@ -66 +67 @@
   fprintf(traceMemHist,title.String());
   fflush(traceMemHist);
+*/
   return(traceMemHist);
 }
@@ -132 +134 @@
 
 #ifdef TRACE_MEMORY
+  static BText beginLine = "(";
+  static BText endLine = ")";
+  static BText sepField = ",";
+  static BText quotes = "'";
+  static int numEvent = 0;
   int mode = Mode();
   BBool ok = EnableTraceMemory().Value() && 
@@ -143 +150 @@
     int aliveObjects = BSyntaxObject::NSyntaxObject();
     BText type = (!Grammar())?BText("NO_TYPED"):Grammar()->Name();
-    BText id   = Identify();
+    BText id = Identify();
+    id.Replace('\'','¬');
     if(Grammar()) { type = Grammar()->Name(); }
 
-    BText reg = BText("")+
-    TxtFmt(BInt(this),"%X")+"\t"+
-    ModeName()+"\t"+
-    type+"\t"+
-    "\""+id+"\""+"\t"+
-    "\""+msg+"\"\t"+
-    Level()+"\t"+
-    ((sourcePath_!=NULL)?sourcePath_->Name():BText("NO_SOURCE_PATH"))+"\t"+
-    (int)IsHashed()+"\t"+
-    NRefs()+"\t"+
-    aliveObjects+"\n";
+    BText reg = 
+    BText((numEvent==0)?"":",\n") +
+    beginLine + 
+    quotes+"PTR_"+TxtFmt(BInt(this),"%X")+quotes+sepField+
+    quotes+ModeName()+quotes+sepField+
+    quotes+type+quotes+sepField+
+    quotes+id+quotes+sepField+
+    quotes+msg+quotes+sepField+
+    Level()+sepField+
+    quotes+((sourcePath_!=NULL)?sourcePath_->Name():BText("NO_SOURCE_PATH"))+quotes+sepField+
+    (int)IsHashed()+sepField+
+    NRefs()+sepField+
+    aliveObjects+endLine;
     if(!traceMemHist_) { traceMemHist_ = InitTraceMemHist(); }
-    Std(reg);
+  //Std(reg);
     fprintf(traceMemHist_,reg.String());
     fflush(traceMemHist_);
+    numEvent++;
   }
 #endif
@@ -362 +373 @@
 {
        if(Name       ().HasName()) { return(Name       ()); }
+  else if(Expression ().HasName()) { return(Expression ()); }
   else if(LocalName  ().HasName()) { return(LocalName  ()); }
-  else if(Expression ().HasName()) { return(Expression ()); }
   else if(Description().HasName()) { return(Description()); }
   else                             { return(tmp_); }