Temp test

Author: spandruvada

src/thd_cdev.cpp

@@ -40,49 +40,61 @@
 #include "thd_engine.h"
 
 // Clamp to cdev min state or trip specific min if valid
-int cthd_cdev::thd_clamp_state_min(int _state, int temp_min_state)
+int cthd_cdev::thd_clamp_state_min(int _state, int temp_min_state, int temp_max_state)
 {
-	int _min_state = min_state;
+	if (min_state <= max_state) {
+		int _min_state = min_state;
 
-	if (_min_state >= max_state) {
-		if (temp_min_state && temp_min_state <= _min_state)
-			_min_state = temp_min_state;
-	} else {
-		if (temp_min_state && temp_min_state >= _min_state)
+		if (temp_min_state > min_state)
 			_min_state = temp_min_state;
-	}
 
-	thd_log_debug("def_min_state:%d curr_min_state:%d\n", min_state,
-			_min_state);
+		if (_state < _min_state)
+			_state = _min_state;
 
-	if ((_min_state <= max_state && _state <= _min_state)
-			|| (_min_state >= max_state && _state >= _min_state))
-		return _min_state;
-	else
+		thd_log_debug("def_min_state:%d curr_min_state:%d _state:%d\n", min_state, temp_min_state, _state);
 		return _state;
+	}
+
+	int _max_state = max_state;
+
+	if (temp_max_state > max_state)
+		_max_state = temp_max_state;
+
+	if (_state < _max_state)
+		_state = _max_state;
+
+	thd_log_debug("def_max_state:%d curr_max_state:%d _state:%d\n", max_state, temp_max_state, _state);
+
+	return _state;
 }
 
 // Clamp to cdev max state or trip specific max if valid
-int cthd_cdev::thd_clamp_state_max(int _state, int temp_max_state)
+int cthd_cdev::thd_clamp_state_max(int _state, int temp_min_state, int temp_max_state)
 {
-	int _max_state = max_state;
+	if (min_state <= max_state) {
+		int _max_state = max_state;
 
-	if (min_state >= _max_state) {
-		if (temp_max_state && temp_max_state >= _max_state)
+		if (temp_max_state < max_state)
 			_max_state = temp_max_state;
-	} else {
-		if (temp_max_state && temp_max_state <= _max_state)
-			_max_state = temp_max_state;
-	}
 
-	thd_log_debug("def_max_state:%d temp_max_state:%d curr_max_state:%d\n",
-			max_state, temp_max_state, _max_state);
+		if (_state > _max_state)
+			_state = _max_state;
 
-	if ((min_state <= _max_state && _state >= _max_state)
-			|| (min_state >= _max_state && _state <= _max_state))
-		return _max_state;
-	else
+		thd_log_debug("def_max_state:%d curr_max_state:%d _state:%d\n", max_state, temp_max_state, _state);
 		return _state;
+	}
+
+	int _min_state = min_state;
+
+	if (temp_min_state > min_state)
+		_min_state = temp_min_state;
+
+	if (_state > _min_state)
+		_state = _min_state;
+
+	thd_log_debug("def_max_state:%d curr_max_state:%d _state:%d\n", min_state, temp_min_state, _state);
+
+	return _state;
 }
 
 int cthd_cdev::thd_cdev_exponential_controller(int set_point, int target_temp,
@@ -98,7 +110,7 @@ int cthd_cdev::thd_cdev_exponential_controller(int set_point, int target_temp,
 		_curr_state = get_curr_state(true);
 		// Clamp the current state to min_state, as we start from min to max for
 		// activation of a cooling device
-		_curr_state = thd_clamp_state_min(_curr_state, temp_min_state);
+		_curr_state = thd_clamp_state_min(_curr_state, temp_min_state, temp_max_state);
 		thd_log_debug(
 				"thd_cdev_set_%d:curr state %d max state %d temp_min:%d temp_max:%d\n",
 				index, _curr_state, _max_state, temp_min_state, temp_max_state);
@@ -135,15 +147,16 @@ int cthd_cdev::thd_cdev_exponential_controller(int set_point, int target_temp,
 		}
 
 		// Make sure that the state is not beyond max_state
-		_state = thd_clamp_state_max(_state, temp_max_state);
+		_state = thd_clamp_state_max(_state, temp_min_state, temp_max_state);
 
 		trend_increase = true;
 		thd_log_debug("op->device:%s %d\n", type_str.c_str(), _state);
 		set_curr_state(_state, control);
 	} else {
 		// Get the latest state, which is not the latest from the hardware but last set state to the device
 		_curr_state = get_curr_state();
-		_curr_state = thd_clamp_state_max(_curr_state);
+		//_curr_state = thd_clamp_state_max(_curr_state);
+		_curr_state = thd_clamp_state_max(_curr_state, temp_min_state, temp_max_state);
 
 		thd_log_debug("thd_cdev_set_%d:curr state %d max state %d\n", index,
 				_curr_state, _max_state);
@@ -159,13 +172,15 @@ int cthd_cdev::thd_cdev_exponential_controller(int set_point, int target_temp,
 				_state = _curr_state - inc_dec_val;
 
 			// Make sure that it is not beyond min_state
-			_state = thd_clamp_state_min(_state);
+			_state = thd_clamp_state_min(_state, temp_min_state, temp_max_state);
+		//	_state = thd_clamp_state_min(_state);
 			thd_log_info("op->device:%s %d\n", type_str.c_str(), _state);
 			set_curr_state(_state, control);
 		} else {
+			_state = thd_clamp_state_min(min_state, temp_min_state, temp_max_state);
 			thd_log_debug("op->device: force min %s %d\n", type_str.c_str(),
-					min_state);
-			set_curr_state(min_state, control);
+					_state);
+			set_curr_state(_state, control);
 		}
 	}
 

src/thd_cdev.h

@@ -98,8 +98,8 @@ class cthd_cdev {
 	int thd_cdev_exponential_controller(int set_point, int target_temp,
 			int temperature, int state, int arg, int temp_min_state = 0,
 			int temp_max_state = 0);
-	int thd_clamp_state_min(int _state, int temp_min_state = 0);
-	int thd_clamp_state_max(int _state, int temp_max_state = 0);
+	int thd_clamp_state_min(int _state, int temp_min_state = 0, int temp_max_state = 0);
+	int thd_clamp_state_max(int _state, int temp_min_state = 0, int temp_max_state = 0);
 public:
 	static const int default_debounce_interval = 2; // In seconds
 	static const int default_max_exponent = 20; // Max 2 power (x) is raised

src/thd_engine_adaptive.cpp

@@ -342,9 +342,19 @@ int cthd_engine_adaptive::install_itmt(struct itmt_entry *itmt_entry, int& pl1_m
 	 * Which is opposite of the argument order in the
 	 * thd_trip_point_add_cdev()
 	 */
+
+if (itmt_zone == "BSKN") {
+	trip_pt.thd_trip_point_add_cdev(*cdev, cthd_trip_point::default_influence,
+	DEFAULT_SAMPLE_TIME_SEC, 0, 0,
+	NULL, 1, 50000000, 30000000);
+
+} else  {
+
+	
 	trip_pt.thd_trip_point_add_cdev(*cdev, cthd_trip_point::default_influence,
 	DEFAULT_SAMPLE_TIME_SEC, 0, 0,
 	NULL, 1, _max_state, _min_state);
+}
 
 	zone->add_trip(trip_pt, 1);
 	zone->zone_cdev_set_binded();
@@ -598,6 +608,7 @@ void cthd_engine_adaptive::update_engine_state() {
 		policy_active = 1;
 
 		if (itmt_target_pl1_max != TRIP_PT_INVALID_TARGET_STATE) {
+			itmt_target_pl1_max = 50000000;
 			int _pl1_val = itmt_target_pl1_max / 1000;
 
 			if (target_pl_max == TRIP_PT_INVALID_TARGET_STATE || target_pl_max > _pl1_val) {
@@ -608,6 +619,7 @@ void cthd_engine_adaptive::update_engine_state() {
 					thd_log_info("RAPL MMIO device not found\n");
 					return;
 				}
+
 				thd_log_info("Set PL1 max based on ITMT :%d\n", itmt_target_pl1_max);
 				adaptive_target.code = "PL1MAX";
 				adaptive_target.argument = std::to_string(_pl1_val);

src/thd_sensor_virtual.cpp

@@ -126,6 +126,7 @@ unsigned int cthd_sensor_virtual::_read_temperature() {
 
 			temp = link_sensor->sensor->read_temperature();
 
+			//temp = 70000;
 			if (!link_sensor->power_sensor)
 				temp = temp / 1000; //convert to degree C