Changeset 2ffb6ae in tol

Timestamp:

Feb 9, 2011, 9:34:10 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

8f99127

Parents:

db1c18b

Message:

Fixes #1085

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

Location:

tol

Files:

• OIS/ois.cpp (modified) (5 diffs)
• OIS/oiscompress.cpp (modified) (2 diffs)
• OIS/oiscreator.cpp (modified) (3 diffs)
• OIS/oisloader.cpp (modified) (3 diffs)
• OIS/oisxml.cpp (modified) (1 diff)
• OIS/tol_ois.h (modified) (2 diffs)
• tol_version_def.h (modified) (1 diff)

tol/OIS/ois.cpp

@@ -63 +63 @@
 BArray<BSystemDat*> BOis::loadModeOptions_;
 
-size_t BOis::_MaxBlockLength_ = 1024*1024;
+size_t BOis::_MaxBlockLength_    = 1024*1024;
+int    BOis::_NumAuxiliarBuffer_ = 9;
 
 #ifdef TRACE_OIS_FILE
@@ -95 +96 @@
   source_        (),
   packages_      (),
-  auxilarBuffer(),
-  auxilarBufferSize_(0)
-{
-  AllocAuxilarBuffer(_MaxBlockLength_);
+  auxilarBuffer  (NULL),
+  auxilarBufferSize_(NULL)
+{
+  auxilarBuffer = new char*[_NumAuxiliarBuffer_];
+  auxilarBufferSize_ = new int[_NumAuxiliarBuffer_];
+  for(int i=0; i<_NumAuxiliarBuffer_; i++)
+  {
+    auxilarBufferSize_[i] = 0;
+    auxilarBuffer[i] = NULL;
+    AllocAuxilarBuffer(i,_MaxBlockLength_);
+  }
   InitBuild();
 }
@@ -108 +116 @@
 {
   Close();
-  if(auxilarBuffer) 
-  {
+  if(auxilarBuffer)
+  {
+    for(int i=0; i<_NumAuxiliarBuffer_; i++)
+    {
+      if(auxilarBuffer[i])
+      {
+        delete [] auxilarBuffer[i];
+      }
+    }
     delete [] auxilarBuffer;
-  }
-}
-
-
-//--------------------------------------------------------------------
- char* BOis::AllocAuxilarBuffer(int size) 
-//--------------------------------------------------------------------
-{
-  if(size>auxilarBufferSize_)
-  {
-    if(auxilarBuffer)
+    auxilarBuffer = NULL;
+  }
+  if(auxilarBufferSize_) 
+  {
+    delete [] auxilarBufferSize_;
+    auxilarBufferSize_ = NULL;
+  }
+}
+
+
+//--------------------------------------------------------------------
+ char* BOis::AllocAuxilarBuffer(int id, int size) 
+//--------------------------------------------------------------------
+{
+  if((id<0) || (id>=_NumAuxiliarBuffer_))
+  {
+    Error(BText("[OIS] FATAL ERROR IN BOis::AllocAuxilarBuffer id=")+id+
+    " out of range [0,BOis::_NumAuxiliarBuffer_="+BOis::_NumAuxiliarBuffer_+"] ");
+    exit(-1);    
+  }
+  if(size>auxilarBufferSize_[id])
+  {
+    if(auxilarBuffer[id])
     {
-      delete [] auxilarBuffer;
-      auxilarBuffer = NULL;
+      delete [] auxilarBuffer[id];
+      auxilarBuffer[id] = NULL;
     }  
-    auxilarBufferSize_ = int(double(size)*1.2);
-    auxilarBuffer = new char[auxilarBufferSize_];
-  }
-  return(auxilarBuffer);
+    auxilarBufferSize_[id] = int(double(size)*1.2);
+    auxilarBuffer[id] = new char[auxilarBufferSize_[id] ];
+  }
+  return(auxilarBuffer[id]);
 }
 
@@ -168 +195 @@
 //--------------------------------------------------------------------
 {  
-  BText dirOriPath = GetFilePath(tolFile);
+  BText absTolPath = GetStandardAbsolutePath(tolFile);
+  BText absDirPath = GetFilePath(absTolPath);
   BText filPrf = GetFilePrefix(tolFile);
-  BText dirAbsPath = Replace(RemoveLastSlash(
-    GetStandardAbsolutePath(dirOriPath)),"\\","/");
-  BText oisSubPath = PlainPath(dirAbsPath+ArchiveExtension());
+  BText oisSubPath = PlainPath(absDirPath+filPrf+ArchiveExtension());
   connection_ = Replace(oisDefRoot_,"\\","/")+"module/"+oisSubPath;
   address_.concept_  = "";
   address_.version_  = "";
-  address_.node_     = dirOriPath+filPrf;
+  address_.node_     = "";
   options_.tolSourceSearchPaths_.AllocBuffer(1);
-  options_.tolSourceSearchPaths_[0].alias_ = ToName(GetFilePrefix(dirAbsPath));
-  options_.tolSourceSearchPaths_[0].value_ = dirAbsPath;
-/*
+  options_.tolSourceSearchPaths_[0].alias_ = ToName(absDirPath);
+  options_.tolSourceSearchPaths_[0].value_ = absDirPath;
+
 //Std(BText("\nTRACE BOis::SetModulePath('")+tolFile+"'");
 //Std(BText("\nTRACE   connection_='")+connection_+"'");
@@ -186 +212 @@
 //Std(BText("\nTRACE   alias_='")+options_.tolSourceSearchPaths_[0].alias_+"'");
 //Std(BText("\nTRACE   value_='")+options_.tolSourceSearchPaths_[0].value_+"'");
-*/
+/* */
 }
 

tol/OIS/oiscompress.cpp

@@ -49 +49 @@
   else //BZip2 Compress method
   {
-    char* dest = AllocAuxilarBuffer(destLen);
+    char* dest = AllocAuxilarBuffer(5,destLen);
     int cmprs = BZ2_bzBuffToBuffCompress 
     ( 
@@ -289 +289 @@
     else
     {
-      char* source = AllocAuxilarBuffer(sourceLen);
+      char* source = AllocAuxilarBuffer(6,sourceLen);
       if(!source)
       {

tol/OIS/oiscreator.cpp

@@ -309 +309 @@
   FILE* file=fopen(path.String(),"rb");
   if(!file) { return(false); }
-  char* contens = AllocAuxilarBuffer(size+1);
+  char* contens = AllocAuxilarBuffer(2,size+1);
   int r = fread(contens,1,size,file);  
   contens[r]='\0';
@@ -413 +413 @@
   int s = x.Size();
   EWrite(s, stream);
-  BCoefDeg* buf = (BCoefDeg*)AllocAuxilarBuffer(sizeof(BCoefDeg)*x.Size());
+  BCoefDeg* buf = (BCoefDeg*)AllocAuxilarBuffer(3,sizeof(BCoefDeg)*x.Size());
   for(int i=0; i<x.Size(); i++)
   {
@@ -1070 +1070 @@
   else
   {
-    BDat* buf = (BDat*)AllocAuxilarBuffer(sizeof(BDat)*r*c);
+    BDat* buf = (BDat*)AllocAuxilarBuffer(4,sizeof(BDat)*r*c);
     int i, j, k;
     for(i=k=0; i<r; i++) { for(j=0; j<c; j++) { buf[k++] = x(i,j); } }

tol/OIS/oisloader.cpp

@@ -397 +397 @@
   if(control_.typeSizes_.sizeof_BCoefDeg_==sizeof(BCoefDegOld))
   {
-    BCoefDegOld* buf = (BCoefDegOld*)AllocAuxilarBuffer(sizeof(BCoefDegOld)*s);
+    BCoefDegOld* buf = (BCoefDegOld*)AllocAuxilarBuffer(0,sizeof(BCoefDegOld)*s);
     Ensure(Read(buf,sizeof(BCoefDegOld),s,stream));
     for(i=0; i<x.Size(); i++)
@@ -407 +407 @@
   else if(control_.typeSizes_.sizeof_BCoefDeg_==sizeof(BCoefDeg))
   {
-    BCoefDeg* buf = (BCoefDeg*)AllocAuxilarBuffer(sizeof(BCoefDeg)*s);
+    BCoefDeg* buf = (BCoefDeg*)AllocAuxilarBuffer(1,sizeof(BCoefDeg)*s);
     Ensure(Read(buf,sizeof(BCoefDeg),s,stream));
     for(i=0; i<x.Size(); i++)
@@ -1513 +1513 @@
 {
   bool isOza = (options_.compressor_.fileManager_.engine_==BAE_ZIPARC_);
+  if(!isOza) { return(false); }
   BDir dir(path);
   lostSource_=!dir.Exist();
-  bool updated; 
-  if(lostSource_) 
-  {
-    updated = true; 
-  }
-  else
-  {
-    BText name = BText("._tol_source_/")+PlainPath(path);
-    BStream* fn = isOza?streamHandler_->Open(name,name):NULL;
-    source_.Add(fn);  
-    if(isOza && !fn) 
+  if(lostSource_) { return(false); }
+  bool updated = false; 
+  BText name = BText("._tol_source_/")+PlainPath(path);
+  BStream* fn = streamHandler_->Open(name,name);
+  source_.Add(fn);  
+  if(fn) 
+  {
+    int size    = dir.Bytes();
+    int oldSize = (int)tolSources_[n].bytes_;
+    if(oldSize==size)
     { 
-      updated = true; 
-    }
-    else
-    {
-      int size    = dir.Bytes();
-      int oldSize = (int)tolSources_[n].bytes_;
-      if(oldSize!=size) 
+      time_t time      = dir.Time();
+      BDate  date      = BTimer::TimeToDate(time);
+      BDate  oldDate   = tolSources_[n].release_;
+      double diff      = DifInSeconds(oldDate,date);
+      if(fabs(diff)<1.0) 
       { 
-        updated = false; 
+        updated = true; 
       }
-      else
+      else 
       {
-        time_t time      = dir.Time();
-        BDate  date      = BTimer::TimeToDate(time);
-        BDate  oldDate   = tolSources_[n].release_;
-        double diff      = DifInSeconds(oldDate,date);
-        if(fabs(diff)<1.0) 
+        FILE* file=fopen(path.String(),"rb");
+        if(!file) 
         { 
-          updated = true; 
+          Warning(I2("Cannot check if source file ",
+                     "No se pudo comprobar si el fichero fuente ")+path+
+                  I2(" is synchronized with this module.",
+                     " está sincronizado con este módulo."));
         }
-        else if(!isOza)
-        { 
-          updated = false; 
-        }
-        else if(fn && fn->Bytes()!=size) 
-        { 
-          updated = false; 
-        }
-        else 
+        else
         {
-          FILE* file=fopen(path.String(),"rb");
-          if(!file) 
-          { 
-            Warning(I2("Cannot check if source file ",
-                       "No se pudo comprobar si el fichero fuente ")+path+
-                    I2(" is synchronized with this module.",
-                       " está sincronizado con este módulo."));
-            updated = true; 
-          }
-          else
-          {
-            char* contens = AllocAuxilarBuffer(2*size+2);
-            char* oldCont = contens+(size+1);
-            int r = fread(contens,1,size,file);  
-            contens[r]='\0';
-            fclose(file);
+          char* contens = AllocAuxilarBuffer(7,size+1);
+          char* oldCont = AllocAuxilarBuffer(8,size+1);
+          int r = fread(contens,1,size,file);  
+          fclose(file);
+          if(r==size)
+          {
+            contens[size]='\0';
             assert(r==size);
             Read(oldCont,1,size,fn);
             oldCont[size]='\0';
-            int cmp = memcmp(oldCont,contens,r);
+            int cmp = memcmp(oldCont,contens,size);
             updated = (cmp==0);
-            if(updated) 
+            if(!updated) 
             { 
             //tolSources_[n].release_ = date; 
+              Std(BText("[OIS] File ")+path+" has changed and module should be rebuilt.\n"); 
               SetFileTime(path, BTimer::DateToTime(tolSources_[n].release_));
             }

tol/OIS/oisxml.cpp

@@ -535 +535 @@
         }
       }
-      if(!obsoleteSource_) { obsoleteSource_ = !CheckUpdatedSource(n, path); }
+      if(!obsoleteSource_) { 
+       obsoleteSource_ = !CheckUpdatedSource(n, path); }
     }
   }

tol/OIS/tol_ois.h

@@ -604 +604 @@
 //auxiliar buffer  
   static size_t _MaxBlockLength_;
-  char* auxilarBuffer;
-  int auxilarBufferSize_;
+  static int _NumAuxiliarBuffer_;
+
+  char** auxilarBuffer;
+  int* auxilarBufferSize_;
   
 //Functions
@@ -615 +617 @@
   bool  Warning(const BText& msg) const;
   BSyntaxObject* NullError(const BText& msg) const;
-  char* AllocAuxilarBuffer(int size);
+  char* AllocAuxilarBuffer(int id, int size);
 
 public:

tol/tol_version_def.h

@@ -25 +25 @@
 #define VERSION_MINOR   0
 #define VERSION_RELEASE 1
-#define VERSION_BUILD   "0.53.alpha"
+#define VERSION_BUILD   "0.54.alpha"
 
 #if defined(_MSC_VER)