Changes to enable independence from interrogatedb runtime lib

interrogate_request_database is a rather obscure mechanism, which is (probably) currently already broken; let's handle this via Dtool_PyModuleInitHelper instead in the future

Author: rdb

src/interrogate/interfaceMakerPythonNative.cxx

@@ -1760,14 +1760,38 @@ write_module_support(ostream &out, ostream *out_h, InterrogateModuleDef *def) {
 
   out << "  {nullptr, nullptr, 0, nullptr}\n" << "};\n\n";
 
+  if (!no_database) {
+    out << "static const InterrogateModuleDef _in_module_def = {\n"
+        << "  " << def->file_identifier << ",  /* file_identifier */\n"
+        << "  \"" << def->library_name << "\",  /* library_name */\n"
+        << "  \"" << def->library_hash_name << "\",  /* library_hash_name */\n"
+        << "  \"" << def->module_name << "\",  /* module_name */\n";
+    if (def->database_filename != nullptr) {
+      out << "  \"" << def->database_filename
+          << "\",  /* database_filename */\n";
+    } else {
+      out << "  (const char *)0,  /* database_filename */\n";
+    }
+
+    out << "  nullptr,  /* unique_names */\n"
+        << "  0,  /* num_unique_names */\n";
+    out << "  nullptr,  /* fptrs */\n"
+        << "  0,  /* num_fptrs */\n";
+    out << "  1,  /* first_index */\n"
+        << "  " << InterrogateDatabase::get_ptr()->get_next_index()
+        << "  /* next_index */\n"
+        << "};\n\n";
+  }
+
+  const char *def_ptr = no_database ? "nullptr" : "&_in_module_def";
   if (_external_imports.empty()) {
-    out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n";
+    out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr, " << def_ptr << "};\n";
   } else {
     out <<
       "#ifdef LINK_ALL_STATIC\n"
-      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n"
+      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr, " << def_ptr << "};\n"
       "#else\n"
-      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, imports};\n"
+      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, imports, " << def_ptr << "};\n"
       "#endif\n";
   }
   if (out_h != nullptr) {

src/interrogate/interrogateBuilder.cxx

@@ -508,6 +508,7 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
     out_code << "};\n\n";
   }
 
+#if 0
   if (!no_database) {
     // Now build the module definition structure to add ourselves to the
     // global interrogate database.
@@ -551,6 +552,7 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
         << "  interrogate_request_module(&_in_module_def);\n"
         << "}\n\n";
   }
+#endif
 }
 
 /**

src/interrogate/interrogate_module.cxx

@@ -158,9 +158,7 @@ static bool print_dependent_types(const string &lib1, const string &lib2) {
 }
 
 int write_python_table_native(std::ostream &out) {
-  out << "\n#include \"dtoolbase.h\"\n"
-      << "#include \"interrogate_request.h\"\n\n"
-      << "#include \"py_panda.h\"\n\n";
+  out << "#include \"py_panda.h\"\n\n";
 
   int count = 0;
 
@@ -298,10 +296,18 @@ int write_python_table_native(std::ostream &out) {
 
   out.put('\n');
 
+  out << "#if defined(_WIN32) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)\n"
+      << "#define EXPORT_INIT_FUNC __declspec(dllexport)\n"
+      << "#elif __GNUC__ >= 4 && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)\n"
+      << "#define EXPORT_INIT_FUNC __attribute__((visibility(\"default\")))\n"
+      << "#else\n"
+      << "#define EXPORT_INIT_FUNC\n"
+      << "#endif\n\n";
+
   out << "#if PY_MAJOR_VERSION >= 3\n"
-      << "extern \"C\" EXPORT_CLASS PyObject *PyInit_" << library_name << "();\n"
+      << "extern \"C\" EXPORT_INIT_FUNC PyObject *PyInit_" << library_name << "();\n"
       << "#else\n"
-      << "extern \"C\" EXPORT_CLASS void init" << library_name << "();\n"
+      << "extern \"C\" EXPORT_INIT_FUNC void init" << library_name << "();\n"
       << "#endif\n";
 
   out << "\n"

src/interrogatedb/py_panda.cxx

@@ -5,7 +5,6 @@
  */
 
 #include "py_panda.h"
-#include "config_interrogatedb.h"
 #include "executionEnvironment.h"
 
 #ifdef HAVE_PYTHON
@@ -701,17 +700,17 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
   // to do that.  Perhaps we'll find a better place for this in the future.
   static bool initialized_main_dir = false;
   if (!initialized_main_dir) {
-    if (interrogatedb_cat.is_debug()) {
+    /*if (interrogatedb_cat.is_debug()) {
       // Good opportunity to print this out once, at startup.
       interrogatedb_cat.debug()
         << "Python " << version << "\n";
-    }
+    }*/
 
     if (!ExecutionEnvironment::has_environment_variable("MAIN_DIR")) {
       // Grab the __main__ module.
       PyObject *main_module = PyImport_ImportModule("__main__");
       if (main_module == NULL) {
-        interrogatedb_cat.warning() << "Unable to import __main__\n";
+        std::cerr << "Warning: unable to import __main__\n";
       }
 
       // Extract the __file__ attribute, if present.
@@ -743,7 +742,7 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
         }
 #endif
         else {
-          interrogatedb_cat.warning() << "Invalid string for __main__.__file__\n";
+          std::cerr << "Invalid string for __main__.__file__\n";
         }
       }
       ExecutionEnvironment::shadow_environment_variable("MAIN_DIR", main_dir.to_os_specific());

src/interrogatedb/py_panda.h

@@ -12,6 +12,7 @@
 #include "pnotify.h"
 #include "vector_uchar.h"
 #include "register_type.h"
+#include "interrogate_request.h"
 
 #if defined(HAVE_PYTHON) && !defined(CPPPARSER)
 
@@ -338,6 +339,7 @@ struct LibraryDef {
   PyMethodDef *const _methods;
   const Dtool_TypeDef *const _types;
   Dtool_TypeDef *const _external_types;
+  const InterrogateModuleDef *const _module_def;
 };
 
 #if PY_MAJOR_VERSION >= 3