Changeset b14855 in git for Singular/iparith.cc

Timestamp:

Mar 11, 2011, 1:38:28 PM (12 years ago)

Author:

Andreas Steenpaß <steenpas@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

6f83ae275d45dbae3bcb20755554e9f50fe75f22

Parents:

240d6e0f71a7c78b7ad7e858be185c519c48c85f

Message:

fixed: timeout for waitall and waitfirst

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

File:

• Singular/iparith.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -3237 +3237 @@
     WerrorS("negative timeout"); return TRUE;
   }
-  int t = 1000*getRTimer()/TIMER_RESOLUTION;
+  int t = getRTimer()/TIMER_RESOLUTION;  // in seconds
   int i;
   int ret = -1;
@@ -3249 +3249 @@
       Lforks->m[i-1].rtyp=DEF_CMD;
       Lforks->m[i-1].data=NULL;
-      timeout = si_max(0,timeout - 1000*getRTimer()/TIMER_RESOLUTION + t);
+      timeout = si_max(0,timeout - 1000*(getRTimer()/TIMER_RESOLUTION - t));
     }
     else /* terminate the for loop */