Changeset 57dcd6 in git

Timestamp:

Dec 13, 2012, 12:07:24 AM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c1e7a64cbf29c8f08287152a94545e06e8608a9a

Parents:

801d2b82d26cf116224a17169c6379c454c018e7

git-author:

Alexander Dreyer <adreyer@gmx.de>2012-12-13 00:07:24+01:00

git-committer:

Alexander Dreyer <adreyer@gmx.de>2012-12-14 11:40:21+01:00

Message:

using LIB("pyobject.so"); instead of system("pyobject");

Files:

• Singular/extra.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (2 diffs)
• Singular/iplib.cc (modified) (4 diffs)
• Singular/pyobject.cc (modified) (8 diffs)
• Singular/pyobject_setup.cc (modified) (1 diff)
• libpolys/polys/mod_raw.cc (modified) (1 diff)
• libpolys/polys/mod_raw.h (modified) (1 diff)

Singular/extra.cc

@@ -2948 +2948 @@
          res->rtyp = NONE;
          return FALSE;
-       }
-       else
-
-  /*==== pyobject (or pyobject*, like pyobject.so) force loading python ===*/
-       if (strncmp(sys_cmd, "pyobject", 8) == 0)
-       {
-         res->rtyp = NONE;
-         return pyobject_ensure();
        }
        else

Singular/iparith.cc

@@ -5155 +5155 @@
   char libnamebuf[256];
   lib_types LT = type_of_LIB(s, libnamebuf);
+
 #ifdef HAVE_DYNAMIC_LOADING
   extern BOOLEAN load_modules(char *newlib, char *fullpath, BOOLEAN autoexport);
@@ -5195 +5196 @@
       }
       case LT_BUILTIN:
-        return FALSE;
+        SModulFunc_t iiGetBuiltinModInit(char*);
+        return load_builtin(s,autoexport, iiGetBuiltinModInit(s));
       case LT_MACH_O:
       case LT_ELF:

Singular/iplib.cc

@@ -672 +672 @@
 }
 
+int huhu_mod_init(SModulFunctions*){ return 0; }
+
+#define SI_GET_BUILTIN_MOD_INIT(name) \
+  int name##_mod_init(SModulFunctions*); \
+  if (strcmp(libname, #name ".so") == 0) {  return name##_mod_init; }
+
+
+SModulFunc_t
+iiGetBuiltinModInit(char* libname)
+{
+  SI_FOREACH_BUILTIN(SI_GET_BUILTIN_MOD_INIT)
+
+  return NULL;
+}
+
+
+#undef SI_GET_BUILTIN_MOD_INIT
+
+
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 BOOLEAN iiTryLoadLib(leftv v, const char *id)
@@ -684 +703 @@
   idhdl packhdl;
   lib_types LT;
-
   for(i=0; suffix[i] != NULL; i++)
   {
@@ -702 +720 @@
       else if (LT==LT_BUILTIN)
       {
-        LoadResult=load_builtin(s,FALSE,(SModulFunc_t)NULL);
+        LoadResult=load_builtin(s,FALSE, iiGetBuiltinModInit(s));
       }
       if(!LoadResult )
@@ -1126 +1144 @@
     (*init)(&sModulFunctions);
   }
-  if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loaded %s \n", newlib);
+  if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loaded (builtin) %s \n", newlib);
   currPack->loaded=1;
   currPack=s;

Singular/pyobject.cc

@@ -413 +413 @@
   size_t size(leftv iter, size_t distance = 0) const 
   {
-    if (iter) { do { ++distance; } while(iter = iter->next); }; 
+    if (iter) { do { ++distance; } while((iter = iter->next)); }; 
     return distance;
   }
@@ -463 +463 @@
   sync_contexts();
 
-  Py_XINCREF(Py_None);
+  Py_INCREF(Py_None);
   return PythonCastStatic<>(Py_None).assign_to(result);
 }
@@ -496 +496 @@
   sync_contexts();
 
-  Py_XINCREF(Py_None);
+  Py_INCREF(Py_None);
   return PythonCastStatic<>(Py_None).assign_to(result);
 }
@@ -503 +503 @@
 void* pyobject_Init(blackbox*)
 {
-  Py_XINCREF(Py_None);
+  Py_INCREF(Py_None);
   return Py_None;
 }
@@ -715 +715 @@
 
 #define PYOBJECT_ADD_C_PROC(name) \
-  add_C_proc((currPack->libname? currPack->libname: ""), (char*)#name, FALSE, name);
-
-typedef  BOOLEAN (*func_type)(leftv, leftv);
-void pyobject_init(int (*add_C_proc)(const char*, const char*, BOOLEAN,
-                                     func_type) )
+  psModulFunctions->iiAddCproc((currPack->libname? currPack->libname: ""),\
+     (char*)#name, FALSE, name);
+
+int pyobject_mod_init(SModulFunctions* psModulFunctions)
 {
   int tok = -1;
@@ -734 +733 @@
     bbx->blackbox_Op3     = pyobject_Op3;
     bbx->blackbox_OpM     = pyobject_OpM;
-    bbx->data             = omAlloc0(newstruct_desc_size());
+    bbx->data             = (void*)omAlloc0(newstruct_desc_size());
     
     PythonInterpreter::init(tok);
@@ -742 +741 @@
     PYOBJECT_ADD_C_PROC(python_run); 
   }
+  return 0;
 }
 #undef PYOBJECT_ADD_C_PROC
@@ -747 +747 @@
 #ifndef EMBED_PYTHON
 extern "C" { 
-  void mod_init(SModulFunctions* psModulFunctions)
+  int mod_init(SModulFunctions* psModulFunctions)
   { 
-    pyobject_init(psModulFunctions->iiAddCproc); 
+    return pyobject_mod_init(psModulFunctions); 
   }
 }

Singular/pyobject_setup.cc

@@ -19 +19 @@
 #include <Singular/ipshell.h>
 
-/* whether pyobject module is linked statically or dynamically */
-
-#ifdef EMBED_PYTHON // Case: we include the pyobject interface in the binary
-
-#ifdef HAVE_PYTHON
+#ifdef EMBED_PYTHON
 #include "pyobject.cc"
-static BOOLEAN pyobject_load()
-{
-   pyobject_init(iiAddCproc);
-   return FALSE;
-}
-
-#else // Forced embedding, but no (development version of) python available!
-static BOOLEAN pyobject_load() { return TRUE; } 
 #endif
 
-
-# else // Case: pyobject may be loaded from a dynamic module (prefered variant)
-// Note: we do not need python at compile time.
 static BOOLEAN pyobject_load()
 {
   return jjLOAD("pyobject.so", TRUE);
 }
-#endif
-
-
 
 /// blackbox support - initialization via autoloading

libpolys/polys/mod_raw.cc

@@ -34 +34 @@
 #define BYTES_TO_CHECK 7
 
-char* si_bultin_libs[]={ "huhu.so", NULL };
+#define SI_BUILTIN_LIBSTR(name) (char*) #name ".so",
+
+char* si_bultin_libs[]={ SI_FOREACH_BUILTIN(SI_BUILTIN_LIBSTR)  NULL };
+
+#undef SI_BUILTIN_LIBSTR 
 
 lib_types type_of_LIB(char *newlib, char *libnamebuf)

libpolys/polys/mod_raw.h

@@ -39 +39 @@
 
 #endif /* HAVE_DL */
+
+
+#ifdef EMBED_PYTHON
+#define SI_BUILTIN_PYOBJECT(add) add(pyobject)
+#else
+#define SI_BUILTIN_PYOBJECT(add) 
+#endif
+
+/// Use @c add(name) to add built-in library to macro
+#define SI_FOREACH_BUILTIN(add)\
+  add(huhu)\
+  SI_BUILTIN_PYOBJECT(add)
+
+
 #endif /* MOD_RAW_H */