Changeset 8e9626b in tol

Timestamp:

Aug 25, 2015, 9:47:58 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b2fecec

Parents:

33fc49e

Message:

resolviendo situación detectada por valgrind

initializing TOL ==10862== Conditional jump or move depends on
uninitialised value(s)
==10862==    at 0x5941C94: BFixedSizeMemoryHandler::IsAssigned(void
const*, unsigned short) (bfsmem.cpp:602)
==10862==    by 0x5AB6415: BNameBlock::BNameBlock() (nameblock.cpp:138)
==10862==    by 0x5AC17CF:
BGraContensBase<BNameBlock>::InitInstances() (nameblock.cpp:1549)
==10862==    by 0x592DBE6:
BGraContensBase<BNameBlock>::InitGrammar(int, BText const&, BText
const&, BSyntaxObject* (*)(BText const&, BSyntaxObject*),
BSyntaxObject* (*)(BText const&, BSyntaxObject*)) (tol_bgencon.h:135)
==10862==    by 0x58FE04D: InitGrammars(char const*) (init.cpp:847)
==10862==    by 0x5902B62: InitializeFromMainArgs (init.cpp:1601)
==10862==    by 0x400C55: main (tol.cpp:43)

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

Location:

tol/btol/bgrammar

Files:

• nameblock.cpp (modified) (14 diffs)
• tol_bnameblock.h (modified) (1 diff)

tol/btol/bgrammar/nameblock.cpp

@@ -118 +118 @@
   public_  (),
 //private_ (), 
+  createdWithNew_(-1),
   evLevel_ (BGrammar::Level()),
   level_   (-999999999),
@@ -132 +133 @@
   SetEmptyKey(public_ ,emptyHashKey_);
 //SetEmptyKey(private_,emptyHashKey_);
+#if 0
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -138 +140 @@
 #endif
   createdWithNew_ = isAssigned==1;
+#endif
 }
 
@@ -146 +149 @@
   public_  (),
 //private_ (),
+  createdWithNew_(-1),
   evLevel_ (BGrammar::Level()),
   level_   (-999999999),
@@ -160 +164 @@
   SetEmptyKey(public_ ,emptyHashKey_);
 //SetEmptyKey(private_,emptyHashKey_);
+#if 0
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -166 +171 @@
 #endif
   createdWithNew_ = isAssigned==1;
+#endif
 }
 
@@ -174 +180 @@
   public_  (),
 //private_ (),
+  createdWithNew_(-1),
   evLevel_ (BGrammar::Level()),
   level_   (-999999999),
@@ -188 +195 @@
   SetEmptyKey(public_ ,emptyHashKey_);
 //SetEmptyKey(private_,emptyHashKey_);
+#if 0
 #if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -194 +202 @@
 #endif
   createdWithNew_ = isAssigned!=-1;
+#endif
   *this = ns;
 }  
@@ -202 +211 @@
 {
   Clean();
+}
+
+int BNameBlock::GetCreatedWithNew()
+{
+  if ( this->createdWithNew_ == -1 )
+    {
+#if (__USE_POOL__==__POOL_BFSMEM__)
+    short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
+#else
+    short isAssigned = -1;
+#endif
+    createdWithNew_ = isAssigned==1;
+    }
+  return this->createdWithNew_;
 }
 
@@ -307 +330 @@
 {
 #if (__USE_POOL__==__POOL_BFSMEM__)
-  if(createdWithNew_) 
+  if(const_cast<BNameBlock*>(this)->GetCreatedWithNew() /*createdWithNew_*/) 
   { 
     short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
@@ -315 +338 @@
 #endif       
   { 
-    return(true); 
+    return( 1 ); 
   }
 }
@@ -354 +377 @@
 #if (__USE_POOL__==__POOL_BFSMEM__)
   if(current_ && 
-     current_->createdWithNew_ &&
+     const_cast<BNameBlock*>(current_)->GetCreatedWithNew() /*current_->createdWithNew_*/ &&
      !(BFSMEM_Hndlr->IsAssigned(current_,current_->GetPageNum())))
   {
@@ -379 +402 @@
 #if (__USE_POOL__==__POOL_BFSMEM__)
   if(building_ && 
-     building_->Contens().createdWithNew_ &&
+     building_->Contens().GetCreatedWithNew() /*.createdWithNew_*/ &&
      !(BFSMEM_Hndlr->IsAssigned(&building_->Contens(),
                                 building_->Contens().GetPageNum())))

tol/btol/bgrammar/tol_bnameblock.h

@@ -83 +83 @@
   BRequiredPackage* requiredPackages_;
   BText localName_;
-  bool createdWithNew_;
+  int createdWithNew_;
   int evLevel_;
   int level_;
   int nonPrivateMembers_;
   bool doingRebuildFullNameDeep;
+
+  int GetCreatedWithNew();
 public:
   bool startedPackage;