[padb-devel] [padb commit] r53 - Quick hack to make --deadlock work with input files.

[codesite-noreply at google.com]

Author: apittman
Date: Tue Jun 16 05:45:35 2009
New Revision: 53

Modified:
    trunk/src/padb

Log:
Quick hack to make --deadlock work with input files.
The way modes and output formatting works is due to
change soon so just make it work for now and tidy it up
later.


Modified: trunk/src/padb
==============================================================================
--- trunk/src/padb	(original)
+++ trunk/src/padb	Tue Jun 16 05:45:35 2009
@@ -3554,8 +3554,12 @@
      $countoutput = 1
        if ( ( defined $mode and $mode eq "stack" ) or $conf{"verbose"} );

-    if ($input_file) {
-        go_file( $input_file, "input" );
+    if ( defined($input_file) ) {
+        my $m = "input";
+        if ( defined $mode ) {
+            $m = $mode;
+        }
+        go_file( $input_file, $m );
          exit(0);
      }

@@ -4417,7 +4421,17 @@

  sub deadlock_detect {
      my ( $handle, $lines ) = @_;
-    my $data = $lines->{raw};
+    my $data;
+
+    # XXX This is a bit of a hack to make the deadlock
+    # code work with input files, the whole thing is due
+    # a tidy-up on the full-duplex branch where this should
+    # be solved properly.
+    if ( defined $lines->{raw} ) {
+        $data = $lines->{raw};
+    } else {
+        $data = $lines->{lines};
+    }

      # print Dumper $data;
      my %coll_data;