Changeset 098784 in git


Ignore:
Timestamp:
Feb 7, 2019, 2:53:21 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
d0cd21e86cf844ac74991fb599f0b73de5308e93fcdeeaee8c503399a44c025a273cfa24a3b97bd9
Parents:
ab771712f9cf6f304a7dbc3fd948527f91510bb4aa4d311381250221eea57c0b1aa32b5f6c7a1185
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-02-07 14:53:21+01:00
git-committer:
GitHub <noreply@github.com>2019-02-07 14:53:21+01:00
Message:
Merge pull request #908 from rbehrends/threadsupport

Finalizing thread support.
Files:
146 added
25 edited

Legend:

Unmodified
Added
Removed

  • Singular/dyn_modules/bigintm/mod_main.cc

    rab7717 r098784  
    4545
    4646   // Q: should we call 'bigintm_setup' here??!?!?
    47    VAR return MAX_TOK;
     47   return MAX_TOK;
    4848}

  • Singular/dyn_modules/gfanlib/gfanlib.cc

    rab7717 r098784  
    2424  bbpolytope_setup(p);
    2525  tropical_setup(p);
    26   VAR return MAX_TOK;
     26  return MAX_TOK;
    2727}
    2828

  • Singular/dyn_modules/polymake/polymake_wrapper.cc

    rab7717 r098784  
    19791979  p->iiAddCproc("polymakeInterface.lib","vertexEdgeGraph",FALSE,PMvertexEdgeGraph);
    19801980
    1981   VAR blackbox* b=getBlackboxStuff(polytopeID);
     1981  blackbox* b=getBlackboxStuff(polytopeID);
    19821982  b->blackbox_Op2=bbpolytope_Op2;
    19831983
    19841984  init_polymake_help();
    1985   VAR return MAX_TOK;
     1985  return MAX_TOK;
    19861986}
    19871987

  • Singular/dyn_modules/pyobject/pyobject.cc

    rab7717 r098784  
    717717extern "C" int SI_MOD_INIT(pyobject)(SModulFunctions* psModulFunctions)
    718718{
    719   VAR int tok = -1;
    720   VAR blackbox* bbx = pyobject_blackbox(tok);
     719  int tok = -1;
     720  blackbox* bbx = pyobject_blackbox(tok);
    721721  if (bbx->blackbox_Init != pyobject_Init)
    722722  {
    … …  
    738738    PYOBJECT_ADD_C_PROC(python_run);
    739739  }
    740   VAR return MAX_TOK;
     740  return MAX_TOK;
    741741}
    742742#undef PYOBJECT_ADD_C_PROC

  • Singular/dyn_modules/syzextra/mod_main.cc

    rab7717 r098784  
    525525
    526526#undef ADD
    527   VAR return MAX_TOK;
    528 }
     527  return MAX_TOK;
     528}

  • Singular/iparith.cc

    raa4d31 r098784  
    53315331BOOLEAN jjLOAD_TRY(const char *s)
    53325332{
    5333   void (*WerrorS_save)(const char *s) = WerrorS_callback;
    5334   WerrorS_callback=WerrorS_dummy;
    5335   WerrorS_dummy_cnt=0;
    5336   BOOLEAN bo=jjLOAD(s,TRUE);
    5337   if (TEST_OPT_PROT && (bo || (WerrorS_dummy_cnt>0)))
    5338     Print("loading of >%s< failed\n",s);
    5339   WerrorS_callback=WerrorS_save;
    5340   errorreported=0;
     5333  if (!iiGetLibStatus(s))
     5334  {
     5335    void (*WerrorS_save)(const char *s) = WerrorS_callback;
     5336    WerrorS_callback=WerrorS_dummy;
     5337    WerrorS_dummy_cnt=0;
     5338    BOOLEAN bo=jjLOAD(s,TRUE);
     5339    if (TEST_OPT_PROT && (bo || (WerrorS_dummy_cnt>0)))
     5340      Print("loading of >%s< failed\n",s);
     5341    WerrorS_callback=WerrorS_save;
     5342    errorreported=0;
     5343  }
    53415344  return FALSE;
    53425345}

  • Singular/iplib.cc

    rab7717 r098784  
    10961096#include <pthread.h>
    10971097
    1098 STATIC_VAR std::map<std::string, void *> *dyn_modules;
     1098THREAD_VAR std::map<std::string, void *> *dyn_modules;
    10991099
    11001100bool registered_dyn_module(char *fullname) {
    … …  
    11021102    return false;
    11031103  std::string fname = fullname;
    1104   return !(dyn_modules->count(fname));
     1104  return dyn_modules->count(fname) != 0;
    11051105}
    11061106

  • Singular/ipshell.h

    raa4d31 r098784  
    9797poly    iiHighCorner(ideal i, int ak);
    9898char *  iiConvName(const char *libname);
     99BOOLEAN iiGetLibStatus(const char *lib);
    99100BOOLEAN iiLoadLIB(FILE *fp, const char *libnamebuf, const char *newlib,
    100101                         idhdl pl, BOOLEAN autoexport, BOOLEAN tellerror);

  • Singular/links/asciiLink.cc

    raa4d31 r098784  
    2424static const char* GetIdString(idhdl h);
    2525static int DumpRhs(FILE *fd, idhdl h);
    26 static BOOLEAN DumpQring(FILE *fd, idhdl h, const char *type_str);
     26static BOOLEAN DumpQring(FILE *fd, idhdl h);
     27static BOOLEAN DumpNCring(FILE *fd, idhdl h);
    2728static BOOLEAN DumpAsciiMaps(FILE *fd, idhdl h, idhdl rhdl);
    2829static BOOLEAN CollectLibs(char *name, char ***list_of_libs);
    … …  
    294295    if (strcmp(IDID(h),"Top")==0) return FALSE; // do not dump "Top"
    295296    if (IDPACKAGE(h)->language==LANG_SINGULAR) return FALSE;
     297    if (IDPACKAGE(h)->language==LANG_MIX) return FALSE;
    296298  }
    297299  if (type_id == CRING_CMD)
    … …  
    310312    return FALSE;
    311313
     314  // handle nc-rings separately
     315  if ((type_id == RING_CMD)&&(rIsNCRing(IDRING(h))))
     316    return DumpNCring(fd,h);
     317
    312318  // handle qrings separately
    313319  if ((type_id == RING_CMD)&&(IDRING(h)->qideal!=NULL))
    314     return DumpQring(fd, h, type_str);
     320    return DumpQring(fd, h);
    315321
    316322  // C-proc not to be dumped
    … …  
    368374  {
    369375    case LIST_CMD:
    370     {
    371       lists l = IDLIST(h);
    372       int i, nl = l->nr + 1;
    373 
    374       for (i=0; i<nl; i++)
    375         if (GetIdString((idhdl) &(l->m[i])) == NULL) return NULL;
    376     }
     376    //{
     377    //
     378    //
     379    //  lists l = IDLIST(h);
     380    //  int i, nl = l->nr + 1;
     381//
     382    //  for (i=0; i<nl; i++)
     383    //    if (GetIdString((idhdl) &(l->m[i])) == NULL) return NULL;
     384    //  break;
     385    //}
    377386    case CRING_CMD:
    378387    #ifdef SINGULAR_4_2
    … …  
    408417}
    409418
    410 static BOOLEAN DumpQring(FILE *fd, idhdl h, const char *type_str)
     419static BOOLEAN DumpNCring(FILE *fd, idhdl h)
    411420{
    412421  char *ring_str = h->String();
    413   if (fprintf(fd, "%s temp_ring = %s;\n", Tok2Cmdname(RING_CMD), ring_str)
    414               == EOF) return TRUE;
    415   if (fprintf(fd, "%s temp_ideal = %s;\n", Tok2Cmdname(IDEAL_CMD),
    416               iiStringMatrix((matrix) IDRING(h)->qideal, 1, currRing, n_GetChar(currRing->cf)))
     422  ring r=IDRING(h);
     423
     424  if (rIsPluralRing(r))
     425  {
     426    if (fprintf(fd, "ring temp_ring = %s;\n", ring_str)
     427      == EOF) return TRUE;
     428    if (fprintf(fd, "ideal temp_C = %s;\n",
     429              iiStringMatrix((matrix) r->GetNC()->C, 2, r, n_GetChar(r->cf)))
     430      == EOF) return TRUE;
     431    if (fprintf(fd, "ideal temp_D = %s;\n",
     432              iiStringMatrix((matrix) r->GetNC()->D, 2, r, n_GetChar(r->cf)))
     433      == EOF) return TRUE;
     434    if (fprintf(fd, "def %s = nc_algebra(temp_C,temp_D);\n",IDID(h)) == EOF)
     435      return TRUE;
     436    if (fputs("kill temp_ring;\n",fd) == EOF) return TRUE;
     437  }
     438  if (rIsLPRing(r))
     439  {
     440    //if (fprintf(fd, "ring %s = %s;\n", IDID(h), ring_str) == EOF) return TRUE;
     441    //if (fprintf(fd, "attrib(%s,\"isLetterplaceRing\",%d);\n",IDID(h),r->isLPring) ==EOF) return TRUE;
     442    Warn("cannot write LP ring %s",IDID(h));
     443    return TRUE;
     444  }
     445  omFree(ring_str);
     446  return FALSE;
     447}
     448
     449static BOOLEAN DumpQring(FILE *fd, idhdl h)
     450{
     451  char *ring_str = h->String();
     452  ring r=IDRING(h);
     453  if (fprintf(fd, "ring temp_ring = %s;\n", ring_str) == EOF) return TRUE;
     454  if (fprintf(fd, "ideal temp_ideal = %s;\n",
     455              iiStringMatrix((matrix) r->qideal, 1, currRing, n_GetChar(r->cf)))
    417456      == EOF) return TRUE;
    418457  if (fputs("attrib(temp_ideal, \"isSB\", 1);\n",fd) == EOF) return TRUE;
    419   if (fprintf(fd, "%s %s = temp_ideal;\n", type_str, IDID(h)) == EOF)
     458  if (fprintf(fd, "qring %s = temp_ideal;\n",IDID(h)) == EOF)
    420459    return TRUE;
    421460  if (fputs("kill temp_ring;\n",fd) == EOF) return TRUE;

  • Singular/links/ssiLink.cc

    raa4d31 r098784  
    4949#include <netinet/in.h> /* for htons etc.*/
    5050
    51 #define SSI_VERSION 12
     51#define SSI_VERSION 13
    5252// 5->6: changed newstruct representation
    5353// 6->7: attributes
    … …  
    5757// 10->11: extended ring descr. for named coeffs (not in used until 4.1)
    5858// 11->12: add rank to ideal/module, add smatrix
     59// 12->13: NC rings
    5960
    6061VAR link_list ssiToBeClosed=NULL;
    … …  
    233234  {
    234235    fputs("0 0 0 0 "/*,r->ch,r->N, blocks, q-ideal*/,d->f_write);
     236  }
     237  if (rIsLPRing(r)) // cannot be combined with 23 2
     238  {
     239    fprintf(d->f_write,"23 1 %d %d ",SI_LOG2(r->bitmask),r->isLPring);
     240  }
     241  else
     242  {
     243    unsigned long bm=0;
     244    int b=0;
     245    bm=rGetExpSize(bm,b,r->N);
     246    if (r->bitmask!=bm)
     247    {
     248      fprintf(d->f_write,"23 0 %d ",SI_LOG2(r->bitmask));
     249    }
     250    if (rIsPluralRing(r))
     251    {
     252      fputs("23 2 ",d->f_write);
     253      void ssiWriteIdeal(const ssiInfo *d, int typ,const ideal I);
     254      ssiWriteIdeal(d,MATRIX_CMD,(ideal)r->GetNC()->C);
     255      ssiWriteIdeal(d,MATRIX_CMD,(ideal)r->GetNC()->D);
     256    }
    235257  }
    236258}
    … …  
    779801  }
    780802  res->flag=fl;
     803}
     804void ssiReadRingProperties(si_link l)
     805{
     806  ssiInfo *d=(ssiInfo*)l->data;
     807  int what=s_readint(d->f_read);
     808  switch(what)
     809  {
     810    case 0: // bitmask
     811    {
     812      int lb=s_readint(d->f_read);
     813      unsigned long bm=~0L;
     814      bm=bm<<lb;
     815      bm=~bm;
     816      rUnComplete(d->r);
     817      d->r->bitmask=bm;
     818      rComplete(d->r);
     819      break;
     820    }
     821    case 1: // LPRing
     822    {
     823      int lb=s_readint(d->f_read);
     824      int isLPring=s_readint(d->f_read);
     825      unsigned long bm=~0L;
     826      bm=bm<<lb;
     827      bm=~bm;
     828      rUnComplete(d->r);
     829      d->r->bitmask=bm;
     830      d->r->isLPring=isLPring;
     831      rComplete(d->r);
     832      break;
     833    }
     834    case 2: // Plural rings
     835    {
     836      matrix C=ssiReadMatrix(d);
     837      matrix D=ssiReadMatrix(d);
     838      nc_CallPlural(C,D,NULL,NULL,d->r,true,true,false,d->r,false);
     839      break;
     840    }
     841  }
    781842}
    782843//**************************************************************************/
    … …  
    12871348             if (d->r==NULL) return NULL;
    12881349             res->data=(char*)d->r;
     1350             d->r->ref++;
    12891351             res->rtyp=RING_CMD;
    12901352             if (t==15) // setring
    … …  
    13601422    case 21: ssiReadAttrib(res,l);
    13611423             break;
     1424    case 23: ssiReadRingProperties(l);
     1425             return ssiRead1(l);
     1426             break;
    13621427    // ------------
    13631428    case 98: // version
    … …  
    14011466  && (res->RingDependend()))
    14021467  {
    1403     if(ssiSetCurrRing(d->r)) { d->r=currRing; d->r->ref++; }
     1468    if(ssiSetCurrRing(d->r)) { d->r=currRing; }
    14041469  }
    14051470  return res;
    … …  
    15201585                        else if(tt==MATRIX_CMD) fputs("8 ",d->f_write);
    15211586                        else if(tt==SMATRIX_CMD) fputs("22 ",d->f_write);
    1522                         else
     1587                        else /* tt==MODUL_CMD*/
    15231588                        {
    15241589                          ideal M=(ideal)dd;
    … …  
    21682233// 21 attrib <bit-attrib> <len> <a-name1> <val1>... <data>
    21692234// 22 smatrix
     2235// 23 0 <log(bitmask)> ring properties: max.exp.
     2236// 23 1 <log(bitmask)> <r->IsLPRing> ring properties:LPRing
     2237// 23 2 <matrix C> <matrix D> ring properties: PLuralRing
    21702238//
    21712239// 98: verify version: <ssi-version> <MAX_TOK> <OPT1> <OPT2>

  • Singular/misc_ip.cc

    rab7717 r098784  
    714714
    715715   // set global variable to show memory usage
    716   EXTERN_VAR int om_sing_opt_show_mem;
     716  int om_sing_opt_show_mem;
    717717  if (BVERBOSE(V_SHOW_MEM)) om_sing_opt_show_mem = 1;
    718718  else om_sing_opt_show_mem = 0;

  • Tst/Old/m141si.res.gz.uu

    raa4d31 r098784  
    11begin 640 m141si.res.gz
    2 M'XL(".\Z4%<``VTQ-#%S:2YR97,`O==/2\,P%`#P^SY%*!XZD6W='P7+=AA>
    3 MAN)!O8]T>>T>3=HN>;/SVYMNZD`%:9%W*>'U_9K0I'W)\\O=ZE$($2W\!0L2
    4 M.)_$O>>/Z+B)JKVIPN"V%G"0IM(PH`,%_7/2I$G*46N!Y^"T"69`)_Q-#H?B
    5 M\E)84)!B@44FR-':D:2]6Z>H082.[&_QN0A,-(T<#@JH!\V=(.[_?)PCE6;:
    6 MB%"74H6!SRN4M&J@,0FN`K)O?A#_RK:H$R:VVY>$4-`#.N*TE;3C5VF?FC8?
    7 M;=X0I]LYC29K/RG=6&9+2`JP7,Z"8R#-*N,R4==/8-05=NZQ,QRSPPD[G+'#
    8 M*1OT516L@TW[%>`J7P4I96*<*F5E-6"VI?LEEU.2@-``E\N3C9:N]8]:@>XH
    9 M\Z2RX,MZZY%NMK#)Z[KU1*#*$^E:=W>:0%,6;:&1!PZ"[0?6@91J[5M_U=?/
    10 MG?OL>!*(>Y.OR'43<6^.P'B]]<::[X>!T5?VS4(\K)8B\'OW8P_Q>1,?1OWX
    11 +HO<.P/0W.7,,````
     2M'XL("`ID5%P"`VTQ-#%S:2YR97,`;8]!"X)`$(7O_HIAZ*`1FFD%+7J(+D)T
     3ML7L4;3:T*^*.9/\^MT)!NLSAF^_Q>/EQEQT`($R[0R4#)9%P\A]=6'IM=.7B
     4MY@FR/>M*29];1F^0(BL]2"F@`<86%I*_X5$R"&`ZA5I>Y8U**@M@PR?#9V[,
     5MZ49*@FNX_L<30!W&H2&_E$_??E!X?>?RLT$X44]6EIB78:E=-'><8:W',^:]
     6;O4YAGVT!NU9?T07%4.^&GI@X;^+`Y-0M`0``
    127`
    138end

  • Tst/Old/m141si.stat

    raa4d31 r098784  
    1 1 >> tst_memory_0 :: 1415105097:4011, 32 bit:4.0.1:i686-Linux:mamawutz:194256
    2 1 >> tst_memory_1 :: 1415105097:4011, 32 bit:4.0.1:i686-Linux:mamawutz:2271020
    3 1 >> tst_memory_2 :: 1415105097:4011, 32 bit:4.0.1:i686-Linux:mamawutz:2311992
    4 1 >> tst_timer_1 :: 1415105097:4011, 32 bit:4.0.1:i686-Linux:mamawutz:3
     11 >> tst_memory_0 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:79680
     21 >> tst_memory_1 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:2150160
     31 >> tst_memory_2 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:2191264
     41 >> tst_timer_1 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:2

  • Tst/Old/m24si.res.gz.uu

    raa4d31 r098784  
    11begin 640 m24si.res.gz
    2 M'XL("/^?*5@``VTR-'-I+G)E<P"]6$UOVS@0O>M7$,(>I$)P+#G.=F.X0#_V
    3 M$&S10]*]]!+0XMAA38DJ24=6?GV'E"6K3A9;N04-V*;(>3./,T\?H[O/'VX^
    4 M$4+2-_BC>+DA:CG+IM-9$NV3)GF*$U8M@KN#56:M!"^W1"S#ZYK`GA:5@(G9
    5 MFW!![.?B@IBF`L(U>:MSSA-22.8.Y2.H6G$#O;>9\[8(.LPU>7OW_N;&'CO0
    6 M-:GMN*2%'0]BV5E908FSI;0'"BAS!\8-&SOG8@WGNK"7-JPVU.QT)!(26O]A
    7 MW-(GW29<4&0]C#H<=\[F)\XLK1#_&]`'G^C,90R=62X-&,<=6##MO5Q9+YP!
    8 M%80O"[IWPRB+CYG_TUJX+1&,DR;A(DPR]QMVN##A=F(`>OTSY$I9]P2M09#V
    9 M^+].\+8JSS*UELH10^T$=0=-ISW?*!RJ!.F6AGQ=SBU11#-JJ(U,*PS-@!$C
    10 MR9J+7B1I*TPLX(]^!BP&7A28G<+4$JJ1MY4S[F819/CMLA0\94GSE#19LG]*
    11 M]DVRSW#M0"GHHSJAYT)JB,0/&QY&[;+F[%B/=;*&/>0[W+QC+N(3'YUD6XZM
    12 MSIP]0[Z95>^K5VC!8,U+9T"BCG_<QSG5\<CJIJ?2?;&ZO&R9VL5`]=BK7\B/
    13 MD[(MVJZHR"-5QTN#W6JEX)'+G78J(+DL#93FN@>_GB#8(J/3Z\]1]ZG3[98+
    14 M050_F3E%;L"TX)>TA)QPO>6U5K)HA?BL&$:;^S9M]XYC=*CBZ?P24YI=:CXI
    15 MH9[8A7`1/_?V%4MKY8?F\Y?6M6'KC2CPK)?V'$`_):.*301?X<ED5(/T?ROL
    16 M@8N5)]BWG30<R_N1:^,36U&5H?!N[=@?U&;()^Z;%KS8C"_*>;"-DK`J0?G"
    17 M*=`>(%9EOC#IN:?`]%S@V1'/!F;>@3/OP+EWX*4W(-ZJ0&G(QRM`5WB3-&M/
    18 M,)^HM5=8#7SS8/YYYPN'C]9@>`&^<-M5+J@>?:%F(,Y$;E?XR(FW]=%,\P?(
    19 MMW4]NA"<;5=4CP[7%K"0Y5@@]I,^('P\L3,@DMWCZ/_NK]TSOVL>/]Z\(^$&
    20 M.VY%A;,[]@19URA0(:*P4C(?M!'9K&\C#B;')==[M9U$^)_]CVLDL)_%IV.Y
    21 M,\'/MPE!^R(&EZ(O7R[<ZYBX?Q\3L2K"P_=QW].B7?O"X%EK&Q]Z6]=<!+(R
    22 M7):1!I/8"_DCY-%L-I]?SJ^F"7;LV?P*^]2@3>PP7UU>@]N_/_][^RD:I*CM
    23 J(1MMH,!B/*"I*DZ[LOXU1X9=HRL&IJ`MQ#$741HO_@B^`S\W3]^.$@``
     2M'XL("`ID5%P"`VTR-'-I+G)E<P"E55UOVC`4?<^OL*P].)5%B2&L(V)2U^T!
     3M:>I#V[WTI<J(Z=PZ<>082/CUN[:)26&3*A6)Q!_WX]QSCYW[A^_+6X10\A4>
     4M6E3/2"\F;#R>4-+2CNYC6M19='^P8M9*BNH5R06>[Q!O\[*6?&1:@S-D?Y>7
     5MR'0U1Z)!U\U*"(I*5;BIVG*]T\+P$&WBHF51[S-'U_<WRZ6=.Z<YVMEQE9=V
     6M/,AE5U7-*UBME)UHGA=N8MRPLVLNUW"M3SNU:1N3FTU#)$78QL>QAX_Z(EQ2
     7M0#W,.ASWP=*38!86AG?'FT-,".88@V`62\>-P\Z+:!RBS&P44?!<(K$H\]8-
     8M"8N/S'^V%JXD!'D2BC-,F7OBW@]381<&3E?O`5>I70!H#:(D^'\Y\;==.6-J
     9MK;0#!MJ)=KUK,@YX"1ZJ!.!6!KTL4@L4O(O<Y#9S7D/J@A?(*+06,H@D\<*$
     10M!KZ-,T`QB**YV6B@%N4-X+9RAFJRB,&_9RG:,]KM:<=HNZ=M1UL&>P=(4<CJ
     11MA+Z2JN%$OBEXF+5GS=D5P=?)FK=\M8'B'7(9G\3H)>LQ>ITY^P+P,JO>BPNP
     12M*/A:5,X`D1Y_'/),/];=)'U/=T7ED=K-2`??V0?X<5*V3=N4-=KF^G@UV%)K
     13MS;=";1JG`K12E>&5F0?GJQ$X6T]R>O\<=9\XW;X**9$.B\PI\ID;[_PO+0$F
     14MV/>XUEJ57HAGS3"->?*T/3F,Y-#%T_4%4,JFC1A5?#>R&SB+SZ.]0&NM_,`\
     15MS4)SF9/]S^4WA)_AKM"Y'$GQ&Q^K87V)N90$UUJM!@2P22#@8'+<<JKQ'.#_
     16M=LY1`">Q,87:F.C]!4;^$P);Y/'QTGU(XO`E(45-8'H3A],(=OZJ.SN4\>%4
     17M.EHB51NA*M)P0T&19LM79#))TVDZ&U.X:U@Z@Q,6265OB2%?%!O=66+N?CS\
     18MNKLE`XJ\^KO&\)+@Y@^8ZO)43^&"9J!WUPR@P#?BR`5)XNQ3]!>^)=_W2`<`
     19!````
    2420`
    2521end

  • Tst/Old/m24si.stat

    raa4d31 r098784  
    1 1 >> tst_memory_0 :: 1479122943:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:227904
    2 1 >> tst_memory_1 :: 1479122943:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2424832
    3 1 >> tst_memory_2 :: 1479122943:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2441216
    4 1 >> tst_timer_1 :: 1479122943:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:3
     11 >> tst_memory_0 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:205384
     21 >> tst_memory_1 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:2278176
     31 >> tst_memory_2 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:2319280
     41 >> tst_timer_1 :: 1549034506:4114, 64 bit:4.1.1:x86_64-Linux:jim:4

  • Tst/Short/ok_s.lst

    raa4d31 r098784  
    127127ncfactor_usl2_reducible_bug_s
    128128ncfactor_usl2_s
     129newstruct_ring
    129130nfmodsyz_s
    130131parallel_s

  • factory/globaldefs.h

    rab7717 r098784  
    1010#define STATIC_INST_VAR static
    1111#define GLOBAL_VAR
     12#define THREAD_VAR
     13#else
     14#define GLOBAL_VAR
     15#define THREAD_VAR __thread
    1216#endif
    1317

  • gfanlib/gfanlib_circuittableint.cpp

    rab7717 r098784  
    99
    1010namespace gfan{
    11 INST_VAR class MVMachineIntegerOverflow MVMachineIntegerOverflow;
     11INST_VAR MVMachineIntegerOverflowType MVMachineIntegerOverflow;
    1212}

  • gfanlib/gfanlib_circuittableint.h

    rab7717 r098784  
    2626};
    2727
    28 EXTERN_INST_VAR MVMachineIntegerOverflow MVMachineIntegerOverflow;
     28typedef MVMachineIntegerOverflow MVMachineIntegerOverflowType;
     29
     30EXTERN_INST_VAR MVMachineIntegerOverflowType MVMachineIntegerOverflow;
    2931
    3032/*

  • kernel/linear_algebra/Minor.cc

    rab7717 r098784  
    836836*/
    837837
    838 int MinorValue::g_rankingStrategy = -1;
     838THREAD_VAR int MinorValue::g_rankingStrategy = -1;
    839839
    840840int MinorValue::getWeight () const

  • libpolys/misc/options.h

    rab7717 r098784  
    1111/*the general set of verbose-options : si_opt_2(verbose) */
    1212#ifdef __cplusplus
    13 extern "C" unsigned si_opt_1; //< NOTE: Original option variable name: test
    14 extern "C" unsigned si_opt_2; //< NOTE: Original option variable name: verbose
     13extern "C" VAR unsigned si_opt_1; //< NOTE: Original option variable name: test
     14extern "C" VAR unsigned si_opt_2; //< NOTE: Original option variable name: verbose
    1515extern "C" BOOLEAN siCntrlc;
    1616#else

  • libpolys/polys/monomials/ring.cc

    raa4d31 r098784  
    16641664  if (r1->cf!=r2->cf) return FALSE;
    16651665  if (rVar(r1)!=rVar(r2)) return FALSE;
     1666  if (r1->bitmask!=r2->bitmask) return FALSE;
     1667  #ifdef HAVE_SHIFTBBA
     1668  if (r1->isLPring!=r2->isLPring) return FALSE;
     1669  #endif
    16661670
    16671671  if( !rSamePolyRep(r1, r2) )

  • libpolys/polys/nc/old.gring.cc

    rab7717 r098784  
    16551655
    16561656  /* zero exponents !? */
    1657   VAR poly M1    = nc_mm_Mult_p(m1,p_Head(p1,r),r); // M1 = m1 * lt(p1)
    1658   VAR poly M2    = nc_mm_Mult_p(m2,p_Head(p2,r),r); // M2 = m2 * lt(p2)
     1657  poly M1    = nc_mm_Mult_p(m1,p_Head(p1,r),r); // M1 = m1 * lt(p1)
     1658  poly M2    = nc_mm_Mult_p(m2,p_Head(p2,r),r); // M2 = m2 * lt(p2)
    16591659
    16601660#ifdef PDEBUG
    … …  
    16881688  }
    16891689
    1690   VAR number C1  = p_GetCoeff(M1,r);      // C1 = lc(M1)
    1691   VAR number C2  = p_GetCoeff(M2,r);      // C2 = lc(M2)
     1690  number C1  = p_GetCoeff(M1,r);      // C1 = lc(M1)
     1691  number C2  = p_GetCoeff(M2,r);      // C2 = lc(M2)
    16921692
    16931693  /* GCD stuff */
    1694   VAR number C = n_SubringGcd(C1, C2, r->cf);           // C = gcd(C1, C2)
     1694  number C = n_SubringGcd(C1, C2, r->cf);           // C = gcd(C1, C2)
    16951695
    16961696  if (!n_IsOne(C, r->cf))                              // if C != 1
    … …  
    18511851#endif
    18521852  /* pSetComp(m,r)=0? */
    1853   VAR poly M = nc_mm_Mult_pp(m, p1,r);
    1854   VAR number C=p_GetCoeff(M,r);
     1853  poly M = nc_mm_Mult_pp(m, p1,r);
     1854  number C=p_GetCoeff(M,r);
    18551855  M=p_Add_q(M,nc_mm_Mult_p(m,p_LmDeleteAndNext(p_Copy(p1,r),r),r),r); // _pp?
    18561856  q=__p_Mult_nn(q,C,r);
    1857   VAR number MinusOne=n_Init(-1,r->cf);
     1857  number MinusOne=n_Init(-1,r->cf);
    18581858  if (!n_Equal(cQ,MinusOne,r->cf))
    18591859  {

  • libpolys/polys/weight.cc

    rab7717 r098784  
    1818
    1919/*0 implementation*/
    20 extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
     20extern "C" THREAD_VAR double (*wFunctional)(int *degw, int *lpol, int npol,
    2121       double *rel, double wx, double wNsqr);
    2222extern "C" double wFunctionalMora(int *degw, int *lpol, int npol,

  • libpolys/polys/weight.h

    rab7717 r098784  
    2424
    2525// internal:
    26 extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
     26extern "C" THREAD_VAR double (*wFunctional)(int *degw, int *lpol, int npol,
    2727       double *rel, double wx, double wNsqr);
    2828extern "C" double wFunctionalBuch(int *degw, int *lpol, int npol,
Note: See TracChangeset for help on using the changeset viewer.