Changeset 751

Timestamp:

12/01/07 05:42:30 (16 years ago)

Author:

ppalmers

Message:

implement cache versioning

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/SConstruct (modified) (2 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/serialize.cpp (modified) (7 diffs)
• trunk/libffado/src/libutil/serialize.h (modified) (2 diffs)
• trunk/libffado/src/SConscript (modified) (2 diffs)

trunk/libffado/config.h.in

@@ -21 +21 @@
-#define PACKAGE_VERSION "$VERSION-$REVISION"
-
+/* Define to the version of the cace. */
+#define CACHE_VERSION "$VERSION-$REVISION"
+
-/* Define to the api version */
-#define FFADO_API_VERSION $FFADO_API_VERSION

trunk/libffado/SConstruct

@@ -227 +227 @@
-        env['REVISION'] = ''
-
-4
+5
-
-env['PACKAGE'] = "libffado"
-7
+8
-env['LIBVERSION'] = "1.0.0"
-
@@ -242 +242 @@
-#
-env.ScanReplace( "config.h.in" )
+# ensure that the config.h is updated with the version
+NoCache("config.h")
+AlwaysBuild("config.h")
-
-pkgconfig = env.ScanReplace( "libffado.pc.in" )

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -442 +442 @@
-    Util::XMLDeserialize deser( sFileName, getDebugLevel() );
-
+    if (!deser.isValid()) {
+        debugOutput( DEBUG_LEVEL_NORMAL, "cache not valid: %s\n",
+                     sFileName.c_str() );
+        return false;
+    }
+
-    bool result = deserialize( "", deser );
-    if ( result ) {

trunk/libffado/src/libutil/serialize.cpp

@@ -21 +21 @@
- *
- */
+#include "config.h" // FOR CACHE_VERSION
-
-#include "serialize.h"
@@ -33 +34 @@
-    : IOSerialize()
-    , m_filepath( fileName )
-
-
+
+
+
-    try {
-        m_doc.create_root_node( "ffado_cache" );
+        writeVersion();
-    } catch ( const exception& ex ) {
-        cout << "Exception caught: " << ex.what();
-    }
-}
-
-
-Util::XMLSerialize::XMLSerialize( Glib::ustring fileName, int verboseLevel )
@@ -48 +50 @@
-    , m_verboseLevel( verboseLevel )
-{
+    setDebugLevel(verboseLevel);
-    try {
-        m_doc.create_root_node( "ffado_cache" );
+        writeVersion();
-    } catch ( const exception& ex ) {
-        cout << "Exception caught: " << ex.what();
@@ -63 +67 @@
-    }
-
+}
+
+void
+Util::XMLSerialize::writeVersion()
+{
+    xmlpp::Node* pNode = m_doc.get_root_node();
+    xmlpp::Element* pElem = pNode->add_child( "CacheVersion" );
+    char* valstr;
+    asprintf( &valstr, "%s", CACHE_VERSION );
+    pElem->set_child_text( valstr );
+    free( valstr );
-}
-
@@ -164 +179 @@
-    : IODeserialize()
-    , m_filepath( fileName )
-
-
+
+
+
-    try {
-        m_parser.set_substitute_entities(); //We just want the text to
@@ -181 +197 @@
-    , m_verboseLevel( verboseLevel )
-{
+    setDebugLevel(verboseLevel);
-    try {
-        m_parser.set_substitute_entities(); //We just want the text to
@@ -193 +210 @@
-Util::XMLDeserialize::~XMLDeserialize()
-{
+}
+
+bool
+Util::XMLDeserialize::isValid()
+{
+    return checkVersion();
+}
+
+bool
+Util::XMLDeserialize::checkVersion()
+{
+    Glib::ustring savedVersion;
+    if (read( "CacheVersion", savedVersion )) {
+        Glib::ustring expectedVersion = CACHE_VERSION;
+        debugOutput( DEBUG_LEVEL_NORMAL, "Cache version: %s, expected: %s.\n", savedVersion.c_str(), expectedVersion.c_str() );
+        if (expectedVersion == savedVersion) {
+            debugOutput( DEBUG_LEVEL_VERBOSE, "Cache version OK.\n" );
+            return true;
+        } else {
+            debugOutput( DEBUG_LEVEL_VERBOSE, "Cache version not OK.\n" );
+            return false;
+        }
+    } else return false;
-}
-

trunk/libffado/src/libutil/serialize.h

@@ -72 +72 @@
-                            Glib::ustring str);
-    private:
+        void writeVersion();
+
-        Glib::ustring    m_filepath;
-        xmlpp::Document  m_doc;
@@ -94 +96 @@
-
-        virtual bool isExisting( std::string strMemberName );
-
+
+
-    private:
-        Glib::ustring    m_filepath;

trunk/libffado/src/SConscript

@@ -171 +171 @@
-' )
-
+# Explicitly make these files dependent on config.h
+# to make sure they contain the most recent version
+# #define's
+version_dependent_files = [
+    "ffado.os", # external API versioning
+    "libutil/serialize.os", # cache versioning
+    ]
+
+
-source = ffado_source
-pkgdata = []
@@ -215 +224 @@
-ffadolib = libenv.SharedLibrary( "ffado", source )
-
+for file in version_dependent_files:
+    Depends(file, '#/config.h')
+    NoCache(file)
+    AlwaysBuild(file)
+
+# FIXME: there has to be a better way
+AlwaysBuild(ffadolib)
+NoCache(ffadolib)
+
-#
-# All the following tries to emulate the versioning of installed libs as seen from libtool...