Define a separate structure to represent main features. This allows

for faster main features lookup. One side effect of this change is
that subfeatures can no longer have labels nor be ignored. I do not
think that this is a problem in practice, and actually this makes a
lot of sense.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4834 7894878c-1315-0410-8ee3-d5d059ff63e0

prog/sensord/chips.c

@@ -141,7 +141,7 @@ rrdF3
 }
 
 static void getAvailableFeatures (const sensors_chip_name *name,
-                                  const sensors_subfeature *feature,
+                                  const sensors_feature *feature,
                                   short *has_features,
                                   int *feature_nrs, int size,
                                   int first_val)
@@ -149,7 +149,7 @@ static void getAvailableFeatures (const sensors_chip_name *name,
   const sensors_subfeature *iter;
   int i = 0;
 
-  while ((iter = sensors_get_all_subfeatures(name, feature->number, &i))) {
+  while ((iter = sensors_get_all_subfeatures(name, feature, &i))) {
     int index0;
 
     index0 = iter->type - first_val;
@@ -166,7 +166,7 @@ static void getAvailableFeatures (const sensors_chip_name *name,
 #define IN_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_IN]
 static void fillChipVoltage (FeatureDescriptor *voltage,
                              const sensors_chip_name *name,
-                             const sensors_subfeature *feature)
+                             const sensors_feature *feature)
 {
   const int size = SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN + 1;
   short has_features[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN + 1] = { 0, };
@@ -215,7 +215,7 @@ static void fillChipVoltage (FeatureDescriptor *voltage,
 #define TEMP_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_TEMP]
 static void fillChipTemperature (FeatureDescriptor *temperature,
                                  const sensors_chip_name *name,
-                                 const sensors_subfeature *feature)
+                                 const sensors_feature *feature)
 {
   const int size = SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP + 1;
   short has_features[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP + 1] = { 0, };
@@ -267,7 +267,7 @@ static void fillChipTemperature (FeatureDescriptor *temperature,
 #define FAN_FEATURE_NR(x)   feature_nrs[x - SENSORS_FEATURE_FAN]
 static void fillChipFan (FeatureDescriptor *fan,
                          const sensors_chip_name *name,
-                         const sensors_subfeature *feature)
+                         const sensors_feature *feature)
 {
   const int size = SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN + 1;
   short has_features[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN + 1] = { 0, };
@@ -312,26 +312,42 @@ static void fillChipFan (FeatureDescriptor *fan,
 }
 
 static void fillChipVid (FeatureDescriptor *vid,
-                         const sensors_subfeature *feature)
+                         const sensors_chip_name *name,
+                         const sensors_feature *feature)
 {
+  int i = 0;
+  const sensors_subfeature *sub;
+
+  sub = sensors_get_all_subfeatures(name, feature, &i);
+  if (!sub)
+    return;
+
   vid->format = fmtVolt_3;
   vid->rrd = rrdF3;
   vid->type = DataType_voltage;
   vid->alarmNumber = -1;
   vid->beepNumber = -1;
-  vid->dataNumbers[0] = feature->number;
+  vid->dataNumbers[0] = sub->number;
   vid->dataNumbers[1] = -1;
 }
 
 static void fillChipBeepEnable (FeatureDescriptor *beepen,
-                                const sensors_subfeature *feature)
+                                const sensors_chip_name *name,
+                                const sensors_feature *feature)
 {
+  int i = 0;
+  const sensors_subfeature *sub;
+
+  sub = sensors_get_all_subfeatures(name, feature, &i);
+  if (!sub)
+    return;
+
   beepen->format = fmtSoundAlarm;
   beepen->rrd = rrdF0;
   beepen->type = DataType_other;
   beepen->alarmNumber = -1;
   beepen->beepNumber = -1;
-  beepen->dataNumbers[0] = feature->number;
+  beepen->dataNumbers[0] = sub->number;
   beepen->dataNumbers[1] = -1;
 }
 
@@ -339,7 +355,7 @@ static
 FeatureDescriptor * generateChipFeatures (const sensors_chip_name *chip)
 {
 	int nr, count = 1;
-	const sensors_subfeature *sensor;
+	const sensors_feature *sensor;
 	FeatureDescriptor *features;
 
 	/* How many main features do we have? */
@@ -367,15 +383,16 @@ FeatureDescriptor * generateChipFeatures (const sensors_chip_name *chip)
 			fillChipFan(&features[count], chip, sensor);
 			break;
 		case SENSORS_FEATURE_VID:
-			fillChipVid(&features[count], sensor);
+			fillChipVid(&features[count], chip, sensor);
 			break;
 		case SENSORS_FEATURE_BEEP_ENABLE:
-			fillChipBeepEnable(&features[count], sensor);
+			fillChipBeepEnable(&features[count], chip, sensor);
 			break;
 		default:
 			continue;
 		}
 
+		features[count].feature = sensor;
 		count++;
 	}
 

prog/sensord/rrd.c

@@ -156,15 +156,11 @@ applyToFeatures
 
         for (index0 = 0; (ret == 0) && (num < MAX_RRD_SENSORS) && features[index0].format; ++ index0) {
           const FeatureDescriptor *feature = features + index0;
-          int labelNumber = feature->dataNumbers[0];
-          const char *rawLabel = NULL;
+          const char *rawLabel = features->feature->name;
           char *label = NULL;
 
-          if (getRawLabel (chip, labelNumber, &rawLabel)) {
-            sensorLog (LOG_ERR, "Error getting raw sensor label: %s/#%d", chip->prefix, labelNumber);
-            ret = -1;
-          } else if (!(label = sensors_get_label (chip, labelNumber))) {
-            sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
+          if (!(label = sensors_get_label (chip, features->feature))) {
+            sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, rawLabel);
             ret = -1;
           } else  {
             rrdCheckLabel (rawLabel, num);

prog/sensord/sense.c

@@ -33,26 +33,6 @@
 #define DO_SET 2
 #define DO_RRD 3
 
-int
-getRawLabel
-(const sensors_chip_name *name, int feature, const char **label) {
-  const sensors_subfeature *mainfeat, *sub;
-  int a, b;
-
-  a = 0;
-  while ((mainfeat = sensors_get_features(name, &a))) {
-    b = 0;
-    while ((sub = sensors_get_all_subfeatures(name, mainfeat->number, &b))) {
-      if (sub->number == feature) {
-        *label = sub->name;
-	return 0;
-      }
-    }
-  }
-  /* TODO: Ensure labels match RRD construct and are not repeated! */
-  return -1;
-}
-
 static const char *
 chipName
 (const sensors_chip_name *chip) {
@@ -87,12 +67,11 @@ doKnownChip
     ret = idChip (chip);
   for (index0 = 0; (ret == 0) && features[index0].format; ++ index0) {
     const FeatureDescriptor *feature = features + index0;
-    int labelNumber = feature->dataNumbers[0];
     int alarm, beep;
     char *label = NULL;
 
-    if (!(label = sensors_get_label (chip, labelNumber))) {
-      sensorLog (LOG_ERR, "Error getting sensor label: %s/#%d", chip->prefix, labelNumber);
+    if (!(label = sensors_get_label (chip, feature->feature))) {
+      sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, feature->feature->name);
       ret = 22;
     } else {
       double values[MAX_DATA];

prog/sensord/sensord.h

@@ -56,8 +56,6 @@ extern int unloadLib (void);
 
 /* from sense.c */
 
-extern int getRawLabel (const sensors_chip_name *name, int feature, const char **label);
-
 extern int readChips (void);
 extern int scanChips (void);
 extern int setChips (void);
@@ -91,7 +89,8 @@ typedef struct {
   DataType type;
   int alarmNumber;
   int beepNumber;
-  int dataNumbers[MAX_DATA + 1]; /* First entry is used for the label */
+  const sensors_feature *feature;
+  int dataNumbers[MAX_DATA + 1];
 } FeatureDescriptor;
 
 typedef struct {

prog/sensors/chips.c

@@ -31,32 +31,30 @@
 void print_chip_raw(const sensors_chip_name *name)
 {
 	int a, b;
-	const sensors_subfeature *feature, *sub;
+	const sensors_feature *feature;
+	const sensors_subfeature *sub;
 	char *label;
 	double val;
 
 	a = 0;
 	while ((feature = sensors_get_features(name, &a))) {
+		if (!(label = sensors_get_label(name, feature))) {
+			printf("ERROR: Can't get feature label!\n");
+			continue;
+		}
+		printf("%s:\n", label);
+		free(label);
+
 		b = 0;
-		while ((sub = sensors_get_all_subfeatures(name, feature->number,
-						      &b))) {
-			if (!(label = sensors_get_label(name, sub->number))) {
-				printf("ERROR: Can't get feature `%s' label!\n",
-				       sub->name);
-				continue;
-			}
+		while ((sub = sensors_get_all_subfeatures(name, feature, &b))) {
 			if (sub->flags & SENSORS_MODE_R) {
 				if (sensors_get_value(name, sub->number, &val))
 					printf("ERROR: Can't get feature `%s' "
 					       "data!\n", sub->name);
-				else if (sub->mapping != SENSORS_NO_MAPPING)
-					printf("  %s: %.2f\n", label, val);
 				else
-					printf("%s: %.2f (%s)\n", label, val,
-					       sub->name);
+					printf("  %s: %.2f\n", sub->name, val);
 			} else
 				printf("(%s)\n", label);
-			free(label);
 		}
 	}
 }
@@ -73,7 +71,7 @@ static void print_label(const char *label, int space)
 }
 
 static void sensors_get_available_features(const sensors_chip_name *name,
-					   const sensors_subfeature *feature,
+					   const sensors_feature *feature,
 					   short *has_features,
 					   double *feature_vals, int size,
 					   int first_val)
@@ -81,7 +79,7 @@ static void sensors_get_available_features(const sensors_chip_name *name,
 	const sensors_subfeature *iter;
 	int i = 0;
 
-	while ((iter = sensors_get_all_subfeatures(name, feature->number, &i))) {
+	while ((iter = sensors_get_all_subfeatures(name, feature, &i))) {
 		int indx, err;
 
 		indx = iter->type - first_val;
@@ -103,13 +101,13 @@ static void sensors_get_available_features(const sensors_chip_name *name,
 static int sensors_get_label_size(const sensors_chip_name *name)
 {
 	int i;
-	const sensors_subfeature *iter;
+	const sensors_feature *iter;
 	char *label;
 	unsigned int max_size = 11;	/* 11 as minumum label width */
 
 	i = 0;
 	while ((iter = sensors_get_features(name, &i))) {
-		if ((label = sensors_get_label(name, iter->number)) &&
+		if ((label = sensors_get_label(name, iter)) &&
 		    strlen(label) > max_size)
 			max_size = strlen(label);
 		free(label);
@@ -143,7 +141,7 @@ static void print_temp_limits(double limit1, double limit2,
 #define TEMP_FEATURE(x)		has_features[x - SENSORS_FEATURE_TEMP]
 #define TEMP_FEATURE_VAL(x)	feature_vals[x - SENSORS_FEATURE_TEMP]
 static void print_chip_temp(const sensors_chip_name *name,
-			    const sensors_subfeature *feature,
+			    const sensors_feature *feature,
 			    int label_size)
 {
 	double val, limit1, limit2;
@@ -154,7 +152,7 @@ static void print_chip_temp(const sensors_chip_name *name,
 	short has_features[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP + 1] = { 0, };
 	double feature_vals[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP + 1] = { 0.0, };
 
-	if (!(label = sensors_get_label(name, feature->number))) {
+	if (!(label = sensors_get_label(name, feature))) {
 		printf("ERROR: Can't get temperature label!\n");
 		return;
 	}
@@ -276,7 +274,7 @@ static void print_chip_temp(const sensors_chip_name *name,
 #define IN_FEATURE(x)		has_features[x - SENSORS_FEATURE_IN]
 #define IN_FEATURE_VAL(x)	feature_vals[x - SENSORS_FEATURE_IN]
 static void print_chip_in(const sensors_chip_name *name,
-			  const sensors_subfeature *feature,
+			  const sensors_feature *feature,
 			  int label_size)
 {
 	const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN + 1;
@@ -285,7 +283,7 @@ static void print_chip_in(const sensors_chip_name *name,
 	double val, alarm_max, alarm_min;
 	char *label;
 
-	if (!(label = sensors_get_label(name, feature->number))) {
+	if (!(label = sensors_get_label(name, feature))) {
 		printf("ERROR: Can't get in label!\n");
 		return;
 	}
@@ -336,7 +334,7 @@ static void print_chip_in(const sensors_chip_name *name,
 #define FAN_FEATURE(x)		has_features[x - SENSORS_FEATURE_FAN]
 #define FAN_FEATURE_VAL(x)	feature_vals[x - SENSORS_FEATURE_FAN]
 static void print_chip_fan(const sensors_chip_name *name,
-			   const sensors_subfeature *feature,
+			   const sensors_feature *feature,
 			   int label_size)
 {
 	char *label;
@@ -345,7 +343,7 @@ static void print_chip_fan(const sensors_chip_name *name,
 	double feature_vals[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN + 1] = { 0.0, };
 	double val;
 
-	if (!(label = sensors_get_label(name, feature->number))) {
+	if (!(label = sensors_get_label(name, feature))) {
 		printf("ERROR: Can't get fan label!\n");
 		return;
 	}
@@ -383,28 +381,42 @@ static void print_chip_fan(const sensors_chip_name *name,
 	printf("\n");
 }
 
-static void print_chip_vid(const sensors_chip_name *name, int f_vid,
+static void print_chip_vid(const sensors_chip_name *name,
+			   const sensors_feature *feature,
 			   int label_size)
 {
 	char *label;
+	const sensors_subfeature *subfeature;
 	double vid;
+	int i = 0;
 
-	if ((label = sensors_get_label(name, f_vid))
-	 && !sensors_get_value(name, f_vid, &vid)) {
+	subfeature = sensors_get_all_subfeatures(name, feature, &i);
+	if (!subfeature)
+		return;
+
+	if ((label = sensors_get_label(name, feature))
+	 && !sensors_get_value(name, subfeature->number, &vid)) {
 		print_label(label, label_size);
 		printf("%+6.3f V\n", vid);
 	}
 	free(label);
 }
 
-static void print_chip_beep_enable(const sensors_chip_name *name, int f_beep,
+static void print_chip_beep_enable(const sensors_chip_name *name,
+				   const sensors_feature *feature,
 				   int label_size)
 {
 	char *label;
+	const sensors_subfeature *subfeature;
 	double beep_enable;
+	int i = 0;
 
-	if ((label = sensors_get_label(name, f_beep))
-	 && !sensors_get_value(name, f_beep, &beep_enable)) {
+	subfeature = sensors_get_all_subfeatures(name, feature, &i);
+	if (!subfeature)
+		return;
+
+	if ((label = sensors_get_label(name, feature))
+	 && !sensors_get_value(name, subfeature->number, &beep_enable)) {
 		print_label(label, label_size);
 		printf("%s\n", beep_enable ? "enabled" : "disabled");
 	}
@@ -413,7 +425,7 @@ static void print_chip_beep_enable(const sensors_chip_name *name, int f_beep,
 
 void print_chip(const sensors_chip_name *name)
 {
-	const sensors_subfeature *feature;
+	const sensors_feature *feature;
 	int i, label_size;
 
 	label_size = sensors_get_label_size(name);
@@ -431,11 +443,10 @@ void print_chip(const sensors_chip_name *name)
 			print_chip_fan(name, feature, label_size);
 			break;
 		case SENSORS_FEATURE_VID:
-			print_chip_vid(name, feature->number, label_size);
+			print_chip_vid(name, feature, label_size);
 			break;
 		case SENSORS_FEATURE_BEEP_ENABLE:
-			print_chip_beep_enable(name, feature->number,
-					       label_size);
+			print_chip_beep_enable(name, feature, label_size);
 			break;
 		default:
 			continue;