kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-13 15:50:59 +00:00
Code Issues Projects Releases Wiki Activity

FS-6271 --resolve Adding support for smoothing the min-cpu-idle by X number of seconds. Adds the cpu-idle-smoothing-depth into the conf/autoload_configs/switch.conf.xml configs with a default value of 30 seconds.

Browse Source
This commit is contained in:
William King 2014-02-26 12:36:45 -08:00
parent 27dd568892
commit 3575a07c40
4 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/vanilla/autoload_configs/switch.conf.xml
View File

@ -34,6 +34,8 @@
as different hostnames.
-->
<!-- <param name="switchname" value="freeswitch"/> -->
<!-- <param name="cpu-idle-smoothing-depth" value="30"/> -->
<!-- Maximum number of simultaneous DB handles open -->
<param name="max-db-handles" value="50"/>

1
src/include/private/switch_core_pvt.h
View File

@ -259,6 +259,7 @@ struct switch_runtime {
uint32_t debug_level;
uint32_t runlevel;
uint32_t tipping_point;
uint32_t cpu_idle_smoothing_depth;
uint32_t microseconds_per_tick;
int32_t timer_affinity;
switch_profile_timer_t *profile_timer;

2
src/switch_core.c
View File

@ -1976,6 +1976,8 @@ static void switch_load_core_config(const char *file)
switch_core_min_idle_cpu(atof(val));
} else if (!strcasecmp(var, "tipping-point") && !zstr(val)) {
runtime.tipping_point = atoi(val);
} else if (!strcasecmp(var, "cpu-idle-smoothing-depth") && !zstr(val)) {
runtime.cpu_idle_smoothing_depth = atoi(val);
} else if (!strcasecmp(var, "events-use-dispatch") && !zstr(val)) {
runtime.events_use_dispatch = switch_true(val);
} else if (!strcasecmp(var, "initial-event-threads") && !zstr(val)) {

50
src/switch_profile.c
View File

@ -32,7 +32,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "switch.h"
#include "switch_profile.h"
#include "private/switch_core_pvt.h"
#ifdef __linux__
#include <stdio.h>
@ -51,6 +51,9 @@ struct profile_timer
/* last calculated percentage of idle time */
double last_percentage_of_idle_time;
double *percentage_of_idle_time_ring;
unsigned int last_idle_time_index;
unsigned int cpu_idle_smoothing_depth;
#ifdef __linux__
/* the cpu feature gets disabled on errors */
@ -207,8 +210,21 @@ SWITCH_DECLARE(switch_bool_t) switch_get_system_idle_time(switch_profile_timer_t
halftime = totaltime / 2UL;
p->last_percentage_of_idle_time = ((100 * idletime + halftime) / totaltime);
p->last_idle_time_index += 1;
if ( p->last_idle_time_index >= p->cpu_idle_smoothing_depth ) {
p->last_idle_time_index = 0;
}
p->percentage_of_idle_time_ring[p->last_idle_time_index] = ((100 * idletime + halftime) / totaltime);
p->last_percentage_of_idle_time = 0;
for ( int x = 0; x < p->cpu_idle_smoothing_depth; x++ ) {
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "IDLE TIME: (%d)[%lf]\n", x, p->percentage_of_idle_time_ring[x]);
p->last_percentage_of_idle_time += p->percentage_of_idle_time_ring[x];
}
p->last_percentage_of_idle_time /= p->cpu_idle_smoothing_depth;
*idle_percentage = p->last_percentage_of_idle_time;
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "IDLE TIME finalized: [%lf]\n", *idle_percentage);
p->last_user_time = user;
p->last_nice_time = nice;
@ -246,7 +262,18 @@ SWITCH_DECLARE(switch_bool_t) switch_get_system_idle_time(switch_profile_timer_t
__int64 i64Kernel = i64KernelTime - p->i64LastKernelTime;
__int64 i64Idle = i64IdleTime - p->i64LastIdleTime;
__int64 i64System = i64User + i64Kernel;
*idle_percentage = 100.0 * i64Idle / i64System;
p->last_idle_time_index += 1;
if ( p->last_idle_time_index >= p->cpu_idle_smoothing_depth ) {
p->last_idle_time_index = 0;
}
p->percentage_of_idle_time_ring[p->last_idle_time_index] = 100.0 * i64Idle / i64System;
*idle_percentage = 0;
for ( int x = 0; x < p->cpu_idle_smoothing_depth; x++ ) {
*idle_percentage += p->percentage_of_idle_time_ring[x];
}
*idle_percentage /= p->cpu_idle_smoothing_depth;
} else {
*idle_percentage = 100.0;
p->valid_last_times = 1;
@ -274,7 +301,21 @@ SWITCH_DECLARE(switch_bool_t) switch_get_system_idle_time(switch_profile_timer_t
SWITCH_DECLARE(switch_profile_timer_t *)switch_new_profile_timer(void)
{
return calloc(1, sizeof(switch_profile_timer_t));
switch_profile_timer_t *p = calloc(1, sizeof(switch_profile_timer_t));
if ( runtime.cpu_idle_smoothing_depth && runtime.cpu_idle_smoothing_depth > 0 ) {
p->cpu_idle_smoothing_depth = runtime.cpu_idle_smoothing_depth;
} else {
p->cpu_idle_smoothing_depth = 30;
}
p->percentage_of_idle_time_ring = calloc(1, sizeof(double) * p->cpu_idle_smoothing_depth);
for ( int x = 0; x < p->cpu_idle_smoothing_depth; x++ ) {
p->percentage_of_idle_time_ring[x] = 100.0;
}
return p;
}
SWITCH_DECLARE(void) switch_delete_profile_timer(switch_profile_timer_t **p)
@ -284,6 +325,7 @@ SWITCH_DECLARE(void) switch_delete_profile_timer(switch_profile_timer_t **p)
#ifdef __linux__
close((*p)->procfd);
#endif
free((*p)->percentage_of_idle_time_ring);
free(*p);
*p = NULL;
}