Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r9b516a55e9622aa62cce1a017153a03eb66fdcc7 --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 9b516a55e9622aa62cce1a017153a03eb66fdcc7) @@ -16,6 +16,7 @@ # Module imports from logging import Logger +import time # Project imports from leahi_dialin.common.constants import NO_RESET @@ -87,7 +88,9 @@ } } + self.handler_execution_times = [] + @publish(["msg_id_dd_conc_pump_data", "dd_concentrate_pumps", "dd_concentrate_pump_timestamp"]) def _handler_concentrate_pumps_sync(self, message, timestamp=0.0): """ @@ -97,6 +100,7 @@ @param message: published concentrate pumps' data message @return: None """ + start = time.perf_counter() sensor_list =[] sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name, DataTypes.F32)) @@ -128,8 +132,10 @@ decoder_list = sensor_list, message = message) self.dd_concentrate_pump_timestamp = timestamp + self.handler_execution_times.append(time.perf_counter()-start) + def cmd_concentrate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump data broadcast interval override command Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 -r9b516a55e9622aa62cce1a017153a03eb66fdcc7 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 9b516a55e9622aa62cce1a017153a03eb66fdcc7) @@ -16,6 +16,7 @@ # Module imports from logging import Logger +import time # Project imports from leahi_dialin.common.constants import NO_RESET @@ -79,6 +80,7 @@ dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name: 0 } } + self.handler_execution_times = [] @publish(["msg_id_dd_dialysate_pumps_data", "dd_dialysate_pumps", "dd_dialysate_pump_timestamp",]) @@ -90,6 +92,7 @@ @param message: published dialysate pumps' data message @return: None """ + start = time.perf_counter() sensor_list =[] sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name, DataTypes.F32)) @@ -116,6 +119,7 @@ decoder_list = sensor_list, message = message) self.dd_dialysate_pump_timestamp = timestamp + self.handler_execution_times.append(time.perf_counter()-start) def cmd_dialysate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r9b516a55e9622aa62cce1a017153a03eb66fdcc7 --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 9b516a55e9622aa62cce1a017153a03eb66fdcc7) @@ -16,6 +16,7 @@ # Module imports from logging import Logger +import time # Project imports from leahi_dialin.common.constants import NO_RESET @@ -82,6 +83,7 @@ self.dbg7 = 0.0 self.dbg8 = 0.0 self.dbg9 = 0.0 + self.handler_execution_times = [] @publish(["msg_id_dd_heaters_data", "dd_heaters", @@ -94,6 +96,7 @@ @param message: published DD heaters data message @returns none """ + start = time.perf_counter() sensor_list = [] sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDHeaterNames.D45_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name, DataTypes.F32)) @@ -123,6 +126,7 @@ message = message, start_from_byte = len(sensor_list) * DataTypes.U32.size()) self.dd_heaters_timestamp = timestamp + self.handler_execution_times.append(time.perf_counter()-start) def cmd_heaters_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/dd/modules/mixing_cntrl.py =================================================================== diff -u -r74affa1ef5c98ee0ecf7d9f854b090ea23ee0054 -r9b516a55e9622aa62cce1a017153a03eb66fdcc7 --- leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision 74affa1ef5c98ee0ecf7d9f854b090ea23ee0054) +++ leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision 9b516a55e9622aa62cce1a017153a03eb66fdcc7) @@ -16,6 +16,7 @@ # Module imports from logging import Logger +import time # Project imports from leahi_dialin.common.constants import NO_RESET @@ -94,6 +95,7 @@ self.dd_acid_ki_gain = 0.0 self.dd_mixing_control_timestamp = 0 #: The timestamp of the last message + self.handler_execution_times = [] @publish(["msg_id_dd_mixing_control_data", @@ -113,6 +115,7 @@ @param message: published mixing control data message @return: None """ + start = time.perf_counter() msg_list = [] msg_list.append(('self.bicarb_mixing_state', DataTypes.U32)) @@ -155,6 +158,7 @@ message = message) self.dd_mixing_control_timestamp = timestamp + self.handler_execution_times.append(time.perf_counter()-start) def cmd_dialysate_mixing_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 -r9b516a55e9622aa62cce1a017153a03eb66fdcc7 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 9b516a55e9622aa62cce1a017153a03eb66fdcc7) @@ -16,6 +16,7 @@ # Module imports from logging import Logger +import time # Project imports from leahi_dialin.common.constants import NO_RESET @@ -72,6 +73,7 @@ dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name: 0.0 } + self.handler_execution_times = [] @publish(["msg_id_dd_temperature_data", "dd_temperatures", "dd_temperatures_timestamp"]) @@ -82,6 +84,7 @@ @param message: published DD temperature sensors data message @returns none """ + start = time.perf_counter() sensor_list =[] sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name, DataTypes.F32)) @@ -112,6 +115,8 @@ decoder_list = sensor_list, message = message) self.dd_temperatures_timestamp = timestamp + self.handler_execution_times.append(time.perf_counter()-start) + def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -r7d9c0eeed29a86791382b338d5b2c8b8751f3467 -r9b516a55e9622aa62cce1a017153a03eb66fdcc7 --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 7d9c0eeed29a86791382b338d5b2c8b8751f3467) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 9b516a55e9622aa62cce1a017153a03eb66fdcc7) @@ -16,6 +16,7 @@ # Module imports from logging import Logger +import time # Project imports from leahi_dialin.common.constants import NO_RESET @@ -64,6 +65,7 @@ dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_VOLTAGE.name: 0.0, dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_CURRENT.name: 0.0 } + self.handler_execution_times = [] @publish(["msg_id_dd_voltages_data","dd_voltages_timestamp","monitored_voltages"]) @@ -75,6 +77,7 @@ @param message: published monitored voltages data message @return: none """ + start = time.perf_counter() sensor_list = [] sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_1_2V.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_3_3V.name, DataTypes.F32)) @@ -85,14 +88,15 @@ sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_DC_POWER_SUPPY_VOLTAGE.name, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_DC_POWER_SUPPY_CURRENT.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_DC_POWER_SUPPY_CURRENT.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_VOLTAGE.name, DataTypes.F32)) sensor_list.append((dd_enum_repository.DDMonitoredVoltages.FPGA_AC_HEATER_CURRENT.name, DataTypes.F32)) self.process_into_dict(dict_to_update = self.monitored_voltages, decoder_list = sensor_list, message = message) self.dd_voltages_timestamp = timestamp + self.handler_execution_times.append(time.perf_counter()-start) def cmd_monitored_voltages_broadcast_interval_override(self, ms: int = 1000, reset: int = NO_RESET) -> int: