Commit: b6cf428474c310b6315e862084c6c338cad6fee1 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: b6cf428474c310b6315e862084c6c338cad6fee1 (tree)
• Time: 2012-12-15 00:55:18
• Author: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Implement some additional permanent debugging support.

Change Summary

• modified: ChangeLog
• modified: src/pkgdeps.cpp
• modified: src/tarproc.cpp

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2012-12-14  Keith Marshall  <[e-mail]>
 
+	Implement some additional permanent debugging support.
+
+	* src/pkgdeps.cpp (pkgXmlDocument::ResolveDependencies):
+	[DEBUG_TRACE_DEPENDENCIES]: Enable DMH digest mode for messages.
+
+	* src/tarproc.cpp (pkgTarArchiveInstaller::ProcessDataStream):
+	[DEBUG_TRACE_TRANSACTIONS]: Add logging of installed file path names.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Insert a missing snprintf format effector.
 
 	* src/pkgnget.cpp (pkgDownloadMeterGUI::Update): Add omitted '%'

--- a/src/pkgdeps.cpp
+++ b/src/pkgdeps.cpp
@@ -281,6 +281,13 @@ pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
 
   while( package != NULL )
   {
+    /* Collect any debugging messages, relating to this dependency,
+     * into a single message digest.
+     */
+    DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+	dmh_control( DMH_BEGIN_DIGEST )
+      );
+
     /* We have a valid XML entity, which may identify dependencies;
      * check if it includes any "requires" specification...
      */
@@ -527,6 +534,14 @@ pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
        */
       dep = dep->FindNextAssociate( requires_key );
     }
+
+    /* Flush out any digest of debugging messages, which may
+     * have been collected, in respect of this dependency.
+     */
+    DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+	dmh_control( DMH_END_DIGEST )
+      );
+
     /* Also consider any dependencies which may be common to
      * all releases, or all components, of the current package;
      * we do this by walking back through the XML hierarchy,

--- a/src/tarproc.cpp
+++ b/src/tarproc.cpp
@@ -697,6 +697,17 @@ int pkgTarArchiveInstaller::ProcessDataStream( const char *pathname )
 	 */
 	commit_saved_entity( pathname, octval( header.field.mtime ) );
 	installed->AddEntry( filename_key, pathname + sysroot_len );
+
+	/* Additionally, when the appropriate level of debug
+	 * tracing has been enabled, report the installation of
+	 * this file to the diagnostic log.
+	 *
+	 * FIXME: this would be a good place to add reporting
+	 * of installation, in verbose execution mode.
+	 */
+	DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_TRANSACTIONS ),
+	    dmh_printf( "  %s\n", pathname )
+	  );
     }
     return status;
   }