Changeset 2ac2935 in git for Singular/pyobject_setup.cc

Timestamp:

Dec 7, 2012, 3:41:00 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ec1006cbd9971c4271d05aefada775ef29d762a6

Parents:

7e18d198148353f88708cfa20f738ac338cb1f556554ca42ebe1277c9afe7990970390905a6e1cf0

Message:

Merge conflict resolved

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()
+{
+  BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport);
+  return jjLOADLIB("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");
+  if (pyobject_load()) return NULL;
+  return 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");
+}