Changeset aa4d31 in git

Timestamp:

Feb 7, 2019, 1:18:27 PM (5 years ago)

Author:

Reimer Behrends <behrends@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

098784114c00a08a4d18cf392c0f2411aa0d007ed669f7b103e531e130535f2141dd1d77cfa31a81

Parents:

54b24c79febc0e79ee3f9c6a86b7c4d505c69a43

Message:

parallel preprocessor-related fixes.

Files:

• Singular/dyn_modules/gfanlib/gfanlib.cc (modified) (1 diff)
• Singular/dyn_modules/polymake/polymake_wrapper.cc (modified) (1 diff)
• Singular/dyn_modules/pyobject/pyobject.cc (modified) (2 diffs)
• Singular/dyn_modules/syzextra/mod_main.cc (modified) (1 diff)
• gfanlib/gfanlib_circuittableint.cpp (modified) (1 diff)
• gfanlib/gfanlib_circuittableint.h (modified) (1 diff)
• libpolys/misc/options.h (modified) (1 diff)
• libpolys/polys/weight.cc (modified) (1 diff)
• libpolys/polys/weight.h (modified) (1 diff)
• ppcc/LICENSE (modified) (2 diffs)
• ppcc/adlib/config-defs.h (added)
• ppcc/adlib/md5.cc (added)
• ppcc/adlib/md5.h (added)
• ppcc/adlib/md5block.h (added)
• ppcc/adlib/os.cc (modified) (3 diffs)
• ppcc/adlib/os.h (modified) (2 diffs)
• ppcc/adlib/str.cc (modified) (2 diffs)
• ppcc/adlib/test1.cc (modified) (1 diff)
• ppcc/adlib/test2.cc (modified) (1 diff)
• ppcc/adlib/test7.cc (added)
• ppcc/auto.def (modified) (4 diffs)
• ppcc/autosetup/README.adlib (added)
• ppcc/autosetup/adlib.patch (added)
• ppcc/autosetup/autosetup (modified) (1 diff)
• ppcc/autosetup/cc.tcl (modified) (2 diffs)
• ppcc/autosetup/configure (modified) (1 diff)
• ppcc/cnf/genmd5.c (added)
• ppcc/gclib/README.adlib (added)
• ppcc/gclib/dlmalloc.c (added)
• ppcc/gclib/gc.c (added)
• ppcc/src/parser.cc (modified) (9 diffs)
• ppcc/src/parser.h (added)
• ppcc/src/ppcc.cc (modified) (1 diff)

Singular/dyn_modules/gfanlib/gfanlib.cc

@@ -24 +24 @@
   bbpolytope_setup(p);
   tropical_setup(p);
-  VAR return MAX_TOK;
+  return MAX_TOK;
 }
 

Singular/dyn_modules/polymake/polymake_wrapper.cc

@@ -1979 +1979 @@
   p->iiAddCproc("polymakeInterface.lib","vertexEdgeGraph",FALSE,PMvertexEdgeGraph);
 
-  VAR blackbox* b=getBlackboxStuff(polytopeID);
+  blackbox* b=getBlackboxStuff(polytopeID);
   b->blackbox_Op2=bbpolytope_Op2;
 
   init_polymake_help();
-  VAR return MAX_TOK;
+  return MAX_TOK;
 }
 

Singular/dyn_modules/pyobject/pyobject.cc

@@ -717 +717 @@
 extern "C" int SI_MOD_INIT(pyobject)(SModulFunctions* psModulFunctions)
 {
-  VAR int tok = -1;
-  VAR blackbox* bbx = pyobject_blackbox(tok);
+  int tok = -1;
+  blackbox* bbx = pyobject_blackbox(tok);
   if (bbx->blackbox_Init != pyobject_Init)
   {
@@ -738 +738 @@
     PYOBJECT_ADD_C_PROC(python_run);
   }
-  VAR return MAX_TOK;
+  return MAX_TOK;
 }
 #undef PYOBJECT_ADD_C_PROC

Singular/dyn_modules/syzextra/mod_main.cc

@@ -525 +525 @@
 
 #undef ADD
-  VAR return MAX_TOK;
-}
+  return MAX_TOK;
+}

gfanlib/gfanlib_circuittableint.cpp

@@ -9 +9 @@
 
 namespace gfan{
-INST_VAR class MVMachineIntegerOverflow MVMachineIntegerOverflow;
+INST_VAR MVMachineIntegerOverflowType MVMachineIntegerOverflow;
 }

gfanlib/gfanlib_circuittableint.h

@@ -26 +26 @@
 };
 
-EXTERN_INST_VAR MVMachineIntegerOverflow MVMachineIntegerOverflow;
+typedef MVMachineIntegerOverflow MVMachineIntegerOverflowType;
+
+EXTERN_INST_VAR MVMachineIntegerOverflowType MVMachineIntegerOverflow;
 
 /*

libpolys/misc/options.h

@@ -11 +11 @@
 /*the general set of verbose-options : si_opt_2(verbose) */
 #ifdef __cplusplus
-extern "C" unsigned si_opt_1; //< NOTE: Original option variable name: test
-extern "C" unsigned si_opt_2; //< NOTE: Original option variable name: verbose
+extern "C" VAR unsigned si_opt_1; //< NOTE: Original option variable name: test
+extern "C" VAR unsigned si_opt_2; //< NOTE: Original option variable name: verbose
 extern "C" BOOLEAN siCntrlc;
 #else

libpolys/polys/weight.cc

@@ -18 +18 @@
 
 /*0 implementation*/
-extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
+extern "C" THREAD_VAR double (*wFunctional)(int *degw, int *lpol, int npol,
        double *rel, double wx, double wNsqr);
 extern "C" double wFunctionalMora(int *degw, int *lpol, int npol,

libpolys/polys/weight.h

@@ -24 +24 @@
 
 // internal:
-extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
+extern "C" THREAD_VAR double (*wFunctional)(int *degw, int *lpol, int npol,
        double *rel, double wx, double wNsqr);
 extern "C" double wFunctionalBuch(int *degw, int *lpol, int npol,

ppcc/LICENSE

@@ -1 @@
-This license applies to all parts of this software project that are not
-third-party libraries. The third-party libraries are:
+The AdLib system is distributed under the terms of the Boost Software
+License 1.0 (see below). This license applies to all files in this directory
+or any of its subdirectories that are not third-party libraries. The
+following parts are third-party libraries:
 
-* The Tiny GC garbage collector (comprising all files in the gclib
-  directory).
-* The autosetup code (comprising all files in the autosetup directory).
+* The Tiny GC garbage collector and Doug Lea's malloc() implementation
+  (comprising the files in the gclib directory).
+* The autosetup code (comprising the files in the autosetup directory).
 
-These libraries have their own licenses whose terms differ from the
-terms below.
+These third-party libraries have their own licenses whose terms differ from
+those of the Boost Software License.
 
 ---------------------------------------------------------------------------
@@ -35 +37 @@
 ---------------------------------------------------------------------------
 
-

ppcc/adlib/os.cc

@@ -11 +11 @@
   if (fp == NULL)
     return NULL;
-  Str *result = new Str(1024);
+  StrArr *result = new StrArr();
   for (;;) {
     size_t nbytes = fread(buffer, 1, sizeof(buffer), fp);
     if (nbytes == 0)
       break;
-    result->add(buffer, nbytes);
-  }
-  return result;
+    result->add(new Str(buffer, nbytes));
+  }
+  return StrJoin(result, "");
 }
 
@@ -197 +197 @@
 }
 
-Str *Pwd() {
+Str *CurrentDir() {
 #ifdef PATH_MAX
   char *path = getcwd(NULL, PATH_MAX);
@@ -389 +389 @@
 }
 
+Str *AbsolutePath(Str *path) {
+  if (path->starts_with(PathSeparator)) {
+    return path->clone();
+  }
+  Str *result = CurrentDir();
+  return result->add(PathSeparator)->add(path);
+}
+
+Str *NormalizePath(Str *path) {
+  bool abs = path->starts_with(PathSeparator);
+  StrArr *parts = path->split(PathSeparator);
+  StrArr *result = new StrArr();
+  for (Int i = 0; i < parts->len(); i++) {
+    Str *part = parts->at(i);
+    if (part->eq("") || part->eq(".")) {
+      // do nothing
+    } else if (part->eq("..")) {
+      if (result->len() > 0)
+        result->pop();
+      else if (!abs)
+        result->add(part);
+    } else {
+      result->add(part);
+    }
+  }
+  if (abs)
+    return S(PathSeparator)->add(StrJoin(result, PathSeparator));
+  else
+    return StrJoin(result, PathSeparator);
+}
+
+Str *GetEnv(const char *name) {
+  char *result = getenv(name);
+  if (result)
+    return new Str(result);
+  else
+    return NULL;
+}
+
+Str *GetEnv(Str *name) {
+  return GetEnv(name->c_str());
+}
+
+Str *ProgramPath() {
+  Str *arg0 = new Str(ArgV[0]);
+  Str *result = arg0;
+  if (arg0) {
+    if (FileStat(result, true)) {
+      return NormalizePath(AbsolutePath(result));
+    }
+    if (!arg0->starts_with(PathSeparator)) {
+      Str *path = GetEnv("PATH");
+      StrArr *paths = path ? path->split(':') : A();
+      for (Int i = 0; i < paths->len(); i++) {
+        Str *p = paths->at(i)->clone();
+        p->add(PathSeparator);
+        p->add(arg0);
+        if (FileStat(p, true)) {
+          result = p;
+          break;
+        }
+      }
+    }
+  }
+  return result ? NormalizePath(AbsolutePath(result)) : result;
+}
+
 bool MakeDir(const char *path, bool recursive) {
   if (!recursive)

ppcc/adlib/os.h

@@ -32 +32 @@
 };
 
-Str *Pwd();
+Str *CurrentDir();
 bool ChDir(Str *path);
 bool ChDir(const char *path);
@@ -65 +65 @@
 Str *BaseName(Str *path);
 Str *FileExtension(Str *path);
+Str *AbsolutePath(Str *path);
+Str *NormalizePath(Str *path);
+Str *GetEnv(Str *name);
+Str *GetEnv(const char *name);
+
+Str *ProgramPath();
+
 bool MakeDir(Str *path, bool recursive = false);
 bool MakeDir(const char *path, bool recursive = false);

ppcc/adlib/str.cc

@@ -11 +11 @@
 
 StrArr *Str::split(const char *s, Int n) {
+  if (n == 1)
+    return split(s[0]);
   Arr<Int> *parts = new Arr<Int>();
   parts->add(-n);
@@ -96 +98 @@
   if (arr->len() == 0)
     return new Str();
-  Str *result = new Str(arr->len() * (n + 1));
+  Int len = (arr->len() - 1) * n;
+  for (Int i = 0; i < arr->len(); i++) {
+    len += arr->at(i)->len();
+  }
+  Str *result = new Str(len);
   result->add(arr->first());
   for (Int i = 1; i < arr->len(); i++) {
-    result->add(sep, n);
+    if (n >= 0)
+      result->add(sep, n);
     result->add(arr->at(i));
   }

ppcc/adlib/test1.cc

@@ -58 +58 @@
   Check(sum_tree(tree) * 2 == counter * (counter - 1),
       "stress test memory allocation");
+  Check(NormalizePath(S("/foo/x/../bar/./"))->eq("/foo/bar"), "normalize path");
+  Check(BaseName(ProgramPath())->eq("test1"), "program path");
 }

ppcc/adlib/test2.cc

@@ -22 +22 @@
   Check(ListFiles(".")->len() > 0, "reading directories");
   StrSet *files = new StrSet(ListFiles("adlib"));
-  files = new StrSet(ListFileTree(Pwd(), ListFilesRelative));
+  files = new StrSet(ListFileTree(CurrentDir(), ListFilesRelative));
   Check(files->contains(S(__FILE__)), "reading directories recursively");
 }

ppcc/auto.def

@@ -117 +117 @@
 proc check-tmp-flags {flags} {
   msg-checking "Checking whether the C++ compiler accepts $flags..."
-  set iquote [cctest -cflags "-iquote ."]
-  if {$iquote} {
+  set works [cctest -cflags $flags]
+  if {$works} {
     msg-result yes
     return 1
@@ -192 +192 @@
   }
   cc-check-includes dirent.h
-  # -iquote vs. -I
-  set iquote [check-tmp-flags "-iquote"]
   define OPT ""
   foreach opt {{-g -O2} {-g -O} {-g}} {
@@ -287 +285 @@
 set adlibsrc [glob adlib/*.cc]
 if {!$boehm} {
-  lappend adlibsrc "gclib/tinygc.c"
+  lappend adlibsrc "gclib/gc.c"
 }
 
@@ -323 +321 @@
 set progre [glob -nocomplain src/*.re]
 set proghdr [glob -nocomplain src/*.h]
+set testsrc [lsort -unique $testsrc]
 set gensrc {}
 foreach file $progre {

ppcc/autosetup/autosetup

@@ -1864 +1864 @@
 {#!/bin/sh
 dir="`dirname "$0"`/autosetup"
-WRAPPER="$0"; export WRAPPER; exec "`$dir/autosetup-find-tclsh`" "$dir/autosetup" "$@"
+WRAPPER="$0"; export WRAPPER; exec "`"$dir/autosetup-find-tclsh"`" "$dir/autosetup" "$@"
 }
         }

ppcc/autosetup/cc.tcl

@@ -12 +12 @@
 ## CC       - C compiler
 ## CXX      - C++ compiler
+## CPP      - C preprocessor
 ## CCACHE   - Set to "none" to disable automatic use of ccache
 ## CFLAGS   - Additional C compiler flags
@@ -700 +701 @@
 define CCACHE [find-an-executable [get-env CCACHE ccache]]
 
+# If any of these are set in the environment, propagate them to the AUTOREMAKE commandline
+foreach i {CC CXX CCACHE CPP CFLAGS CXXFLAGS CXXFLAGS LDFLAGS LIBS CROSS CPPFLAGS LINKFLAGS CC_FOR_BUILD LD} {
+        if {[env-is-set $i]} {
+                # Note: If the variable is set on the command line, get-env will return that value
+                # so the command line will continue to override the environment
+                define-append AUTOREMAKE [quote-if-needed $i=[get-env $i ""]]
+        }
+}
+
 # Initial cctest settings
 cc-store-settings {-cflags {} -includes {} -declare {} -link 0 -lang c -libs {} -code {} -nooutput 0}

ppcc/autosetup/configure

@@ -1 +1 @@
 #!/bin/sh
 dir="`dirname "$0"`/autosetup"
-WRAPPER="$0"; export WRAPPER; exec "`$dir/autosetup-find-tclsh`" "$dir/autosetup" "$@"
+WRAPPER="$0"; export WRAPPER; exec "`"$dir/autosetup-find-tclsh"`" "$dir/autosetup" "$@"

ppcc/src/parser.cc

@@ -1 +1 @@
 #include "adlib/lib.h"
 #include "adlib/map.h"
+#include "adlib/set.h"
 #include "pplex.h"
 
@@ -18 +19 @@
 static Dict *class_vars;
 static Dict *class_types;
+static StrSet *type_prefix_set;
+static Dict *namespaced;
 
 enum DeclType {
@@ -37 +40 @@
   GCVar(class_vars, new Dict());
   GCVar(class_types, new Dict());
+  GCVar(type_prefix_set, new StrSet());
+  type_prefix_set->add(S("class"));
+  type_prefix_set->add(S("struct"));
+  type_prefix_set->add(S("typedef"));
+  // special treatment for some gfanlib variables for now.
+  GCVar(namespaced, new Dict());
+  namespaced->add(S("MVMachineIntegerOverflow"), S("gfan"));
+  namespaced->add(S("lpSolver"), S("gfan"));
 });
 
@@ -244 +255 @@
   }
   if ((is_class && !is_extern) || init_start >= 0) {
-    if (is_toplevel)
+    if (is_toplevel) {
       init_list->add(var_name);
+    }
     Token var_init = Token(SymGen, var_name->clone()->add("__INIT__"));
     parser->emit(static_token);
@@ -262 +274 @@
       parser->init_count++;
       parser->emit(Token(SymGen, S(
-        "static pSingular_register_init_var(void *, void *, long);"
+        "void pSingular_register_init_var(void *, void *, long);"
         "class %s__CONSTR__ {\n"
-        "  %s__CONSTR__() {\n"
+        "  public: %s__CONSTR__() {\n"
         "    pSingular_register_init_var(&%s, &%s__INIT__, sizeof(%s));\n"
         "  }\n"
@@ -281 +293 @@
     Token &token = output->at(i);
     if (token.sym == SymIdent && class_vars->contains(token.str)) {
-      token.str = class_vars->at(token.str);
+      Int j = i-1;
+      while (j >= 0 && TEST(SymsWS | BIT(SymAst), output->at(j).sym))
+        j--;
+      if (j < 0 || !type_prefix_set->contains(output->at(j).str))
+        token.str = class_vars->at(token.str);
     }
   }
@@ -318 +334 @@
     if (class_vars->contains(var_name)) {
       Str *type = class_types->at(var_name);
+      if (namespaced->contains(var_name)) {
+        type = namespaced->at(var_name)->clone()->add("::")->add(type);
+        var_name = namespaced->at(var_name)->clone()->add("::")->add(var_name);
+      }
       init_part->add(S(
         "  %s = (%c *)pSingular_alloc_var((long)sizeof(%c));\n"
@@ -374 +394 @@
     Int var_pos = -1, var_start = -1, var_end = -1;
     var_start = parser->current_pos();
-    parser->skip_while(SymsTypePrefix | BIT(SymWS));
+    parser->skip_while(SymsTypePrefix | BIT(SymWS) | BIT(SymClass));
     if (TEST(SymsEndDecl | BIT(SymLBrkt), parser->current_sym())) {
       // We are one symbol past the initial variable identifier.
@@ -481 +501 @@
         if (toplevel->len() > 0)
           toplevel->pop();
+        tl = 0;
         parser->advance();
         break;

ppcc/src/ppcc.cc

@@ -160 +160 @@
 void TestOutputExecutable() {
   if (mode == LINK) {
-    Str *path = S("factory/threadsupport.cc");
-    for (Int i = 0; i < 4; i++) {
-      if (FileStat(path)) {
-        ExtraArgs->add(path);
-        return;
-      }
-      path = S("../")->add(path);
+    if (Output && FileExtension(Output)->len() != 0) {
+      return;
+    }
+    Str *path = DirName(ProgramPath());
+    if (path) {
+      path->add("/../Singular/threadsupport.cc");
+      path = NormalizePath(path);
+    }
+    if (path && FileStat(path)) {
+      ExtraArgs->add(path);
+    } else {
+      PrintLn(path);
+      Error("cannot locate ppcc directory");
     }
   }