Changeset 5644

Timestamp:

02/15/09 18:15:31 (3 years ago)

Author:

khali

Message:

Exit the configuration file parser as soon as we are done with it.
This makes the peak memory consumption significantly lower (-15% using
"sensors" in my tests).

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/init.c (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -11 +11 @@
               Fix memory leak in scanner when using flex 2.5.9 or later
               Report configuration file read errors
+              Exit the configuration file parser sooner
   lm_sensors.init: Support new format of /etc/sysconfig/lm_sensors (#2246)
                    Drop support for kernels 2.4 and earlier

lm-sensors/trunk/lib/init.c

@@ -62 +62 @@
 }
 
+static int parse_config(FILE *input)
+{
+        int err;
+
+        if (sensors_scanner_init(input))
+                return -SENSORS_ERR_PARSE;
+        err = sensors_parse();
+        sensors_scanner_exit();
+        if (err)
+                return -SENSORS_ERR_PARSE;
+
+        return 0;
+}
+
 int sensors_init(FILE *input)
 {
@@ -72 +86 @@
                 goto exit_cleanup;
 
-        res = -SENSORS_ERR_PARSE;
         if (input) {
-                if (sensors_scanner_init(input) ||
-                    sensors_parse())
+                res = parse_config(input);
+                if (res)
                         goto exit_cleanup;
         } else {
@@ -83 +96 @@
                         input = fopen(ALT_CONFIG_FILE, "r");
                 if (input) {
-                        if (sensors_scanner_init(input) ||
-                            sensors_parse()) {
-                                fclose(input);
+                        res = parse_config(input);
+                        fclose(input);
+                        if (res)
                                 goto exit_cleanup;
-                        }
-                        fclose(input);
+
                 } else if (errno != ENOENT) {
                         sensors_parse_error(strerror(errno), 0);
+                        res = -SENSORS_ERR_PARSE;
                         goto exit_cleanup;
                 }
@@ -198 +211 @@
         int i;
 
-        sensors_scanner_exit();
-
         for (i = 0; i < sensors_proc_chips_count; i++) {
                 free_chip_name(&sensors_proc_chips[i].chip);