Changeset 10263 for OpenSceneGraph/trunk/src/osg/Notify.cpp

Timestamp:

05/25/09 12:46:37 (4 years ago)

Author:

robert

Message:

From Colin McDonald?, "The latest osg::notify is crashing at initialisation on Solaris, due to
constructor issues:

Within the NullStream? & NotifyStream? classes the base class objects
(ostream) were being initialised before the class member _buffer objects
which they referenced, causing a crash.

I had to move the file scope g_NullStream & g_NotifyStream initialisation
into a function to get them to work.

Also there was a missing osg:: qualifier on getNotifyHandler."

Files:

• OpenSceneGraph/trunk/src/osg/Notify.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/src/osg/Notify.cpp

@@ -36 +36 @@
 public:
     NullStream():
-        std::ostream(&_buffer) {}
+        std::ostream(new NullStreamBuffer)
+    { _buffer = dynamic_cast<NullStreamBuffer *>(rdbuf()); }
+        
+    ~NullStream()
+    {
+        rdbuf(0);
+        delete _buffer;
+    }
 
 protected:
-    NullStreamBuffer _buffer;
+    NullStreamBuffer* _buffer;
 };
 
@@ -77 +84 @@
 public:
     NotifyStream():
-        std::ostream(&_buffer) {}
+        std::ostream(new NotifyStreamBuffer)
+    { _buffer = dynamic_cast<NotifyStreamBuffer *>(rdbuf()); }
 
     void setCurrentSeverity(osg::NotifySeverity severity)
     {
-        _buffer.setCurrentSeverity(severity);
+        _buffer->setCurrentSeverity(severity);
     }
 
     osg::NotifySeverity getCurrentSeverity() const
     {
-        return _buffer.getCurrentSeverity();
+        return _buffer->getCurrentSeverity();
+    }
+        
+    ~NotifyStream()
+    {
+        rdbuf(0);
+        delete _buffer;
     }
 
 protected:
-    NotifyStreamBuffer _buffer;
+    NotifyStreamBuffer* _buffer;
 };
 
@@ -99 +113 @@
 static osg::ApplicationUsageProxy Notify_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE, "OSG_NOTIFY_LEVEL <mode>", "FATAL | WARN | NOTICE | DEBUG_INFO | DEBUG_FP | DEBUG | INFO | ALWAYS");
 
-osg::NotifySeverity g_NotifyLevel = osg::NOTICE;
-osg::NullStream g_NullStream;
-osg::NotifyStream g_NotifyStream;
+static osg::NotifySeverity g_NotifyLevel = osg::NOTICE;
+static osg::NullStream *g_NullStream;
+static osg::NotifyStream *g_NotifyStream;
 
 void osg::setNotifyLevel(osg::NotifySeverity severity)
@@ -118 +132 @@
 void osg::setNotifyHandler(osg::NotifyHandler *handler)
 {
-    osg::NotifyStreamBuffer *buffer = static_cast<osg::NotifyStreamBuffer *>(g_NotifyStream.rdbuf());
+    osg::NotifyStreamBuffer *buffer = static_cast<osg::NotifyStreamBuffer *>(g_NotifyStream->rdbuf());
     if (buffer)
         buffer->setNotifyHandler(handler);
 }
 
-osg::NotifyHandler *getNotifyHandler()
+osg::NotifyHandler* osg::getNotifyHandler()
 {
     osg::initNotifyLevel();
-    osg::NotifyStreamBuffer *buffer = static_cast<osg::NotifyStreamBuffer *>(g_NotifyStream.rdbuf());
+    osg::NotifyStreamBuffer *buffer = static_cast<osg::NotifyStreamBuffer *>(g_NotifyStream->rdbuf());
     return buffer ? buffer->getNotifyHandler() : 0;
 }
@@ -133 +147 @@
 {
     static bool s_NotifyInit = false;
+    static osg::NullStream s_NullStream;
+    static osg::NotifyStream s_NotifyStream;
 
     if (s_NotifyInit) return true;
+
+    g_NullStream = &s_NullStream;
+    g_NotifyStream = &s_NotifyStream;
     
     // g_NotifyLevel
@@ -169 +188 @@
 
     // Setup standard notify handler
-    osg::NotifyStreamBuffer *buffer = dynamic_cast<osg::NotifyStreamBuffer *>(g_NotifyStream.rdbuf());
+    osg::NotifyStreamBuffer *buffer = dynamic_cast<osg::NotifyStreamBuffer *>(g_NotifyStream->rdbuf());
     if (buffer && !buffer->getNotifyHandler())
         buffer->setNotifyHandler(new StandardNotifyHandler);
@@ -194 +213 @@
     if (severity<=g_NotifyLevel)
     {
-        g_NotifyStream.setCurrentSeverity(severity);
-        return g_NotifyStream;
-    }
-    return g_NullStream;
+        g_NotifyStream->setCurrentSeverity(severity);
+        return *g_NotifyStream;
+    }
+    return *g_NullStream;
 }