Changeset 83c5220 in tol

Timestamp:

May 9, 2011, 2:26:59 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

9d29ae0

Parents:

b4aa879

Message:

Refs #1199
Making optional BFSMEM system

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

Location:

tol

Files:

• bbasic/cor.cpp (modified) (2 diffs)
• bbasic/tol_bcore.h (modified) (2 diffs)
• btol/bgrammar/nameblock.cpp (modified) (10 diffs)
• btol/bgrammar/syn.cpp (modified) (5 diffs)
• btol/timeset_type/tol_btmsgra.h (modified) (1 diff)
• contrib/optimal_bw/FastUnivariateDensityDerivative.cpp (modified) (4 diffs)

tol/bbasic/cor.cpp

@@ -57 +57 @@
 }
 
+#if (__USE_POOL__!=__POOL_BFSMEM__)
+
+BCore::MemAssignInfo::MemAssignInfo(BCore* address)
+{
+  SetAddress(address);
+}
+
+void BCore::MemAssignInfo::SetAddress(BCore* address)
+{
+  address_ = address;  
+  size_    = 0;
+  pageNum_ = 0;
+}
+
+short BCore::MemAssignInfo::IsAssigned() 
+{ 
+  return(-1); 
+}
+
+void BCore::MemAssignInfo::SafeDestroy()
+{
+}
+
+#else
 
 BCore::MemAssignInfo::MemAssignInfo(BCore* address)
@@ -98 +122 @@
   }
 }
+
+#endif

tol/bbasic/tol_bcore.h

@@ -59 +59 @@
     //See on tol_bfsmem.h a sample of Memory Handler
     virtual short IsAssigned() const { return(-1); }
-#if (__USE_POOL__==__POOL_BFSMEM__)
-    virtual BFixedSizeMemoryBase* GetMemHandler() const { return(NULL); }
-    virtual unsigned short  GetPageNum   () const { return(0); }
-    virtual size_t GetSizeOf() const { return(0); } 
     struct TOL_API MemAssignInfo
     {
@@ -74 +70 @@
       void SafeDestroy();
     };
-#else
-    struct TOL_API MemAssignInfo
-    {
-      short IsAssigned() { return(-1); }
-      void SafeDestroy() { }
-      MemAssignInfo(BCore* adress) { }
-    };
+#if (__USE_POOL__==__POOL_BFSMEM__)
+    virtual BFixedSizeMemoryBase* GetMemHandler() const { return(NULL); }
 #endif
+    virtual unsigned short  GetPageNum   () const { return(0); }
+    virtual size_t GetSizeOf() const { return(0); } 
 };
 

tol/btol/bgrammar/nameblock.cpp

@@ -58 +58 @@
       BRequiredPackage    BNameBlock::globalRequiredPackages_;
 
+#if (__USE_POOL__==__POOL_BFSMEM__)
 static BFixedSizeMemoryBase* BFSMEM_Hndlr = 
  BFSMSingleton<sizeof(BNameBlock)>::Handler();
-
+#endif
 static BStruct* strNameBlockMemberInfo_  = NULL;
 static BStruct* strClassMemberInfo_  = NULL;
@@ -128 +129 @@
   SetEmptyKey(public_ ,NULL);
   SetEmptyKey(private_,NULL);
+#if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);
+#else
+  short isAssigned = -1;
+#endif
   createdWithNew_ = isAssigned==1;
 }
@@ -152 +157 @@
   SetEmptyKey(public_ ,NULL);
   SetEmptyKey(private_,NULL);
+#if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);
+#else
+  short isAssigned = -1;
+#endif
   createdWithNew_ = isAssigned==1;
 }
@@ -174 +183 @@
   startedPackage(false)
 {
+#if (__USE_POOL__==__POOL_BFSMEM__)
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);
+#else
+  short isAssigned = -1;
+#endif
   createdWithNew_ = isAssigned!=-1;
   *this = ns;
@@ -277 +290 @@
 //--------------------------------------------------------------------
 {
+#if (__USE_POOL__==__POOL_BFSMEM__)
   if(createdWithNew_) 
   { 
@@ -282 +296 @@
     return(isAssigned); 
   }
-  else                
+  else        
+#endif       
   { 
     return(true); 
@@ -321 +336 @@
 //--------------------------------------------------------------------
 { 
+#if (__USE_POOL__==__POOL_BFSMEM__)
   if(current_ && 
      current_->createdWithNew_ &&
@@ -328 +344 @@
     current_ = NULL;
   }
+#endif
   return(current_); 
 }
@@ -344 +361 @@
 //--------------------------------------------------------------------
 { 
+#if (__USE_POOL__==__POOL_BFSMEM__)
   if(building_ && 
      building_->Contens().createdWithNew_ &&
@@ -353 +371 @@
     building_ = NULL;
   }
+#endif
   return(building_); 
 }

tol/btol/bgrammar/syn.cpp

@@ -461 +461 @@
 }
 
+
 //--------------------------------------------------------------------
 union BIntPointerMask
@@ -468 +469 @@
   const BSyntaxObject*        obj_;
   const BGrammar*             gra_;
+#if (__USE_POOL__==__POOL_BFSMEM__)
   const BFixedSizeMemoryBase* mhn_;
+#endif
 };
 
@@ -496 +499 @@
      (sizeof(objMask.obj_) == size) &&
      (objMask.obj_->GetPageNum() == pageNum)&&
+#if (__USE_POOL__==__POOL_BFSMEM__)
      (objMask.obj_->GetMemHandler() == mhnMask.mhn_)&&
+#endif
      (objMask.obj_->IsAssigned()!=0))
   {
@@ -518 +523 @@
   objMask.obj_ = this;
   graMask.gra_ = Grammar();
+#if (__USE_POOL__==__POOL_BFSMEM__)
   mhnMask.mhn_ = GetMemHandler();
+#endif
   int mode = Mode();
   int size = sizeof(this);
@@ -534 +541 @@
   return(BText(address));
 }
+

tol/btol/timeset_type/tol_btmsgra.h

@@ -424 +424 @@
   }
 
-  BBool Contain       (const BDate&)             const { return(BFALSE); }
-  BInt  PeriodsBetween(const BDate& d1, const BDate& d2) const  {  return(0); }
+//BBool Contain       (const BDate&)             const { return(BFALSE); }
+//BInt  PeriodsBetween(const BDate& d1, const BDate& d2) const  {  return(0); }
 
 protected:

tol/contrib/optimal_bw/FastUnivariateDensityDerivative.cpp

@@ -57 +57 @@
     size_ = size;
     _bfsm_BaseSize__ = sizeof(double)*size_;
-
+#if (__USE_POOL__==__POOL_BFSMEM__)
     buffer_ = (double*)BFixedSizeMemoryBase::
               Instance(_bfsm_BaseSize__)->New(_bfsm_BaseSize__,_bfsm_VectorPageNum__); 
-//  buffer_ = new double[size_];
+#else
+    buffer_ = new double[size_];
+#endif
   }
   else
@@ -74 +76 @@
   if(buffer_)
   {
+#if (__USE_POOL__==__POOL_BFSMEM__)
     BFixedSizeMemoryBase::Instance(_bfsm_BaseSize__)->Delete(buffer_,_bfsm_VectorPageNum__);
-  //delete buffer_;
+#else
+    delete buffer_;
+#endif
     buffer_ = NULL; 
     size_ = 0; 
@@ -90 +95 @@
     size_ = size;
     _bfsm_BaseSize__ = sizeof(int)*size_;
+#if (__USE_POOL__==__POOL_BFSMEM__)
     buffer_ = (int*)BFixedSizeMemoryBase::
               Instance(_bfsm_BaseSize__)->New(_bfsm_BaseSize__,_bfsm_VectorPageNum__); 
-  //buffer_ = new int[size_];
+#else
+    buffer_ = new int[size_];
+#endif
   }
   else
@@ -106 +114 @@
   if(buffer_)
   {
+#if (__USE_POOL__==__POOL_BFSMEM__)
     BFixedSizeMemoryBase::Instance(_bfsm_BaseSize__)->Delete(buffer_,_bfsm_VectorPageNum__);
-  //delete buffer_;
+#else
+    delete buffer_;
+#endif
     buffer_ = NULL; 
     size_ = 0;