From db652c9e92b49fbd875b3312e140128aaa2246bb Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 24 Jan 2007 21:05:49 +0000 Subject: [PATCH] sensors-detect: Do not bufferize stdout during probes. This makes it easier to see what is being tried in real time, in particular if the probing locks for any reason. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4311 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + prog/detect/sensors-detect | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGES b/CHANGES index ae64acd0..1483ba2a 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,7 @@ SVN HEAD (Olexiy Avramchenko) Add VIA CX700 detection Drop legacy W83627HF ISA detection + Don't bufferize stdout during probes 2.10.2 (20070115) diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index d99c2751..124d1ad3 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -2931,6 +2931,7 @@ sub scan_adapter next unless i2c_probe(\*FILE, $addr, $funcs); printf "Client found at address 0x%02x\n",$addr; + $| = 1; foreach $chip (@chip_ids) { if (exists $chip->{i2c_addrs} and contains $addr, @{$chip->{i2c_addrs}}) { printf("\%-60s", sprintf("Probing for `\%s'... ", $chip->{name})); @@ -2962,12 +2963,14 @@ sub scan_adapter } } } + $| = 0; } } sub scan_isa_bus { my ($chip,$addr,$conf); + $| = 1; foreach $chip (@chip_ids) { next if not exists $chip->{isa_addrs} or not exists $chip->{isa_detect}; foreach $addr (@{$chip->{isa_addrs}}) { @@ -2989,6 +2992,7 @@ sub scan_isa_bus } } } + $| = 0; } use vars qw(%superio); @@ -3107,6 +3111,7 @@ sub scan_superio printf("Probing for Super-I/O at 0x\%x/0x\%x\n", $addrreg, $datareg); + $| = 1; FAMILY: foreach my $family (@superio_ids) { printf("\%-60s", "Trying family `$family->{family}'... "); @@ -3143,6 +3148,7 @@ sub scan_superio exit_superio($addrreg, $datareg); } + $| = 0; } @@ -5637,9 +5643,11 @@ sub main print "Some CPUs or memory controllers may also contain embedded sensors.\n"; print "Do you want to scan for them? (YES/no): "; unless ( =~ /^\s*n/i) { + $| = 1; foreach my $entry (@cpu_ids) { scan_cpu($entry); } + $| = 0; } print "\n";