Changeset 3e7db4 in git for Singular/pyobject_setup.cc

Timestamp:

Dec 11, 2012, 7:33:39 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

14e634edb64741be0fbc04c9c89e8523cb0c1cc521dbb4186f3a2c56539d8f92abe1ee9e0fa0ae2c

Parents:

dcf88ff0bb046d73a7bde65e033fc58cbb5f4a97c9050082385152a64066f7540914cae34d990a43

Message:

Merge pull request #207 from kovzol/spielwiese

Adding new command line option --no-shell to prevent running escape shel...

NOTE: according to Hans we have to fix some more things in order to make this right

File:

• Singular/pyobject_setup.cc (modified) (1 diff)

Singular/pyobject_setup.cc

@@ -16 +16 @@
 #include <kernel/mod2.h>
 #include <kernel/febase.h>
+#include <Singular/blackbox.h>
+#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
+#include "pyobject.cc"
+static BOOLEAN pyobject_load()
+{
+   pyobject_init(iiAddCproc);
+   return FALSE;
+}
 
-  #if defined(HAVE_STATIC) 
-    #ifdef HAVE_STATIC_PYTHON
-      #define HAVE_STATIC_PYOBJECT
-    #endif
-  #else
-    #ifdef EMBED_PYTHON
-      #define HAVE_STATIC_PYOBJECT
-    #else
-      #define HAVE_DYNAMIC_PYOBJECT
-    #endif
-  #endif 
+#else // Forced embedding, but no (development version of) python available!
+static BOOLEAN pyobject_load() { return TRUE; } 
 #endif
 
-# ifdef HAVE_STATIC_PYOBJECT // Case: link pyobject interface statically
-#include "pyobject.cc"
-void pyobject_setup() { pyobject_init(); }
+
+# 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
 
 
-# elif defined(HAVE_DYNAMIC_PYOBJECT) // Case: pyobject is dynamic module (prefered variant)
 
-// forward declaration for Singular/iplib.cc
-void* binary_module_function(const char* lib, const char* func); 
-void pyobject_setup()
+/// blackbox support - initialization via autoloading
+void* pyobject_autoload(blackbox* bbx)
 {
-  void* fktn = binary_module_function("pyobject", "mod_init");
-  if (fktn) (* reinterpret_cast<void (*)()>(fktn) )();
-  else Werror("python related functions are not available");
+  assume(bbx != NULL);
+  return (pyobject_load()? NULL: bbx->blackbox_Init(bbx));
 }
 
-#else                // Case: no python
-void pyobject_setup() { }
+void pyobject_default_destroy(blackbox  *b, void *d)
+{
+  Werror("Python-based functionality not available!");
+}
 
-#endif  // HAVE_PYTHON
+// Setting up an empty blackbox type, which can be filled with pyobject
+void pyobject_setup() 
+{
+  blackbox *bbx = (blackbox*)omAlloc0(sizeof(blackbox));
+  bbx->blackbox_Init = pyobject_autoload;
+  bbx->blackbox_destroy = pyobject_default_destroy;
+  setBlackboxStuff(bbx, "pyobject");
+}
 
+/// Explicitely load, if not loaded already
+BOOLEAN pyobject_ensure() {
+
+  int tok = -1;
+  blackbox* bbx = (blackboxIsCmd("pyobject", tok) == ROOT_DECL?
+                   getBlackboxStuff(tok): (blackbox*)NULL);
+  if (bbx == NULL) return TRUE;
+  return (bbx->blackbox_Init == pyobject_autoload?  pyobject_load(): FALSE);  
+}
+
+
+