notify: make Notify::config_initialized() static

rdb · rdb · commit fd5ec07a47bb · 2020-03-08T10:48:50.000+01:00
This may be slightly more efficient.
diff --git a/dtool/src/prc/configPageManager.cxx b/dtool/src/prc/configPageManager.cxx
@@ -720,7 +720,7 @@ scan_up_from(Filename &result, const Filename &dir,
  */
 void ConfigPageManager::
 config_initialized() {
-  Notify::ptr()->config_initialized();
+  Notify::config_initialized();
 
 #ifndef NDEBUG
   ConfigVariableString panda_package_version
diff --git a/dtool/src/prc/notify.cxx b/dtool/src/prc/notify.cxx
@@ -430,7 +430,7 @@ config_initialized() {
   // notify-output even after the initial import of Panda3D modules.  However,
   // it cannot be changed after the first time it is set.
 
-  if (_ostream_ptr == &cerr) {
+  if (_global_ptr == nullptr || _global_ptr->_ostream_ptr == &cerr) {
     static ConfigVariableFilename notify_output
       ("notify-output", "",
        "The filename to which to write all the output of notify");
@@ -440,12 +440,14 @@ config_initialized() {
 
     std::string value = notify_output.get_value();
     if (!value.empty() && !initialized.test_and_set()) {
+      Notify *ptr = Notify::ptr();
+
       if (value == "stdout") {
         cout.setf(std::ios::unitbuf);
-        set_ostream_ptr(&cout, false);
+        ptr->set_ostream_ptr(&cout, false);
 
       } else if (value == "stderr") {
-        set_ostream_ptr(&cerr, false);
+        ptr->set_ostream_ptr(&cerr, false);
 
       } else {
         Filename filename = value;
@@ -462,7 +464,7 @@ config_initialized() {
           dup2(logfile_fd, STDERR_FILENO);
           close(logfile_fd);
 
-          set_ostream_ptr(&cerr, false);
+          ptr->set_ostream_ptr(&cerr, false);
         }
 #else
         pofstream *out = new pofstream;
@@ -471,7 +473,7 @@ config_initialized() {
           delete out;
         } else {
           out->setf(std::ios::unitbuf);
-          set_ostream_ptr(out, true);
+          ptr->set_ostream_ptr(out, true);
         }
 #endif  // BUILD_IPHONE
       }
diff --git a/dtool/src/prc/notifyCategory.cxx b/dtool/src/prc/notifyCategory.cxx
@@ -184,11 +184,11 @@ update_severity_cache() {
 
       // Take this opportunity to have Notify check whether the notify-output
       // variable changed.
-      Notify::ptr()->config_initialized();
+      Notify::config_initialized();
     }
   } else {
     _severity_cache = _severity;
-    Notify::ptr()->config_initialized();
+    Notify::config_initialized();
   }
 
   mark_cache_valid(_local_modified);
diff --git a/dtool/src/prc/pnotify.h b/dtool/src/prc/pnotify.h
@@ -72,7 +72,7 @@ class EXPCL_DTOOL_PRC Notify {
 
   static NotifySeverity string_severity(const std::string &string);
 
-  void config_initialized();
+  static void config_initialized();
 
 private:
   std::ostream *_ostream_ptr;

Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,11 @@ update_severity_cache() {`
`184`	`184`
`185`	`185`	`// Take this opportunity to have Notify check whether the notify-output`
`186`	`186`	`// variable changed.`
`187`		`- Notify::ptr()->config_initialized();`
	`187`	`+ Notify::config_initialized();`
`188`	`188`	`}`
`189`	`189`	`} else {`
`190`	`190`	`_severity_cache = _severity;`
`191`		`- Notify::ptr()->config_initialized();`
	`191`	`+ Notify::config_initialized();`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`mark_cache_valid(_local_modified);`