Changeset d3b70ae in git


Ignore:
Timestamp:
Jun 14, 2011, 11:52:41 AM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
f773274cbe208b555ecdb96d8a2075cec9025877
Parents:
9ff6868c3e8b30908a3c8d1c2872ee10b02e9d8e
Message:
put inits into siInit


git-svn-id: file:///usr/local/Singular/svn/trunk@14276 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Singular/libsingular.h

    r9ff686 rd3b70ae  
    3030#include <singular/options.h>
    3131
    32 int siInit(char *);
     32void siInit(char *);
    3333
    3434/* we need this function in Sage*/

  • Singular/misc_ip.cc

    r9ff686 rd3b70ae  
    385385
    386386/*2
    387 * initialize components of Singular
    388 */
    389 int inits(void)
    390 {
    391   int t;
    392 /*4 signal handler:*/
    393   init_signals();
    394 /*4 randomize: */
    395   t=initTimer();
    396   /*t=(int)time(NULL);*/
    397   if (t==0) t=1;
    398   initRTimer();
    399   siSeed=t;
    400 #ifdef HAVE_FACTORY
    401   factoryseed(t);
    402 #endif
    403 /*4 private data of other modules*/
    404   memset(&sLastPrinted,0,sizeof(sleftv));
    405   sLastPrinted.rtyp=NONE;
    406   return t;
    407 }
    408 
    409 /*2
    410387* the renice routine for very large jobs
    411388* works only on unix machines,
    … …  
    11241101}
    11251102
    1126 int siInit(char *name)
     1103/*2
     1104* initialize components of Singular
     1105*/
     1106void siInit(char *name)
    11271107{
    11281108#ifdef HAVE_FACTORY
    … …  
    11451125  /* initialize components */
    11461126  factoryError=WerrorS;
    1147   siRandomStart=inits();
     1127/*4 randomize: */
     1128  int t=initTimer();
     1129  /*t=(int)time(NULL);*/
     1130  if (t==0) t=1;
     1131  initRTimer();
     1132  siSeed=t;
     1133#ifdef HAVE_FACTORY
     1134  factoryseed(t);
     1135#endif
     1136  siRandomStart=t;
     1137/*4 private data of other modules*/
     1138  memset(&sLastPrinted,0,sizeof(sleftv));
     1139  sLastPrinted.rtyp=NONE;
    11481140  feOptSpec[FE_OPT_RANDOM].value = (void*) ((long)siRandomStart);
    11491141

  • Singular/tesths.cc

    r9ff686 rd3b70ae  
    5656
    5757  siInit(argv[0]);
     58  init_signals();
    5859
    5960  // parse command line options
    … …  
    9798
    9899  /* say hello */
    99 #ifdef HAVE_FANS
    100   bbcone_setup();
    101   bbfan_setup();
    102 #endif /* HAVE_FANS */
    103100  //for official version: not active
    104101  //bigintm_setup();
    … …  
    132129  }
    133130  pyobject_setup();
     131#ifdef HAVE_FANS
     132  bbcone_setup();
     133  bbfan_setup();
     134#endif /* HAVE_FANS */
    134135  errorreported = 0;
    135136
Note: See TracChangeset for help on using the changeset viewer.