Changeset bcf71ac in tol for tol/bbasic/sys.cpp

Timestamp:

May 28, 2010, 11:47:00 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

af1369e

Parents:

d74c90b

Message:

Fixes #546

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

File:

• tol/bbasic/sys.cpp (modified) (2 diffs)

tol/bbasic/sys.cpp

@@ -995 +995 @@
 //--------------------------------------------------------------------
 //Opens a file and locks it
-//If cannot do it then sleeps and retries again until time is out
-FILE* FOpenAndLock(
+static FILE* fOpenAndLock(
+   const char *filename,
+   const char *mode)
+//--------------------------------------------------------------------
+{
+  FILE* fil=NULL;
+  #ifdef _MSC_VER
+  fopen_s(&fil, filename, mode);
+  #else
+  fil = fopen(filename, mode);
+  #endif
+  return(fil);
+}
+
+//--------------------------------------------------------------------
+//Opens a file and locks it
+//If doesn't can do it then sleeps and retries again until time is out
+FILE* BSys::FOpenAndLock(
    const char *filename,
    const char *mode,
@@ -1004 +1020 @@
 {
   FILE* fil=NULL;
+  double sleep = 1.0;
+  double sleepCum = 0.0;
+  int tryNum = 0; 
+  bool ok = false;
+  do
+  {
+    #ifdef _MSC_VER
+    ok = fopen_s(&fil, filename, mode)==0;
+    #else
+    fil = fopen(filename, mode);
+    ok = fil!=NULL;
+    #endif
+    if(!ok)
+    {
+      fil = NULL;
+      BSys::SleepMilliSeconds((unsigned int)sleep);
+      sleepCum += sleep;
+      sleep = floor(1.1*sleep)+(1+timeOutInMilliseconds/100);
+      tryNum++;
+      Warning(BText("[BSys::FOpenAndLock] Retraying to open locked file ")+filename+" for "+tryNum+"-th time\n");
+    }
+  } while(!fil && (sleepCum<timeOutInMilliseconds));
+  if(!fil && errorMessage && errorMessage[0])
+  {
+    Error(BText("Cannot open file ")+filename+" in mode "+mode+"\n"+
+          errorMessage);
+  }
   return(fil);
 }
 
 //--------------------------------------------------------------------
-//Unlocks a file and close it
-i FUnlockAndClose(FILE* file)
-//--------------------------------------------------------------------
-{
-  FILE* fil=NULL;
-  return(fil);
-}
+//Unlocks a file and closes it
+bool BSys::FUnlockAndClose(FILE* file, const char *filename)
+//--------------------------------------------------------------------
+{
+  if(fclose(file))
+  {
+    Error(BText("Cannot close file ")+filename);
+    return(false);
+  }
+  return(true);
+}