Reducing header overuse, non-inlining selected methods (CPPOST-35).

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 820dce1..4942b5d 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -150,6 +150,7 @@ libsaml_la_SOURCES = \
        saml2/metadata/impl/MetadataProvider.cpp \
        saml2/metadata/impl/MetadataSchemaValidators.cpp \
        saml2/metadata/impl/NullMetadataProvider.cpp \
+       saml2/metadata/impl/ObservableMetadataProvider.cpp \
        saml2/metadata/impl/SignatureMetadataFilter.cpp \
        saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp \
        saml2/metadata/impl/WhitelistMetadataFilter.cpp \

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index dcd0ab5..adcdda6 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -548,6 +548,10 @@
                                                        >\r
                                                </File>\r
                                                <File\r
+                                                       RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"\r
+                                                       >\r
+                                               </File>\r
+                                               <File\r
                                                        RelativePath=".\saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp"\r
                                                        >\r
                                                </File>\r

diff --git a/saml/saml2/metadata/ObservableMetadataProvider.h b/saml/saml2/metadata/ObservableMetadataProvider.h
index 91070f9..2bae5c7 100644 (file)
--- a/saml/saml2/metadata/ObservableMetadataProvider.h
+++ b/saml/saml2/metadata/ObservableMetadataProvider.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,10 @@
 #define __saml2_obsmetadataprov_h__
 
 #include <saml/saml2/metadata/MetadataProvider.h>
-#include <xmltooling/util/Threads.h>
+
+namespace xmltooling {
+    class XMLTOOL_API Mutex;
+};
 
 namespace opensaml {
     
@@ -45,24 +48,15 @@ namespace opensaml {
              * 
              * @param e DOM to supply configuration for provider
              */
-            ObservableMetadataProvider(const xercesc::DOMElement* e=NULL)
-                : MetadataProvider(e), m_observerLock(xmltooling::Mutex::create()) {
-            }
+            ObservableMetadataProvider(const xercesc::DOMElement* e=NULL);
             
             /**
              * Convenience method for notifying every registered Observer of an event.
              */
-            virtual void emitChangeEvent() const {
-                xmltooling::Lock lock(m_observerLock);
-                for (std::vector<const Observer*>::const_iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
-                    (*i)->onEvent(*this);
-                }
-            }
+            virtual void emitChangeEvent() const;
 
         public:
-            virtual ~ObservableMetadataProvider() {
-                delete m_observerLock;
-            }
+            virtual ~ObservableMetadataProvider();
             
             /**
              * An observer of metadata provider changes.
@@ -88,10 +82,7 @@ namespace opensaml {
              * 
              * @param newObserver metadata observer to add
              */
-            virtual void addObserver(const Observer* newObserver) const {
-                xmltooling::Lock lock(m_observerLock);
-                m_observers.push_back(newObserver);
-            }
+            virtual void addObserver(const Observer* newObserver) const;
 
             /**
              * Removes a metadata observer.
@@ -99,16 +90,7 @@ namespace opensaml {
              * @param oldObserver metadata observer to remove
              * @return  the old observer
              */
-            virtual const Observer* removeObserver(const Observer* oldObserver) const {
-                xmltooling::Lock lock(m_observerLock);
-                for (std::vector<const Observer*>::iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
-                    if (oldObserver==(*i)) {
-                        m_observers.erase(i);
-                        return oldObserver;
-                    }
-                }
-                return NULL;
-            }
+            virtual const Observer* removeObserver(const Observer* oldObserver) const;
 
         private:
             mutable xmltooling::Mutex* m_observerLock;

diff --git a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
index ef7d131..10c5b70 100644 (file)
--- a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
@@ -30,6 +30,7 @@
 #include <memory>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/logging.h>
+#include <xmltooling/util/Threads.h>
 #include <xmltooling/util/XMLHelper.h>
 
 

diff --git a/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp b/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp
new file mode 100644 (file)
index 0000000..7724741
--- /dev/null
+++ b/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp
@@ -0,0 +1,66 @@
+/*
+ *  Copyright 2009 Internet2
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * ObservableMetadataProvider.cpp
+ * 
+ * A metadata provider that notifies interested parties of changes.
+ */
+
+#include "internal.h"
+#include "saml2/metadata/ObservableMetadataProvider.h"
+
+#include <xmltooling/util/Threads.h>
+
+using namespace opensaml::saml2md;
+using namespace xmltooling;
+using namespace std;
+
+ObservableMetadataProvider::ObservableMetadataProvider(const xercesc::DOMElement* e)
+    : MetadataProvider(e), m_observerLock(Mutex::create())
+{
+}
+
+ObservableMetadataProvider::~ObservableMetadataProvider()
+{
+    delete m_observerLock;
+}
+
+void ObservableMetadataProvider::emitChangeEvent() const
+{
+    Lock lock(m_observerLock);
+    for (vector<const Observer*>::const_iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
+        (*i)->onEvent(*this);
+    }
+}
+
+void ObservableMetadataProvider::addObserver(const Observer* newObserver) const
+{
+    Lock lock(m_observerLock);
+    m_observers.push_back(newObserver);
+}
+
+const ObservableMetadataProvider::Observer* ObservableMetadataProvider::removeObserver(const Observer* oldObserver) const
+{
+    Lock lock(m_observerLock);
+    for (vector<const Observer*>::iterator i=m_observers.begin(); i!=m_observers.end(); i++) {
+        if (oldObserver==(*i)) {
+            m_observers.erase(i);
+            return oldObserver;
+        }
+    }
+    return NULL;
+}