Merge pull request #58 from zhang-rui/main

fixes and improvements

Author: zhang-rui

Makefile.am

@@ -26,6 +26,7 @@ sbin_PROGRAMS = intel_lpmd
 
 intel_lpmd_CPPFLAGS = \
 	-I@top_srcdir@/src \
+        -I@top_srcdir@/src/include \
 	-DTDLOCALEDIR=\"$(datadir)/locale\" \
 	-DGLIB_SUPPORT
 

data/intel_lpmd.service.in

@@ -1,13 +1,16 @@
 [Unit]
 Description= Intel Linux Energy Optimizer (lpmd) Service
 ConditionVirtualization=no
+StartLimitInterval=200
+StartLimitBurst=5
 
 [Service]
 Type=dbus
 SuccessExitStatus=2
 BusName=org.freedesktop.intel_lpmd
 ExecStart=@sbindir@/intel_lpmd --systemd --dbus-enable
 Restart=on-failure
+RestartSec=30
 
 [Install]
 WantedBy=multi-user.target

src/lpmd.h src/include/lpmd.hsrc/lpmd.h renamed to src/include/lpmd.h

@@ -143,6 +143,7 @@ static void lpmd_parse_state(xmlDoc *doc, xmlNode *a_node, lpmd_config_state_t *
 					else
 						snprintf (state->active_cpus, sizeof(state->active_cpus), "%s", tmp_value);
 				}
+				xmlFree(tmp_value);
 			}
 		}
 	}
@@ -196,6 +197,9 @@ static void lpmd_parse_states(xmlDoc *doc, xmlNode *a_node, lpmd_config_t *lpmd_
 					cpu_config[MAX_CONFIG_LEN - 1] = '\0';
 				}
 
+				if (tmp_value)
+					xmlFree (tmp_value);
+
 				if (strncmp ((const char*) cur_node->name, "State", strlen ("State")))
 					continue;
 
@@ -238,14 +242,14 @@ static int lpmd_fill_config(xmlDoc *doc, xmlNode *a_node, lpmd_config_t *lpmd_co
 							|| lpmd_config->mode < 0)
 						goto err;
 				}
-				else if (!strncmp((const char*)cur_node->name, "HfiLpmEnable", strlen("HfiEnable"))) {
+				else if (!strncmp((const char*)cur_node->name, "HfiLpmEnable", strlen("HfiLpmEnable"))) {
 					errno = 0;
 					lpmd_config->hfi_lpm_enable = strtol (tmp_value, &pos, 10);
 					if (errno || *pos != '\0'
 							|| (lpmd_config->hfi_lpm_enable != 1 && lpmd_config->hfi_lpm_enable != 0))
 						goto err;
 				}
-				else if (!strncmp((const char*)cur_node->name, "HfiSuvEnable", strlen("HfiEnable"))) {
+				else if (!strncmp((const char*)cur_node->name, "HfiSuvEnable", strlen("HfiSuvEnable"))) {
 					errno = 0;
 					lpmd_config->hfi_suv_enable = strtol (tmp_value, &pos, 10);
 					if (errno || *pos != '\0'

src/thermal.h src/include/thermal.hsrc/thermal.h renamed to src/include/thermal.h

@@ -622,7 +622,7 @@ int init_epp_epb(void)
 	int ret;
 	char path[MAX_STR_LENGTH];
 
-	saved_cpu_info = malloc (sizeof(struct cpu_info) * max_cpus);
+	saved_cpu_info = calloc (sizeof(struct cpu_info), max_cpus);
 
 	for (c = 0; c < max_cpus; c++) {
 		saved_cpu_info[c].epp_str[0] = '\0';

src/lpmd_config.c

@@ -400,11 +400,11 @@ static int enter_state(lpmd_config_state_t *state, int bsys, int bcpu)
 
 static int process_next_config_state(lpmd_config_t *config, int wlt_index)
 {
-	lpmd_config_state_t *state;
-	int i;
+	lpmd_config_state_t *state = NULL;
+	int i = 0;
 	int interval = -1;
 	int epp, epb;
-	char epp_str[32];
+	char epp_str[32] = "";
 
 	// Check for new state
 	for (i = 0; i < config->config_state_count; ++i) {