Add support for many processors (not just cores)

* 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}

This solves issue #152 "Mac pro with two processors".

Author: Ati Sharma

src/mbpfan.c

@@ -5,6 +5,7 @@
  *  Modifications (2012) by Ismail Khatib <ikhatib@gmail.com>
  *  Modifications (2012-present) by Daniel Graziotin <daniel@ineed.coffee> [CURRENT MAINTAINER]
  *  Modifications (2017-present) by Robert Musial <rmusial@fastmail.com>
+ *  Modifications (2018-present) by Ati Sharma <ati.sharma@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,7 +19,8 @@
  *
  *
  *  Notes:
- *    Assumes any number of processors and fans (max. 10)
+ *    Assumes any number of processors, cores and fans (max. 6, 16, 12
+ *    as defined in NUM_PROCESSORS, NUM_HWMONS, NUM_TEMP_INPUTS and NUM_FANS)
  *    It uses only the temperatures from the processors as input.
  *    Requires coretemp and applesmc kernel modules to be loaded.
  *    Requires root use
@@ -58,6 +60,12 @@ int low_temp = 63;   // try ranges 55-63
 int high_temp = 66;  // try ranges 58-66
 int max_temp = 86;   // do not set it > 90
 
+// maximum number of processors etc supported
+#define NUM_PROCESSORS 6
+#define NUM_HWMONS 12
+#define NUM_TEMP_INPUTS 16
+#define NUM_FANS 10
+
 int polling_interval = 7;
 
 t_sensors* sensors = NULL;
@@ -102,9 +110,9 @@ bool is_modern_sensors_path()
 
     int counter;
 
-    for (counter = 0; counter < 10; counter++) {
+    for (counter = 0; counter < NUM_HWMONS; counter++) {
         int temp;
-        for (temp = 1; temp < 10; ++temp) {
+        for (temp = 1; temp < NUM_TEMP_INPUTS; ++temp) {
             char *path = smprintf("/sys/devices/platform/coretemp.0/hwmon/hwmon%d/temp%d_input", counter, temp);
             int res = access(path, R_OK);
             free(path);
@@ -127,6 +135,9 @@ t_sensors *retrieve_sensors()
     char *path = NULL;
     char *path_begin = NULL;
 
+    const char *path_end = "_input";
+    int sensors_found = 0;
+
     if (!is_modern_sensors_path()) {
         if(verbose) {
             printf("Using legacy sensor path for kernel < 3.15.0\n");
@@ -148,71 +159,72 @@ t_sensors *retrieve_sensors()
             }
         }
 
-        path_begin = strdup("/sys/devices/platform/coretemp.0/hwmon/hwmon");
+	// loop over up to 6 processors
+	int processor;
+	for (processor = 0; processor < NUM_PROCESSORS; processor++) {
 
-        int counter;
-        for (counter = 0; counter < 10; counter++) {
+	    path_begin = smprintf("/sys/devices/platform/coretemp.%d/hwmon/hwmon", processor);
 
-            char hwmon_path[strlen(path_begin)+2];
+	    int counter;
+	    for (counter = 0; counter < NUM_HWMONS; counter++) {
 
-            sprintf(hwmon_path, "%s%d", path_begin, counter);
+		char hwmon_path[strlen(path_begin)+2];
 
-            int res = access(hwmon_path, R_OK);
-            if (res == 0) {
+		sprintf(hwmon_path, "%s%d", path_begin, counter);
 
-                free(path_begin);
-                path_begin = smprintf("%s/temp", hwmon_path);
+		int res = access(hwmon_path, R_OK);
+		if (res == 0) {
 
-                if(verbose) {
-                    printf("Found hwmon path at %s\n", path_begin);
+		    free(path_begin);
+		    path_begin = smprintf("%s/temp", hwmon_path);
 
-                    if(daemonize) {
-                        syslog(LOG_INFO, "Found hwmon path at %s\n", path_begin);
-                    }
+		    if(verbose) {
+			printf("Found hwmon path at %s\n", path_begin);
 
-                }
+			if(daemonize) {
+			    syslog(LOG_INFO, "Found hwmon path at %s\n", path_begin);
+			}
 
-                break;
-            }
-        }
-    }
+		    }
 
-    const char *path_end = "_input";
+		    break;
+		}
+	    }
 
-    int sensors_found = 0;
+	    int core = 0;
+	    for(core = 0; core<NUM_TEMP_INPUTS; core++) {
+		path = smprintf("%s%d%s", path_begin, core, path_end);
 
-    int counter = 0;
-    for(counter = 0; counter<10; counter++) {
-        path = smprintf("%s%d%s", path_begin, counter, path_end);
+		FILE *file = fopen(path, "r");
 
-        FILE *file = fopen(path, "r");
+		if(file != NULL) {
+		    s = (t_sensors *) malloc( sizeof( t_sensors ) );
+		    s->path = strdup(path);
+		    fscanf(file, "%d", &s->temperature);
 
-        if(file != NULL) {
-            s = (t_sensors *) malloc( sizeof( t_sensors ) );
-            s->path = strdup(path);
-            fscanf(file, "%d", &s->temperature);
+		    if (sensors_head == NULL) {
+			sensors_head = s;
+			sensors_head->next = NULL;
 
-            if (sensors_head == NULL) {
-                sensors_head = s;
-                sensors_head->next = NULL;
+		    } else {
+			t_sensors *tmp = sensors_head;
 
-            } else {
-                t_sensors *tmp = sensors_head;
-
-                while (tmp->next != NULL) {
-                    tmp = tmp->next;
-                }
+			while (tmp->next != NULL) {
+			    tmp = tmp->next;
+			}
 
-                tmp->next = s;
-                tmp->next->next = NULL;
-            }
+			tmp->next = s;
+			tmp->next->next = NULL;
+		    }
 
-            s->file = file;
-            sensors_found++;
-        }
+		    s->file = file;
+		    sensors_found++;
+		}
 
-        free(path);
-        path = NULL;
+		free(path);
+		path = NULL;
+	    }
+	}
     }
 
     if(verbose) {
@@ -252,7 +264,7 @@ t_fans *retrieve_fans()
     int counter = 0;
     int fans_found = 0;
 
-    for(counter = 0; counter<10; counter++) {
+    for(counter = 0; counter<NUM_FANS; counter++) {
 
         path_output = smprintf("%s%d%s", path_begin, counter, path_output_end);
         path_manual = smprintf("%s%d%s", path_begin, counter, path_man_end);

src/mbpfan.h

@@ -59,6 +59,7 @@ void retrieve_settings(const char* settings_path);
 
 /**
  * Detect the sensors in /sys/devices/platform/coretemp.0/temp
+ * and /sys/devices/platform/coretemp.1/temp etc
  * Return a linked list of t_sensors (first temperature detected)
  */
 t_sensors *retrieve_sensors();
@@ -103,4 +104,4 @@ unsigned short get_temp(t_sensors* sensors);
  */
 void mbpfan();
 
-#endif
+#endif