Changeset 5497

Timestamp:

12/02/08 14:53:43 (4 years ago)

Author:

khali

Message:

Turn chips_detected into a hash. This is more appropriate to the data
we store than the array we were using so far.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (13 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -2413 +2413 @@
 ####################
 
-use vars qw(@chips_detected);
-
-# We will build a complicated structure @chips_detected here, being:
-# A list of
-#  references to hashes
-#    with field 'driver', being a string with the driver name for this chip;
-#    with field 'detected'
-#      being a reference to a list of
-#        references to hashes of type 'detect_data';
+use vars qw(%chips_detected);
+
+# We will build a complicated structure %chips_detected here, being a hash
+# where keys are driver names and values are detected chip information in
+# the form of a list of hashes of type 'detect_data'.
 
 # Type detect_data:
@@ -2447 +2443 @@
 {
         my ($chipdriver, $datahash) = @_;
-        my ($i, $new_detected_ref, $detected_ref, $main_entry, $detected_entry,
+        my ($i, $new_detected_ref, $detected_ref, $detected_entry,
             $put_in_detected, @hash_addrs, @entry_addrs);
 
         # First determine where the hash has to be added.
-        for ($i = 0; $i < @chips_detected; $i++) {
-                last if ($chips_detected[$i]->{driver} eq $chipdriver);
-        }
-        if ($i == @chips_detected) {
-                push @chips_detected, {
-                        driver => $chipdriver,
-                        detected => [],
-                };
-        }
-        $new_detected_ref = $chips_detected[$i]->{detected};
+        $chips_detected{$chipdriver} = []
+                unless exists $chips_detected{$chipdriver};
+        $new_detected_ref = $chips_detected{$chipdriver};
 
         # Find out whether our new entry should go into the detected list
@@ -2471 +2460 @@
         $put_in_detected = 1;
  FIND_LOOP:
-        foreach $main_entry (@chips_detected) {
-                foreach $detected_entry (@{$main_entry->{detected}}) {
+        foreach $detected_ref (values %chips_detected) {
+                foreach $detected_entry (@{$detected_ref}) {
                         @entry_addrs = ($detected_entry->{i2c_addr});
                         push @entry_addrs, @{$detected_entry->{i2c_sub_addrs}}
@@ -2491 +2480 @@
         # sub address. This may not be the best idea to do, as it may remove
         # detections without replacing them with second-best ones. Too bad.
-        foreach $main_entry (@chips_detected) {
-                $detected_ref = $main_entry->{detected};
+        foreach $detected_ref (values %chips_detected) {
                 for ($i = @$detected_ref-1; $i >=0; $i--) {
                         @entry_addrs = ($detected_ref->[$i]->{i2c_addr});
@@ -2514 +2502 @@
 {
         my ($chipdriver, $datahash) = @_;
-        my ($i, $new_detected_ref, $detected_ref, $main_entry);
+        my ($i, $new_detected_ref, $detected_ref);
 
         # First determine where the hash has to be added.
-        for ($i = 0; $i < @chips_detected; $i++) {
-                last if ($chips_detected[$i]->{driver} eq $chipdriver);
-        }
-        if ($i == @chips_detected) {
-                push @chips_detected, {
-                        driver => $chipdriver,
-                        detected => [],
-                };
-        }
-        $new_detected_ref = $chips_detected[$i]->{detected};
+        $chips_detected{$chipdriver} = []
+                unless exists $chips_detected{$chipdriver};
+        $new_detected_ref = $chips_detected{$chipdriver};
 
         # Find out whether our new entry should go into the detected list
         # or not. We only compare main isa_addr here, of course.
-        foreach $main_entry (@chips_detected) {
-                $detected_ref = $main_entry->{detected};
-                for ($i = 0; $i < @{$main_entry->{detected}}; $i++) {
+        foreach $detected_ref (values %chips_detected) {
+                for ($i = 0; $i < @{$detected_ref}; $i++) {
                         if (exists $detected_ref->[$i]->{isa_addr} and
                             exists $datahash->{isa_addr} and
@@ -4787 +4767 @@
 sub generate_modprobes
 {
-        my ($chip, $detection, $adap);
+        my ($driver, $detection, $adap);
         my ($isa, $ipmi);
         my ($modprobes, $configfile);
 
-        foreach $chip (@chips_detected) {
-                foreach $detection (@{$chip->{detected}}) {
+        foreach $driver (keys %chips_detected) {
+                foreach $detection (@{$chips_detected{$driver}}) {
                         # Tag adapters which host hardware monitoring chips we want to access
                         if (exists $detection->{i2c_devnr}
@@ -4803 +4783 @@
                         }
                 }
-                if ($chip->{driver} eq "ipmisensors") {
+                if ($driver eq "ipmisensors") {
                         $ipmi = 1;
                 }
@@ -4812 +4792 @@
         # directly, so module options are no longer needed.
         unless (kernel_version_at_least(2, 6, 28)) {
-                foreach $chip (@chips_detected) {
+                foreach $driver (keys %chips_detected) {
                         my @optionlist = ();
-                        foreach $detection (@{$chip->{detected}}) {
+                        foreach $detection (@{$chips_detected{$driver}}) {
                                 next unless exists $detection->{i2c_addr}
                                          && exists $detection->{isa_addr}
@@ -4827 +4807 @@
                         $configfile = "# hwmon module options\n"
                                 unless defined $configfile;
-                        $configfile .= "options $chip->{driver} ignore=".
+                        $configfile .= "options $driver ignore=".
                                        (join ",", @optionlist)."\n";
                 }
@@ -4853 +4833 @@
         # Now determine the chip probe lines
         $modprobes .= "# Chip drivers\n";
-        foreach $chip (@chips_detected) {
-                next if not @{$chip->{detected}};
-                if ($chip->{driver} eq "to-be-written") {
-                        $modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet\n";
+        foreach $driver (keys %chips_detected) {
+                next if not @{$chips_detected{$driver}};
+                if ($driver eq "to-be-written") {
+                        $modprobes .= "# no driver for ${$chips_detected{$driver}}[0]{chipname} yet\n";
                 } else {
-                        open(local *INPUTFILE, "modprobe -l $chip->{driver} 2>/dev/null |");
+                        open(local *INPUTFILE, "modprobe -l $driver 2>/dev/null |");
                         local $_;
                         my $modulefound = 0;
@@ -4871 +4851 @@
                         # isn't supported
                         if ((($? >> 8) == 0) && ! $modulefound) {
-                                $modprobes .= "# Warning: the required module $chip->{driver} is not currently installed\n".
+                                $modprobes .= "# Warning: the required module $driver is not currently installed\n".
                                               "# on your system. For status of 2.6 kernel ports check\n".
                                               "# http://www.lm-sensors.org/wiki/Devices. If driver is built\n".
                                               "# into the kernel, or unavailable, comment out the following line.\n";
                         }
-                        $modprobes .= "modprobe $chip->{driver}\n";
+                        $modprobes .= "modprobe $driver\n";
                 }
         }
@@ -4989 +4969 @@
         print "\n";
 
-        if (!@chips_detected) {
+        if (!keys %chips_detected) {
                 print "Sorry, no sensors were detected.\n",
                       "Either your sensors are not supported, or they are connected to an\n",
@@ -5003 +4983 @@
         <STDIN>;
 
-        my ($chip, $data);
-        foreach $chip (@chips_detected) {
-                next unless @{$chip->{detected}};
-                find_aliases($chip->{detected});
-                print "\nDriver `$chip->{driver}':\n";
-                print_chips_report($chip->{detected});
+        foreach my $driver (keys %chips_detected) {
+                next unless @{$chips_detected{$driver}};
+                find_aliases($chips_detected{$driver});
+                print "\nDriver `$driver':\n";
+                print_chips_report($chips_detected{$driver});
         }
         print "\n";