Add support for many processors (not just cores)

Add an outer loop in mbpfan.c:retrieve_sensors to loop over all coretemp
directories. Also increase hard-coded limits from 10 to 12 or 16 since
the temp endpoints are sometimes indexed that high.
    
For example, this is required for supporting a Mac Pro with two processors
of 16 cores, requiring
/sys/devices/platform/coretemp.0/hwmon/hwmon0/temp{1..12}
/sys/devices/platform/coretemp.1/hwmon/hwmon1/temp{1..12}
    
Fixes #152.

Author: mikaelbjoern

mbpfan.conf

@@ -1,7 +1,17 @@
 [general]
 # see https://ineed.coffee/3838/a-beginners-tutorial-for-mbpfan-under-ubuntu for the values
-#min_fan_speed = 2000	# put the *lowest* value of "cat /sys/devices/platform/applesmc.768/fan*_min"
-#max_fan_speed = 6200	# put the *highest* value of "cat /sys/devices/platform/applesmc.768/fan*_max"
+# 
+# mbpfan will load the max / min speed of from the files produced by the applesmc driver. If these files are not found it will set all fans to the default of min_speed = 2000 and max_speed = 6200
+# by setting the values for the speeds in this config it will override whatever it finds in:
+# /sys/devices/platform/applesmc.768/fan*_min
+# /sys/devices/platform/applesmc.768/fan*_max
+# or the defaults.
+#
+# multiple fans can be configured by using the config key of min_fan*_speed and max_fan*_speed
+# the number used will correlate to the file number of the fan in the applesmc driver that are used to control the fan speed.
+#
+#min_fan1_speed = 2000	# put the *lowest* value of "cat /sys/devices/platform/applesmc.768/fan*_min"
+#max_fan1_speed = 6200	# put the *highest* value of "cat /sys/devices/platform/applesmc.768/fan*_max"
 low_temp = 63			# try ranges 55-63, default is 63
 high_temp = 66			# try ranges 58-66, default is 66
 max_temp = 86			# take highest number returned by "cat /sys/devices/platform/coretemp.*/hwmon/hwmon*/temp*_max", divide by 1000

mbpfan.conf.test0

@@ -1,7 +1,7 @@
 [general]
 # see https://ineed.coffee/3838/a-beginners-tutorial-for-mbpfan-under-ubuntu for the values
-min_fan_speed = 2000	# put the *lowest* value of "cat /sys/devices/platform/applesmc.768/fan*_min"
-max_fan_speed = 6200	# put the *highest* value of "cat /sys/devices/platform/applesmc.768/fan*_max"
+min_fan1_speed = 2000	# put the *lowest* value of "cat /sys/devices/platform/applesmc.768/fan*_min"
+max_fan1_speed = 6200	# put the *highest* value of "cat /sys/devices/platform/applesmc.768/fan*_max"
 low_temp = 63			# try ranges 55-63, default is 63
 high_temp = 66			# try ranges 58-66, default is 66
 max_temp = 86			# take highest number returned by "cat /sys/devices/platform/coretemp.*/hwmon/hwmon*/temp*_max", divide by 1000

mbpfan.conf.test1

@@ -1,6 +1,6 @@
 [general]
-min_fan_speed = 6200	# default is 2000
-max_fan_speed = 6200	# default is 6200
+min_fan1_speed = 6200	# default is 2000
+max_fan1_speed = 6200	# default is 6200
 low_temp = 63			# try ranges 55-63, default is 63
 high_temp = 66			# try ranges 58-66, default is 66
 max_temp = 86			# do not set it > 90, default is 86

mbpfan.conf.test2

@@ -0,0 +1,7 @@
+[general]
+min_fan1_speed = 2000	# default is 2000
+min_fan2_speed = 2000	# default is 6200
+low_temp = 63			# try ranges 55-63, default is 63
+high_temp = 66			# try ranges 58-66, default is 66
+max_temp = 86			# do not set it > 90, default is 86
+polling_interval = 1	# default is 7

src/daemon.c

@@ -112,7 +112,7 @@ void signal_handler(int signal)
     switch(signal) {
     case SIGHUP:
         syslog(LOG_WARNING, "Received SIGHUP signal.");
-        retrieve_settings(NULL);
+        retrieve_settings(NULL, fans);
         break;
 
     case SIGTERM:

src/global.h

@@ -19,7 +19,12 @@ struct s_fans {
     char* path;  // TODO: unused
     char* fan_output_path;
     char* fan_manual_path;
+    int step_up;
+    int step_down;
+    int fan_id;
     int old_speed;
+    int fan_max_speed;
+    int fan_min_speed;
     struct s_fans *next;
 };
 
@@ -29,4 +34,4 @@ typedef struct s_fans t_fans;
 extern t_sensors* sensors;
 extern t_fans* fans;
 
-#endif
+#endif

src/main.c

@@ -54,7 +54,6 @@ void print_usage(int argc, char *argv[])
     }
 }
 
-
 void check_requirements()
 {
 
@@ -97,49 +96,6 @@ void check_requirements()
 
 }
 
-
-static int read_value(const char *path)
-{
-    int value = -1;
-    FILE *file = fopen(path, "r");
-    if (file != NULL) {
-        fscanf(file, "%d", &value);
-        fclose(file);
-    }
-    return value;
-}
-
-
-void set_defaults(void)
-{
-    int i;
-    char *path;
-    int value;
-    for (i = 1; i <= 10; ++i) {
-        path = smprintf("%s/fan%d_min", APPLESMC_PATH, i);
-        value = read_value(path);
-        if (value != -1 && (min_fan_speed == -1 || value < min_fan_speed)) {
-            min_fan_speed = value;
-        }
-        free(path);
-
-        path = smprintf("%s/fan%d_max", APPLESMC_PATH, i);
-        value = read_value(path);
-        if (value != -1 && (max_fan_speed == -1 || value > max_fan_speed)) {
-            max_fan_speed = value;
-        }
-        free(path);
-    }
-
-    if (min_fan_speed == -1) {
-        min_fan_speed = 2000;
-    }
-    if (max_fan_speed == -1) {
-        max_fan_speed = 6200;
-    }
-}
-
-
 int main(int argc, char *argv[])
 {
 
@@ -170,10 +126,7 @@ int main(int argc, char *argv[])
         }
     }
 
-
-
     check_requirements();
-    set_defaults();
 
     // pointer to mbpfan() function in mbpfan.c
     void (*fan_control)() = mbpfan;

src/main.h

@@ -1,2 +1 @@
 void check_requirements();
-void set_defaults();