jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add optional profiling

Browse Source
This commit is contained in:
Theo Arends 2021-10-29 18:49:29 +02:00
parent c11083c306
commit 45fcd8ac83
6 changed files with 115 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasmota/support.ino
View File

@ -1997,22 +1997,25 @@ const uint8_t I2C_RETRY_COUNTER = 3;
uint32_t i2c_active[4] = { 0 };
uint32_t i2c_buffer = 0;
void I2cBegin(int sda, int scl, uint32_t frequency = 100000);
void I2cBegin(int sda, int scl, uint32_t frequency) {
bool I2cBegin(int sda, int scl, uint32_t frequency = 100000);
bool I2cBegin(int sda, int scl, uint32_t frequency) {
bool result = true;
#ifdef ESP8266
Wire.begin(sda, scl);
#endif
#ifdef ESP32
bool result = Wire.begin(sda, scl, frequency);
AddLog(LOG_LEVEL_DEBUG, PSTR("I2C: Begin %d"), result);
result = Wire.begin(sda, scl, frequency);
#endif
// AddLog(LOG_LEVEL_DEBUG, PSTR("I2C: Bus1 %d"), result);
return result;
}
#ifdef ESP32
void I2c2Begin(int sda, int scl, uint32_t frequency = 100000);
void I2c2Begin(int sda, int scl, uint32_t frequency) {
bool I2c2Begin(int sda, int scl, uint32_t frequency = 100000);
bool I2c2Begin(int sda, int scl, uint32_t frequency) {
bool result = Wire1.begin(sda, scl, frequency);
AddLog(LOG_LEVEL_DEBUG, PSTR("I2C: Bus 2 begin %d"), result);
// AddLog(LOG_LEVEL_DEBUG, PSTR("I2C: Bus2 %d"), result);
return result;
}
bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size, uint32_t bus = 0);

86
tasmota/support_profiling.ino Normal file
View File

@ -0,0 +1,86 @@
/*
support_profiling.ino - profiling support for Tasmota
Copyright (C) 2021 Theo Arends
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//#define USE_PROFILING
#define PROFILE_THRESHOLD 70 // Minimum duration in milliseconds to start logging
//#define USE_PROFILE_DRIVER
#define USE_PROFILE_FUNCTION
/*********************************************************************************************\
* Profiling features
\*********************************************************************************************/
#ifndef USE_PROFILING
#undef USE_PROFILE_DRIVER
#undef USE_PROFILE_FUNCTION
#endif
#ifdef USE_PROFILE_DRIVER
#define PROFILE_DRIVER(DRIVER, FUNCTION, START) AddLogDriver(DRIVER, FUNCTION, START)
#else
#define PROFILE_DRIVER(DRIVER, FUNCTION, START)
#endif // USE_PROFILE_DRIVER
#ifdef USE_PROFILE_FUNCTION
#define PROFILE_FUNCTION(DRIVER, INDEX, FUNCTION, START) AddLogFunction(DRIVER, INDEX, FUNCTION, START)
#else
#define PROFILE_FUNCTION(DRIVER, INDEX, FUNCTION, START)
#endif // USE_PROFILE_DRIVER
/*********************************************************************************************\
* Profiling services
\*********************************************************************************************/
#ifdef USE_PROFILING
// Below needs to be inline with enum XsnsFunctions
const char kXSnsFunctions[] PROGMEM = "SETTINGS_OVERRIDE|PIN_STATE|MODULE_INIT|PRE_INIT|INIT|"
"LOOP|EVERY_50_MSECOND|EVERY_100_MSECOND|EVERY_200_MSECOND|EVERY_250_MSECOND|EVERY_SECOND|"
"SAVE_SETTINGS|SAVE_AT_MIDNIGHT|SAVE_BEFORE_RESTART|"
"AFTER_TELEPERIOD|JSON_APPEND|WEB_SENSOR|COMMAND|COMMAND_SENSOR|COMMAND_DRIVER|"
"MQTT_SUBSCRIBE|MQTT_INIT|MQTT_DATA|"
"SET_POWER|SET_DEVICE_POWER|SHOW_SENSOR|ANY_KEY|"
"ENERGY_EVERY_SECOND|ENERGY_RESET|"
"RULES_PROCESS|TELEPERIOD_RULES_PROCESS|SERIAL|FREE_MEM|BUTTON_PRESSED|"
"WEB_ADD_BUTTON|WEB_ADD_CONSOLE_BUTTON|WEB_ADD_MANAGEMENT_BUTTON|WEB_ADD_MAIN_BUTTON|"
"WEB_ADD_HANDLER|SET_CHANNELS|SET_SCHEME|HOTPLUG_SCAN|"
"DEVICE_GROUP_ITEM";
#ifdef USE_PROFILE_DRIVER
void AddLogDriver(const char *driver, uint8_t function, uint32_t start) {
uint32_t profile_millis = millis() - start;
if (profile_millis > PROFILE_THRESHOLD) {
char stemp1[20];
AddLog(LOG_LEVEL_DEBUG, PSTR("PRF: *** %s FUNC_%s (%d ms)"), driver, GetTextIndexed(stemp1, sizeof(stemp1), function, kXSnsFunctions), profile_millis);
}
}
#endif // USE_PROFILE_DRIVER
#ifdef USE_PROFILE_FUNCTION
void AddLogFunction(const char *driver, uint8_t index, uint8_t function, uint32_t start) {
uint32_t profile_millis = millis() - start;
if (profile_millis > PROFILE_THRESHOLD) {
char stemp1[20];
AddLog(LOG_LEVEL_DEBUG, PSTR("PRF: *** %s_%02d FUNC_%s (%d ms)"), driver, index, GetTextIndexed(stemp1, sizeof(stemp1), function, kXSnsFunctions), profile_millis);
}
}
#endif // USE_PROFILE_DRIVER
#endif // USE_PROFILING

4
tasmota/support_tasmota.ino
View File

@ -1901,12 +1901,12 @@ void GpioInit(void)
#ifdef USE_I2C
TasmotaGlobal.i2c_enabled = (PinUsed(GPIO_I2C_SCL) && PinUsed(GPIO_I2C_SDA));
if (TasmotaGlobal.i2c_enabled) {
I2cBegin(Pin(GPIO_I2C_SDA), Pin(GPIO_I2C_SCL));
TasmotaGlobal.i2c_enabled = I2cBegin(Pin(GPIO_I2C_SDA), Pin(GPIO_I2C_SCL));
}
#ifdef ESP32
TasmotaGlobal.i2c_enabled_2 = (PinUsed(GPIO_I2C_SCL, 1) && PinUsed(GPIO_I2C_SDA, 1));
if (TasmotaGlobal.i2c_enabled_2) {
I2c2Begin(Pin(GPIO_I2C_SDA, 1), Pin(GPIO_I2C_SCL, 1));
TasmotaGlobal.i2c_enabled_2 = I2c2Begin(Pin(GPIO_I2C_SDA, 1), Pin(GPIO_I2C_SCL, 1));
}
#endif
#endif // USE_I2C

2
tasmota/tasmota.h
View File

@ -294,7 +294,7 @@ enum UploadTypes { UPL_TASMOTA = 1, UPL_SETTINGS, UPL_EFM8BB1, UPL_TASMOTACLIENT
enum ExecuteCommandPowerOptions { POWER_OFF, POWER_ON, POWER_TOGGLE, POWER_BLINK, POWER_BLINK_STOP,
POWER_OFF_NO_STATE = 8, POWER_ON_NO_STATE, POWER_TOGGLE_NO_STATE,
POWER_SHOW_STATE = 16 };
enum SendKeyPowerOptions { POWER_HOLD = 3, POWER_INCREMENT = 4, POWER_INV = 5, POWER_CLEAR = 6, POWER_RELEASE = 7,
enum SendKeyPowerOptions { POWER_HOLD = 3, POWER_INCREMENT = 4, POWER_INV = 5, POWER_CLEAR = 6, POWER_RELEASE = 7,
POWER_100 = 8, CLEAR_RETAIN = 9, POWER_DELAYED = 10 };
enum SendKeyOptions { KEY_BUTTON, KEY_SWITCH };
enum SendKeyMultiClick { SINGLE = 10, DOUBLE = 11, TRIPLE = 12, QUAD = 13, PENTA = 14};

11
tasmota/xdrv_interface.ino
View File

@ -1135,11 +1135,18 @@ bool XdrvCall(uint8_t Function)
{
bool result = false;
DEBUG_TRACE_LOG(PSTR("DRV: %d"), Function);
// DEBUG_TRACE_LOG(PSTR("DRV: %d"), Function);
uint32_t profile_driver_start = millis();
for (uint32_t x = 0; x < xdrv_present; x++) {
uint32_t profile_function_start = millis();
result = xdrv_func_ptr[x](Function);
PROFILE_FUNCTION(PSTR("xdrv"), kXdrvList[x], Function, profile_function_start);
if (result && ((FUNC_COMMAND == Function) ||
(FUNC_COMMAND_DRIVER == Function) ||
(FUNC_MQTT_DATA == Function) ||
@ -1155,5 +1162,7 @@ bool XdrvCall(uint8_t Function)
}
}
PROFILE_DRIVER(PSTR("xdrv"), Function, profile_driver_start);
return result;
}

29
tasmota/xsns_interface.ino
View File

@ -1114,29 +1114,19 @@ bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index) {
bool XsnsCall(uint8_t Function) {
bool result = false;
DEBUG_TRACE_LOG(PSTR("SNS: %d"), Function);
// DEBUG_TRACE_LOG(PSTR("SNS: %d"), Function);
#ifdef PROFILE_XSNS_EVERY_SECOND
uint32_t profile_start_millis = millis();
#endif // PROFILE_XSNS_EVERY_SECOND
uint32_t profile_driver_start = millis();
for (uint32_t x = 0; x < xsns_present; x++) {
if (XsnsEnabled(0, x)) { // Skip disabled sensor
if ((FUNC_WEB_SENSOR == Function) && !XsnsEnabled(1, x)) { continue; } // Skip web info for disabled sensors
#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
uint32_t profile_start_millis = millis();
#endif // PROFILE_XSNS_SENSOR_EVERY_SECOND
uint32_t profile_function_start = millis();
result = xsns_func_ptr[x](Function);
#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
uint32_t profile_millis = millis() - profile_start_millis;
if (profile_millis) {
if (FUNC_EVERY_SECOND == Function) {
AddLog(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d to Sensor %d took %u mS"), TasmotaGlobal.uptime, Function, x, profile_millis);
}
}
#endif // PROFILE_XSNS_SENSOR_EVERY_SECOND
PROFILE_FUNCTION(PSTR("xsns"), kXsnsList[x], Function, profile_function_start);
if (result && ((FUNC_COMMAND == Function) ||
(FUNC_PIN_STATE == Function) ||
@ -1147,14 +1137,7 @@ bool XsnsCall(uint8_t Function) {
}
}
#ifdef PROFILE_XSNS_EVERY_SECOND
uint32_t profile_millis = millis() - profile_start_millis;
if (profile_millis) {
if (FUNC_EVERY_SECOND == Function) {
AddLog(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d took %u mS"), TasmotaGlobal.uptime, Function, profile_millis);
}
}
#endif // PROFILE_XSNS_EVERY_SECOND
PROFILE_DRIVER(PSTR("xsns"), Function, profile_driver_start);
return result;
}