Changeset 4b889d in git
- Timestamp:
- Oct 13, 2010, 4:27:07 PM (14 years ago)
- Branches:
- (u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
- Children:
- d8bea6a01d65c731d77843ab1d42d5132a89ac9e
- Parents:
- 959ce8cf3526914e1147194757d731686bd0d825
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/gentable.cc
r959ce8 r4b889d 451 451 { 452 452 id_nr++; 453 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_GETTIMEOFDAY\n");454 453 fprintf(outfile," {\"%s\", %*d, %3d, ",cmds[m].name, 455 454 20-strlen(cmds[m].name), … … 481 480 break; 482 481 } 483 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#endif\n");484 482 cmds[m].name=NULL; 485 483 m=-1; … … 530 528 " { NULL, 0, 0, 0}\n" 531 529 "};\n" 532 "#ifdef HAVE_GETTIMEOFDAY\n"533 530 "#define LAST_IDENTIFIER %d\n" 534 "#else\n" 535 "#define LAST_IDENTIFIER %d\n" 536 "#endif\n",id_nr,id_nr-1); 531 ,id_nr); 537 532 fclose(outfile); 538 533 } … … 576 571 { 577 572 if(cmds[m].tokval>0) id_nr++; 578 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_GETTIMEOFDAY\n");579 573 fprintf(outfile," iiArithAddCmd(\"%s\", %*d, %3d, ",cmds[m].name, 580 574 (int)(20-strlen(cmds[m].name)), … … 614 608 } 615 609 fprintf(outfile,", %d);\n", m); 616 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#endif\n");617 610 } 618 611 fprintf(outfile, "/* end of list marker */\n"); 619 612 fprintf(outfile, 620 "#ifdef HAVE_GETTIMEOFDAY\n" 621 " sArithBase.nLastIdentifier = %d;\n" 622 "#else /* HAVE_GETTIMEOFDAY */\n" 623 " sArithBase.nLastIdentifier = %d;\n" 624 "#endif /* HAVE_GETTIMEOFDAY */\n", 625 id_nr,id_nr-1); 613 " sArithBase.nLastIdentifier = %d;\n", 614 id_nr); 626 615 627 616 628 617 fprintf(outfile, 629 618 "}\n" 630 "#ifdef HAVE_GETTIMEOFDAY\n"631 619 "#define LAST_IDENTIFIER %d\n" 632 "#else\n" 633 "#define LAST_IDENTIFIER %d\n" 634 "#endif\n",id_nr,id_nr-1); 620 ,id_nr); 635 621 fclose(outfile); 636 622 } -
Singular/gentable2.cc
r959ce8 r4b889d 451 451 { 452 452 id_nr++; 453 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_GETTIMEOFDAY\n");454 453 fprintf(outfile," {\"%s\", %*d, %3d, ",cmds[m].name, 455 454 20-strlen(cmds[m].name), … … 481 480 break; 482 481 } 483 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#endif\n");484 482 cmds[m].name=NULL; 485 483 m=-1; … … 530 528 " { NULL, 0, 0, 0}\n" 531 529 "};\n" 532 "#ifdef HAVE_GETTIMEOFDAY\n"533 530 "#define LAST_IDENTIFIER %d\n" 534 "#else\n" 535 "#define LAST_IDENTIFIER %d\n" 536 "#endif\n",id_nr,id_nr-1); 531 ,id_nr); 537 532 fclose(outfile); 538 533 } … … 576 571 { 577 572 if(cmds[m].tokval>0) id_nr++; 578 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_GETTIMEOFDAY\n");579 573 fprintf(outfile," iiArithAddCmd(\"%s\", %*d, %3d, ",cmds[m].name, 580 574 (int)(20-strlen(cmds[m].name)), … … 614 608 } 615 609 fprintf(outfile,", %d);\n", m); 616 if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#endif\n");617 610 } 618 611 fprintf(outfile, "/* end of list marker */\n"); 619 612 fprintf(outfile, 620 "#ifdef HAVE_GETTIMEOFDAY\n" 621 " sArithBase.nLastIdentifier = %d;\n" 622 "#else /* HAVE_GETTIMEOFDAY */\n" 623 " sArithBase.nLastIdentifier = %d;\n" 624 "#endif /* HAVE_GETTIMEOFDAY */\n", 625 id_nr,id_nr-1); 613 " sArithBase.nLastIdentifier = %d;\n", 614 id_nr); 626 615 627 616 628 617 fprintf(outfile, 629 618 "}\n" 630 "#ifdef HAVE_GETTIMEOFDAY\n"631 619 "#define LAST_IDENTIFIER %d\n" 632 "#else\n" 633 "#define LAST_IDENTIFIER %d\n" 634 "#endif\n",id_nr,id_nr-1); 620 ,id_nr,id_nr-1); 635 621 fclose(outfile); 636 622 } -
Singular/grammar.cc
r959ce8 r4b889d 2379 2379 startTimer(); 2380 2380 } 2381 #ifdef HAVE_GETTIMEOFDAY2382 2381 if (rtimerv) 2383 2382 { … … 2385 2384 startRTimer(); 2386 2385 } 2387 #endif2388 2386 prompt_char = '>'; 2389 2387 #ifdef HAVE_SDB -
Singular/grammar.y
r959ce8 r4b889d 364 364 startTimer(); 365 365 } 366 #ifdef HAVE_GETTIMEOFDAY367 366 if (rtimerv) 368 367 { … … 370 369 startRTimer(); 371 370 } 372 #endif373 371 prompt_char = '>'; 374 372 #ifdef HAVE_SDB -
Singular/misc_ip.cc
r959ce8 r4b889d 405 405 /*t=(int)time(NULL);*/ 406 406 if (t==0) t=1; 407 #ifdef HAVE_GETTIMEOFDAY408 407 initRTimer(); 409 #endif410 408 #ifdef buildin_rand 411 409 siSeed=t; -
Singular/subexpr.cc
r959ce8 r4b889d 369 369 case VCOLMAX: 370 370 case VTIMER: 371 #ifdef HAVE_GETTIMEOFDAY372 371 case VRTIMER: 373 #endif374 372 case VOICE: 375 373 case VMAXDEG: … … 401 399 case VCOLMAX: 402 400 case VTIMER: 403 #ifdef HAVE_GETTIMEOFDAY404 401 case VRTIMER: 405 #endif406 402 case VOICE: 407 403 case VMAXDEG: … … 887 883 case VCOLMAX: 888 884 case VTIMER: 889 #ifdef HAVE_GETTIMEOFDAY890 885 case VRTIMER: 891 #endif892 886 case VOICE: 893 887 case VMAXDEG: … … 1016 1010 case VCOLMAX: return (void *)colmax; 1017 1011 case VTIMER: return (void *)getTimer(); 1018 #ifdef HAVE_GETTIMEOFDAY1019 1012 case VRTIMER: return (void *)getRTimer(); 1020 #endif1021 1013 case VOICE: return (void *)(myynest+1); 1022 1014 case VMAXDEG: return (void *)Kstd1_deg; -
Singular/table.h
r959ce8 r4b889d 1227 1227 ,{D(jjCOLMAX), VCOLMAX, INT_CMD } 1228 1228 ,{D(jjTIMER), VTIMER, INT_CMD } 1229 #ifdef HAVE_GETTIMEOFDAY1230 1229 ,{D(jjRTIMER), VRTIMER, INT_CMD } 1231 #endif1232 1230 ,{D(jjMAXDEG), VMAXDEG, INT_CMD } 1233 1231 ,{D(jjMAXMULT), VMAXMULT, INT_CMD } -
kernel/timer.cc
r959ce8 r4b889d 140 140 } 141 141 142 #ifdef HAVE_GETTIMEOFDAY143 142 /*0 Real timer implementation*/ 144 143 int rtimerv = 0; … … 148 147 void initRTimer() 149 148 { 149 #ifdef HAVE_GETTIMEOFDAY 150 150 gettimeofday(&startRl, &tzp); 151 151 gettimeofday(&siStartRTime, &tzp); 152 #else 153 memset(&startRl,0,sizeof(startRl)); 154 memset(&startRTime,0,sizeof(startRTime)); 155 #endif 152 156 } 153 157 … … 202 206 Print("//%s %.2f sec \n" ,v ,f); 203 207 } 204 #endif -
kernel/timer.h
r959ce8 r4b889d 16 16 int getTimer(); 17 17 18 #ifdef HAVE_GETTIMEOFDAY19 18 extern int rtimerv; 20 19 void startRTimer(void); … … 23 22 void initRTimer(); 24 23 int getRTimer(); 25 #endif26 24 27 25 void SetTimerResolution(int res);
Note: See TracChangeset
for help on using the changeset viewer.