Changeset e665360 in git

Timestamp:

May 25, 1998, 11:28:33 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

eb816eae221c6afa793536b78f3f6090b3fcca67

Parents:

237da4a965b4c32761c7294fe88cc2b9bba88453

Message:

* minor bug fixes


git-svn-id: file:///usr/local/Singular/svn/trunk@1987 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• LIB/standard.lib (modified) (3 diffs)
• febase.h (modified) (2 diffs)
• mpsr.h (modified) (2 diffs)
• sing_mp.cc (modified) (2 diffs)

Singular/LIB/standard.lib

@@ -1 @@
-// $Id: standard.lib,v 1.15 1998-05-25 08:44:14 obachman Exp $
+// $Id: standard.lib,v 1.16 1998-05-25 21:28:33 obachman Exp $
 //////////////////////////////////////////////////////////////////////////////
 
-version="$Id: standard.lib,v 1.15 1998-05-25 08:44:14 obachman Exp $";
+version="$Id: standard.lib,v 1.16 1998-05-25 21:28:33 obachman Exp $";
 info="
 LIBRARY: standard.lib   PROCEDURES WHICH ARE ALWAYS LOADED AT START-UP
@@ -151 +151 @@
       if (typeof(#[1]) == "int")
       {
-        int wait = #[1] * 1000000;
-        int j,k = 10, 0;
+        int wait = #[1];
+        int j = 10;
+        
         string bs = nameof(basering);
         link l_fork = "MPtcp:fork";
@@ -160 +161 @@
         write(l_fork, quote(groebner(eval(i))));
         
-        while(k < wait)
+        // sleep in small intervalls for appr. one second
+        if (wait > 0)
         {
-          if (status(l_fork, "read", "ready", j)) {break;}
-          k = k + j;
-          j = j + j;
+          while(j < 1000000)
+          {
+            if (status(l_fork, "read", "ready", j)) {break;}
+            j = j + j;
+          }
         }
-
+        
+        // sleep in intervalls of one second from now on
+        j = 1;
+        while (j < wait)
+        {
+          if (status(l_fork, "read", "ready", 1000000)) {break;}
+          j = j + 1;
+        }
+        
         if (status(l_fork, "read", "ready"))
         {

Singular/febase.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.h,v 1.16 1998-05-04 13:44:47 Singular Exp $ */
+/* $Id: febase.h,v 1.17 1998-05-25 21:28:31 obachman Exp $ */
 /*
 * ABSTRACT
@@ -29 +29 @@
 
 extern char*  feErrors;
+extern int    feErrorsLen;
 extern FILE*  feProtFile;
 extern FILE*  feFilePending; /*temp. storage for grammar.y */

Singular/mpsr.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr.h,v 1.8 1998-04-21 10:59:27 obachman Exp $ */
+/* $Id: mpsr.h,v 1.9 1998-05-25 21:28:32 obachman Exp $ */
 /***************************************************************
  *
@@ -118 +118 @@
   if (gTa_Length < length)
     {
-      Free(gTa, gTa_Length*sizeof(MP_Sint32_t));
+      if (gTa != NULL)
+        Free(gTa, gTa_Length*sizeof(MP_Sint32_t));
       gTa = (MP_Sint32_t *) Alloc((length)*sizeof(MP_Sint32_t));
       gTa_Length = length;

Singular/sing_mp.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sing_mp.cc,v 1.16 1998-05-12 10:35:24 obachman Exp $ */
+/* $Id: sing_mp.cc,v 1.17 1998-05-25 21:28:32 obachman Exp $ */
 
 /*
@@ -462 +462 @@
     {
       if (v != NULL) v->CleanUp();
-      v = mpsr_InitLeftv(STRING_CMD, (void *) feErrors);
+      v = mpsr_InitLeftv(STRING_CMD, (void *) mstrdup(feErrors));
+      Free(feErrors, feErrorsLen);
       feErrors = NULL;
     }