Changeset b14855 in git


Ignore:
Timestamp:
Mar 11, 2011, 1:38:28 PM (12 years ago)
Author:
Andreas Steenpaß <steenpas@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
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
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    r240d6e rb14855  
    32373237    WerrorS("negative timeout"); return TRUE;
    32383238  }
    3239   int t = 1000*getRTimer()/TIMER_RESOLUTION;
     3239  int t = getRTimer()/TIMER_RESOLUTION;  // in seconds
    32403240  int i;
    32413241  int ret = -1;
    … …  
    32493249      Lforks->m[i-1].rtyp=DEF_CMD;
    32503250      Lforks->m[i-1].data=NULL;
    3251       timeout = si_max(0,timeout - 1000*getRTimer()/TIMER_RESOLUTION + t);
     3251      timeout = si_max(0,timeout - 1000*(getRTimer()/TIMER_RESOLUTION - t));
    32523252    }
    32533253    else /* terminate the for loop */

  • Singular/ssiLink.cc

    r240d6e rb14855  
    3535#include <kernel/intvec.h>
    3636#include <kernel/options.h>
     37#include <kernel/timer.h>
    3738#include <Singular/subexpr.h>
    3839#include <Singular/silink.h>
Note: See TracChangeset for help on using the changeset viewer.