Changeset 138

Timestamp:

12/29/98 20:48:43 (14 years ago)

Author:

frodo

Message:

Library and application support for 'set' statements

Location:

lm-sensors/trunk

Files:

• lib/access.c (modified) (4 diffs)
• lib/sensors.h (modified) (1 diff)
• prog/sensors/main.c (modified) (5 diffs)

lm-sensors/trunk/lib/access.c

@@ -18 +18 @@
 */
 
-#include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
 #include "access.h"
@@ -25 +25 @@
 #include "error.h"
 #include "proc.h"
+#include "general.h"
+
+static int sensors_do_this_chip_sets(sensors_chip_name name);
 
 /* Compare two chips name descriptions, to see whether they could match.
@@ -199 +202 @@
 int sensors_set_feature(sensors_chip_name name, int feature, double value)
 {
-  const sensors_chip_feature *featureptr;
+  const sensors_chip_feature *main_feature;
+  const sensors_chip_feature *alt_feature;
   const sensors_chip *chip;
   const sensors_expr *expr = NULL;
   int i,res;
+  int final_expr=0;
+  double to_write;
 
   if (sensors_chip_name_has_wildcards(name))
     return -SENSORS_ERR_WILDCARDS;
-  if (! (featureptr = sensors_lookup_feature_nr(name.prefix,feature)))
+  if (! (main_feature = sensors_lookup_feature_nr(name.prefix,feature)))
     return -SENSORS_ERR_NO_ENTRY;
-  if (! (featureptr->mode && SENSORS_MODE_W))
+  if (main_feature->compute_mapping == SENSORS_NO_MAPPING)
+    alt_feature = NULL;
+  else if (! (alt_feature =
+                   sensors_lookup_feature_nr(name.prefix,
+                                             main_feature->compute_mapping)))
+    return -SENSORS_ERR_NO_ENTRY;
+  if (! (main_feature->mode && SENSORS_MODE_W))
     return -SENSORS_ERR_ACCESS;
   for (chip = NULL; !expr && (chip = sensors_for_all_config_chips(name,chip));)
-    for (i = 0; !expr && (i < chip->computes_count); i++)
-      if (!strcmp(featureptr->name,chip->computes->name))
+    for (i = 0; !final_expr && (i < chip->computes_count); i++)
+      if (!strcmp(main_feature->name,chip->computes[i].name)) {
         expr = chip->computes->to_proc;
+        final_expr = 1;
+      } else if (alt_feature && 
+                 !strcmp(alt_feature->name,chip->computes[i].name))
+        expr = chip->computes[i].to_proc;
+
+  to_write = value;
   if (expr)
-    if ((res = sensors_eval_expr(name,expr,value,&value)))
+    if ((res = sensors_eval_expr(name,expr,value,&to_write)))
       return res;
-  if (sensors_write_proc(name,feature,value))
+  if (sensors_write_proc(name,feature,to_write))
     return -SENSORS_ERR_PROC;
   return 0;
@@ -331 +349 @@
   return 0;
 }
+
+/* Execute all set statements for this particular chip. The chip may not 
+   contain wildcards!  This function will return 0 on success, and <0 on 
+   failure. */
+int sensors_do_this_chip_sets(sensors_chip_name name)
+{
+  sensors_chip *chip;
+  double value;
+  int err,i,j;
+  int res = 0;
+  const sensors_chip_feature *feature;
+  int *feature_list = NULL;
+  int feature_count = 0;
+  int feature_max = 0;
+  int feature_nr;
+
+  for(chip = NULL; (chip = sensors_for_all_config_chips(name,chip));)
+    for(i = 0; i < chip->sets_count; i++) {
+      feature = sensors_lookup_feature_name(name.prefix,chip->sets[i].name);
+      if (! feature) {
+        sensors_parse_error("Unknown feature name",chip->sets[i].lineno);
+        err = SENSORS_ERR_NO_ENTRY;
+        continue;
+      }
+      feature_nr = feature->number;
+
+      /* Check whether we already set this feature */
+      for(j = 0; j < feature_count; j++)
+        if(feature_list[j] == feature_nr)
+          break;
+      if (j != feature_count)
+        continue;
+      sensors_add_array_el(&feature_nr,(void **)&feature_list,&feature_count,
+                        &feature_max, sizeof(int));
+
+      res = sensors_eval_expr(name,chip->sets[i].value,0,&value);
+      if (res) {
+        sensors_parse_error("Parsing expression",chip->sets[i].lineno);
+        err = res;
+        continue;
+      }
+      if ((res = sensors_set_feature(name,feature_nr,value))) {
+        err = res;
+        continue;
+      }
+    }
+  free(feature_list);
+  return res;
+}
+
+/* Execute all set statements for this particular chip. The chip may contain
+   wildcards!  This function will return 0 on success, and <0 on failure. */
+int sensors_do_chip_sets(sensors_chip_name name)
+{
+  int nr,this_res;
+  const sensors_chip_name *found_name;
+  int res = 0;
+
+  for (nr = 0; (found_name = sensors_get_detected_chips(&nr));)
+    if (sensors_match_chip(name,*found_name)) {
+      this_res = sensors_do_this_chip_sets(*found_name);
+      if (! res)
+        res = this_res;
+    }
+  return res;
+}
+
+/* Execute all set statements for all detected chips. This is the same as
+   calling sensors_do_chip_sets with an all wildcards chip name */
+int sensors_do_all_sets(void)
+{
+  sensors_chip_name name = { SENSORS_CHIP_NAME_PREFIX_ANY, 
+                             SENSORS_CHIP_NAME_BUS_ANY,
+                             SENSORS_CHIP_NAME_ADDR_ANY };
+  return sensors_do_chip_sets(name);
+}
+

lm-sensors/trunk/lib/sensors.h

@@ -82 +82 @@
 /* Set the value of a feature of a certain chip. Note that chip should not
    contain wildcard values! This function will return 0 on success, and <0
-   on failure.  BUGGY! */
+   on failure. */
 extern int sensors_set_feature(sensors_chip_name name, int feature,
                                double value);
+
+/* Execute all set statements for this particular chip. The chip may contain
+   wildcards!  This function will return 0 on success, and <0 on failure. */
+extern int sensors_do_chip_sets(sensors_chip_name name);
+
+/* Execute all set statements for all detected chips. This is the same as
+   calling sensors_do_chip_sets with an all wildcards chip name */
+extern int sensors_do_all_sets(void);
 
 /* This function returns all detected chips, one by one. To start at the

lm-sensors/trunk/prog/sensors/main.c

@@ -55 +55 @@
   printf("  -c, --config-file     Specify a config file\n");
   printf("  -h, --help            Display this help text\n");
+  printf("  -s, --set             Execute `set' statements too (root only)\n");
   printf("  -v, --version         Display the program version\n");
   printf("\n");
@@ -120 +121 @@
 {
   int c,res;
+  int do_sets;
 
   int chip_nr;
@@ -127 +129 @@
   struct option long_opts[] =  {
     { "help", no_argument, NULL, 'h' },
+    { "set", no_argument, NULL, 's' },
     { "version", no_argument, NULL, 'v'},
     { "config-file", required_argument, NULL, 'c' }
   };
 
+  do_sets = 0;
   while (1) {
-    c = getopt_long(argc,argv,"hvc:",long_opts,NULL);
+    c = getopt_long(argc,argv,"hvsc:",long_opts,NULL);
     if (c == EOF)
       break;
@@ -149 +153 @@
       config_file_name = strdup(optarg);
       break;
+    case 's':
+      do_sets = 1;
+      break;
     default:
       fprintf(stderr,"Internal error while parsing options!\n");
@@ -167 +174 @@
   /* Here comes the real code... */
 
+  if (do_sets) 
+    if ((res = sensors_do_all_sets())) {
+      fprintf(stderr,"%s\n",sensors_strerror(res));
+      exit(1);
+    }
+  
   for (chip_nr = 0; (chip = sensors_get_detected_chips(&chip_nr));) {
     if (chip->bus == SENSORS_CHIP_NAME_BUS_ISA)